Changeset 94:fcb6fe10e08c in AnnotationManagerN4J for src

Timestamp:

Feb 10, 2015, 4:45:56 PM (9 years ago)

Author:

casties

Branch:

default

Message:

added config option for webapp URL prefix.

Location:

src/main

Files:

• java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java (modified) (4 diffs)
• java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java (modified) (2 diffs)
• java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsResource.java (modified) (1 diff)
• java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java (modified) (4 diffs)
• java/de/mpiwg/itgroup/annotations/restlet/utils/UrlPrefixFilter.java (added)
• webapp/WEB-INF/serverconfig.property.template (modified) (1 diff)

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

@@ -30 +30 @@
 import org.restlet.routing.Router;
 
+import de.mpiwg.itgroup.annotations.restlet.utils.UrlPrefixFilter;
+
 /**
  * @author casties
@@ -46 +48 @@
     public Restlet createInboundRoot() {
 
+        Restlet root = null;
         Router router = new Router(getContext());
         
@@ -59 +62 @@
         router.attach("/resources/{id}/annotations", AnnotatorAnnotationsByResources.class);
         router.attach("/", AnnotatorInfo.class);
-        //return router;
+        root = router;
 
         // this.authenticator = createAuthenticator();
         // authenticator.setNext(router);
-        // return authenticator;
+        
+        if (this.webappUriPrefix != null) {
+                // add prefix path to url
+                UrlPrefixFilter prefixFilter = new UrlPrefixFilter();
+                prefixFilter.setPrefix(this.webappUriPrefix);;
+                prefixFilter.setNext(root);
+                root = prefixFilter;
+        }
 
         // handle Cross-Origin-Resource-Security headers
@@ -69 +79 @@
         corsFilter.setAllowedOrigins(new HashSet<String>(Arrays.asList("*")));
         corsFilter.setAllowedCredentials(true);
-        corsFilter.setNext(router);
-        return corsFilter;
+        corsFilter.setNext(root);
+        root = corsFilter;
+
+        return root;
 
     }

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

@@ -115 +115 @@
     
     /**
+     * prefix for webapp URLs (if needed by proxying).
+     */
+    protected String webappUriPrefix = null;
+    public static final String WEBAPP_PREFIX = "annotationmanager.webapp.prefix";
+    
+    /**
      * prefix to create uris for tags in store.
      */
@@ -172 +178 @@
                         graphdbPath = serverConfig.getProperty(GRAPHDB_PATH_KEY, graphdbPath);
                         ldapServerUrl = serverConfig.getProperty(LDAP_SERVER_KEY, null);
+                        webappUriPrefix = serverConfig.getProperty(WEBAPP_PREFIX, null);
                         /*
                          * uri prefixes

src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsResource.java

@@ -49 +49 @@
 public class AnnotationsResource extends ServerResource {
 
-    public static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.restlet.annotations_ui.AnnotationsResource");
+    public static Logger logger = Logger.getLogger(AnnotationsResource.class.getCanonicalName());
 
     private AnnotationStore store;

src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java

@@ -35 +35 @@
 
 import de.mpiwg.itgroup.annotations.restlet.BaseRestlet;
+import de.mpiwg.itgroup.annotations.restlet.utils.UrlPrefixFilter;
 
 /**
@@ -54 +55 @@
     public Restlet createInboundRoot() {
         // this.authenticator = createAuthenticator();
-
+        Restlet root = null;
+        
         Router router = new Router(getContext());
-
         router.attach("/groups", GroupsResource.class);
         router.attach("/groups/", GroupsResource.class);
@@ -70 +71 @@
         router.attach("/annotations/{id}", AnnotationResource.class);
         router.attach("/annotations/{id}/", AnnotationResource.class);
-
         router.attach("/", InfoResource.class);
+        root = router;
+        
+        if (this.webappUriPrefix != null) {
+                // add prefix path to url
+                UrlPrefixFilter prefixFilter = new UrlPrefixFilter();
+                prefixFilter.setPrefix(this.webappUriPrefix);;
+                prefixFilter.setNext(root);
+                root = prefixFilter;
+        }
 
         // use simple password verifier
@@ -87 +96 @@
         guard.setVerifier(verifier);
         // put everything through guard
-        guard.setNext(router);
-        return guard;
+        guard.setNext(root);
+        root = guard;
+        
+        return root;
     }
 

src/main/webapp/WEB-INF/serverconfig.property.template

@@ -10 +10 @@
 annotationmanager.uris.groups = http://entities.mpiwg-berlin.mpg.de/groups/
 annotationmanager.uris.annotations = http://entities.mpiwg-berlin.mpg.de/annotations/
+#annotationmanager.webapp.prefix = /annotations