diff --git a/.classpath b/.classpath
index c404996..e67dd21 100644
--- a/.classpath
+++ b/.classpath
@@ -5,9 +5,9 @@
-
-
-
-
+
+
+
+
diff --git a/.project b/.project
index 2ae1ee0..f20e316 100644
--- a/.project
+++ b/.project
@@ -1,17 +1,17 @@
-
-
- Registry
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
+
+
+ Registry.trunk
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/changelog.xml b/changelog.xml
index 7469e0a..948d421 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,4 +1,7 @@
+
+ Adding WS-Topic for the new Runtime Resource
+
Adding mapping for the new Runtime Resource
diff --git a/etc/profile.xml b/etc/profile.xml
index 00dcf99..9103d08 100644
--- a/etc/profile.xml
+++ b/etc/profile.xml
@@ -18,7 +18,7 @@
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.2
+ 2.1.3
@@ -52,7 +52,7 @@
Stub classes for interfacing the IS-Registry
IS-Registry-stubs
- 2.1.0
+ 2.1.3
diff --git a/schema/RegistryFactory.wsdl b/schema/RegistryFactory.wsdl
index d25f212..6e41355 100644
--- a/schema/RegistryFactory.wsdl
+++ b/schema/RegistryFactory.wsdl
@@ -96,11 +96,7 @@
-
-
-
-
-
+
@@ -116,6 +112,9 @@
+
+
+
@@ -124,8 +123,6 @@
-
-
@@ -134,6 +131,7 @@
+
diff --git a/src/org/gcube/informationsystem/registry/impl/state/Definitions.java b/src/org/gcube/informationsystem/registry/impl/state/Definitions.java
index 4126351..870ad92 100644
--- a/src/org/gcube/informationsystem/registry/impl/state/Definitions.java
+++ b/src/org/gcube/informationsystem/registry/impl/state/Definitions.java
@@ -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;
diff --git a/src/org/gcube/informationsystem/registry/impl/state/RegistryFactoryResource.java b/src/org/gcube/informationsystem/registry/impl/state/RegistryFactoryResource.java
index a3ee6a9..680f240 100644
--- a/src/org/gcube/informationsystem/registry/impl/state/RegistryFactoryResource.java
+++ b/src/org/gcube/informationsystem/registry/impl/state/RegistryFactoryResource.java
@@ -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);
-
-
+
}
}