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

WS-Topic for Runtime Resources added 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Registry@53135 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Manuele Simi 2012-04-05 16:27:19 +00:00
parent dbe11e0cdb
commit cba4b9239e
7 changed files with 57 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.classpath
View File

@ -5,9 +5,9 @@
<classpathentry kind="src" path="test"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<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/ISCollector/org.gcube.informationsystem.collector.stubs.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/IS_PUBLISHER.2.0"/>
<classpathentry combineaccessrules="false" kind="src" path="/GCF.1.3.0"/>
<classpathentry kind="lib" path="/Users/manuele/work/test/gCore/lib/org.gcube.informationsystem.registry.stubs.jar"/>
<classpathentry kind="lib" path="/Users/manuele/work/test/gCore/lib/org.gcube.informationsystem.collector.stubs.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/gcf.TRUNK"/>
<classpathentry combineaccessrules="false" kind="src" path="/IS_PUBLISHER.2.1"/>
<classpathentry kind="output" path="bin"/>
</classpath>

34
.project
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Registry</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Registry.trunk</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

3
changelog.xml
View File

@ -1,4 +1,7 @@
<ReleaseNotes>
<Changeset component="org.gcube.information-system.registry.2-1-3" date="2012-04-05">
<Change>Adding WS-Topic for the new Runtime Resource</Change>
</Changeset>
<Changeset component="org.gcube.information-system.registry.2-1-2" date="2011-10-06">
<Change>Adding mapping for the new Runtime Resource</Change>
</Changeset>

4
etc/profile.xml
View File

@ -18,7 +18,7 @@
<Main>
<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>
<Version>2.1.2</Version>
<Version>2.1.3</Version>
<Mandatory level="VO"/>
<Shareable level="VO"/>
<GHNRequirements>
@ -52,7 +52,7 @@
<Software>
<Description>Stub classes for interfacing the IS-Registry</Description>
<Name>IS-Registry-stubs</Name>
<Version>2.1.0</Version>
<Version>2.1.3</Version>
<MultiVersion value="true"/>
<Mandatory level="GHN"/>
<Shareable level="VO"/>

12
schema/RegistryFactory.wsdl
View File

@ -96,11 +96,7 @@
<xsd:element name="Service" type="tns:RegistryProperty"/>
<xsd:element name="Collection" type="tns:RegistryProperty"/>
<xsd:element name="CS" type="tns:RegistryProperty"/>
<xsd:element name="CSInstance" type="tns:RegistryProperty"/>
<xsd:element name="GHN" type="tns:RegistryProperty"/>
<xsd:element name="gLiteSE" type="tns:RegistryProperty"/>
@ -116,6 +112,9 @@
<xsd:element name="MetadataCollection" type="tns:RegistryProperty"/>
<xsd:element name="GenericResource" type="tns:RegistryProperty"/>
<xsd:element name="RuntimeResource" type="tns:RegistryProperty"/>
<xsd:element name="RegistryFactoryResourceProperties">
<xsd:complexType>
@ -124,8 +123,6 @@
<xsd:element ref="tns:ExternalRunningInstance" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:Service" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:Collection" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:CS" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:CSInstance" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:GHN" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:gLiteSE" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:gLiteCE" minOccurs="1" maxOccurs="1"/>
@ -134,6 +131,7 @@
<xsd:element ref="tns:VRE" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:MetadataCollection" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:GenericResource" minOccurs="1" maxOccurs="1"/>
<xsd:element ref="tns:RuntimeResource" minOccurs="1" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>

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

@ -33,7 +33,7 @@ public class Definitions {
gLiteCE() {public GCUBEResource getResourceImplementation() throws Exception {return null;}},
gLiteSite() {public GCUBEResource getResourceImplementation()throws Exception {return null;}},
gLiteService() {public GCUBEResource getResourceImplementation() throws Exception {return null;}},
GenericResource() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEGenericResource.class);}},
GenericResource() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEGenericResource.class);}},
MetadataCollection() {public GCUBEResource getResourceImplementation() throws Exception {return GHNContext.getImplementation(GCUBEMCollection.class);}};
abstract public GCUBEResource getResourceImplementation() throws Exception;

111
src/org/gcube/informationsystem/registry/impl/state/RegistryFactoryResource.java
View File

@ -12,7 +12,7 @@ import org.globus.wsrf.ResourceException;
* a GCUBEResource profile is created/removed/updated. A single instance of this class is created within
* each instance of the IS-Registry service.
*
* @author Andrea Manzi, Manuele Simi (CNR)
* @author Manuele Simi (CNR)
*
*/
public class RegistryFactoryResource extends GCUBEWSResource {
@ -23,10 +23,8 @@ public class RegistryFactoryResource extends GCUBEWSResource {
protected static final String CollectionRP="Collection";
protected static final String CSRP="CS";
protected static final String CSInstanceRP="CSInstance";
protected static final String RuntimeResourceRP="RuntimeResource";
protected static final String GHNRP="GHN";
protected static final String gLiteSERP="gLiteSE";
@ -51,8 +49,7 @@ public class RegistryFactoryResource extends GCUBEWSResource {
ExternalRunningInstanceRP,
ServiceRP,
CollectionRP,
CSRP,
CSInstanceRP,
RuntimeResourceRP,
GHNRP,
gLiteSERP,
gLiteCERP,
@ -167,9 +164,7 @@ public class RegistryFactoryResource extends GCUBEWSResource {
*/
public void setCollection (RegistryProperty property) {
this.getResourcePropertySet().get(CollectionRP).clear();
this.getResourcePropertySet().get(CollectionRP).add(property);
//this.getPersistenceDelegate().store(this);
this.getResourcePropertySet().get(CollectionRP).add(property);
}
/**
@ -184,53 +179,27 @@ public class RegistryFactoryResource extends GCUBEWSResource {
/**
* Default Setter for the RP CS
* Default Setter for the RP RuntimeResource
*
* @param property The RegistryProperty
*
*/
public void setCS (RegistryProperty property) {
this.getResourcePropertySet().get(CSRP).clear();
this.getResourcePropertySet().get(CSRP).add(property);
//this.getPersistenceDelegate().store(this);
public void setRuntimeResource (RegistryProperty property) {
this.getResourcePropertySet().get(RuntimeResourceRP).clear();
this.getResourcePropertySet().get(RuntimeResourceRP).add(property);
}
/**
* Default getter for the RP CS
* Default getter for the RP RuntimeResource
*
* @return The RegistryProperty
*
*/
public RegistryProperty getCS () {
return (RegistryProperty) this.getResourcePropertySet().get(CSRP).get(0);
public RegistryProperty getRuntimeResource () {
return (RegistryProperty) this.getResourcePropertySet().get(RuntimeResourceRP).get(0);
}
/**
* Default Setter for the RP CSInstance
*
* @param property The RegistryProperty
*
*/
public void setCSInstance (RegistryProperty property) {
this.getResourcePropertySet().get(CSInstanceRP).clear();
this.getResourcePropertySet().get(CSInstanceRP).add(property);
//this.getPersistenceDelegate().store(this);
}
/**
* Default getter for the RP CSInstance
*
* @return The RegistryProperty
*
*/
public RegistryProperty getCSInstance () {
return (RegistryProperty) this.getResourcePropertySet().get(CSInstanceRP).get(0);
}
/**
* Default Setter for the RP ghn
@ -264,7 +233,6 @@ public class RegistryFactoryResource extends GCUBEWSResource {
public void setGLiteSE (RegistryProperty property) {
this.getResourcePropertySet().get(gLiteSERP).clear();
this.getResourcePropertySet().get(gLiteSERP).add(property);
//this.getPersistenceDelegate().store(this);
}
/**
@ -286,9 +254,7 @@ public class RegistryFactoryResource extends GCUBEWSResource {
*/
public void setGLiteCE (RegistryProperty property) {
this.getResourcePropertySet().get(gLiteCERP).clear();
this.getResourcePropertySet().get(gLiteCERP).add(property);
//this.getPersistenceDelegate().store(this);
this.getResourcePropertySet().get(gLiteCERP).add(property);
}
/**
@ -311,9 +277,7 @@ public class RegistryFactoryResource extends GCUBEWSResource {
*/
public void setGLiteSite (RegistryProperty property) {
this.getResourcePropertySet().get(gLiteSiteRP).clear();
this.getResourcePropertySet().get(gLiteSiteRP).add(property);
//this.getPersistenceDelegate().store(this);
this.getResourcePropertySet().get(gLiteSiteRP).add(property);
}
/**
@ -335,9 +299,7 @@ public class RegistryFactoryResource extends GCUBEWSResource {
*/
public void setGLiteService (RegistryProperty property) {
this.getResourcePropertySet().get(gLiteServiceRP).clear();
this.getResourcePropertySet().get(gLiteServiceRP).add(property);
//this.getPersistenceDelegate().store(this);
this.getResourcePropertySet().get(gLiteServiceRP).add(property);
}
/**
@ -358,9 +320,7 @@ public class RegistryFactoryResource extends GCUBEWSResource {
*/
public void setVRE (RegistryProperty property) {
this.getResourcePropertySet().get(VRERP).clear();
this.getResourcePropertySet().get(VRERP).add(property);
//this.getPersistenceDelegate().store(this);
this.getResourcePropertySet().get(VRERP).add(property);
}
/**
@ -370,7 +330,6 @@ public class RegistryFactoryResource extends GCUBEWSResource {
*/
public RegistryProperty getVRE () {
return (RegistryProperty) this.getResourcePropertySet().get(gLiteServiceRP).get(0);
}
@ -382,9 +341,7 @@ public class RegistryFactoryResource extends GCUBEWSResource {
*/
public void setMetadataCollection (RegistryProperty property) {
this.getResourcePropertySet().get(MetadataCollectionRP).clear();
this.getResourcePropertySet().get(MetadataCollectionRP).add(property);
//this.getPersistenceDelegate().store(this);
this.getResourcePropertySet().get(MetadataCollectionRP).add(property);
}
/**
@ -399,7 +356,6 @@ public class RegistryFactoryResource extends GCUBEWSResource {
}
/**
* Default Setter for the RP Generic
*
@ -423,26 +379,13 @@ public class RegistryFactoryResource extends GCUBEWSResource {
}
/**
* Sets an empty resource for each RP for notification purposes
*/
private void initialiseRPs() {
RegistryProperty property = new RegistryProperty();
/*for (Method method :this.getClass().getDeclaredMethods()) {
if (method.getName().contains("set")) {
try {
method.invoke(this,property);
} catch (IllegalArgumentException e) {
} catch (IllegalAccessException e) {
} catch (InvocationTargetException e) {
}
break;
}
}*/
this.getResourcePropertySet().get(RunningInstanceRP).clear();
this.getResourcePropertySet().get(RunningInstanceRP).add(property);
@ -455,12 +398,9 @@ public class RegistryFactoryResource extends GCUBEWSResource {
this.getResourcePropertySet().get(CollectionRP).clear();
this.getResourcePropertySet().get(CollectionRP).add(property);
this.getResourcePropertySet().get(CSRP).clear();
this.getResourcePropertySet().get(CSRP).add(property);
this.getResourcePropertySet().get(CSInstanceRP).clear();
this.getResourcePropertySet().get(CSInstanceRP).add(property);
this.getResourcePropertySet().get(RuntimeResourceRP).clear();
this.getResourcePropertySet().get(RuntimeResourceRP).add(property);
this.getResourcePropertySet().get(GHNRP).clear();
this.getResourcePropertySet().get(GHNRP).add(property);
@ -484,8 +424,7 @@ public class RegistryFactoryResource extends GCUBEWSResource {
this.getResourcePropertySet().get(GenericResourceRP).clear();
this.getResourcePropertySet().get(GenericResourceRP).add(property);
}
}