Changeset 18:aafa3884b2c4 in AnnotationManagerN4J for src/main/java/de/mpiwg

Timestamp:

Sep 5, 2012, 4:05:54 PM (13 years ago)

Author:

casties

Branch:

default

Message:

new AnnotationStore? restlet for HTML-UI.
reorganisation of classes.

Location:

src/main/java/de/mpiwg/itgroup/annotations

Files:

• Actor.java (modified) (1 diff)
• NS.java (moved) (moved from src/main/java/de/mpiwg/itgroup/annotations/old/NS.java) (1 diff)
• neo4j/AnnotationStore.java (modified) (1 diff)
• old/AnnotationServerDb.java (deleted)
• restlet/AnnotationStoreGroups.java (added)
• restlet/AnnotationStoreInfo.java (added)
• restlet/AnnotationStoreRestlet.java (added)
• restlet/AnnotatorInfo.java (modified) (1 diff)
• restlet/AnnotatorResourceImpl.java (modified) (5 diffs)
• restlet/AnnotatorRestlet.java (added)
• restlet/BaseRestlet.java (added)
• restlet/RestServer.java (deleted)

src/main/java/de/mpiwg/itgroup/annotations/Actor.java

@@ -5 +5 @@
 
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
-import de.mpiwg.itgroup.annotations.old.NS;
 
 /**

src/main/java/de/mpiwg/itgroup/annotations/NS.java

@@ -1 @@
-package de.mpiwg.itgroup.annotations.old;
+package de.mpiwg.itgroup.annotations;
 
 public class NS {

src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

@@ -72 +72 @@
         Node person = getNodeIndex(NodeTypes.PERSON).get("uri", userUri).getSingle();
         return person;
+    }
+
+    /**
+     * Returns List of Groups.
+     * 
+     * @param person
+     * @return
+     */
+    public List<Group> getGroups(String uriQuery) {
+        ArrayList<Group> groups = new ArrayList<Group>();
+        Index<Node> idx = getNodeIndex(NodeTypes.GROUP);
+        if (uriQuery == null) uriQuery = "*";
+        IndexHits<Node> groupNodes = idx.get("uri", uriQuery);
+        for (Node groupNode : groupNodes) {
+            Actor group = createActorFromNode(groupNode);
+            groups.add((Group) group);
+        }
+        return groups;
     }
 

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

@@ -3 +3 @@
 import java.io.InputStream;
 
-import org.apache.log4j.Logger;
-import org.restlet.data.Form;
 import org.restlet.data.MediaType;
 import org.restlet.representation.InputRepresentation;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;
-import org.restlet.resource.Options;
 import org.restlet.resource.ServerResource;
-
-
-
 
 
 public class AnnotatorInfo extends ServerResource {
 
-private Logger logger = Logger.getRootLogger();
-        
-        /**
-         * Erlaubt cross scripting bei Aufruf aus Javascript
-         * @param entity
-         */
-        @Options
-        public void doOptions(Representation entity) {
-            Form responseHeaders = (Form) getResponse().getAttributes().get("org.restlet.http.headers");
-            if (responseHeaders == null) {
-                responseHeaders = new Form();
-                getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
-            }
-            responseHeaders.add("Access-Control-Allow-Origin", "*");
-            responseHeaders.add("Access-Control-Allow-Methods", "POST,OPTIONS,GET");
-            responseHeaders.add("Access-Control-Allow-Headers", "Content-Type");
-            responseHeaders.add("Access-Control-Allow-Credentials", "false");
-            responseHeaders.add("Access-Control-Max-Age", "60");
-        }
-
-
-        
         @Get("html")
         public Representation getHTML(){

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

@@ -38 +38 @@
 import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Annotation;
+import de.mpiwg.itgroup.annotations.NS;
 import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
 import de.mpiwg.itgroup.annotations.Group;
 import de.mpiwg.itgroup.annotations.Person;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
-import de.mpiwg.itgroup.annotations.old.NS;
 
 /**
@@ -65 +65 @@
                     .get("org.restlet.ext.servlet.ServletContext");
             logger.debug("Getting AnnotationStore from Context");
-            store = (AnnotationStore) sc.getAttribute(RestServer.ANNSTORE_KEY);
+            store = (AnnotationStore) sc.getAttribute(BaseRestlet.ANNSTORE_KEY);
         }
         return store;
@@ -149 +149 @@
         String consumerKey = token.getParamAsPrimitive("consumerKey").getAsString();
         // get stored consumer secret for key
-        RestServer restServer = (RestServer) getApplication();
+        BaseRestlet restServer = (BaseRestlet) getApplication();
         String consumerSecret = restServer.getConsumerSecret(consumerKey);
         logger.debug("requested consumer key=" + consumerKey + " secret=" + consumerSecret);
@@ -208 +208 @@
                 String userName = creator.getName();
                 if (userName == null) {
-                    RestServer restServer = (RestServer) getApplication();
+                    BaseRestlet restServer = (BaseRestlet) getApplication();
                     userName = restServer.getFullNameFromLdap(userId);
                 }
@@ -500 +500 @@
         // try to get full name
         if (creator.getName() == null && username != null) {
-            RestServer restServer = (RestServer) getApplication();
+            BaseRestlet restServer = (BaseRestlet) getApplication();
             String fullName = restServer.getFullNameFromLdap(username);
             creator.setName(fullName);