gCubeSystem
/
is-registry
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Manuele Simi 2011-10-20 20:53:23 +00:00
parent 3f3787da1e
commit 28985c6293
7 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@ -7,6 +7,7 @@
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/GCORELIBS"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/GCORELIBS"/>
<classpathentry kind="lib" path="/Dependencies/ISREGISTRY/org.gcube.informationsystem.registry.stubs.jar"/> <classpathentry kind="lib" path="/Dependencies/ISREGISTRY/org.gcube.informationsystem.registry.stubs.jar"/>
<classpathentry kind="lib" path="/Dependencies/ISCollector/org.gcube.informationsystem.collector.stubs.jar"/> <classpathentry kind="lib" path="/Dependencies/ISCollector/org.gcube.informationsystem.collector.stubs.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/GCF.TRUNK"/> <classpathentry combineaccessrules="false" kind="src" path="/IS_PUBLISHER.2.0"/>
<classpathentry combineaccessrules="false" kind="src" path="/GCF.1.3.0"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

2
README
View File

@ -18,7 +18,7 @@ Authors
Version and Release Date Version and Release Date
------------------------ ------------------------
v. 2.0.0 (07-02-2011) v. 2.1.2 (06-10-2011)
Description Description

6
changelog.xml
View File

@ -1,4 +1,10 @@
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.information-system.registry.2-1-2" date="2011-10-06">
<Change>Adding mapping for the new Runtime Resource</Change>
</Changeset>
<Changeset component="org.gcube.information-system.registry.2-1-1" date="2011-07-11">
<Change>WS-Resources of a to-be-removed RI are deleted synchronously and bulky</Change>
</Changeset>
<Changeset component="org.gcube.information-system.registry.2-1-0" date="2011-03-25"> <Changeset component="org.gcube.information-system.registry.2-1-0" date="2011-03-25">
<Change>Adding pre/post processing mechanisms for configurable resource manipulation</Change> <Change>Adding pre/post processing mechanisms for configurable resource manipulation</Change>
<Change>Removing the old and unused Registry portType</Change> <Change>Removing the old and unused Registry portType</Change>

8
etc/profile.xml
View File

@ -3,7 +3,7 @@
<ID/> <ID/>
<Type>Service</Type> <Type>Service</Type>
<Profile> <Profile>
<Description>IS-Registry: validate, register and unregister GCUBE resources to/from the IS. It also publishes Topics for notifications about GCUBE resource events</Description> <Description>Registry service for gCube Resources</Description>
<Class>InformationSystem</Class> <Class>InformationSystem</Class>
<Name>IS-Registry</Name> <Name>IS-Registry</Name>
<Version>1.0.0</Version> <Version>1.0.0</Version>
@ -16,9 +16,9 @@
</Dependencies> </Dependencies>
<Packages> <Packages>
<Main> <Main>
<Description>IS-Registry: validate, register and unregister GCUBE resources to/from the IS. It also publishes Topics for notifications about GCUBE resource events</Description> <Description>IS-Registry: validate, register and unregister gCube resources to/from the IS. It exposes WS-Topics for notifications about gCube resources' lifecycle</Description>
<Name>IS-Registry-service</Name> <Name>IS-Registry-service</Name>
<Version>2.1.0</Version> <Version>2.1.2</Version>
<Mandatory level="VO"/> <Mandatory level="VO"/>
<Shareable level="VO"/> <Shareable level="VO"/>
<GHNRequirements> <GHNRequirements>
@ -50,7 +50,7 @@
</PortType> </PortType>
</Main> </Main>
<Software> <Software>
<Description>IS-Registry: validate, register and unregister GCUBE resources to/from the IS. It also publishes Topics for notifications about GCUBE resource events</Description> <Description>Stub classes for interfacing the IS-Registry</Description>
<Name>IS-Registry-stubs</Name> <Name>IS-Registry-stubs</Name>
<Version>2.1.0</Version> <Version>2.1.0</Version>
<MultiVersion value="true"/> <MultiVersion value="true"/>

3
src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java
View File

@ -46,10 +46,11 @@ public class ServiceContext extends GCUBEServiceContext {
protected GCUBEProducer<RegistryTopic, GCUBEResource> topicProducer; protected GCUBEProducer<RegistryTopic, GCUBEResource> topicProducer;
@SuppressWarnings("unchecked") @SuppressWarnings("rawtypes")
protected class NotificationResourceScheduler extends GCUBEScheduledHandler { protected class NotificationResourceScheduler extends GCUBEScheduledHandler {
@SuppressWarnings("unchecked")
public NotificationResourceScheduler(long interval, Mode mode) { public NotificationResourceScheduler(long interval, Mode mode) {
super(interval, mode); super(interval, mode);
} }

1
src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java
View File

@ -11,7 +11,6 @@ import org.gcube.common.core.resources.GCUBEResource;
import org.gcube.common.core.scope.GCUBEScope; import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.common.core.utils.logging.GCUBELog; import org.gcube.common.core.utils.logging.GCUBELog;
import org.gcube.informationsystem.registry.impl.contexts.FactoryContext; 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.contexts.ServiceContext;
import org.gcube.informationsystem.registry.impl.state.RegistryFactoryResource; import org.gcube.informationsystem.registry.impl.state.RegistryFactoryResource;
import org.gcube.informationsystem.registry.impl.state.Definitions.OperationType; import org.gcube.informationsystem.registry.impl.state.Definitions.OperationType;

2
src/org/gcube/informationsystem/registry/impl/state/Definitions.java
View File

@ -8,6 +8,7 @@ import org.gcube.common.core.resources.GCUBEHostingNode;
import org.gcube.common.core.resources.GCUBEMCollection; import org.gcube.common.core.resources.GCUBEMCollection;
import org.gcube.common.core.resources.GCUBEResource; import org.gcube.common.core.resources.GCUBEResource;
import org.gcube.common.core.resources.GCUBERunningInstance; import org.gcube.common.core.resources.GCUBERunningInstance;
import org.gcube.common.core.resources.GCUBERuntimeResource;
import org.gcube.common.core.resources.GCUBEService; import org.gcube.common.core.resources.GCUBEService;
/** /**
@ -22,6 +23,7 @@ public class Definitions {
/** The Resource Types */ /** The Resource Types */
public static enum ResourceMappings { 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);}}, RunningInstance() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBERunningInstance.class);}},
ExternalRunningInstance() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEExternalRunningInstance.class);}}, ExternalRunningInstance() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEExternalRunningInstance.class);}},
Service() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEService.class);}}, Service() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEService.class);}},