Changeset 86:e3f0613b2f2d in AnnotationManagerN4J

Timestamp:

Feb 2, 2015, 10:32:53 AM (9 years ago)

Author:

casties

Branch:

default

Message:

renamed getFullname to make it configurable.
fixed Restlet at 2.2.3.

Files:

• pom.xml (modified) (1 diff)
• src/main/java/de/mpiwg/itgroup/annotations/Person.java (modified) (1 diff)
• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java (modified) (3 diffs)
• src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java (modified) (3 diffs)
• src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonsResource.java (modified) (1 diff)

pom.xml

@@ -10 +10 @@
     <!-- <restlet-version>2.0.15</restlet-version> -->
     <!-- <restlet-version>2.1.7</restlet-version> -->
-    <restlet-version>2.2-SNAPSHOT</restlet-version>
+    <restlet-version>2.2.3</restlet-version>
   </properties>
   <repositories>

src/main/java/de/mpiwg/itgroup/annotations/Person.java

@@ -88 +88 @@
     public String updateName(BaseRestlet application) {
         if (id != null) {
-            name = application.getFullNameFromLdap(id);
+            name = application.getFullNameForId(id);
         }
         return name;

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -164 +164 @@
      * 
      * @param entity
-     * @return
+     * @return user-id
      */
     public String checkAuthToken(Representation entity) {
@@ -249 +249 @@
                     if (userName == null) {
                         BaseRestlet restServer = (BaseRestlet) getApplication();
-                        userName = restServer.getFullNameFromLdap(userId);
+                        userName = restServer.getFullNameForId(userId);
                     }
                     userObject.put("name", userName);
@@ -625 +625 @@
         if (creator.getName() == null && username != null) {
             BaseRestlet restServer = (BaseRestlet) getApplication();
-            String fullName = restServer.getFullNameFromLdap(username);
+            String fullName = restServer.getFullNameForId(username);
             creator.setName(fullName);
         }

src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java

@@ -21 +21 @@
  * <http://www.gnu.org/licenses/lgpl-3.0.html>.
  * #L%
- * Author: Robert Casties (casties@mpiwg-berlin.mpg.de)
+ * Author: Robert Casties (casties@mpiwg-berlin.mpg.de),
+ *         Dirk Wintergruen (dwinter@mpiwg-berlin.mpg.de)
  */
 
@@ -98 +99 @@
     public static final String LDAP_SERVER_KEY = "annotationmanager.ldapserver.url";
 
+    /**
+     * web frontend admin user name
+     */
     public static final String ADMIN_USER_KEY = "annotationmanager.admin.user";
+    /**
+     * web frontend admin user password
+     */
     public static final String ADMIN_PASSWORD_KEY = "annotationmanager.admin.password";
 
@@ -277 +284 @@
 
     /**
+     * Return the full name (String) of the person with the given user-id.
+     * 
+     * Contacts a naming service (currently LDAP).
+     * 
+     * @param userId
+     * @return full-name
+     */
+    public String getFullNameForId(String userId) {
+        return getFullNameFromLdap(userId);
+    }   
+    
+    /**
      * Hole den vollen Benutzernamen aus dem LDAP
      * 

src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonsResource.java

@@ -126 +126 @@
         String name = form.getFirstValue("name");
         if (name == null || name.isEmpty()) {
-            name = ((BaseRestlet) getApplication()).getFullNameFromLdap(id);
+            name = ((BaseRestlet) getApplication()).getFullNameForId(id);
         }
         String uri = form.getFirstValue("uri");