diff --git a/org/gcube/informationservice/registry/impl/core/Registry.java b/org/gcube/informationservice/registry/impl/core/Registry.java deleted file mode 100644 index cc34521..0000000 --- a/org/gcube/informationservice/registry/impl/core/Registry.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.gcube.informationservice.registry.impl.core; - -public class Registry { - -} diff --git a/org/gcube/informationservice/registry/deploy-jndi-config.xml b/org/gcube/informationsystem/registry/deploy-jndi-config.xml similarity index 100% rename from org/gcube/informationservice/registry/deploy-jndi-config.xml rename to org/gcube/informationsystem/registry/deploy-jndi-config.xml diff --git a/org/gcube/informationservice/registry/deploy-server.wsdd b/org/gcube/informationsystem/registry/deploy-server.wsdd similarity index 100% rename from org/gcube/informationservice/registry/deploy-server.wsdd rename to org/gcube/informationsystem/registry/deploy-server.wsdd diff --git a/org/gcube/informationservice/registry/deploy-server.wsdd_NOSEC b/org/gcube/informationsystem/registry/deploy-server.wsdd_NOSEC similarity index 100% rename from org/gcube/informationservice/registry/deploy-server.wsdd_NOSEC rename to org/gcube/informationsystem/registry/deploy-server.wsdd_NOSEC diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/collection.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/collection.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/collection.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/collection.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/cs.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/cs.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/cs.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/cs.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/csinstance.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/csinstance.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/csinstance.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/csinstance.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/dhn.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/dhn.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/dhn.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/dhn.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/externalRi.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/externalRi.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/externalRi.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/externalRi.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/generic.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/generic.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/generic.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/generic.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/glite.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/glite.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/glite.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/glite.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/metaColl.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/metaColl.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/metaColl.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/metaColl.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/ri.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/ri.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/ri.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/ri.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/service.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/service.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/service.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/service.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/transProgram.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/transProgram.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/transProgram.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/transProgram.xml diff --git a/org/gcube/informationservice/registry/etc/PullRegistration/vdl.xml b/org/gcube/informationsystem/registry/etc/PullRegistration/vdl.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/PullRegistration/vdl.xml rename to org/gcube/informationsystem/registry/etc/PullRegistration/vdl.xml diff --git a/org/gcube/informationservice/registry/etc/RegistrationHandler.properties b/org/gcube/informationsystem/registry/etc/RegistrationHandler.properties similarity index 100% rename from org/gcube/informationservice/registry/etc/RegistrationHandler.properties rename to org/gcube/informationsystem/registry/etc/RegistrationHandler.properties diff --git a/org/gcube/informationservice/registry/etc/ServiceProfile_IS-Registry_InformationSystem.xml b/org/gcube/informationsystem/registry/etc/ServiceProfile_IS-Registry_InformationSystem.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/ServiceProfile_IS-Registry_InformationSystem.xml rename to org/gcube/informationsystem/registry/etc/ServiceProfile_IS-Registry_InformationSystem.xml diff --git a/org/gcube/informationservice/registry/etc/pushFactory.xml b/org/gcube/informationsystem/registry/etc/pushFactory.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/pushFactory.xml rename to org/gcube/informationsystem/registry/etc/pushFactory.xml diff --git a/org/gcube/informationservice/registry/etc/registration.properties b/org/gcube/informationsystem/registry/etc/registration.properties similarity index 100% rename from org/gcube/informationservice/registry/etc/registration.properties rename to org/gcube/informationsystem/registry/etc/registration.properties diff --git a/org/gcube/informationservice/registry/etc/registrationFactory.xml b/org/gcube/informationsystem/registry/etc/registrationFactory.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/registrationFactory.xml rename to org/gcube/informationsystem/registry/etc/registrationFactory.xml diff --git a/org/gcube/informationservice/registry/etc/registrationPush.xml b/org/gcube/informationsystem/registry/etc/registrationPush.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/registrationPush.xml rename to org/gcube/informationsystem/registry/etc/registrationPush.xml diff --git a/org/gcube/informationservice/registry/etc/security-descriptor-Factory.xml b/org/gcube/informationsystem/registry/etc/security-descriptor-Factory.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/security-descriptor-Factory.xml rename to org/gcube/informationsystem/registry/etc/security-descriptor-Factory.xml diff --git a/org/gcube/informationservice/registry/etc/security-descriptor-Service.xml b/org/gcube/informationsystem/registry/etc/security-descriptor-Service.xml similarity index 100% rename from org/gcube/informationservice/registry/etc/security-descriptor-Service.xml rename to org/gcube/informationsystem/registry/etc/security-descriptor-Service.xml diff --git a/org/gcube/informationservice/registry/impl/core/FactoryContext.java b/org/gcube/informationsystem/registry/impl/core/FactoryContext.java similarity index 93% rename from org/gcube/informationservice/registry/impl/core/FactoryContext.java rename to org/gcube/informationsystem/registry/impl/core/FactoryContext.java index f368255..17ea6fe 100644 --- a/org/gcube/informationservice/registry/impl/core/FactoryContext.java +++ b/org/gcube/informationsystem/registry/impl/core/FactoryContext.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import org.gcube.common.core.contexts.GCUBEServiceContext; import org.gcube.common.core.contexts.GCUBEStatefulPortTypeContext; diff --git a/org/gcube/informationservice/registry/impl/core/ProfileContext.java b/org/gcube/informationsystem/registry/impl/core/ProfileContext.java similarity index 92% rename from org/gcube/informationservice/registry/impl/core/ProfileContext.java rename to org/gcube/informationsystem/registry/impl/core/ProfileContext.java index c6e4ed2..89580ba 100644 --- a/org/gcube/informationservice/registry/impl/core/ProfileContext.java +++ b/org/gcube/informationsystem/registry/impl/core/ProfileContext.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import org.gcube.common.core.contexts.GCUBEServiceContext; import org.gcube.common.core.contexts.GCUBEStatefulPortTypeContext; diff --git a/org/gcube/informationservice/registry/impl/core/ProfileResource.java b/org/gcube/informationsystem/registry/impl/core/ProfileResource.java similarity index 86% rename from org/gcube/informationservice/registry/impl/core/ProfileResource.java rename to org/gcube/informationsystem/registry/impl/core/ProfileResource.java index f227637..6f99bae 100644 --- a/org/gcube/informationservice/registry/impl/core/ProfileResource.java +++ b/org/gcube/informationsystem/registry/impl/core/ProfileResource.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import org.gcube.common.core.state.GCUBEWSResource; diff --git a/org/gcube/informationservice/registry/impl/core/ProfileResourceHome.java b/org/gcube/informationsystem/registry/impl/core/ProfileResourceHome.java similarity index 83% rename from org/gcube/informationservice/registry/impl/core/ProfileResourceHome.java rename to org/gcube/informationsystem/registry/impl/core/ProfileResourceHome.java index 7c44e7b..1fa1d9a 100644 --- a/org/gcube/informationservice/registry/impl/core/ProfileResourceHome.java +++ b/org/gcube/informationsystem/registry/impl/core/ProfileResourceHome.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import org.gcube.common.core.contexts.GCUBEStatefulPortTypeContext; diff --git a/org/gcube/informationsystem/registry/impl/core/Registry.java b/org/gcube/informationsystem/registry/impl/core/Registry.java new file mode 100644 index 0000000..22a8e12 --- /dev/null +++ b/org/gcube/informationsystem/registry/impl/core/Registry.java @@ -0,0 +1,5 @@ +package org.gcube.informationsystem.registry.impl.core; + +public class Registry { + +} diff --git a/org/gcube/informationservice/registry/impl/core/RegistryConfiguration.java b/org/gcube/informationsystem/registry/impl/core/RegistryConfiguration.java similarity index 96% rename from org/gcube/informationservice/registry/impl/core/RegistryConfiguration.java rename to org/gcube/informationsystem/registry/impl/core/RegistryConfiguration.java index f5bb254..a55c44f 100644 --- a/org/gcube/informationservice/registry/impl/core/RegistryConfiguration.java +++ b/org/gcube/informationsystem/registry/impl/core/RegistryConfiguration.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; /** * diff --git a/org/gcube/informationservice/registry/impl/core/RegistryFactory.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java similarity index 91% rename from org/gcube/informationservice/registry/impl/core/RegistryFactory.java rename to org/gcube/informationsystem/registry/impl/core/RegistryFactory.java index 710a8b5..4e7304d 100644 --- a/org/gcube/informationservice/registry/impl/core/RegistryFactory.java +++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import java.rmi.RemoteException; import java.util.ArrayList; @@ -13,8 +13,8 @@ import org.gcube.common.core.faults.GCUBEFault; import org.gcube.common.core.porttypes.GCUBEStartupPortType; import org.gcube.common.core.utils.logging.GCUBELog; -import org.gcube.informationservice.registry.stubs.StartRegistration; -import org.gcube.informationservice.registry.stubs.StartRegistrationResponse; +import org.gcube.informationsystem.registry.stubs.StartRegistration; +import org.gcube.informationsystem.registry.stubs.StartRegistrationResponse; import org.globus.wsrf.Constants; import org.globus.wsrf.ResourceContext; diff --git a/org/gcube/informationservice/registry/impl/core/RegistryFactoryPersistenceDelegate.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryPersistenceDelegate.java similarity index 95% rename from org/gcube/informationservice/registry/impl/core/RegistryFactoryPersistenceDelegate.java rename to org/gcube/informationsystem/registry/impl/core/RegistryFactoryPersistenceDelegate.java index 36d38c4..81991a7 100644 --- a/org/gcube/informationservice/registry/impl/core/RegistryFactoryPersistenceDelegate.java +++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryPersistenceDelegate.java @@ -1,10 +1,10 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import org.gcube.common.core.persistence.GCUBEWSFilePersistenceDelegate; -import org.gcube.informationservice.registry.stubs.RegistryProperty; +import org.gcube.informationsystem.registry.stubs.RegistryProperty; import org.globus.wsrf.utils.SubscriptionPersistenceUtils; public class RegistryFactoryPersistenceDelegate extends GCUBEWSFilePersistenceDelegate{ diff --git a/org/gcube/informationservice/registry/impl/core/RegistryFactoryResource.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java similarity index 98% rename from org/gcube/informationservice/registry/impl/core/RegistryFactoryResource.java rename to org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java index 28eeefb..792dc7a 100644 --- a/org/gcube/informationservice/registry/impl/core/RegistryFactoryResource.java +++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import java.util.ArrayList; @@ -7,8 +7,8 @@ import javax.xml.namespace.QName; import org.gcube.common.core.is.publisher.ISPublisher; import org.gcube.common.core.node.GHNContext; import org.gcube.common.core.state.GCUBEWSResource; -import org.gcube.informationservice.registry.impl.util.RegistrationThread; -import org.gcube.informationservice.registry.stubs.RegistryProperty; +import org.gcube.informationsystem.registry.impl.util.RegistrationThread; +import org.gcube.informationsystem.registry.stubs.RegistryProperty; import org.globus.wsrf.ResourceException; import org.globus.wsrf.config.ContainerConfig; import org.globus.wsrf.impl.SimpleResourceKey; diff --git a/org/gcube/informationservice/registry/impl/core/RegistryFactoryResourceHome.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResourceHome.java similarity index 83% rename from org/gcube/informationservice/registry/impl/core/RegistryFactoryResourceHome.java rename to org/gcube/informationsystem/registry/impl/core/RegistryFactoryResourceHome.java index 59bb645..2af0b51 100644 --- a/org/gcube/informationservice/registry/impl/core/RegistryFactoryResourceHome.java +++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResourceHome.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import org.gcube.common.core.contexts.GCUBEStatefulPortTypeContext; import org.gcube.common.core.state.GCUBEWSHome; diff --git a/org/gcube/informationservice/registry/impl/core/RegistryPersistenceDelegate.java b/org/gcube/informationsystem/registry/impl/core/RegistryPersistenceDelegate.java similarity index 93% rename from org/gcube/informationservice/registry/impl/core/RegistryPersistenceDelegate.java rename to org/gcube/informationsystem/registry/impl/core/RegistryPersistenceDelegate.java index a108c18..e5813a2 100644 --- a/org/gcube/informationservice/registry/impl/core/RegistryPersistenceDelegate.java +++ b/org/gcube/informationsystem/registry/impl/core/RegistryPersistenceDelegate.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; diff --git a/org/gcube/informationservice/registry/impl/core/ServiceContext.java b/org/gcube/informationsystem/registry/impl/core/ServiceContext.java similarity index 89% rename from org/gcube/informationservice/registry/impl/core/ServiceContext.java rename to org/gcube/informationsystem/registry/impl/core/ServiceContext.java index f274611..d1dbc34 100644 --- a/org/gcube/informationservice/registry/impl/core/ServiceContext.java +++ b/org/gcube/informationsystem/registry/impl/core/ServiceContext.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.core; +package org.gcube.informationsystem.registry.impl.core; import org.gcube.common.core.contexts.GCUBEServiceContext; diff --git a/org/gcube/informationservice/registry/impl/util/RegistrationThread.java b/org/gcube/informationsystem/registry/impl/util/RegistrationThread.java similarity index 92% rename from org/gcube/informationservice/registry/impl/util/RegistrationThread.java rename to org/gcube/informationsystem/registry/impl/util/RegistrationThread.java index e6e432b..bfd2f8a 100644 --- a/org/gcube/informationservice/registry/impl/util/RegistrationThread.java +++ b/org/gcube/informationsystem/registry/impl/util/RegistrationThread.java @@ -1,4 +1,4 @@ -package org.gcube.informationservice.registry.impl.util; +package org.gcube.informationsystem.registry.impl.util; import java.util.ArrayList; @@ -9,7 +9,7 @@ import org.apache.commons.logging.LogFactory; import org.gcube.common.core.is.publisher.ISPublisher; import org.gcube.common.core.node.GHNContext; import org.gcube.common.core.scope.GCUBEScope; -import org.gcube.informationservice.registry.impl.core.*; +import org.gcube.informationsystem.registry.impl.core.*; /** * Registration Thread class