This commit is contained in:
Manuele Simi 2009-10-16 17:10:32 +00:00
parent 94616c9d27
commit 0ec8e9d2c6
43 changed files with 32 additions and 24 deletions

View File

@ -6,7 +6,7 @@
xmlns:aggr="http://mds.globus.org/aggregator/types">
<service name="gcube/informationsystem/registry/Registry" provider="Handler" use="literal" style="document">
<parameter name="className" value="org.gcube.informationsystem.registry.impl.Registry"/>
<parameter name="className" value="org.gcube.informationsystem.registry.impl.porttypes.Registry"/>
<wsdlFile>share/schema/org.gcube.informationsystem.registry/Registry_service.wsdl</wsdlFile>
<parameter name="allowedMethods" value="*"/>
<parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>
@ -19,7 +19,7 @@
<!-- Factory service -->
<service name="gcube/informationsystem/registry/RegistryFactory" provider="Handler" use="literal" style="document">
<parameter name="className" value="org.gcube.informationsystem.registry.impl.RegistryFactory"/>
<parameter name="className" value="org.gcube.informationsystem.registry.impl.porttypes.RegistryFactory"/>
<wsdlFile>share/schema/org.gcube.informationsystem.registry/RegistryFactory_service.wsdl</wsdlFile>
<parameter name="allowedMethods" value="*"/>
<parameter name="handlerClass" value="org.globus.axis.providers.RPCProvider"/>

View File

@ -64,7 +64,18 @@
<Files>
<File>org.gcube.informationsystem.registry.stubs.jar</File>
</Files>
</Software>
</Software>
<Software>
<Description>Test-suite for IS-Registry: provide sample interaction usages with an IS-Registry instance</Description>
<Name>IS-Registry-test-suite</Name>
<Version>1.0.0</Version>
<MultiVersion value="true"/>
<Shareable level="VO"/>
<Type>application</Type>
<Files>
<File>lib/org.gcube.informationsystem.registry.testsuite.jar</File>
</Files>
</Software>
</Packages>
</Profile>
</Resource>

View File

@ -19,7 +19,7 @@ import org.gcube.common.core.utils.events.GCUBEProducer;
import org.gcube.common.core.utils.events.GCUBETopic;
import org.gcube.common.core.utils.handlers.GCUBEHandler;
import org.gcube.common.core.utils.handlers.GCUBEScheduledHandler;
import org.gcube.informationsystem.registry.impl.RegistryFactory;
import org.gcube.informationsystem.registry.impl.porttypes.RegistryFactory;
import org.gcube.informationsystem.registry.impl.resourcemanagement.EliminatePoolingThread;
import org.gcube.informationsystem.registry.impl.state.RegistryFactoryResource;
import org.gcube.informationsystem.registry.stubs.CreateResourceMessage;

View File

@ -1,4 +1,4 @@
package org.gcube.informationsystem.registry.impl;
package org.gcube.informationsystem.registry.impl.porttypes;
import org.apache.axis.utils.XMLUtils;
import org.gcube.common.core.contexts.GCUBEServiceContext;

View File

@ -1,4 +1,4 @@
package org.gcube.informationsystem.registry.impl;
package org.gcube.informationsystem.registry.impl.porttypes;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;

View File

@ -13,7 +13,7 @@ import org.gcube.common.core.informationsystem.client.ISClient.ISMalformedQueryE
import org.gcube.common.core.informationsystem.client.queries.GCUBEGenericQuery;
import org.gcube.common.core.resources.GCUBERunningInstance;
import org.gcube.common.core.utils.logging.GCUBELog;
import org.gcube.informationsystem.registry.impl.RegistryFactory;
import org.gcube.informationsystem.registry.impl.porttypes.RegistryFactory;
import org.gcube.informationsystem.registry.impl.contexts.ServiceContext;
import org.gcube.informationsystem.registry.stubs.RemoveResourceMessage;

View File

@ -140,7 +140,7 @@ public class RegistryRegistrationTest {
*/
static void printUsage() {
System.out
.println("RegistryRegistrationTest <factory URI> <resource file> <resource type> <caller scope>");
.println("RegistryRegistrationTest <factory URI> <resource file> <caller scope> <resource type>");
System.out
.println("allowed types are: RunningInstance/Service/GHN/GenericResource");
System.exit(1);

View File

@ -41,12 +41,11 @@ public class RegistryRemoveTest {
message.setType(args[3]);
message.setUniqueID(args[1]);
registryFactoryPortType.removeResource(message);
System.out.println("Profile with ID " + args[1] + "has been succesfully removed");
} catch (Exception e) {
e.printStackTrace();
}
System.out.println("Profile with ID " + args[1]
+ "has been succesfully removed");
}
}

View File

@ -46,10 +46,10 @@ public static void main (String[]args ) throws Exception {
message.setType(GCUBEService.TYPE);
registryFactoryPortType.updateResource(message);
System.out.println("Profile has been updated");
} catch(Exception e) {
e.printStackTrace();
}
System.out.println("Profile has been updated");
}
}

View File

@ -4,7 +4,12 @@ Decription
A client for the IS Registry allowing to add/delete profiles from the IS
Usage
source <script name> <resource ID>/<profile file>
source removeGCUBEResource.sh <RegistryFactory URI> <resource ID> <scope> <resource type>
source registerGCUBEResource.sh <RegistryFactory URI> <profile file> <scope> <resource type>
Example
source removeGCUBEResource.sh http://node4.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory 778ba410-8d94-11de-889b-bed95c57e445 /d4science.research-infrastructures.eu/EM RunningInstance
source registerGCUBEResource.sh http://node4.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory ./samples/RIProfile.xml /d4science.research-infrastructures.eu/EM RunningInstance
Author Manuele Simi
Last Update 30/09/2009
Last Update 16/10/2009

View File

@ -0,0 +1 @@
java -cp ./org.gcube.informationsystem.registry.stubs.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest $1 $2 $3 $4

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.stubs.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest http://node9.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/ICIS GenericResource

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS GHN

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest http://node9.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/ICIS GHN

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS GHN

View File

@ -0,0 +1 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest $1 $2 $3 $4

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS GenericResource

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node9.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/ICIS GenericResource

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS RunningInstance

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node9.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/ICIS RunningInstance

View File

@ -1 +0,0 @@
java -cp ./org.gcube.informationsystem.registry.jar:$CLASSPATH org/gcube/informationsystem/registry/test/RegistryRemoveTest http://node11.p.d4science.research-infrastructures.eu:8080/wsrf/services/gcube/informationsystem/registry/RegistryFactory $1 /d4science.research-infrastructures.eu/FCPPS RunningInstance