Changeset 6:6dfbe2400f64 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/RestServer.java

Timestamp:

Jul 11, 2012, 3:08:40 PM (12 years ago)

Author:

casties

Branch:

default

Message:

delete annotation should work now.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/RestServer.java (modified) (3 diffs)

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

@@ -54 +54 @@
     private AnnotationStore store;
     public static final String ANNSTORE_KEY = "annotationmanager.store";
+
+    private String ldapServerUrl;
+    public static final String LDAP_SERVER_KEY = "annotationmanager.ldapserver.url";
 
     /**
@@ -81 +84 @@
                      */
                     graphdbPath = serverConfig.getProperty(GRAPHDB_PATH_KEY, graphdbPath);
+                    ldapServerUrl =  serverConfig.getProperty(LDAP_SERVER_KEY, null);
                 } catch (IOException e) {
                     logger.warn("Error loading server config: ", e);
@@ -182 +186 @@
         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;