From 28985c62933a46475ec467b49e2c4eb089c3de66 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Thu, 20 Oct 2011 20:53:23 +0000 Subject: [PATCH] Merging from branch 2.1.x git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Registry@46755 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 3 ++- README | 2 +- changelog.xml | 6 ++++++ etc/profile.xml | 8 ++++---- .../registry/impl/contexts/ServiceContext.java | 3 ++- .../registry/impl/porttypes/RegistryFactory.java | 1 - .../registry/impl/state/Definitions.java | 2 ++ 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.classpath b/.classpath index 7bade01..c404996 100644 --- a/.classpath +++ b/.classpath @@ -7,6 +7,7 @@ - + + diff --git a/README b/README index 24a6c71..276cb0d 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ Authors Version and Release Date ------------------------ -v. 2.0.0 (07-02-2011) +v. 2.1.2 (06-10-2011) Description diff --git a/changelog.xml b/changelog.xml index eaf051b..7469e0a 100644 --- a/changelog.xml +++ b/changelog.xml @@ -1,4 +1,10 @@ + + Adding mapping for the new Runtime Resource + + + WS-Resources of a to-be-removed RI are deleted synchronously and bulky + Adding pre/post processing mechanisms for configurable resource manipulation Removing the old and unused Registry portType diff --git a/etc/profile.xml b/etc/profile.xml index dd3f6cb..00dcf99 100644 --- a/etc/profile.xml +++ b/etc/profile.xml @@ -3,7 +3,7 @@ Service - IS-Registry: validate, register and unregister GCUBE resources to/from the IS. It also publishes Topics for notifications about GCUBE resource events + Registry service for gCube Resources InformationSystem IS-Registry 1.0.0 @@ -16,9 +16,9 @@
- IS-Registry: validate, register and unregister GCUBE resources to/from the IS. It also publishes Topics for notifications about GCUBE resource events + IS-Registry: validate, register and unregister gCube resources to/from the IS. It exposes WS-Topics for notifications about gCube resources' lifecycle IS-Registry-service - 2.1.0 + 2.1.2 @@ -50,7 +50,7 @@
- IS-Registry: validate, register and unregister GCUBE resources to/from the IS. It also publishes Topics for notifications about GCUBE resource events + Stub classes for interfacing the IS-Registry IS-Registry-stubs 2.1.0 diff --git a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java index d18aa56..2942a73 100644 --- a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java +++ b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java @@ -46,10 +46,11 @@ public class ServiceContext extends GCUBEServiceContext { protected GCUBEProducer topicProducer; - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") protected class NotificationResourceScheduler extends GCUBEScheduledHandler { + @SuppressWarnings("unchecked") public NotificationResourceScheduler(long interval, Mode mode) { super(interval, mode); } diff --git a/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java b/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java index 988f4ac..5d55ab2 100644 --- a/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java +++ b/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java @@ -11,7 +11,6 @@ import org.gcube.common.core.resources.GCUBEResource; import org.gcube.common.core.scope.GCUBEScope; import org.gcube.common.core.utils.logging.GCUBELog; import org.gcube.informationsystem.registry.impl.contexts.FactoryContext; -import org.gcube.informationsystem.registry.impl.contexts.ProfileContext; import org.gcube.informationsystem.registry.impl.contexts.ServiceContext; import org.gcube.informationsystem.registry.impl.state.RegistryFactoryResource; import org.gcube.informationsystem.registry.impl.state.Definitions.OperationType; diff --git a/src/org/gcube/informationsystem/registry/impl/state/Definitions.java b/src/org/gcube/informationsystem/registry/impl/state/Definitions.java index c0e4c81..4126351 100644 --- a/src/org/gcube/informationsystem/registry/impl/state/Definitions.java +++ b/src/org/gcube/informationsystem/registry/impl/state/Definitions.java @@ -8,6 +8,7 @@ import org.gcube.common.core.resources.GCUBEHostingNode; import org.gcube.common.core.resources.GCUBEMCollection; import org.gcube.common.core.resources.GCUBEResource; import org.gcube.common.core.resources.GCUBERunningInstance; +import org.gcube.common.core.resources.GCUBERuntimeResource; import org.gcube.common.core.resources.GCUBEService; /** @@ -22,6 +23,7 @@ public class Definitions { /** The Resource Types */ public static enum ResourceMappings { + RuntimeResource() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBERuntimeResource.class);}}, RunningInstance() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBERunningInstance.class);}}, ExternalRunningInstance() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEExternalRunningInstance.class);}}, Service() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEService.class);}},