diff --git a/.settings/.gitignore b/.settings/.gitignore
index 6cb3d6d..0b3fc44 100644
--- a/.settings/.gitignore
+++ b/.settings/.gitignore
@@ -1,2 +1,6 @@
/org.eclipse.core.resources.prefs
/org.eclipse.jdt.core.prefs
+/org.eclipse.jpt.core.prefs
+/org.eclipse.m2e.core.prefs
+/org.eclipse.wst.common.project.facet.core.prefs.xml
+/org.eclipse.wst.common.project.facet.core.xml
diff --git a/pom.xml b/pom.xml
index 3792549..b02d68b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
org.gcube.application
geoportal-logic
- [1.0.0-SNAPSHOT,2.0.0)
+ [1.0.4-SNAPSHOT,2.0.0)
diff --git a/src/main/java/org/gcube/application/geoportal/service/GeoportalService.java b/src/main/java/org/gcube/application/geoportal/service/GeoportalService.java
index 9828801..ccd766a 100644
--- a/src/main/java/org/gcube/application/geoportal/service/GeoportalService.java
+++ b/src/main/java/org/gcube/application/geoportal/service/GeoportalService.java
@@ -13,6 +13,7 @@ import org.glassfish.jersey.server.ResourceConfig;
public class GeoportalService extends ResourceConfig{
+
public GeoportalService() {
super();
//Register interrfaces
diff --git a/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java b/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java
index 20fa725..0dd42be 100644
--- a/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java
+++ b/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManager.java
@@ -15,22 +15,22 @@ public class MongoManager {
//*********** PROJECTS
- public Project insert(Project proj) {
- // TODO check if existing DB
- // TODO check if existing collection
- client.
-
- }
- public Project update(Project proj) {
-
- }
-
- public void delete(String id) {
-
- }
- public Project load(String id) {
-
- }
+// public Project insert(Project proj) {
+// // TODO check if existing DB
+// // TODO check if existing collection
+// client.
+//
+// }
+// public Project update(Project proj) {
+//
+// }
+//
+// public void delete(String id) {
+//
+// }
+// public Project load(String id) {
+//
+// }
//********** PROFILES
diff --git a/src/test/java/org/gcube/application/geoportal/service/legacy/Concessioni.java b/src/test/java/org/gcube/application/geoportal/service/legacy/Concessioni.java
index a3c7f34..fa33bb4 100644
--- a/src/test/java/org/gcube/application/geoportal/service/legacy/Concessioni.java
+++ b/src/test/java/org/gcube/application/geoportal/service/legacy/Concessioni.java
@@ -22,7 +22,9 @@ import javax.ws.rs.core.MediaType;
import org.gcube.application.geoportal.common.rest.InterfaceConstants;
import org.gcube.application.geoportal.managers.AbstractRecordManager;
+import org.gcube.application.geoportal.managers.DefatulEMFProvider;
import org.gcube.application.geoportal.service.GeoportalService;
+import org.geotoolkit.style.DefaultExternalMark;
import org.glassfish.jersey.test.JerseyTest;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -40,13 +42,13 @@ public class Concessioni extends JerseyTest {
@BeforeClass
public static void init() {
- AbstractRecordManager.setDefaultProvider(new DefaultEMFProvider() {
+ AbstractRecordManager.setDefaultProvider(new DefatulEMFProvider(){
@Override
public EntityManagerFactory getFactory() {
System.err.println("***********************SETTING DEBUG CONTEXT******************");
- TokenSetter.set("/gcube/devNext/NexNext");
- return super.getF
+ TokenSetter.set("/gcube/devNext/NextNext");
+ return super.getFactory();
}
});
}
diff --git a/src/test/java/org/gcube/application/geoportal/service/legacy/TokenSetter.java b/src/test/java/org/gcube/application/geoportal/service/legacy/TokenSetter.java
index 4ee12c1..009ec4c 100644
--- a/src/test/java/org/gcube/application/geoportal/service/legacy/TokenSetter.java
+++ b/src/test/java/org/gcube/application/geoportal/service/legacy/TokenSetter.java
@@ -24,7 +24,9 @@ public class TokenSetter {
try{
if(!props.containsKey(scope)) throw new RuntimeException("No token found for scope : "+scope);
SecurityTokenProvider.instance.set(props.getProperty(scope));
- }catch(Throwable e){
+ }catch(Exception e){
+ e.printStackTrace(System.err);
+ throw e;
}
ScopeProvider.instance.set(scope);
}
diff --git a/src/test/resources/META-INF/persistence.xml b/src/test/resources/META-INF/persistence.xml
index e04859f..28b3aaa 100644
--- a/src/test/resources/META-INF/persistence.xml
+++ b/src/test/resources/META-INF/persistence.xml
@@ -19,7 +19,6 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org
org.gcube.application.geoportal.model.content.WorkspaceContent
- org.gcube.application.geoportal.model.gis.ShapeFileLayerDescriptor
org.gcube.application.geoportal.model.gis.SDILayerDescriptor