diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..29abf99 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..714351a --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/pom.xml b/pom.xml index eeab6ee..b7a2be1 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ org.gcube.portlets.admin rmp-common-library - [2.7.1-SNAPSHOT,) + [2.7.2-SNAPSHOT, 3.0.0-SNAPSHOT) diff --git a/src/main/java/org/gcube/context/ContextElaborator.java b/src/main/java/org/gcube/context/ContextElaborator.java index ee93c6a..cf9dcc1 100644 --- a/src/main/java/org/gcube/context/ContextElaborator.java +++ b/src/main/java/org/gcube/context/ContextElaborator.java @@ -1,10 +1,9 @@ package org.gcube.context; -import java.io.File; import java.util.LinkedHashMap; import org.gcube.common.scope.impl.ScopeBean; -import org.gcube.resourcemanagement.support.server.managers.scope.ScopeManager; +import org.gcube.resourcemanagement.support.server.managers.context.ContextManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,10 +18,9 @@ public abstract class ContextElaborator { } - public void all(File voFile) throws Exception{ + public void all() throws Exception{ try { - - LinkedHashMap map = ScopeManager.readScopes(voFile.getAbsolutePath()); + LinkedHashMap map = ContextManager.readContexts(); for(String scope : map.keySet()) { try { String context = map.get(scope).toString(); diff --git a/src/test/java/org/gcube/context/names/TestContextList.java b/src/test/java/org/gcube/context/names/TestContextList.java index d15746c..55a6759 100644 --- a/src/test/java/org/gcube/context/names/TestContextList.java +++ b/src/test/java/org/gcube/context/names/TestContextList.java @@ -12,12 +12,10 @@ public class TestContextList { File test = new File(src, "test"); File resources = new File(test, "resources"); - File voFile = new File(resources, "scopedata.xml"); - File outputFile = new File(resources, "output.txt"); ContextList contextList = new ContextList(outputFile); - contextList.all(voFile); + contextList.all(); }