From 870924d75675355cbaa17d7333f07291a509f644 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 6 Feb 2019 09:18:06 +0000 Subject: [PATCH] Reorganized gCube Model packages git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/resource-registry-handlers@177008 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../handler/resourceregistry/Constants.java | 4 +- .../resourceregistry/EServiceManager.java | 26 ++++++------- .../resourceregistry/HostingNodeManager.java | 38 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java index 3b9ce30..d433218 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java @@ -1,7 +1,7 @@ package org.gcube.smartgears.handler.resourceregistry; -import org.gcube.resourcemanagement.model.reference.entity.resource.EService; -import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode; +import org.gcube.resourcemanagement.model.reference.entities.resources.EService; +import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; /** * Library-wide constants. diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java index c42e5b1..36d5174 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java @@ -43,19 +43,19 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory; -import org.gcube.resourcemanagement.model.impl.entity.facet.AccessPointFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.facet.ServiceStateFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.properties.ValueSchemaImpl; -import org.gcube.resourcemanagement.model.impl.entity.resource.EServiceImpl; -import org.gcube.resourcemanagement.model.impl.relation.isrelatedto.ActivatesImpl; -import org.gcube.resourcemanagement.model.reference.entity.facet.AccessPointFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.ServiceStateFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; -import org.gcube.resourcemanagement.model.reference.entity.properties.ValueSchema; -import org.gcube.resourcemanagement.model.reference.entity.resource.EService; -import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode; -import org.gcube.resourcemanagement.model.reference.relation.isrelatedto.Activates; +import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.ServiceStateFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.resources.EServiceImpl; +import org.gcube.resourcemanagement.model.impl.properties.ValueSchemaImpl; +import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.ActivatesImpl; +import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.ServiceStateFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entities.resources.EService; +import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; +import org.gcube.resourcemanagement.model.reference.properties.ValueSchema; +import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Activates; import org.gcube.smartgears.configuration.application.ApplicationConfiguration; import org.gcube.smartgears.configuration.container.ContainerConfiguration; import org.gcube.smartgears.context.Property; diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java index 04f3f0a..05188dd 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java +++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java @@ -56,25 +56,25 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher; import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory; -import org.gcube.resourcemanagement.model.impl.entity.facet.CPUFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.facet.ContainerStateFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.facet.MemoryFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.facet.NetworkingFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.facet.SimplePropertyFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.facet.SoftwareFacetImpl; -import org.gcube.resourcemanagement.model.impl.entity.resource.HostingNodeImpl; -import org.gcube.resourcemanagement.model.impl.relation.consistsof.HasPersistentMemoryImpl; -import org.gcube.resourcemanagement.model.impl.relation.consistsof.HasVolatileMemoryImpl; -import org.gcube.resourcemanagement.model.reference.entity.facet.CPUFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.ContainerStateFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.MemoryFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.NetworkingFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.SimplePropertyFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.SoftwareFacet; -import org.gcube.resourcemanagement.model.reference.entity.facet.MemoryFacet.MemoryUnit; -import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode; -import org.gcube.resourcemanagement.model.reference.relation.consistsof.HasPersistentMemory; -import org.gcube.resourcemanagement.model.reference.relation.consistsof.HasVolatileMemory; +import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.ContainerStateFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.MemoryFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.NetworkingFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.SimplePropertyFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl; +import org.gcube.resourcemanagement.model.impl.entities.resources.HostingNodeImpl; +import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasPersistentMemoryImpl; +import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasVolatileMemoryImpl; +import org.gcube.resourcemanagement.model.reference.entities.facets.CPUFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.ContainerStateFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.NetworkingFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.SimplePropertyFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet; +import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet.MemoryUnit; +import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode; +import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasPersistentMemory; +import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory; import org.gcube.smartgears.configuration.container.ContainerConfiguration; import org.gcube.smartgears.configuration.library.SmartGearsConfiguration; import org.gcube.smartgears.context.Property;