diff --git a/.classpath b/.classpath index 8d831c8..d64ebcb 100644 --- a/.classpath +++ b/.classpath @@ -24,12 +24,13 @@ - + + - + diff --git a/.project b/.project index 66c89c0..96df7fb 100644 --- a/.project +++ b/.project @@ -15,6 +15,11 @@ + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -22,6 +27,8 @@ + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index f4ef8aa..1b22d70 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,4 +1,5 @@ - + + diff --git a/pom.xml b/pom.xml index 7bf56f0..6480c0e 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ org.gcube.core common-scope-maps - provided + compile @@ -119,13 +119,28 @@ + + maven-compiler-plugin + + ${maven.compiler.source} + ${maven.compiler.target} + + org.apache.maven.plugins maven-assembly-plugin + + + descriptor.xml + + - make-servicearchive - package + servicearchive + install + + single + diff --git a/src/test/java/org/gcube/common/metadataprofilediscovery/TestDataCatalogueMetadataFormatReader.java b/src/test/java/org/gcube/common/metadataprofilediscovery/TestDataCatalogueMetadataFormatReader.java index e2dfa56..7f60184 100644 --- a/src/test/java/org/gcube/common/metadataprofilediscovery/TestDataCatalogueMetadataFormatReader.java +++ b/src/test/java/org/gcube/common/metadataprofilediscovery/TestDataCatalogueMetadataFormatReader.java @@ -28,11 +28,16 @@ public class TestDataCatalogueMetadataFormatReader { /** * Test. */ - //@Test + @Test public void test() { try { + +// String scopeString = "/gcube/devsec/devVRE"; +// String grMetadataProfileSecondaryType = "DataCatalogueMetadata"; + String scopeString = "/gcube/devsec/devVRE"; - String grMetadataProfileSecondaryType = "DataCatalogueMetadata"; + String grMetadataProfileSecondaryType = "GeoNaMetadata"; + ScopeProvider.instance.set(scopeString); MetadataProfileReader reader = new MetadataProfileReader(grMetadataProfileSecondaryType); int i = 0; diff --git a/src/test/java/org/gcube/common/metadataprofilediscovery/TestJaxbMetadataMarshUnmarsh.java b/src/test/java/org/gcube/common/metadataprofilediscovery/TestJaxbMetadataMarshUnmarsh.java index d5d1858..9064456 100644 --- a/src/test/java/org/gcube/common/metadataprofilediscovery/TestJaxbMetadataMarshUnmarsh.java +++ b/src/test/java/org/gcube/common/metadataprofilediscovery/TestJaxbMetadataMarshUnmarsh.java @@ -15,7 +15,6 @@ import org.gcube.common.metadataprofilediscovery.jaxb.MetadataField; import org.gcube.common.metadataprofilediscovery.jaxb.MetadataFormat; import org.gcube.common.metadataprofilediscovery.jaxb.NamespaceCategories; import org.gcube.common.metadataprofilediscovery.jaxb.NamespaceCategory; -import org.junit.Test; /** * The Class TestJaxbMetadataMarshUnmarsh. diff --git a/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatDiscovery.java b/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatDiscovery.java index c820194..e58b74a 100644 --- a/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatDiscovery.java +++ b/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatDiscovery.java @@ -7,7 +7,6 @@ import org.gcube.common.metadataprofilediscovery.bean.MetadataProfile; import org.gcube.common.metadataprofilediscovery.reader.MetadataFormatDiscovery; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; -import org.junit.Test; /** diff --git a/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatReader.java b/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatReader.java index 8ea471a..26f29af 100644 --- a/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatReader.java +++ b/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatReader.java @@ -3,7 +3,6 @@ */ package org.gcube.common.metadataprofilediscovery; -import java.io.File; import java.io.InputStream; import org.gcube.common.metadataprofilediscovery.jaxb.MetadataField; @@ -11,7 +10,6 @@ import org.gcube.common.metadataprofilediscovery.jaxb.MetadataFormat; import org.gcube.common.metadataprofilediscovery.reader.MetadataFormatReader; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; -import org.junit.Test; /**