Changeset 60:99d9afcfd04d in AnnotationManagerN4J for src

Timestamp:

Nov 20, 2012, 6:43:12 PM (11 years ago)

Author:

casties

Branch:

default

Message:

configuration of uri prefixes was completely broken.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java (modified) (2 diffs)

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

@@ -144 +144 @@
                         graphdbPath = serverConfig.getProperty(GRAPHDB_PATH_KEY, graphdbPath);
                         ldapServerUrl = serverConfig.getProperty(LDAP_SERVER_KEY, null);
+                        /*
+                         * uri prefixes
+                         */
+                        if (serverConfig.containsKey(PERSONS_URI_KEY)) {
+                            BaseRestlet.PERSONS_URI_PREFIX = serverConfig.getProperty(PERSONS_URI_KEY);
+                        }
+                        if (serverConfig.containsKey(GROUPS_URI_KEY)) {
+                            BaseRestlet.GROUPS_URI_PREFIX = serverConfig.getProperty(GROUPS_URI_KEY);
+                        }
+                        if (serverConfig.containsKey(TAGS_URI_KEY)) {
+                            BaseRestlet.TAGS_URI_PREFIX = serverConfig.getProperty(TAGS_URI_KEY);
+                        }
+                        if (serverConfig.containsKey(ANNOTATIONS_URI_KEY)) {
+                            AnnotationStore.ANNOTATION_URI_PREFIX = serverConfig.getProperty(ANNOTATIONS_URI_KEY);
+                        }
                     } catch (IOException e) {
                         logger.warn("Error loading server config: ", e);
@@ -205 +220 @@
                 sc.setAttribute(CONSUMERKEYS_KEY, consumerKeys);
             }
-            /*
-             * read uri prefixes
-             */
-            String pup = (String) sc.getAttribute(PERSONS_URI_KEY);
-            if (pup != null) {
-                BaseRestlet.PERSONS_URI_PREFIX = pup;
-            }
-            String gup = (String) sc.getAttribute(GROUPS_URI_KEY);
-            if (gup != null) {
-                BaseRestlet.GROUPS_URI_PREFIX = gup;
-            }
-            String tup = (String) sc.getAttribute(TAGS_URI_KEY);
-            if (tup != null) {
-                BaseRestlet.TAGS_URI_PREFIX = tup;
-            }
-            String aup = (String) sc.getAttribute(ANNOTATIONS_URI_KEY);
-            if (aup != null) {
-                AnnotationStore.ANNOTATION_URI_PREFIX = aup;
-            }
         } else {
             logger.error("Unable to get ServletContext!");