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

Timestamp:

Jul 3, 2012, 7:23:17 PM (12 years ago)

Author:

casties

Branch:

default

Message:

version 0.2 really works now

File:

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

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

@@ -41 +41 @@
     public String CONSUMER_KEYS_PATH = "WEB-INF/consumerkeys.property";
 
+    private Properties serverConfig;
+    public String CONFIG_PROPS_PATH = "WEB-INF/serverconfig.property";
+
     private GraphDatabaseService graphDb;
     public static final String GRAPHDB_KEY = "annotationmanager.graphdb";
-    public String DB_PATH = "WEB-INF/neo4j-annotation-db";
+    public static final String GRAPHDB_PATH_KEY = "annotationmanager.graphdb.path";
+    public String graphdbPath = "WEB-INF/neo4j-annotation-db";
 
     private WrappingNeoServerBootstrapper srv;
@@ -64 +68 @@
                 .get("org.restlet.ext.servlet.ServletContext");
         if (sc != null) {
+            /*
+             * read config from webapp
+             */
+            serverConfig = new Properties();
+            InputStream ps1 = getResourceAsStream(sc, CONFIG_PROPS_PATH);
+            if (ps1 != null) {
+                logger.debug("loading config from " + CONFIG_PROPS_PATH);
+                try {
+                    serverConfig.load(ps1);
+                    /*
+                     * read serverconfig options
+                     */
+                    graphdbPath = serverConfig.getProperty(GRAPHDB_PATH_KEY, graphdbPath);
+                } catch (IOException e) {
+                    logger.warn("Error loading server config: ", e);
+                }
+                logger.debug("config: " + serverConfig);
+            } else {
+                logger.error("Unable to get resource " + CONFIG_PROPS_PATH);
+            }
             // look for database service in context
             graphDb = (GraphDatabaseService) sc.getAttribute(GRAPHDB_KEY);
@@ -70 +94 @@
                  * open database
                  */
-                String dbFn = getResourcePath(sc, DB_PATH);
+                String dbFn = getResourcePath(sc, graphdbPath);
                 if (dbFn != null) {
                     logger.debug("opening DB " + dbFn);
@@ -87 +111 @@
                     srv.start();
                 } else {
-                    logger.error("Unable to get resource " + DB_PATH);
+                    logger.error("Unable to get resource " + dbFn);
                 }
             }
@@ -94 +118 @@
              */
             consumerKeys = new Properties();
-            InputStream ps = getResourceAsStream(sc, CONSUMER_KEYS_PATH);
-            if (ps != null) {
+            InputStream ps2 = getResourceAsStream(sc, CONSUMER_KEYS_PATH);
+            if (ps2 != null) {
                 logger.debug("loading consumer keys from " + CONSUMER_KEYS_PATH);
                 try {
-                    consumerKeys.load(ps);
+                    consumerKeys.load(ps2);
                 } catch (IOException e) {
                     // TODO Auto-generated catch block
@@ -155 +179 @@
      * @return
      */
-    public String getUserNameFromLdap(String creator) {
+    public String getFullNameFromLdap(String creator) {
         String retString = creator; // falls nichts gefunden wird einfach den
                                     // creator zurueckgeben
@@ -163 +187 @@
 
         // TODO: should go into config file
-        String ldapUrl = "ldap://ldapreplik.mpiwg-berlin.mpg.de/dc=mpiwg-berlin,dc=mpg,dc=de"; 
+        String ldapUrl = "ldap://ldap.mpiwg-berlin.mpg.de/dc=mpiwg-berlin,dc=mpg,dc=de"; 
         env.put(javax.naming.Context.PROVIDER_URL, ldapUrl);
 
@@ -175 +199 @@
         }
 
-        String base = "ou=People";
+        String base = "ou=people";
 
         SearchControls sc = new SearchControls();