From 790c66c9078bb1ed92f1bf684ce89f3caed9b325 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 2 Oct 2018 07:19:56 +0000 Subject: [PATCH] Merged changes made in branch caused by is-model and gcube-model repackaging git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry-client@171804 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 4 +-- .../client/ResourceRegistryClient.java | 14 +++++----- .../client/ResourceRegistryClientImpl.java | 20 +++++++------- .../client/ResourceRegistryClientTest.java | 26 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index b65a897..996f192 100644 --- a/pom.xml +++ b/pom.xml @@ -80,8 +80,8 @@ test - org.gcube.information-system - gcube-resources + org.gcube.resource-management + gcube-model test diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java index fc3d3ce..a1fe9a8 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClient.java @@ -4,13 +4,13 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.gcube.informationsystem.model.ER; -import org.gcube.informationsystem.model.ISManageable; -import org.gcube.informationsystem.model.entity.Context; -import org.gcube.informationsystem.model.entity.Facet; -import org.gcube.informationsystem.model.entity.Resource; -import org.gcube.informationsystem.model.relation.ConsistsOf; -import org.gcube.informationsystem.model.relation.IsRelatedTo; +import org.gcube.informationsystem.model.reference.ER; +import org.gcube.informationsystem.model.reference.ISManageable; +import org.gcube.informationsystem.model.reference.entity.Context; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java index ba3755f..343f34d 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientImpl.java @@ -7,16 +7,16 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.ER; -import org.gcube.informationsystem.model.ISManageable; -import org.gcube.informationsystem.model.entity.Context; -import org.gcube.informationsystem.model.entity.Entity; -import org.gcube.informationsystem.model.entity.Facet; -import org.gcube.informationsystem.model.entity.Resource; -import org.gcube.informationsystem.model.relation.ConsistsOf; -import org.gcube.informationsystem.model.relation.IsRelatedTo; -import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.ER; +import org.gcube.informationsystem.model.reference.ISManageable; +import org.gcube.informationsystem.model.reference.entity.Context; +import org.gcube.informationsystem.model.reference.entity.Entity; +import org.gcube.informationsystem.model.reference.entity.Facet; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.ConsistsOf; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; +import org.gcube.informationsystem.model.reference.relation.Relation; import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java index d7ef066..703f8cd 100644 --- a/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java +++ b/src/test/java/org/gcube/informationsystem/resourceregistry/client/ResourceRegistryClientTest.java @@ -8,22 +8,22 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import org.gcube.informationsystem.impl.embedded.HeaderImpl; -import org.gcube.informationsystem.impl.entity.facet.SoftwareFacetImpl; -import org.gcube.informationsystem.impl.entity.resource.HostingNodeImpl; -import org.gcube.informationsystem.impl.utils.ISMapper; -import org.gcube.informationsystem.model.embedded.Header; -import org.gcube.informationsystem.model.entity.Resource; -import org.gcube.informationsystem.model.entity.facet.ContactFacet; -import org.gcube.informationsystem.model.entity.facet.SoftwareFacet; -import org.gcube.informationsystem.model.entity.resource.EService; -import org.gcube.informationsystem.model.entity.resource.HostingNode; -import org.gcube.informationsystem.model.entity.resource.Service; -import org.gcube.informationsystem.model.relation.IsIdentifiedBy; -import org.gcube.informationsystem.model.relation.IsRelatedTo; +import org.gcube.informationsystem.model.impl.embedded.HeaderImpl; +import org.gcube.informationsystem.model.impl.utils.ISMapper; +import org.gcube.informationsystem.model.reference.embedded.Header; +import org.gcube.informationsystem.model.reference.entity.Resource; +import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy; +import org.gcube.informationsystem.model.reference.relation.IsRelatedTo; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException; import org.gcube.informationsystem.types.TypeBinder.TypeDefinition; +import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entity.resource.HostingNodeImpl; +import org.gcube.resourcemanagement.model.reference.entity.facet.ContactFacet; +import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entity.resource.EService; +import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode; +import org.gcube.resourcemanagement.model.reference.entity.resource.Service; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory;