diff --git a/.classpath b/.classpath index 045159b..3477fe8 100644 --- a/.classpath +++ b/.classpath @@ -27,6 +27,7 @@ + diff --git a/.project b/.project index 93a6d99..056f58d 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -15,9 +20,17 @@ + + org.eclipse.wst.validation.validationbuilder + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 0000000..bea0cb0 --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,5 @@ + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..fb95c45 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index f484e2d..0433e58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,6 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v0.2.0-SNAPSHOT] - 2021-02-11 +## [v0.3.0-SNAPSHOT] - 2021-02-11 [#19378] First Release diff --git a/pom.xml b/pom.xml index 6d62d9d..97b5da5 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.datacatalogue catalogue-util-library - 0.2.0-SNAPSHOT + 0.3.0-SNAPSHOT Ckan utility library diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CkanUtilLibrary.gwt.xml b/src/main/java/org/gcube/datacatalogue/utillibrary/CkanUtilLibrary.gwt.xml similarity index 100% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/CkanUtilLibrary.gwt.xml rename to src/main/java/org/gcube/datacatalogue/utillibrary/CkanUtilLibrary.gwt.xml diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/ExtendCkanClient.java b/src/main/java/org/gcube/datacatalogue/utillibrary/ckan/ExtendCkanClient.java similarity index 94% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/ExtendCkanClient.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/ckan/ExtendCkanClient.java index bddf4be..ce8564e 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/ExtendCkanClient.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/ckan/ExtendCkanClient.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.ckan; +package org.gcube.datacatalogue.utillibrary.ckan; import static com.google.common.base.Preconditions.checkNotNull; @@ -14,12 +14,12 @@ import javax.annotation.Nullable; import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Response; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; -import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanException; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; +import org.gcube.datacatalogue.utillibrary.jackan.CkanClient; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +27,6 @@ import com.google.common.base.Charsets; import com.google.common.io.CharStreams; - - /** * The Class ExtendCkanClient. * diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/MarshUnmarshCkanObject.java b/src/main/java/org/gcube/datacatalogue/utillibrary/ckan/MarshUnmarshCkanObject.java similarity index 93% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/MarshUnmarshCkanObject.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/ckan/MarshUnmarshCkanObject.java index 022ee1d..1e15847 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/MarshUnmarshCkanObject.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/ckan/MarshUnmarshCkanObject.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.ckan; +package org.gcube.datacatalogue.utillibrary.ckan; import java.io.IOException; @@ -6,9 +6,9 @@ import org.gcube.com.fasterxml.jackson.core.JsonParseException; import org.gcube.com.fasterxml.jackson.core.JsonProcessingException; import org.gcube.com.fasterxml.jackson.databind.JsonMappingException; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/PatchedCkan.java b/src/main/java/org/gcube/datacatalogue/utillibrary/ckan/PatchedCkan.java similarity index 81% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/PatchedCkan.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/ckan/PatchedCkan.java index 519907c..e448c78 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/PatchedCkan.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/ckan/PatchedCkan.java @@ -1,11 +1,11 @@ -package org.gcube.datacatalogue.ckanutillibrary.ckan; +package org.gcube.datacatalogue.utillibrary.ckan; -import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanException; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; +import org.gcube.datacatalogue.utillibrary.jackan.CkanClient; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException; /** * The Interface PatchedCkan. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/db/DBCaller.java b/src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/db/DBCaller.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java index cdf891e..d276b6b 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/db/DBCaller.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/db/DBCaller.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.db; +package org.gcube.datacatalogue.utillibrary.db; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -11,7 +11,7 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg; +import org.gcube.datacatalogue.utillibrary.shared.RolesCkanGroupOrOrg; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/gcat/GCatCaller.java b/src/main/java/org/gcube/datacatalogue/utillibrary/gcat/GCatCaller.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/gcat/GCatCaller.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/gcat/GCatCaller.java index fb7b6d3..1182559 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/gcat/GCatCaller.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/gcat/GCatCaller.java @@ -1,7 +1,7 @@ /* * */ -package org.gcube.datacatalogue.ckanutillibrary.gcat; +package org.gcube.datacatalogue.utillibrary.gcat; import java.net.MalformedURLException; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CheckedCkanClient.java b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CheckedCkanClient.java similarity index 90% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CheckedCkanClient.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CheckedCkanClient.java index 06017df..ade8cb1 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CheckedCkanClient.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CheckedCkanClient.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.jackan; +package org.gcube.datacatalogue.utillibrary.jackan; import static com.google.common.base.Preconditions.checkNotNull; -import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.checkNotEmpty; -import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.isNotEmpty; +import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.checkNotEmpty; +import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.isNotEmpty; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -27,15 +27,15 @@ import java.util.UUID; import javax.annotation.Nullable; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDatasetBase; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanLicense; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResourceBase; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanNotFoundException; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanValidationException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDatasetBase; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResourceBase; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanNotFoundException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanValidationException; /** * This client performs additional checks when writing to CKAN to ensure written diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CkanClient.java b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CkanClient.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CkanClient.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CkanClient.java index f5f8ca4..2d411bc 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CkanClient.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CkanClient.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.jackan; +package org.gcube.datacatalogue.utillibrary.jackan; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.checkNotEmpty; -import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.removeTrailingSlash; +import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.checkNotEmpty; +import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.removeTrailingSlash; import java.io.IOException; import java.io.InputStream; @@ -49,29 +49,29 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonInclude.Include; import org.gcube.com.fasterxml.jackson.databind.DeserializationFeature; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDatasetBase; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDatasetRelationship; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanError; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroupOrgBase; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanLicense; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanPair; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResourceBase; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanTag; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanTagBase; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanUser; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanUserBase; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanVocabulary; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanVocabularyBase; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanAuthorizationException; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanException; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanNotFoundException; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.CkanValidationException; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDatasetBase; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDatasetRelationship; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanError; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroupOrgBase; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanPair; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResourceBase; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanTag; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanTagBase; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanUser; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanUserBase; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanVocabulary; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanVocabularyBase; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanAuthorizationException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanNotFoundException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.CkanValidationException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CkanQuery.java b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CkanQuery.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CkanQuery.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CkanQuery.java index fcdcbba..57bfa30 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/CkanQuery.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/CkanQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.jackan; +package org.gcube.datacatalogue.utillibrary.jackan; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/JackanModule.java b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/JackanModule.java similarity index 95% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/JackanModule.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/jackan/JackanModule.java index bf1839d..6590760 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/JackanModule.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/JackanModule.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.jackan; +package org.gcube.datacatalogue.utillibrary.jackan; -import static org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient.formatTimestamp; +import static org.gcube.datacatalogue.utillibrary.jackan.CkanClient.formatTimestamp; import java.io.IOException; import java.sql.Timestamp; @@ -33,7 +33,7 @@ import org.gcube.com.fasterxml.jackson.databind.PropertyNamingStrategy; import org.gcube.com.fasterxml.jackson.databind.SerializerProvider; import org.gcube.com.fasterxml.jackson.databind.module.SimpleModule; import org.gcube.com.fasterxml.jackson.databind.ser.std.StdSerializer; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/SearchResults.java b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/SearchResults.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/SearchResults.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/jackan/SearchResults.java index 9b3777f..2247fe0 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/jackan/SearchResults.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/jackan/SearchResults.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.jackan; +package org.gcube.datacatalogue.utillibrary.jackan; import java.util.List; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/ApplicationProfileScopePerUrlReader.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/ApplicationProfileScopePerUrlReader.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/ApplicationProfileScopePerUrlReader.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/ApplicationProfileScopePerUrlReader.java index e0d621e..b901fe1 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/ApplicationProfileScopePerUrlReader.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/ApplicationProfileScopePerUrlReader.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server; +package org.gcube.datacatalogue.utillibrary.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.shared.ex.ApplicationProfileNotFoundException; +import org.gcube.datacatalogue.utillibrary.shared.ex.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/server/CKANTokenBean.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/CKANTokenBean.java similarity index 92% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/CKANTokenBean.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/CKANTokenBean.java index ce96896..cb6b00f 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/CKANTokenBean.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/CKANTokenBean.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server; +package org.gcube.datacatalogue.utillibrary.server; /** * The Class CKANTokenBean. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogue.java similarity index 95% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogue.java index e1171dc..9dfa6cc 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogue.java @@ -1,15 +1,15 @@ -package org.gcube.datacatalogue.ckanutillibrary.server; +package org.gcube.datacatalogue.utillibrary.server; import java.util.List; import java.util.Map; -import org.gcube.datacatalogue.ckanutillibrary.shared.LandingPages; -import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean; -import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanLicense; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; +import org.gcube.datacatalogue.utillibrary.shared.LandingPages; +import org.gcube.datacatalogue.utillibrary.shared.ResourceBean; +import org.gcube.datacatalogue.utillibrary.shared.RolesCkanGroupOrOrg; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization; /** diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueFactory.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueFactory.java index 542d882..a33acd7 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueFactory.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueFactory.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server; +package org.gcube.datacatalogue.utillibrary.server; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java index f1952e8..79acdf5 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueImpl.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server; +package org.gcube.datacatalogue.utillibrary.server; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -29,28 +29,28 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; -import org.gcube.datacatalogue.ckanutillibrary.ckan.ExtendCkanClient; -import org.gcube.datacatalogue.ckanutillibrary.ckan.MarshUnmarshCkanObject; -import org.gcube.datacatalogue.ckanutillibrary.ckan.MarshUnmarshCkanObject.METHOD; -import org.gcube.datacatalogue.ckanutillibrary.db.DBCaller; -import org.gcube.datacatalogue.ckanutillibrary.gcat.GCatCaller; -import org.gcube.datacatalogue.ckanutillibrary.server.DataCatalogueRunningCluster.ACCESS_LEVEL_TO_CATALOGUE_PORTLET; -import org.gcube.datacatalogue.ckanutillibrary.server.utils.CKANConveter; -import org.gcube.datacatalogue.ckanutillibrary.server.utils.CatalogueUtilMethods; -import org.gcube.datacatalogue.ckanutillibrary.server.utils.GCubeUtils; -import org.gcube.datacatalogue.ckanutillibrary.server.utils.GCubeUtils.GCUBE_SCOPE_LEVEL; -import org.gcube.datacatalogue.ckanutillibrary.server.utils.url.EntityContext; -import org.gcube.datacatalogue.ckanutillibrary.shared.LandingPages; -import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean; -import org.gcube.datacatalogue.ckanutillibrary.shared.RolesCkanGroupOrOrg; -import org.gcube.datacatalogue.ckanutillibrary.shared.State; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanLicense; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanUser; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; +import org.gcube.datacatalogue.utillibrary.ckan.ExtendCkanClient; +import org.gcube.datacatalogue.utillibrary.ckan.MarshUnmarshCkanObject; +import org.gcube.datacatalogue.utillibrary.ckan.MarshUnmarshCkanObject.METHOD; +import org.gcube.datacatalogue.utillibrary.db.DBCaller; +import org.gcube.datacatalogue.utillibrary.gcat.GCatCaller; +import org.gcube.datacatalogue.utillibrary.server.DataCatalogueRunningCluster.ACCESS_LEVEL_TO_CATALOGUE_PORTLET; +import org.gcube.datacatalogue.utillibrary.server.utils.CKANConveter; +import org.gcube.datacatalogue.utillibrary.server.utils.CatalogueUtilMethods; +import org.gcube.datacatalogue.utillibrary.server.utils.GCubeUtils; +import org.gcube.datacatalogue.utillibrary.server.utils.GCubeUtils.GCUBE_SCOPE_LEVEL; +import org.gcube.datacatalogue.utillibrary.server.utils.url.EntityContext; +import org.gcube.datacatalogue.utillibrary.shared.LandingPages; +import org.gcube.datacatalogue.utillibrary.shared.ResourceBean; +import org.gcube.datacatalogue.utillibrary.shared.RolesCkanGroupOrOrg; +import org.gcube.datacatalogue.utillibrary.shared.State; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanLicense; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanUser; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueRunningCluster.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueRunningCluster.java index 3f153ea..27c70ed 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueRunningCluster.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/DataCatalogueRunningCluster.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server; +package org.gcube.datacatalogue.utillibrary.server; import static org.gcube.resources.discovery.icclient.ICFactory.client; import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; @@ -22,10 +22,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.shared.ex.ApplicationProfileNotFoundException; -import org.gcube.datacatalogue.ckanutillibrary.shared.ex.NoApplicationProfileMasterException; -import org.gcube.datacatalogue.ckanutillibrary.shared.ex.NoDataCatalogueRuntimeResourceException; -import org.gcube.datacatalogue.ckanutillibrary.shared.ex.ServiceEndPointException; +import org.gcube.datacatalogue.utillibrary.shared.ex.ApplicationProfileNotFoundException; +import org.gcube.datacatalogue.utillibrary.shared.ex.NoApplicationProfileMasterException; +import org.gcube.datacatalogue.utillibrary.shared.ex.NoDataCatalogueRuntimeResourceException; +import org.gcube.datacatalogue.utillibrary.shared.ex.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/server/utils/CKANConveter.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CKANConveter.java similarity index 91% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/CKANConveter.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CKANConveter.java index d772a2c..e452311 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/CKANConveter.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CKANConveter.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server.utils; +package org.gcube.datacatalogue.utillibrary.server.utils; import java.util.ArrayList; import java.util.Iterator; @@ -6,13 +6,13 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.gcube.datacatalogue.ckanutillibrary.ckan.ExtendCkanClient; -import org.gcube.datacatalogue.ckanutillibrary.shared.ResourceBean; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanPair; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResource; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanTag; +import org.gcube.datacatalogue.utillibrary.ckan.ExtendCkanClient; +import org.gcube.datacatalogue.utillibrary.shared.ResourceBean; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanPair; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResource; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanTag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/CatalogueUtilMethods.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CatalogueUtilMethods.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/CatalogueUtilMethods.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CatalogueUtilMethods.java index dd56647..716dcea 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/CatalogueUtilMethods.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/CatalogueUtilMethods.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server.utils; +package org.gcube.datacatalogue.utillibrary.server.utils; import java.net.HttpURLConnection; import java.net.URL; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/GCubeUtils.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/GCubeUtils.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/GCubeUtils.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/GCubeUtils.java index 1b35c32..8011485 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/GCubeUtils.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/GCubeUtils.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server.utils; +package org.gcube.datacatalogue.utillibrary.server.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/GenericUtils.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/GenericUtils.java similarity index 99% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/GenericUtils.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/GenericUtils.java index cb9571e..95888cf 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/GenericUtils.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/GenericUtils.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server.utils; +package org.gcube.datacatalogue.utillibrary.server.utils; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/SessionCatalogueAttributes.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/SessionCatalogueAttributes.java similarity index 93% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/SessionCatalogueAttributes.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/SessionCatalogueAttributes.java index a141eb9..2c3720f 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/SessionCatalogueAttributes.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/SessionCatalogueAttributes.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server.utils; +package org.gcube.datacatalogue.utillibrary.server.utils; /** * A list of attributes that are saved into http session. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/url/EntityContext.java b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/url/EntityContext.java similarity index 86% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/url/EntityContext.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/url/EntityContext.java index 947d1d0..5f7538a 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/utils/url/EntityContext.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/server/utils/url/EntityContext.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.server.utils.url; +package org.gcube.datacatalogue.utillibrary.server.utils.url; /** * Entity context for uri resolver diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/CKanUserWrapper.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/CKanUserWrapper.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/CKanUserWrapper.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/CKanUserWrapper.java index ccc7c49..df04cfb 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/CKanUserWrapper.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/CKanUserWrapper.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared; +package org.gcube.datacatalogue.utillibrary.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/CkanDatasetRelationship.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/CkanDatasetRelationship.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/CkanDatasetRelationship.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/CkanDatasetRelationship.java index c5d12d8..9c54ae4 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/CkanDatasetRelationship.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/CkanDatasetRelationship.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared; +package org.gcube.datacatalogue.utillibrary.shared; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/DatasetRelationships.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/DatasetRelationships.java similarity index 91% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/DatasetRelationships.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/DatasetRelationships.java index 657fb09..f4ae0ab 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/DatasetRelationships.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/DatasetRelationships.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared; +package org.gcube.datacatalogue.utillibrary.shared; /** * 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/shared/LandingPages.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/LandingPages.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/LandingPages.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/LandingPages.java index 2e7695e..e8301ad 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/LandingPages.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/LandingPages.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared; +package org.gcube.datacatalogue.utillibrary.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ResourceBean.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ResourceBean.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ResourceBean.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/ResourceBean.java index 2b124c3..9508d94 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ResourceBean.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ResourceBean.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared; +package org.gcube.datacatalogue.utillibrary.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/RolesCkanGroupOrOrg.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/RolesCkanGroupOrOrg.java similarity index 93% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/RolesCkanGroupOrOrg.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/RolesCkanGroupOrOrg.java index 196b655..4c04e75 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/RolesCkanGroupOrOrg.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/RolesCkanGroupOrOrg.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared; +package org.gcube.datacatalogue.utillibrary.shared; /** * Roles that user can have into organizations/groups. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/State.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/State.java similarity index 74% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/State.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/State.java index ddc8fc2..849810b 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/State.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/State.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared; +package org.gcube.datacatalogue.utillibrary.shared; /** * The current state of this group/user diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/Statistics.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/Statistics.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/Statistics.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/Statistics.java index beef067..237c956 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/Statistics.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/Statistics.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared; +package org.gcube.datacatalogue.utillibrary.shared; import java.io.Serializable; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/ApplicationProfileNotFoundException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/ApplicationProfileNotFoundException.java similarity index 85% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/ApplicationProfileNotFoundException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/ApplicationProfileNotFoundException.java index 384b652..a0a4c96 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/ApplicationProfileNotFoundException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/ApplicationProfileNotFoundException.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared.ex; +package org.gcube.datacatalogue.utillibrary.shared.ex; @SuppressWarnings("serial") /** diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/NoApplicationProfileMasterException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/NoApplicationProfileMasterException.java similarity index 91% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/NoApplicationProfileMasterException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/NoApplicationProfileMasterException.java index feca2ae..0d019ff 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/NoApplicationProfileMasterException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/NoApplicationProfileMasterException.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared.ex; +package org.gcube.datacatalogue.utillibrary.shared.ex; /** * 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/shared/ex/NoDataCatalogueRuntimeResourceException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/NoDataCatalogueRuntimeResourceException.java similarity index 90% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/NoDataCatalogueRuntimeResourceException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/NoDataCatalogueRuntimeResourceException.java index 1f35604..7d20877 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/NoDataCatalogueRuntimeResourceException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/NoDataCatalogueRuntimeResourceException.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared.ex; +package org.gcube.datacatalogue.utillibrary.shared.ex; /** * No Data Catalogue node found. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/ServiceEndPointException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/ServiceEndPointException.java similarity index 90% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/ServiceEndPointException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/ServiceEndPointException.java index bfcecaf..36aea1f 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/ServiceEndPointException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/ServiceEndPointException.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared.ex; +package org.gcube.datacatalogue.utillibrary.shared.ex; /** * Exception thrown when it is not possible retrieve information from the ServiceEndpoint diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/TooManyRunningClustersException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/TooManyRunningClustersException.java similarity index 90% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/TooManyRunningClustersException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/TooManyRunningClustersException.java index 4f73f02..6c337e9 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/ex/TooManyRunningClustersException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/ex/TooManyRunningClustersException.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.shared.ex; +package org.gcube.datacatalogue.utillibrary.shared.ex; /** * Too many clusters in this scope exception. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanActivity.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanActivity.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanActivity.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanActivity.java index 4529d07..c4a1f6a 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanActivity.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanActivity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.sql.Timestamp; import java.util.List; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanCapacity.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanCapacity.java similarity index 92% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanCapacity.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanCapacity.java index 34d0975..398bcce 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanCapacity.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanCapacity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; /** * Actually they are lower case in ckan, but 'public' and 'private' clash with diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDataset.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDataset.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDataset.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDataset.java index b7fc95e..8dd1494 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDataset.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDataset.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.sql.Timestamp; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDatasetBase.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDatasetBase.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDatasetBase.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDatasetBase.java index 6791e29..08b0933 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDatasetBase.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDatasetBase.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; -import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.isNotEmpty; +import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.isNotEmpty; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDatasetRelationship.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDatasetRelationship.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDatasetRelationship.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDatasetRelationship.java index 793e5e5..6fe4222 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanDatasetRelationship.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanDatasetRelationship.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; /** * diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanError.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanError.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanError.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanError.java index 8cd65d8..f1f52e9 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanError.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanError.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroup.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroup.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroup.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroup.java index 6771c71..0463157 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroup.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroup.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; /** * Class to explicitly model a Ckan group, which is not an organization, diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroupOrg.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroupOrg.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroupOrg.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroupOrg.java index 4cfa377..f2ab851 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroupOrg.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroupOrg.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.sql.Timestamp; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroupOrgBase.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroupOrgBase.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroupOrgBase.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroupOrgBase.java index dfcbade..f593304 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanGroupOrgBase.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanGroupOrgBase.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; -import static org.gcube.datacatalogue.ckanutillibrary.server.utils.GenericUtils.isNotEmpty; +import static org.gcube.datacatalogue.utillibrary.server.utils.GenericUtils.isNotEmpty; import java.util.List; @@ -24,7 +24,7 @@ import javax.annotation.Nullable; import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.gcube.datacatalogue.ckanutillibrary.jackan.JackanModule; +import org.gcube.datacatalogue.utillibrary.jackan.JackanModule; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanLicense.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanLicense.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanLicense.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanLicense.java index a3234f0..0e6aa1f 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanLicense.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanLicense.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import org.gcube.com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanOrganization.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanOrganization.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanOrganization.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanOrganization.java index fec6c67..e418798 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanOrganization.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanOrganization.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; /** diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanPair.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanPair.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanPair.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanPair.java index ed54f93..6e86b97 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanPair.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanPair.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.util.Objects; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResource.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResource.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResource.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResource.java index 2f3a580..b290b57 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResource.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import javax.annotation.Nullable; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResourceBase.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResourceBase.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResourceBase.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResourceBase.java index d703e63..5c7b61f 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResourceBase.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResourceBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.io.File; import java.sql.Timestamp; @@ -25,7 +25,7 @@ import javax.annotation.Nullable; import org.gcube.com.fasterxml.jackson.annotation.JsonAnyGetter; import org.gcube.com.fasterxml.jackson.annotation.JsonAnySetter; import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions.JackanException; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions.JackanException; import org.slf4j.Logger; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResponse.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResponse.java similarity index 95% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResponse.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResponse.java index 9a0e5db..01103cf 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanResponse.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; /** * diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanState.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanState.java similarity index 92% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanState.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanState.java index 2d9c6d0..d4669c6 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanState.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; /** * Possible states of a Dataset or Resource - only active datasets show up in diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTag.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTag.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTag.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTag.java index 0482876..84bb088 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTag.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTag.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.sql.Timestamp; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTagBase.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTagBase.java similarity index 97% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTagBase.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTagBase.java index 3a770a9..642b357 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTagBase.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTagBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; /** * A Ckan Tag. Tags can be free or belong to a controlled vocabulary. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTrackingSummary.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTrackingSummary.java similarity index 93% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTrackingSummary.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTrackingSummary.java index c06a024..fbe04b6 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanTrackingSummary.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanTrackingSummary.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; /** * Just don't know what it is. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanUser.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanUser.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanUser.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanUser.java index 56ca3ce..97dc74e 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanUser.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanUser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.sql.Timestamp; import java.util.List; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanUserBase.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanUserBase.java similarity index 98% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanUserBase.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanUserBase.java index 0b80eed..22b0d88 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanUserBase.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanUserBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import javax.annotation.Nullable; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanVocabulary.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanVocabulary.java similarity index 93% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanVocabulary.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanVocabulary.java index 0314917..ef908ef 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanVocabulary.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanVocabulary.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.util.List; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanVocabularyBase.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanVocabularyBase.java similarity index 96% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanVocabularyBase.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanVocabularyBase.java index be9a958..7a13522 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/CkanVocabularyBase.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/CkanVocabularyBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model; import java.util.List; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanAuthorizationException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanAuthorizationException.java similarity index 85% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanAuthorizationException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanAuthorizationException.java index 809600e..1f391fe 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanAuthorizationException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanAuthorizationException.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions; -import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; +import org.gcube.datacatalogue.utillibrary.jackan.CkanClient; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse; /** * Exception raised when the user is not authorized to call the action. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanException.java similarity index 90% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanException.java index f41497c..982331d 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanException.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions; import javax.annotation.Nullable; -import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; +import org.gcube.datacatalogue.utillibrary.jackan.CkanClient; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse; /** * Runtime exception for ckan-related problems. For possible cases description, see {@link eu.trentorise.opendata.jackan.model.CkanError CkanError} diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanNotFoundException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanNotFoundException.java similarity index 83% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanNotFoundException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanNotFoundException.java index d2b5e63..9d21059 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanNotFoundException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanNotFoundException.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions; -import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; +import org.gcube.datacatalogue.utillibrary.jackan.CkanClient; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse; /** * Thrown when Ckan tells us something was not found. Notice this is not related diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanValidationException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanValidationException.java similarity index 85% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanValidationException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanValidationException.java index 7e37c2c..c3858ca 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/CkanValidationException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/CkanValidationException.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions; -import org.gcube.datacatalogue.ckanutillibrary.jackan.CkanClient; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanResponse; +import org.gcube.datacatalogue.utillibrary.jackan.CkanClient; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanResponse; /** * Thrown when Ckan tells us something was not in the proper format. diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/JackanException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/JackanException.java similarity index 91% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/JackanException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/JackanException.java index d66f1df..5884f3f 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/JackanException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/JackanException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions; /** diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/JackanNotFoundException.java b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/JackanNotFoundException.java similarity index 93% rename from src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/JackanNotFoundException.java rename to src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/JackanNotFoundException.java index 9fde660..fd3f655 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/shared/jackan/model/exceptions/JackanNotFoundException.java +++ b/src/main/java/org/gcube/datacatalogue/utillibrary/shared/jackan/model/exceptions/JackanNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.exceptions; +package org.gcube.datacatalogue.utillibrary.shared.jackan.model.exceptions; /** * A runtime exception to raise when something is not found. Note this is not diff --git a/src/test/java/org/gcube/datacatalogue/ckanutillibrary/test/TestDataCatalogueLib.java b/src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java similarity index 93% rename from src/test/java/org/gcube/datacatalogue/ckanutillibrary/test/TestDataCatalogueLib.java rename to src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java index 7fdb54d..6fcb11d 100644 --- a/src/test/java/org/gcube/datacatalogue/ckanutillibrary/test/TestDataCatalogueLib.java +++ b/src/test/java/org/gcube/datacatalogue/utillibrary/test/TestDataCatalogueLib.java @@ -1,4 +1,4 @@ -package org.gcube.datacatalogue.ckanutillibrary.test; +package org.gcube.datacatalogue.utillibrary.test; import java.util.ArrayList; @@ -10,14 +10,14 @@ import java.util.Random; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; -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.shared.ResourceBean; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanDataset; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanGroup; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanOrganization; -import org.gcube.datacatalogue.ckanutillibrary.shared.jackan.model.CkanUser; +import org.gcube.datacatalogue.utillibrary.server.ApplicationProfileScopePerUrlReader; +import org.gcube.datacatalogue.utillibrary.server.DataCatalogueFactory; +import org.gcube.datacatalogue.utillibrary.server.DataCatalogueImpl; +import org.gcube.datacatalogue.utillibrary.shared.ResourceBean; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanDataset; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanGroup; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanOrganization; +import org.gcube.datacatalogue.utillibrary.shared.jackan.model.CkanUser; import org.junit.Before; import org.junit.Test; import org.slf4j.LoggerFactory;