Merge branch 'develop' into 'master'

Removed some unused dependencies

See merge request !3

pom.xml

@@ -64,12 +64,6 @@
       <groupId>axis</groupId>
       <artifactId>axis</artifactId>
       <version>1.4</version>
-    </dependency>
-    <dependency>
-       <groupId>external.lib</groupId>
-       <artifactId>dnmi-ws</artifactId>
-       <version>1.0</version>
-      <scope>provided</scope>
     </dependency>
      <dependency>
        <groupId>commons-logging</groupId>
@@ -77,18 +71,6 @@
        <version>1.0.4</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-       <groupId>external.lib</groupId>
-       <artifactId>xerces</artifactId>
-       <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-       <groupId>external.lib</groupId>
-       <artifactId>xalan</artifactId>
-       <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -101,24 +83,6 @@
       <version>2.1</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-       <groupId>external.lib</groupId>
-       <artifactId>tidy</artifactId>
-       <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-       <groupId>external.lib</groupId>
-       <artifactId>relayclient</artifactId>
-       <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-       <groupId>external.lib</groupId>
-       <artifactId>UserAgentUtils</artifactId>
-       <version>1.6</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>commons-validator</groupId>
       <artifactId>commons-validator</artifactId>
@@ -144,15 +108,15 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-	<groupId>external.lib</groupId>
+	<groupId>commons-codec</groupId>
 	<artifactId>commons-codec</artifactId>
 	<version>1.6</version>
         <scope>provided</scope>
     </dependency>
     <dependency>
-                <groupId>external.lib</groupId>
-                <artifactId>json-simple</artifactId>
-                <version>1.1</version>
+        <groupId>com.googlecode.json-simple</groupId>
+        <artifactId>json-simple</artifactId>
+        <version>1.1.1</version>
     </dependency>
   </dependencies>
 

src/main/java/no/nibio/vips/core/VIPSCoreApplication.java

@@ -56,5 +56,6 @@ public class VIPSCoreApplication extends Application
      */
     private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(no.nibio.vips.core.config.JacksonConfig.class);
+        resources.add(no.nibio.vips.core.service.ModelResourceImpl.class);
     }
 }
\ No newline at end of file