diff --git a/.classpath b/.classpath
index fec6dd2..0be8ab5 100644
--- a/.classpath
+++ b/.classpath
@@ -18,6 +18,11 @@
-
+
+
+
+
+
+
diff --git a/.gwt/.gwt-log b/.gwt/.gwt-log
new file mode 100644
index 0000000..e69de29
diff --git a/.project b/.project
index 7d02ff7..f22867b 100644
--- a/.project
+++ b/.project
@@ -20,6 +20,16 @@
+
+ com.google.gdt.eclipse.core.webAppProjectValidator
+
+
+
+
+ com.google.gwt.eclipse.core.gwtProjectValidator
+
+
+
org.eclipse.m2e.core.maven2Builder
@@ -32,5 +42,6 @@
org.eclipse.jdt.core.javanature
org.eclipse.m2e.core.maven2Nature
org.eclipse.wst.common.project.facet.core.nature
+ com.google.gwt.eclipse.core.gwtNature
diff --git a/.settings/com.google.gwt.eclipse.core.prefs b/.settings/com.google.gwt.eclipse.core.prefs
new file mode 100644
index 0000000..f23a752
--- /dev/null
+++ b/.settings/com.google.gwt.eclipse.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+entryPointModules=
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 443e085..6e80039 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 1b22d70..f4bf050 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index f18add0..00529c0 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,7 +1,8 @@
-
Added method to delete/purge group
+ Project structure and so packages are changed (gwt-widget like structure)
diff --git a/pom.xml b/pom.xml
index 8ac68cc..403f91c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
org.gcube.data-catalogue
ckan-util-library
- 2.1.1-SNAPSHOT
+ 2.2.0-SNAPSHOT
jar
CKan utility library
@@ -27,12 +27,13 @@
data-catalogue
distro
- 1.7
- 1.7
+ 1.8
+ 1.8
0.4.2
9.4.1208.jre7
UTF-8
UTF-8
+ 2.7.0
@@ -47,6 +48,12 @@
+
+ com.google.gwt
+ gwt-user
+ ${gwtVersion}
+ provided
+
org.slf4j
slf4j-log4j12
@@ -140,8 +147,8 @@
maven-compiler-plugin
-
- 1.7
+
+ 1.8
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CkanUtilLibrary.gwt.xml b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CkanUtilLibrary.gwt.xml
new file mode 100644
index 0000000..4455b5b
--- /dev/null
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CkanUtilLibrary.gwt.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/client/CkanUtilLibrary.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/client/CkanUtilLibrary.java
new file mode 100644
index 0000000..eb66288
--- /dev/null
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/client/CkanUtilLibrary.java
@@ -0,0 +1,16 @@
+package org.gcube.datacatalogue.ckanutillibrary.client;
+
+import com.google.gwt.core.client.EntryPoint;
+
+/**
+ * Empty entry point module
+ * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
+ */
+public class CkanUtilLibrary implements EntryPoint {
+
+ @Override
+ public void onModuleLoad() {
+
+ }
+
+}
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ApplicationProfileScopePerUrlReader.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/ApplicationProfileScopePerUrlReader.java
similarity index 96%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/ApplicationProfileScopePerUrlReader.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/ApplicationProfileScopePerUrlReader.java
index 2840ccc..ec42dfa 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ApplicationProfileScopePerUrlReader.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/ApplicationProfileScopePerUrlReader.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary;
+package org.gcube.datacatalogue.ckanutillibrary.server;
import static org.gcube.resources.discovery.icclient.ICFactory.client;
@@ -11,7 +11,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.gcube.common.portal.PortalContext;
import org.gcube.common.resources.gcore.utils.XPathHelper;
import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.datacatalogue.ckanutillibrary.exceptions.ApplicationProfileNotFoundException;
+import org.gcube.datacatalogue.ckanutillibrary.server.exceptions.ApplicationProfileNotFoundException;
import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.Query;
import org.gcube.resources.discovery.client.queries.impl.QueryBox;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogue.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java
similarity index 97%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogue.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java
index ec4d5fe..15fb946 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogue.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java
@@ -1,15 +1,15 @@
-package org.gcube.datacatalogue.ckanutillibrary;
+package org.gcube.datacatalogue.ckanutillibrary.server;
import java.io.File;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
-import org.gcube.datacatalogue.ckanutillibrary.models.CKanUserWrapper;
-import org.gcube.datacatalogue.ckanutillibrary.models.CkanDatasetRelationship;
-import org.gcube.datacatalogue.ckanutillibrary.models.DatasetRelationships;
-import org.gcube.datacatalogue.ckanutillibrary.models.ResourceBean;
-import org.gcube.datacatalogue.ckanutillibrary.models.RolesCkanGroupOrOrg;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.CKanUserWrapper;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.CkanDatasetRelationship;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.DatasetRelationships;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.ResourceBean;
+import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg;
import org.json.simple.JSONObject;
import eu.trentorise.opendata.jackan.model.CkanDataset;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueFactory.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java
similarity index 94%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueFactory.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java
index 788a4b0..aaccb9c 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueFactory.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary;
+package org.gcube.datacatalogue.ckanutillibrary.server;
import java.util.concurrent.ConcurrentHashMap;
@@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory;
public class DataCatalogueFactory {
private static final Logger logger = LoggerFactory.getLogger(DataCatalogueFactory.class);
- private static final long MAX_LIFETIME = 1000 * 60 * 2; // 2 MINUTES
+ private static final long MAX_LIFETIME = 1000 * 60 * 30; // 30 MINUTES
private static DataCatalogueFactory instance = new DataCatalogueFactory();
private static ConcurrentHashMap cache;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueImpl.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java
similarity index 99%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueImpl.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java
index 43f4ac4..952cd4b 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueImpl.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary;
+package org.gcube.datacatalogue.ckanutillibrary.server;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -30,14 +30,14 @@ import net.htmlparser.jericho.Renderer;
import net.htmlparser.jericho.Segment;
import net.htmlparser.jericho.Source;
-import org.gcube.datacatalogue.ckanutillibrary.models.CKanUserWrapper;
-import org.gcube.datacatalogue.ckanutillibrary.models.CkanDatasetRelationship;
-import org.gcube.datacatalogue.ckanutillibrary.models.DatasetRelationships;
-import org.gcube.datacatalogue.ckanutillibrary.models.ResourceBean;
-import org.gcube.datacatalogue.ckanutillibrary.models.RolesCkanGroupOrOrg;
-import org.gcube.datacatalogue.ckanutillibrary.models.State;
-import org.gcube.datacatalogue.ckanutillibrary.utils.UtilMethods;
-import org.gcube.datacatalogue.ckanutillibrary.utils.url.EntityContext;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.CKanUserWrapper;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.CkanDatasetRelationship;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.DatasetRelationships;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.ResourceBean;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.State;
+import org.gcube.datacatalogue.ckanutillibrary.server.utils.UtilMethods;
+import org.gcube.datacatalogue.ckanutillibrary.server.utils.url.EntityContext;
+import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueRunningCluster.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java
similarity index 96%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueRunningCluster.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java
index fe53839..ea7283d 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/DataCatalogueRunningCluster.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary;
+package org.gcube.datacatalogue.ckanutillibrary.server;
import static org.gcube.resources.discovery.icclient.ICFactory.client;
import static org.gcube.resources.discovery.icclient.ICFactory.clientFor;
@@ -18,10 +18,10 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.Property;
import org.gcube.common.resources.gcore.utils.XPathHelper;
import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.datacatalogue.ckanutillibrary.exceptions.ApplicationProfileNotFoundException;
-import org.gcube.datacatalogue.ckanutillibrary.exceptions.NoApplicationProfileMasterException;
-import org.gcube.datacatalogue.ckanutillibrary.exceptions.NoDataCatalogueRuntimeResourceException;
-import org.gcube.datacatalogue.ckanutillibrary.exceptions.ServiceEndPointException;
+import org.gcube.datacatalogue.ckanutillibrary.server.exceptions.ApplicationProfileNotFoundException;
+import org.gcube.datacatalogue.ckanutillibrary.server.exceptions.NoApplicationProfileMasterException;
+import org.gcube.datacatalogue.ckanutillibrary.server.exceptions.NoDataCatalogueRuntimeResourceException;
+import org.gcube.datacatalogue.ckanutillibrary.server.exceptions.ServiceEndPointException;
import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.Query;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/ApplicationProfileNotFoundException.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/ApplicationProfileNotFoundException.java
similarity index 83%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/ApplicationProfileNotFoundException.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/ApplicationProfileNotFoundException.java
index 5ef8d94..71656cb 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/ApplicationProfileNotFoundException.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/ApplicationProfileNotFoundException.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.exceptions;
+package org.gcube.datacatalogue.ckanutillibrary.server.exceptions;
@SuppressWarnings("serial")
/**
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/NoApplicationProfileMasterException.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/NoApplicationProfileMasterException.java
similarity index 90%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/NoApplicationProfileMasterException.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/NoApplicationProfileMasterException.java
index 091a090..3766467 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/NoApplicationProfileMasterException.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/NoApplicationProfileMasterException.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.exceptions;
+package org.gcube.datacatalogue.ckanutillibrary.server.exceptions;
/**
* Thrown when there are more than one application profile, but none of them was set as master
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/NoDataCatalogueRuntimeResourceException.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/NoDataCatalogueRuntimeResourceException.java
similarity index 88%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/NoDataCatalogueRuntimeResourceException.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/NoDataCatalogueRuntimeResourceException.java
index cfe41aa..218c222 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/NoDataCatalogueRuntimeResourceException.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/NoDataCatalogueRuntimeResourceException.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.exceptions;
+package org.gcube.datacatalogue.ckanutillibrary.server.exceptions;
/**
* No Data Catalogue node found.
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/ServiceEndPointException.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/ServiceEndPointException.java
similarity index 89%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/ServiceEndPointException.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/ServiceEndPointException.java
index eeb6de7..0f42299 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/ServiceEndPointException.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/ServiceEndPointException.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.exceptions;
+package org.gcube.datacatalogue.ckanutillibrary.server.exceptions;
/**
* Exception thrown when it is not possible retrieve information from the ServiceEndpoint
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/TooManyRunningClustersException.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/TooManyRunningClustersException.java
similarity index 88%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/TooManyRunningClustersException.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/TooManyRunningClustersException.java
index 57901cc..28c6ae7 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/exceptions/TooManyRunningClustersException.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/exceptions/TooManyRunningClustersException.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.exceptions;
+package org.gcube.datacatalogue.ckanutillibrary.server.exceptions;
/**
* Too many clusters in this scope exception.
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CKanUserWrapper.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/CKanUserWrapper.java
similarity index 97%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CKanUserWrapper.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/CKanUserWrapper.java
index d89a103..e7c1ab2 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CKanUserWrapper.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/CKanUserWrapper.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.models;
+package org.gcube.datacatalogue.ckanutillibrary.server.models;
import java.io.Serializable;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CkanDatasetRelationship.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/CkanDatasetRelationship.java
similarity index 96%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CkanDatasetRelationship.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/CkanDatasetRelationship.java
index 8f6816b..5149420 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CkanDatasetRelationship.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/CkanDatasetRelationship.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.models;
+package org.gcube.datacatalogue.ckanutillibrary.server.models;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/DatasetRelationships.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/DatasetRelationships.java
similarity index 90%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/DatasetRelationships.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/DatasetRelationships.java
index f5cc75f..c807575 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/DatasetRelationships.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/DatasetRelationships.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.models;
+package org.gcube.datacatalogue.ckanutillibrary.server.models;
/**
* Allowed relationships between packages(datasets). Some of them are not supported yet due to the problem
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/ResourceBean.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/ResourceBean.java
similarity index 97%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/ResourceBean.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/ResourceBean.java
index f17a6be..c8e7cce 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/ResourceBean.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/ResourceBean.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.models;
+package org.gcube.datacatalogue.ckanutillibrary.server.models;
import java.io.Serializable;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/State.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/State.java
similarity index 72%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/State.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/State.java
index b9b8af1..d898e82 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/State.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/models/State.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.models;
+package org.gcube.datacatalogue.ckanutillibrary.server.models;
/**
* The current state of this group/user
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/SessionCatalogueAttributes.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/SessionCatalogueAttributes.java
similarity index 93%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/SessionCatalogueAttributes.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/SessionCatalogueAttributes.java
index fc7906c..a141eb9 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/SessionCatalogueAttributes.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/SessionCatalogueAttributes.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.utils;
+package org.gcube.datacatalogue.ckanutillibrary.server.utils;
/**
* A list of attributes that are saved into http session.
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/UtilMethods.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/UtilMethods.java
similarity index 97%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/UtilMethods.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/UtilMethods.java
index 5a43cec..51d23aa 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/UtilMethods.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/UtilMethods.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.utils;
+package org.gcube.datacatalogue.ckanutillibrary.server.utils;
import java.net.HttpURLConnection;
import java.net.URL;
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/url/EntityContext.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/url/EntityContext.java
similarity index 86%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/url/EntityContext.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/url/EntityContext.java
index 2d97d90..981b7d8 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/url/EntityContext.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/url/EntityContext.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.utils.url;
+package org.gcube.datacatalogue.ckanutillibrary.server.utils.url;
/**
* Entity context for uri resolver
diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/RolesCkanGroupOrOrg.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/RolesCkanGroupOrOrg.java
similarity index 90%
rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/RolesCkanGroupOrOrg.java
rename to src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/RolesCkanGroupOrOrg.java
index eb289e5..e4b6f74 100644
--- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/RolesCkanGroupOrOrg.java
+++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/RolesCkanGroupOrOrg.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary.models;
+package org.gcube.datacatalogue.ckanutillibrary.shared;
/**
* Roles that user can have into organizations/groups.
diff --git a/src/test/java/org/gcube/datacatalogue/ckanutillibrary/TestDataCatalogueLib.java b/src/test/java/org/gcube/datacatalogue/ckanutillibrary/server/TestDataCatalogueLib.java
similarity index 95%
rename from src/test/java/org/gcube/datacatalogue/ckanutillibrary/TestDataCatalogueLib.java
rename to src/test/java/org/gcube/datacatalogue/ckanutillibrary/server/TestDataCatalogueLib.java
index 441f40e..eca169c 100644
--- a/src/test/java/org/gcube/datacatalogue/ckanutillibrary/TestDataCatalogueLib.java
+++ b/src/test/java/org/gcube/datacatalogue/ckanutillibrary/server/TestDataCatalogueLib.java
@@ -1,4 +1,4 @@
-package org.gcube.datacatalogue.ckanutillibrary;
+package org.gcube.datacatalogue.ckanutillibrary.server;
import java.util.ArrayList;
import java.util.Arrays;
@@ -10,11 +10,14 @@ import java.util.Map.Entry;
import java.util.UUID;
import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.datacatalogue.ckanutillibrary.models.CKanUserWrapper;
-import org.gcube.datacatalogue.ckanutillibrary.models.CkanDatasetRelationship;
-import org.gcube.datacatalogue.ckanutillibrary.models.DatasetRelationships;
-import org.gcube.datacatalogue.ckanutillibrary.models.RolesCkanGroupOrOrg;
-import org.gcube.datacatalogue.ckanutillibrary.utils.UtilMethods;
+import org.gcube.datacatalogue.ckanutillibrary.server.ApplicationProfileScopePerUrlReader;
+import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueFactory;
+import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueImpl;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.CKanUserWrapper;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.CkanDatasetRelationship;
+import org.gcube.datacatalogue.ckanutillibrary.server.models.DatasetRelationships;
+import org.gcube.datacatalogue.ckanutillibrary.server.utils.UtilMethods;
+import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg;
import org.slf4j.LoggerFactory;
import eu.trentorise.opendata.jackan.CheckedCkanClient;
@@ -193,7 +196,7 @@ public class TestDataCatalogueLib {
Iterator>> iterator = orgs.entrySet().iterator();
while (iterator.hasNext()) {
- Map.Entry> entry = (Map.Entry>) iterator
+ Map.Entry> entry = (Map.Entry>) iterator
.next();
logger.debug("Org is " + entry.getKey() + " and role is " + entry.getValue().get(0));