--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/RestServer.java	Tue Jul 03 21:23:17 2012 +0200
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/RestServer.java	Wed Jul 11 17:08:40 2012 +0200
@@ -54,6 +54,9 @@
     private AnnotationStore store;
     public static final String ANNSTORE_KEY = "annotationmanager.store";
 
+    private String ldapServerUrl;
+    public static final String LDAP_SERVER_KEY = "annotationmanager.ldapserver.url";
+
     /**
      * constructor
      * 
@@ -80,6 +83,7 @@
                      * read serverconfig options
                      */
                     graphdbPath = serverConfig.getProperty(GRAPHDB_PATH_KEY, graphdbPath);
+                    ldapServerUrl =  serverConfig.getProperty(LDAP_SERVER_KEY, null);
                 } catch (IOException e) {
                     logger.warn("Error loading server config: ", e);
                 }
@@ -181,13 +185,14 @@
     public String getFullNameFromLdap(String creator) {
         String retString = creator; // falls nichts gefunden wird einfach den
                                     // creator zurueckgeben
+        if (ldapServerUrl == null) {
+        	return retString;
+        }
         Hashtable<String, String> env = new Hashtable<String, String>();
         String sp = "com.sun.jndi.ldap.LdapCtxFactory";
         env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, sp);
 
-        // TODO: should go into config file
-        String ldapUrl = "ldap://ldap.mpiwg-berlin.mpg.de/dc=mpiwg-berlin,dc=mpg,dc=de"; 
-        env.put(javax.naming.Context.PROVIDER_URL, ldapUrl);
+        env.put(javax.naming.Context.PROVIDER_URL, ldapServerUrl);
 
         DirContext dctx;
         try {