From 0ec8e9d2c6080a86967d08405eee2d3ba1e76167 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 16 Oct 2009 17:10:32 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Registry@16018 82a268e6-3cf1-43bd-a215-b396298e98cf --- etc/deploy-server.wsdd | 4 ++-- etc/profile.xml | 13 ++++++++++++- .../registry/impl/contexts/ServiceContext.java | 2 +- .../registry/impl/{ => porttypes}/Registry.java | 2 +- .../impl/{ => porttypes}/RegistryFactory.java | 2 +- .../registry/impl/profilemanagement/GHN.java | 2 +- .../stubs/testsuite/RegistryRegistrationTest.java | 2 +- .../stubs/testsuite/RegistryRemoveTest.java | 5 ++--- .../stubs/testsuite/RegistryUpdateTest.java | 4 ++-- test-suite/README.TXT | 9 +++++++-- test-suite/registerGUBEResource.sh | 1 + test-suite/registerGenericResourceICIS.sh | 1 - test-suite/removeGHND4ScienceFCPPS.sh | 1 - test-suite/removeGHND4ScienceICIS.sh | 1 - test-suite/removeGHNFCPPS.sh | 1 - test-suite/removeGUBEResource.sh | 1 + test-suite/removeGenericResourceFCPPS.sh | 1 - test-suite/removeGenericResourceICIS.sh | 1 - test-suite/removeRID4ScienceFCPPS.sh | 1 - test-suite/removeRID4ScienceICIS.sh | 1 - test-suite/removeRIFCPPS.sh | 1 - test-suite/{ => samples}/registerGenericResource.sh | 0 test-suite/{ => samples}/registerRIEM.sh | 0 .../{ => samples}/removeAllServicesD4Science.sh | 0 test-suite/{ => samples}/removeGHND4Science.sh | 0 test-suite/{ => samples}/removeGHND4ScienceEM.sh | 0 test-suite/{ => samples}/removeGHND4ScienceFARM.sh | 0 test-suite/{ => samples}/removeGHNTesting.sh | 0 test-suite/{ => samples}/removeGHNgCube.sh | 0 test-suite/{ => samples}/removeGHNgCubeDevSec.sh | 0 .../{ => samples}/removeGenericResourceD4Science.sh | 0 .../removeGenericResourceD4ScienceFARM.sh | 0 .../{ => samples}/removeGenericResourceDevSec.sh | 0 test-suite/{ => samples}/removeGenericResourceEM.sh | 0 .../{ => samples}/removeGenericResourceTesting.sh | 0 test-suite/{ => samples}/removeMCDevSec.sh | 0 test-suite/{ => samples}/removeMCEM.sh | 0 test-suite/{ => samples}/removeRID4Science.sh | 0 test-suite/{ => samples}/removeRID4ScienceEM.sh | 0 test-suite/{ => samples}/removeRIgCube.sh | 0 test-suite/{ => samples}/removeRIgCubeDevSec.sh | 0 test-suite/{ => samples}/removeServicegCube.sh | 0 .../{ => samples}/removeServicegCubeDevSec.sh | 0 43 files changed, 32 insertions(+), 24 deletions(-) rename src/org/gcube/informationsystem/registry/impl/{ => porttypes}/Registry.java (95%) rename src/org/gcube/informationsystem/registry/impl/{ => porttypes}/RegistryFactory.java (99%) create mode 100755 test-suite/registerGUBEResource.sh delete mode 100755 test-suite/registerGenericResourceICIS.sh delete mode 100755 test-suite/removeGHND4ScienceFCPPS.sh delete mode 100755 test-suite/removeGHND4ScienceICIS.sh delete mode 100755 test-suite/removeGHNFCPPS.sh create mode 100755 test-suite/removeGUBEResource.sh delete mode 100755 test-suite/removeGenericResourceFCPPS.sh delete mode 100755 test-suite/removeGenericResourceICIS.sh delete mode 100755 test-suite/removeRID4ScienceFCPPS.sh delete mode 100755 test-suite/removeRID4ScienceICIS.sh delete mode 100755 test-suite/removeRIFCPPS.sh rename test-suite/{ => samples}/registerGenericResource.sh (100%) rename test-suite/{ => samples}/registerRIEM.sh (100%) rename test-suite/{ => samples}/removeAllServicesD4Science.sh (100%) rename test-suite/{ => samples}/removeGHND4Science.sh (100%) rename test-suite/{ => samples}/removeGHND4ScienceEM.sh (100%) rename test-suite/{ => samples}/removeGHND4ScienceFARM.sh (100%) rename test-suite/{ => samples}/removeGHNTesting.sh (100%) rename test-suite/{ => samples}/removeGHNgCube.sh (100%) rename test-suite/{ => samples}/removeGHNgCubeDevSec.sh (100%) rename test-suite/{ => samples}/removeGenericResourceD4Science.sh (100%) rename test-suite/{ => samples}/removeGenericResourceD4ScienceFARM.sh (100%) rename test-suite/{ => samples}/removeGenericResourceDevSec.sh (100%) rename test-suite/{ => samples}/removeGenericResourceEM.sh (100%) rename test-suite/{ => samples}/removeGenericResourceTesting.sh (100%) rename test-suite/{ => samples}/removeMCDevSec.sh (100%) rename test-suite/{ => samples}/removeMCEM.sh (100%) rename test-suite/{ => samples}/removeRID4Science.sh (100%) rename test-suite/{ => samples}/removeRID4ScienceEM.sh (100%) rename test-suite/{ => samples}/removeRIgCube.sh (100%) rename test-suite/{ => samples}/removeRIgCubeDevSec.sh (100%) rename test-suite/{ => samples}/removeServicegCube.sh (100%) rename test-suite/{ => samples}/removeServicegCubeDevSec.sh (100%) diff --git a/etc/deploy-server.wsdd b/etc/deploy-server.wsdd index d28a821..c69f2bc 100644 --- a/etc/deploy-server.wsdd +++ b/etc/deploy-server.wsdd @@ -6,7 +6,7 @@ xmlns:aggr="http://mds.globus.org/aggregator/types"> - + share/schema/org.gcube.informationsystem.registry/Registry_service.wsdl @@ -19,7 +19,7 @@ - + share/schema/org.gcube.informationsystem.registry/RegistryFactory_service.wsdl diff --git a/etc/profile.xml b/etc/profile.xml index fcde6a6..c8edd7d 100644 --- a/etc/profile.xml +++ b/etc/profile.xml @@ -64,7 +64,18 @@ org.gcube.informationsystem.registry.stubs.jar - + + + Test-suite for IS-Registry: provide sample interaction usages with an IS-Registry instance + IS-Registry-test-suite + 1.0.0 + + + application + + lib/org.gcube.informationsystem.registry.testsuite.jar + + diff --git a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java index e2b417a..27efc49 100644 --- a/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java +++ b/src/org/gcube/informationsystem/registry/impl/contexts/ServiceContext.java @@ -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; diff --git a/src/org/gcube/informationsystem/registry/impl/Registry.java b/src/org/gcube/informationsystem/registry/impl/porttypes/Registry.java similarity index 95% rename from src/org/gcube/informationsystem/registry/impl/Registry.java rename to src/org/gcube/informationsystem/registry/impl/porttypes/Registry.java index 42de42f..6161d8b 100644 --- a/src/org/gcube/informationsystem/registry/impl/Registry.java +++ b/src/org/gcube/informationsystem/registry/impl/porttypes/Registry.java @@ -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; diff --git a/src/org/gcube/informationsystem/registry/impl/RegistryFactory.java b/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java similarity index 99% rename from src/org/gcube/informationsystem/registry/impl/RegistryFactory.java rename to src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java index 29d29d6..1e973a2 100644 --- a/src/org/gcube/informationsystem/registry/impl/RegistryFactory.java +++ b/src/org/gcube/informationsystem/registry/impl/porttypes/RegistryFactory.java @@ -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; diff --git a/src/org/gcube/informationsystem/registry/impl/profilemanagement/GHN.java b/src/org/gcube/informationsystem/registry/impl/profilemanagement/GHN.java index 17a48da..bf4cf09 100644 --- a/src/org/gcube/informationsystem/registry/impl/profilemanagement/GHN.java +++ b/src/org/gcube/informationsystem/registry/impl/profilemanagement/GHN.java @@ -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; diff --git a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest.java b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest.java index 55a8ea5..3774494 100644 --- a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest.java +++ b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRegistrationTest.java @@ -140,7 +140,7 @@ public class RegistryRegistrationTest { */ static void printUsage() { System.out - .println("RegistryRegistrationTest "); + .println("RegistryRegistrationTest "); System.out .println("allowed types are: RunningInstance/Service/GHN/GenericResource"); System.exit(1); diff --git a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest.java b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest.java index 7d8c7ae..c2f37ea 100644 --- a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest.java +++ b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryRemoveTest.java @@ -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"); + } } diff --git a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryUpdateTest.java b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryUpdateTest.java index 606107c..8593d41 100644 --- a/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryUpdateTest.java +++ b/src/org/gcube/informationsystem/registry/stubs/testsuite/RegistryUpdateTest.java @@ -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"); + } } diff --git a/test-suite/README.TXT b/test-suite/README.TXT index 2f416f3..3d2b430 100644 --- a/test-suite/README.TXT +++ b/test-suite/README.TXT @@ -4,7 +4,12 @@ Decription A client for the IS Registry allowing to add/delete profiles from the IS Usage -source