Changeset 6517

Timestamp:

09/21/15 14:46:02 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

 

Location:

vlo/branches/vlo-3.3-oeaw/vlo-importer/src

Files:

• main/java/eu/clarin/cmdi/vlo/importer/VLOMarshaller.java (modified) (2 diffs)
• test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) (3 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/VLOMarshaller.java

@@ -53 +53 @@
         FacetConceptMapping result;
         
-                try {
-                        result = (FacetConceptMapping) unmarshal(inputStream, FacetConceptMapping.class);
+                try {                   
+                        JAXBContext jc = JAXBContext.newInstance(FacetConceptMapping.class);
+                Unmarshaller u = jc.createUnmarshaller();
+                result = (FacetConceptMapping) u.unmarshal(inputStream);        
                 } catch (JAXBException e) {
                         throw new RuntimeException();
@@ -63 +65 @@
     }
     
-    /**
-     * Get object of specified type from input stream
-     *
-     * @param inputStream
-     * @param clazz
-     * @return
-     */
-    static Object unmarshal(InputStream inputStream, Class<?> clazz)throws JAXBException{
-        JAXBContext jc = JAXBContext.newInstance(clazz);
-        Unmarshaller u = jc.createUnmarshaller();
-        return u.unmarshal(inputStream);        
-    }
 
     /**

vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.importer;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 import eu.clarin.cmdi.vlo.LanguageCodeUtils;
@@ -5 +17 @@
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.config.VloConfigFactory;
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
 
 public abstract class ImporterTestcase {
@@ -54 +58 @@
 
         MetadataImporter.languageCodeUtils = new LanguageCodeUtils(config);
+        
+        
+        //print classpath
+        
+        ClassLoader cl = ClassLoader.getSystemClassLoader();
+
+        URL[] urls = ((URLClassLoader)cl).getURLs();
+
+        for(URL url: urls){
+                System.out.println(url.getFile());
+        }
       
     }