diff --git a/pom.xml b/pom.xml index 1dee721..f399184 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.gcube.distribution maven-portal-bom - 3.4.0 + 3.6.0 pom import @@ -41,7 +41,7 @@ org.gcube.spatial.data sdi-library - [1.0.0,1.3.0) + [1.0.0,2.0.0) @@ -67,6 +67,20 @@ slf4j-log4j12 + + + ch.qos.logback + logback-classic + 1.2.3 + test + + + junit + junit + 4.12 + test + + diff --git a/src/main/java/org/gcube/usecases/ws/thredds/TokenSetter.java b/src/main/java/org/gcube/usecases/ws/thredds/TokenSetter.java index 4253f33..78de3c8 100644 --- a/src/main/java/org/gcube/usecases/ws/thredds/TokenSetter.java +++ b/src/main/java/org/gcube/usecases/ws/thredds/TokenSetter.java @@ -21,7 +21,6 @@ public class TokenSetter { public static synchronized void set(String scope){ - try{ if(props==null) { props=new Properties(); try { @@ -30,12 +29,8 @@ public class TokenSetter { throw new RuntimeException("YOU NEED TO SET TOKEN FILE IN CONFIGURATION"); } } - if(!props.containsKey(scope)) throw new Exception("No token found for scope : "+scope); + if(!props.containsKey(scope)) throw new RuntimeException("No token found for scope : "+scope); SecurityTokenProvider.instance.set(props.getProperty(scope)); - }catch(Throwable e){ - log.trace("Unable to set token for scope "+scope,e); - } - ScopeProvider.instance.set(scope); } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/java/org/gcube/usecases/ws/thredds/DTSynchUseCase.java b/src/test/java/org/gcube/usecases/ws/thredds/DTSynchUseCase.java index 0675951..ac5275b 100644 --- a/src/test/java/org/gcube/usecases/ws/thredds/DTSynchUseCase.java +++ b/src/test/java/org/gcube/usecases/ws/thredds/DTSynchUseCase.java @@ -14,10 +14,13 @@ import org.gcube.usecases.ws.thredds.model.SynchFolderConfiguration; public class DTSynchUseCase { public static void main(String[] args) throws WorkspaceInteractionException, InternalException, ProcessNotFoundException { - TokenSetter.set("/d4science.research-infrastructures.eu"); +// TokenSetter.set("/d4science.research-infrastructures.eu"); +// String folderId="a8cd78d3-69e8-4d02-ac90-681b2d16d84d"; + + TokenSetter.set("/gcube/devsec/devVRE"); + String folderId="8ebe9ffb-e2cf-4b3e-ab91-cc6933d86625"; SyncEngine engine=SyncEngine.get(); - String folderId="a8cd78d3-69e8-4d02-ac90-681b2d16d84d"; // String folderId="8a6f9749-68d7-4a9a-a475-bd645050c3fd"; // sub folder for faster tests diff --git a/src/test/java/org/gcube/usecases/ws/thredds/TestCommons.java b/src/test/java/org/gcube/usecases/ws/thredds/TestCommons.java index 3200c5f..464309a 100644 --- a/src/test/java/org/gcube/usecases/ws/thredds/TestCommons.java +++ b/src/test/java/org/gcube/usecases/ws/thredds/TestCommons.java @@ -37,7 +37,7 @@ public class TestCommons { private static Map configs=new HashMap<>(); - private static String toUseConfig="default"; + private static String toUseConfig="simple"; static { @@ -46,7 +46,7 @@ public class TestCommons { // folderName="WS-Tests"; - configs.put("simple", new TestSet("Simple label ","/gcube", "Test1","public/netcdf/simpleFolder","***REMOVED***","simple")); + configs.put("simple", new TestSet("Simple label ","/gcube/devsec/devVRE", "Test1","public/netcdf/simpleFolder","***REMOVED***","simple")); configs.put("cmems", new TestSet("CMEMS","/gcube", "CMEMS","public/netcdf/CMEMS","***REMOVED***","cmems")); configs.put("default", new TestSet("Default Tests","/gcube","Thredds Catalog","public/netcdf","***REMOVED***","main")); diff --git a/src/main/resources/log4j.properties b/src/test/resources/log4j.properties similarity index 80% rename from src/main/resources/log4j.properties rename to src/test/resources/log4j.properties index 38535ae..5d16a34 100644 --- a/src/main/resources/log4j.properties +++ b/src/test/resources/log4j.properties @@ -1,6 +1,6 @@ # Root logger option -#log4j.rootLogger=INFO, SM -log4j.logger.org.gcube.usecases.ws=DEBUG,SM +log4j.rootLogger=DEBUG, SM +#log4j.logger.org.gcube.usecases.ws=DEBUG,SM diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml new file mode 100644 index 0000000..b70dd26 --- /dev/null +++ b/src/test/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + \ No newline at end of file