Mercurial > hg > AnnotationManagerN4J

changeset 73:4b8c909cabf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small cleanup. trying restlet 2.2-snapshot now -- feeling lucky.
author casties
date Wed, 12 Mar 2014 11:54:07 +0100
parents 4c2cea836bc0
children e5ff09208c28
files .hgignore pom.xml src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Mar 11 17:43:00 2014 +0100
+++ b/.hgignore	Wed Mar 12 11:54:07 2014 +0100
@@ -13,4 +13,6 @@
 ^src/main/webapp/WEB-INF/consumerkeys\.property$
 
 syntax: regexp
-^src/main/webapp/WEB-INF/serverconfig\.property$
\ No newline at end of file
+^src/main/webapp/WEB-INF/serverconfig\.property$
+syntax: regexp
+^src/main/webapp/WEB-INF/classes$
\ No newline at end of file
--- a/pom.xml	Tue Mar 11 17:43:00 2014 +0100
+++ b/pom.xml	Wed Mar 12 11:54:07 2014 +0100
@@ -8,7 +8,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <neo4j-version>2.0.1</neo4j-version>
     <!-- <restlet-version>2.0.15</restlet-version> -->
-    <restlet-version>2.1.7</restlet-version>
+    <!-- <restlet-version>2.1.7</restlet-version> -->
+    <restlet-version>2.2-SNAPSHOT</restlet-version>
   </properties>
   <repositories>
     <repository>
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Tue Mar 11 17:43:00 2014 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Wed Mar 12 11:54:07 2014 +0100
@@ -49,7 +49,6 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.restlet.data.Form;
 import org.restlet.data.Status;
 import org.restlet.engine.header.Header;
 import org.restlet.representation.Representation;
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java	Tue Mar 11 17:43:00 2014 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java	Wed Mar 12 11:54:07 2014 +0100
@@ -51,8 +51,6 @@
 import org.neo4j.server.WrappingNeoServerBootstrapper;
 import org.restlet.Application;
 import org.restlet.Context;
-import org.restlet.Restlet;
-import org.restlet.data.LocalReference;
 
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;