Skip to content
Snippets Groups Projects
Commit b2f1f059 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Minor changes

parent 48099bdf
No related branches found
No related tags found
No related merge requests found
...@@ -18,5 +18,6 @@ Any value defined here will override the pom.xml file value but is only applicab ...@@ -18,5 +18,6 @@ Any value defined here will override the pom.xml file value but is only applicab
<netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license> <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>WildFly</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server> <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>WildFly</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion> <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.7-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>
<netbeans.hint.jdkPlatform>JDK_1.8_SUN</netbeans.hint.jdkPlatform>
</properties> </properties>
</project-shared-configuration> </project-shared-configuration>
...@@ -12,75 +12,27 @@ ...@@ -12,75 +12,27 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.reflections</groupId>
<artifactId>servlet-api</artifactId> <artifactId>reflections</artifactId>
<version>2.5</version> <version>0.9.11</version>
<scope>provided</scope> </dependency>
</dependency> <dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>3.0.9.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.4.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.9</version>
</dependency>
<dependency>
<groupId>no.nibio.vips.common</groupId>
<artifactId>VIPSCommon</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.thetransactioncompany</groupId> <groupId>com.thetransactioncompany</groupId>
<artifactId>cors-filter</artifactId> <artifactId>cors-filter</artifactId>
<version>1.7.1</version> <version>1.7.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax</groupId> <groupId>no.bioforsk.vips.common</groupId>
<artifactId>javaee-web-api</artifactId> <artifactId>VIPSCommon</artifactId>
<version>6.0</version> <version>1.0-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.bedatadriven</groupId> <groupId>com.bedatadriven</groupId>
<artifactId>jackson-datatype-jts</artifactId> <artifactId>jackson-datatype-jts</artifactId>
<version>2.2</version> <version>2.2</version>
</dependency> <type>jar</type>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
package no.nibio.vips.core.service; package no.nibio.vips.core.service;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -51,7 +53,7 @@ public class ModelResourceImpl implements ModelResource{ ...@@ -51,7 +53,7 @@ public class ModelResourceImpl implements ModelResource{
@Context @Context
HttpServletRequest servletRequest; HttpServletRequest servletRequest;
/** /**
* Lists all models available in this instance, using default language (English) * Lists all models available in this instance, using default language (English)
* @return list of all models available * @return list of all models available
......
...@@ -135,7 +135,7 @@ public class ModelFactory { ...@@ -135,7 +135,7 @@ public class ModelFactory {
reflections = new Reflections(topDomain); reflections = new Reflections(topDomain);
subTypes.addAll(reflections.getSubTypesOf(Model.class)); subTypes.addAll(reflections.getSubTypesOf(Model.class));
} }
/** /**
* Iterates and instantiates one object for each class * Iterates and instantiates one object for each class
*/ */
...@@ -158,7 +158,7 @@ public class ModelFactory { ...@@ -158,7 +158,7 @@ public class ModelFactory {
throw new DuplicateModelIdException(message); throw new DuplicateModelIdException(message);
} }
//System.out.println("Model " + model.getModelName() + " with id=" + model.getModelId().toString() + " was found"); //System.out.println("Model " + model.getModelName() + " with id=" + model.getModelId().toString() + " was found");
} catch ( InstantiationException | IllegalAccessException | DuplicateModelIdException ex) { } catch ( InstantiationException | IllegalAccessException | DuplicateModelIdException | NoClassDefFoundError ex) {
Logger.getLogger(ModelFactory.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(ModelFactory.class.getName()).log(Level.SEVERE, null, ex);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment