Changeset 50:64aa756c60cc in AnnotationManagerN4J for src

Timestamp:

Sep 27, 2012, 3:12:08 PM (13 years ago)

Author:

casties

Branch:

default

Message:

annotations ui can show and delete annotations now.

Location:

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

Files:

• Annotation.java (modified) (2 diffs)
• restlet/AnnotatorAnnotationsByResources.java (modified) (2 diffs)
• restlet/AnnotatorAnnotationsByTags.java (modified) (2 diffs)
• restlet/AnnotatorResources.java (modified) (2 diffs)
• restlet/AnnotatorTags.java (modified) (2 diffs)
• restlet/BaseRestlet.java (modified) (1 diff)
• restlet/annotations_ui/AnnotationResource.java (added)
• restlet/annotations_ui/AnnotationsResource.java (added)
• restlet/annotations_ui/AnnotationsUiRestlet.java (modified) (3 diffs)
• restlet/annotations_ui/GroupMembersResource.java (modified) (1 diff)
• restlet/annotations_ui/PersonsResource.java (modified) (1 diff)

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

@@ -4 +4 @@
 package de.mpiwg.itgroup.annotations;
 
+import java.io.UnsupportedEncodingException;
 import java.util.Set;
+
+import org.apache.commons.codec.binary.Base64;
 
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
@@ -161 +164 @@
 
     /**
+     * Returns an URL-compatible id.
+     * Currently the uri as base64 encoded string.
+     * @return
+     */
+    public String getUrlId() {
+        if (uri == null) return null;
+        try {
+            return Base64.encodeBase64URLSafeString(uri.getBytes("UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            return null;
+        }
+    }
+
+    public static String decodeId(String id) {
+        if (id == null) return null;
+        try {
+            return new String(Base64.decodeBase64(id), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return null;
+        }
+    }
+
+    /**
      * @return the bodyText
      */

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

@@ -7 +7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.neo4j.graphdb.Node;
 import org.restlet.data.Form;
 import org.restlet.data.Parameter;
@@ -14 +13 @@
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;
-import org.restlet.resource.ServerResource;
 
 import de.mpiwg.itgroup.annotations.Annotation;
-import de.mpiwg.itgroup.annotations.NS;
 import de.mpiwg.itgroup.annotations.Person;
-import de.mpiwg.itgroup.annotations.Tag;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
 import de.mpiwg.itgroup.annotations.restlet.utils.JSONObjectComparator;

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

@@ -7 +7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.neo4j.graphdb.Node;
 import org.restlet.data.Form;
 import org.restlet.data.Parameter;
@@ -14 +13 @@
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;
-import org.restlet.resource.ServerResource;
 
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.NS;
 import de.mpiwg.itgroup.annotations.Person;
-import de.mpiwg.itgroup.annotations.Tag;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
 import de.mpiwg.itgroup.annotations.restlet.utils.JSONObjectComparator;

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

@@ -10 +10 @@
 import org.json.JSONObject;
 import org.neo4j.graphdb.Node;
-import org.restlet.data.Form;
 import org.restlet.data.Status;
 import org.restlet.ext.json.JsonRepresentation;
@@ -16 +15 @@
 import org.restlet.resource.Get;
 
-import de.mpiwg.itgroup.annotations.Actor;
-import de.mpiwg.itgroup.annotations.Group;
-import de.mpiwg.itgroup.annotations.NS;
 import de.mpiwg.itgroup.annotations.Resource;
-import de.mpiwg.itgroup.annotations.Tag;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
-import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore.NodeTypes;
 
 

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

@@ -10 +10 @@
 import org.json.JSONObject;
 import org.neo4j.graphdb.Node;
-import org.restlet.data.Form;
 import org.restlet.data.Status;
 import org.restlet.ext.json.JsonRepresentation;
@@ -16 +15 @@
 import org.restlet.resource.Get;
 
-import de.mpiwg.itgroup.annotations.Actor;
-import de.mpiwg.itgroup.annotations.Group;
 import de.mpiwg.itgroup.annotations.NS;
 import de.mpiwg.itgroup.annotations.Tag;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
-import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore.NodeTypes;
 
 

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

@@ -57 +57 @@
     protected String ldapServerUrl;
     public static final String LDAP_SERVER_KEY = "annotationmanager.ldapserver.url";
+
+    public static final String ADMIN_USER_KEY = "annotationmanager.admin.user";
+    public static final String ADMIN_PASSWORD_KEY = "annotationmanager.admin.password";
 
     /**

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

@@ -20 +20 @@
 public class AnnotationsUiRestlet extends BaseRestlet {
 
-    public final String version = "AnnotationManagerN4J/AnnotationsUI 0.2";
+    public final String version = "AnnotationManagerN4J/AnnotationsUI 0.3";
 
     public static Logger logger = Logger.getLogger(AnnotationsUiRestlet.class);
@@ -26 +26 @@
     public AnnotationsUiRestlet(Context context) {
         super(context);
-        logger.debug("StoreRestlet!");
+        logger.info(version);
     }
 
@@ -49 +49 @@
         router.attach("/persons/{id}", PersonResource.class);
         router.attach("/persons/{id}/", PersonResource.class);
+        router.attach("/annotations", AnnotationsResource.class);
+        router.attach("/annotations/", AnnotationsResource.class);
+        router.attach("/annotations/{id}", AnnotationResource.class);
+        router.attach("/annotations/{id}/", AnnotationResource.class);
 
         router.attach("/", InfoResource.class);
 
-        // Create a simple password verifier
+        // use simple password verifier
         MapVerifier verifier = new MapVerifier();
-        verifier.getLocalSecrets().put("scott", "tiger".toCharArray());
+        // get user name and password
+        String user = serverConfig.getProperty(BaseRestlet.ADMIN_USER_KEY);
+        String pw = serverConfig.getProperty(BaseRestlet.ADMIN_PASSWORD_KEY);
+        verifier.getLocalSecrets().put(user, pw.toCharArray());
         // Create a Guard
         ChallengeAuthenticator guard = new ChallengeAuthenticator(getContext(), ChallengeScheme.HTTP_BASIC, "Tutorial");

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

@@ -15 +15 @@
 import org.restlet.resource.Post;
 
-import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Person;
-import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore.NodeTypes;
 
 /**

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

@@ -21 +21 @@
 import de.mpiwg.itgroup.annotations.Person;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
-import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore.NodeTypes;
 import de.mpiwg.itgroup.annotations.restlet.BaseRestlet;