From f771568bbb4d8eed9312c71c12845d765ed09bb6 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 29 Jun 2022 09:12:36 +0200 Subject: [PATCH] Reorganizing packages --- .../{handler => connector}/resourceregistry/Constants.java | 4 ++-- .../resourceregistry/ContextUtility.java | 2 +- .../resourceregistry/FacetBasedPublisher.java | 6 ++---- .../resourceregistry/resourcemanager/EServiceManager.java | 6 +++--- .../resourcemanager/HostingNodeManager.java | 4 ++-- .../resourcemanager/LinuxDistributionInfo.java | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) rename src/main/java/org/gcube/smartgears/{handler => connector}/resourceregistry/Constants.java (83%) rename src/main/java/org/gcube/smartgears/{handler => connector}/resourceregistry/ContextUtility.java (92%) rename src/main/java/org/gcube/smartgears/{publisher => connector}/resourceregistry/FacetBasedPublisher.java (93%) rename src/main/java/org/gcube/smartgears/{handler => connector}/resourceregistry/resourcemanager/EServiceManager.java (98%) rename src/main/java/org/gcube/smartgears/{handler => connector}/resourceregistry/resourcemanager/HostingNodeManager.java (99%) rename src/main/java/org/gcube/smartgears/{handler => connector}/resourceregistry/resourcemanager/LinuxDistributionInfo.java (97%) diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/Constants.java similarity index 83% rename from src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java rename to src/main/java/org/gcube/smartgears/connector/resourceregistry/Constants.java index 57a4920..fb4750c 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/Constants.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/Constants.java @@ -1,6 +1,6 @@ -package org.gcube.smartgears.handler.resourceregistry; +package org.gcube.smartgears.connector.resourceregistry; -import org.gcube.smartgears.handler.resourceregistry.resourcemanager.HostingNodeManager; +import org.gcube.smartgears.connector.resourceregistry.resourcemanager.HostingNodeManager; /** * Library-wide constants. diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/ContextUtility.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/ContextUtility.java similarity index 92% rename from src/main/java/org/gcube/smartgears/handler/resourceregistry/ContextUtility.java rename to src/main/java/org/gcube/smartgears/connector/resourceregistry/ContextUtility.java index 6ca4a7b..f1a3f81 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/ContextUtility.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/ContextUtility.java @@ -1,4 +1,4 @@ -package org.gcube.smartgears.handler.resourceregistry; +package org.gcube.smartgears.connector.resourceregistry; import java.util.UUID; diff --git a/src/main/java/org/gcube/smartgears/publisher/resourceregistry/FacetBasedPublisher.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/FacetBasedPublisher.java similarity index 93% rename from src/main/java/org/gcube/smartgears/publisher/resourceregistry/FacetBasedPublisher.java rename to src/main/java/org/gcube/smartgears/connector/resourceregistry/FacetBasedPublisher.java index 2d88788..b1b08c6 100644 --- a/src/main/java/org/gcube/smartgears/publisher/resourceregistry/FacetBasedPublisher.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/FacetBasedPublisher.java @@ -1,14 +1,12 @@ -package org.gcube.smartgears.publisher.resourceregistry; +package org.gcube.smartgears.connector.resourceregistry; import java.util.Set; import java.util.UUID; import org.gcube.common.clients.config.Property; +import org.gcube.smartgears.connector.resourceregistry.resourcemanager.HostingNodeManager; import org.gcube.smartgears.context.application.ApplicationContext; import org.gcube.smartgears.context.container.ContainerContext; -import org.gcube.smartgears.handler.resourceregistry.Constants; -import org.gcube.smartgears.handler.resourceregistry.ContextUtility; -import org.gcube.smartgears.handler.resourceregistry.resourcemanager.HostingNodeManager; import org.gcube.smartgears.publishing.Publisher; import org.gcube.smartgears.publishing.SmartgearsProfilePublisher; import org.gcube.smartgears.security.AuthorizationProvider; diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java similarity index 98% rename from src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java rename to src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java index 06f9ce5..9df75d9 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java @@ -1,4 +1,4 @@ -package org.gcube.smartgears.handler.resourceregistry.resourcemanager; +package org.gcube.smartgears.connector.resourceregistry.resourcemanager; import java.net.URI; import java.util.ArrayList; @@ -56,9 +56,9 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdent 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.connector.resourceregistry.Constants; +import org.gcube.smartgears.connector.resourceregistry.ContextUtility; import org.gcube.smartgears.context.application.ApplicationContext; -import org.gcube.smartgears.handler.resourceregistry.Constants; -import org.gcube.smartgears.handler.resourceregistry.ContextUtility; import org.gcube.smartgears.security.AuthorizationProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java similarity index 99% rename from src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java rename to src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java index 15c6f10..6401335 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java @@ -1,4 +1,4 @@ -package org.gcube.smartgears.handler.resourceregistry.resourcemanager; +package org.gcube.smartgears.connector.resourceregistry.resourcemanager; import java.io.BufferedReader; import java.io.File; @@ -79,8 +79,8 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdent import org.gcube.smartgears.configuration.container.ContainerConfiguration; import org.gcube.smartgears.configuration.container.Site; import org.gcube.smartgears.configuration.library.SmartGearsConfiguration; +import org.gcube.smartgears.connector.resourceregistry.ContextUtility; import org.gcube.smartgears.context.container.ContainerContext; -import org.gcube.smartgears.handler.resourceregistry.ContextUtility; import org.gcube.smartgears.lifecycle.container.ContainerState; import org.gcube.smartgears.provider.ProviderFactory; import org.gcube.smartgears.security.AuthorizationProvider; diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/LinuxDistributionInfo.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/LinuxDistributionInfo.java similarity index 97% rename from src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/LinuxDistributionInfo.java rename to src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/LinuxDistributionInfo.java index db149ca..60bba9b 100644 --- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/LinuxDistributionInfo.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/LinuxDistributionInfo.java @@ -1,4 +1,4 @@ -package org.gcube.smartgears.handler.resourceregistry.resourcemanager; +package org.gcube.smartgears.connector.resourceregistry.resourcemanager; import java.io.BufferedReader; import java.io.File;