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-schema-client@171808 82a268e6-3cf1-43bd-a215-b396298e98cf

pom.xml

@@ -79,8 +79,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube.information-system</groupId>
-			<artifactId>gcube-resources</artifactId>
+			<groupId>org.gcube.resource-management</groupId>
+			<artifactId>gcube-model</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java

@@ -2,7 +2,7 @@ package org.gcube.informationsystem.resourceregistry.schema;
 
 import java.util.List;
 
-import org.gcube.informationsystem.model.ISManageable;
+import org.gcube.informationsystem.model.reference.ISManageable;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException;

src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java

@@ -6,8 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.gcube.informationsystem.model.AccessType;
-import org.gcube.informationsystem.model.ISManageable;
+import org.gcube.informationsystem.model.reference.AccessType;
+import org.gcube.informationsystem.model.reference.ISManageable;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;

src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java

@@ -2,8 +2,8 @@ package org.gcube.informationsystem.resourceregistry.schema;
 
 import java.util.List;
 
-import org.gcube.informationsystem.model.annotations.Abstract;
-import org.gcube.informationsystem.model.entity.Facet;
+import org.gcube.informationsystem.model.reference.annotations.Abstract;
+import org.gcube.informationsystem.model.reference.entity.Facet;
 import org.gcube.informationsystem.types.TypeBinder;
 import org.gcube.informationsystem.types.TypeBinder.TypeDefinition;
 import org.junit.Assert;