GUAC-800: Use Forms for attributes, not just Fields.

guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/schema/SchemaRESTService.java

@@ -34,7 +34,7 @@ import javax.ws.rs.core.MediaType;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.environment.Environment;
 import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.form.Field;
+import org.glyptodon.guacamole.form.Form;
 import org.glyptodon.guacamole.net.auth.UserContext;
 import org.glyptodon.guacamole.net.basic.rest.AuthProviderRESTExposure;
 import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
@@ -65,8 +65,8 @@ public class SchemaRESTService {
      *     performing the operation.
      *
      * @return
-     *     A collection of form fields which describe the possible attributes
-     *     of a user object.
+     *     A collection of forms which describe the possible attributes of a
+     *     user object.
      *
      * @throws GuacamoleException
      *     If an error occurs while retrieving the possible attributes.
@@ -74,7 +74,7 @@ public class SchemaRESTService {
     @GET
     @Path("/users/attributes")
     @AuthProviderRESTExposure
-    public Collection<Field> getUserAttributes(@QueryParam("token") String authToken) throws GuacamoleException {
+    public Collection<Form> getUserAttributes(@QueryParam("token") String authToken) throws GuacamoleException {
 
         // Retrieve all possible user attributes
         UserContext userContext = authenticationService.getUserContext(authToken);
@@ -90,8 +90,8 @@ public class SchemaRESTService {
      *     performing the operation.
      *
      * @return
-     *     A collection of form fields which describe the possible attributes
-     *     of a connection object.
+     *     A collection of forms which describe the possible attributes of a
+     *     connection object.
      *
      * @throws GuacamoleException
      *     If an error occurs while retrieving the possible attributes.
@@ -99,7 +99,7 @@ public class SchemaRESTService {
     @GET
     @Path("/connections/attributes")
     @AuthProviderRESTExposure
-    public Collection<Field> getConnectionAttributes(@QueryParam("token") String authToken) throws GuacamoleException {
+    public Collection<Form> getConnectionAttributes(@QueryParam("token") String authToken) throws GuacamoleException {
 
         // Retrieve all possible connection attributes
         UserContext userContext = authenticationService.getUserContext(authToken);
@@ -115,8 +115,8 @@ public class SchemaRESTService {
      *     performing the operation.
      *
      * @return
-     *     A collection of form fields which describe the possible attributes
-     *     of a connection group object.
+     *     A collection of forms which describe the possible attributes of a
+     *     connection group object.
      *
      * @throws GuacamoleException
      *     If an error occurs while retrieving the possible attributes.
@@ -124,7 +124,7 @@ public class SchemaRESTService {
     @GET
     @Path("/connectionGroups/attributes")
     @AuthProviderRESTExposure
-    public Collection<Field> getConnectionGroupAttributes(@QueryParam("token") String authToken) throws GuacamoleException {
+    public Collection<Form> getConnectionGroupAttributes(@QueryParam("token") String authToken) throws GuacamoleException {
 
         // Retrieve all possible connection group attributes
         UserContext userContext = authenticationService.getUserContext(authToken);

guacamole/src/main/webapp/app/manage/controllers/manageUserController.js

@@ -105,9 +105,10 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
 
     /**
      * All available user attributes. This is only the set of attribute
-     * definitions, not attribute values.
+     * definitions, organized as logical groupings of attributes, not attribute
+     * values.
      *
-     * @type Field[]
+     * @type Form[]
      */
     $scope.attributes = null;
 

guacamole/src/main/webapp/app/rest/services/schemaService.js

@@ -36,12 +36,13 @@ angular.module('rest').factory('schemaService', ['$injector',
     /**
      * Makes a request to the REST API to get the list of available attributes
      * for user objects, returning a promise that provides an array of
-     * @link{Field} objects if successful. Each element of the array describes
-     * a possible attribute.
+     * @link{Form} objects if successful. Each element of the array describes
+     * a logical grouping of possible attributes.
      *
-     * @returns {Promise.<Field[]>}
-     *     A promise which will resolve with an array of @link{Field}
-     *     objects, where each @link{Field} describes a possible attribute.
+     * @returns {Promise.<Form[]>}
+     *     A promise which will resolve with an array of @link{Form}
+     *     objects, where each @link{Form} describes a logical grouping of
+     *     possible attributes.
      */
     service.getUserAttributes = function getUserAttributes() {
 
@@ -63,12 +64,13 @@ angular.module('rest').factory('schemaService', ['$injector',
     /**
      * Makes a request to the REST API to get the list of available attributes
      * for connection objects, returning a promise that provides an array of
-     * @link{Field} objects if successful. Each element of the array describes
-     * a possible attribute.
+     * @link{Form} objects if successful. Each element of the array describes
+     * a logical grouping of possible attributes.
      *
-     * @returns {Promise.<Field[]>}
-     *     A promise which will resolve with an array of @link{Field}
-     *     objects, where each @link{Field} describes a possible attribute.
+     * @returns {Promise.<Form[]>}
+     *     A promise which will resolve with an array of @link{Form}
+     *     objects, where each @link{Form} describes a logical grouping of
+     *     possible attributes.
      */
     service.getConnectionAttributes = function getConnectionAttributes() {
 
@@ -90,12 +92,13 @@ angular.module('rest').factory('schemaService', ['$injector',
     /**
      * Makes a request to the REST API to get the list of available attributes
      * for connection group objects, returning a promise that provides an array
-     * of @link{Field} objects if successful. Each element of the array
-     * describes a possible attribute.
+     * of @link{Form} objects if successful. Each element of the array
+     * a logical grouping of possible attributes.
      *
-     * @returns {Promise.<Field[]>}
-     *     A promise which will resolve with an array of @link{Field}
-     *     objects, where each @link{Field} describes a possible attribute.
+     * @returns {Promise.<Form[]>}
+     *     A promise which will resolve with an array of @link{Form}
+     *     objects, where each @link{Form} describes a logical grouping of
+     *     possible attributes.
      */
     service.getConnectionGroupAttributes = function getConnectionGroupAttributes() {