Changeset 5145

Timestamp:

05/07/14 12:27:30 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Unmarshaller resource provider added, for validating via the schema. Bypassed because of null-pointer exception at com.sun.org.apache.xerces.internal.impl.XMLEntityScanner.load(XMLEntityScanner.java:1738)

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend

Files:

• nb-configuration.xml (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/rest/JaxbMarshallerFactory.java (modified) (1 diff)
• src/main/java/eu/dasish/annotation/backend/rest/JaxbUnmarshallerFactory.java (added)
• src/main/java/eu/dasish/annotation/backend/rest/ResourceJaxbUnmarshallerProvider.java (added)
• src/main/resources/spring-config/JaxbUnmarshallerFactory.xml (added)
• src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java (modified) (1 diff)
• src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java (modified) (1 diff)
• src/test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/nb-configuration.xml

@@ -10 +10 @@
         <config-files>
             <config-file>src/main/resources/spring-config/jaxbUnmarshallerFactory.xml</config-file>
+            <config-file>src/main/resources/spring-config/JaxbUnmarshallerFactory.xml</config-file>
         </config-files>
         <config-file-groups/>

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/JaxbMarshallerFactory.java

@@ -33 +33 @@
     private Marshaller marshaller;
     // overwritten by the web.xml's 
-    // why?? 
+    // why?? see the bean
     private String schemaLocation = "http://www.dasish.eu/ns/addit file:/users/olhsha/repositories/DASISH/t5.6/schema/trunk/annotator-schema/src/main/target/DASISH-schema.xsd";
     

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java

@@ -55 +55 @@
 @ContextConfiguration(locations = {"/spring-test-config/mockeryRest.xml", "/spring-test-config/mockDBDispatcher.xml",
     "/spring-test-config/mockUriInfo.xml",
-    "/spring-config/jaxbMarshallerFactory.xml"})
+    "/spring-config/jaxbMarshallerFactory.xml", "/spring-config/jaxbUnmarshallerFactory.xml"})
 public class AnnotationResourceTest {
 

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java

@@ -87 +87 @@
         // sorry for the duplication, but JerseyTest is not aware of
         // @ContextConfiguration
-        return "classpath:spring-config/componentscan.xml, classpath:spring-config/notebookDao.xml, classpath:spring-config/annotationDao.xml, classpath:spring-config/principalDao.xml, classpath:spring-config/targetDao.xml, classpath:spring-config/cachedRepresentationDao.xml, classpath:spring-config/dbDispatcher.xml, classpath:spring-config/jaxbMarshallerFactory.xml, classpath:spring-test-config/dataSource.xml";
+        return "classpath:spring-config/componentscan.xml, classpath:spring-config/notebookDao.xml, classpath:spring-config/annotationDao.xml, classpath:spring-config/principalDao.xml, classpath:spring-config/targetDao.xml, classpath:spring-config/cachedRepresentationDao.xml, classpath:spring-config/dbDispatcher.xml, classpath:spring-config/jaxbMarshallerFactory.xml, classpath:spring-config/jaxbUnmarshallerFactory.xml, classpath:spring-test-config/dataSource.xml";
     }
     

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/NotebookResourceTest.java

@@ -32 +32 @@
 @RunWith(value = SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"/spring-test-config/mockeryRest.xml", "/spring-test-config/mockDBDispatcher.xml", "/spring-config/jaxbMarshallerFactory.xml",
-    "/spring-test-config/mockUriInfo.xml"})
+    "/spring-config/jaxbUnmarshallerFactory.xml","/spring-test-config/mockUriInfo.xml"})
 public class NotebookResourceTest {