Changeset 86:e3f0613b2f2d in AnnotationManagerN4J
- Timestamp:
- Feb 2, 2015, 10:32:53 AM (10 years ago)
- Branch:
- default
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
pom.xml
r83 r86 10 10 <!-- <restlet-version>2.0.15</restlet-version> --> 11 11 <!-- <restlet-version>2.1.7</restlet-version> --> 12 <restlet-version>2.2 -SNAPSHOT</restlet-version>12 <restlet-version>2.2.3</restlet-version> 13 13 </properties> 14 14 <repositories> -
src/main/java/de/mpiwg/itgroup/annotations/Person.java
r70 r86 88 88 public String updateName(BaseRestlet application) { 89 89 if (id != null) { 90 name = application.getFullNameF romLdap(id);90 name = application.getFullNameForId(id); 91 91 } 92 92 return name; -
src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java
r85 r86 164 164 * 165 165 * @param entity 166 * @return 166 * @return user-id 167 167 */ 168 168 public String checkAuthToken(Representation entity) { … … 249 249 if (userName == null) { 250 250 BaseRestlet restServer = (BaseRestlet) getApplication(); 251 userName = restServer.getFullNameF romLdap(userId);251 userName = restServer.getFullNameForId(userId); 252 252 } 253 253 userObject.put("name", userName); … … 625 625 if (creator.getName() == null && username != null) { 626 626 BaseRestlet restServer = (BaseRestlet) getApplication(); 627 String fullName = restServer.getFullNameF romLdap(username);627 String fullName = restServer.getFullNameForId(username); 628 628 creator.setName(fullName); 629 629 } -
src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java
r80 r86 21 21 * <http://www.gnu.org/licenses/lgpl-3.0.html>. 22 22 * #L% 23 * Author: Robert Casties (casties@mpiwg-berlin.mpg.de) 23 * Author: Robert Casties (casties@mpiwg-berlin.mpg.de), 24 * Dirk Wintergruen (dwinter@mpiwg-berlin.mpg.de) 24 25 */ 25 26 … … 98 99 public static final String LDAP_SERVER_KEY = "annotationmanager.ldapserver.url"; 99 100 101 /** 102 * web frontend admin user name 103 */ 100 104 public static final String ADMIN_USER_KEY = "annotationmanager.admin.user"; 105 /** 106 * web frontend admin user password 107 */ 101 108 public static final String ADMIN_PASSWORD_KEY = "annotationmanager.admin.password"; 102 109 … … 277 284 278 285 /** 286 * Return the full name (String) of the person with the given user-id. 287 * 288 * Contacts a naming service (currently LDAP). 289 * 290 * @param userId 291 * @return full-name 292 */ 293 public String getFullNameForId(String userId) { 294 return getFullNameFromLdap(userId); 295 } 296 297 /** 279 298 * Hole den vollen Benutzernamen aus dem LDAP 280 299 * -
src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/PersonsResource.java
r75 r86 126 126 String name = form.getFirstValue("name"); 127 127 if (name == null || name.isEmpty()) { 128 name = ((BaseRestlet) getApplication()).getFullNameF romLdap(id);128 name = ((BaseRestlet) getApplication()).getFullNameForId(id); 129 129 } 130 130 String uri = form.getFirstValue("uri");
Note: See TracChangeset
for help on using the changeset viewer.