From 1938782e83d9d3903768bfc5b02eb7c2960ea920 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Thu, 15 Oct 2009 23:28:35 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Collector@15969 82a268e6-3cf1-43bd-a215-b396298e98cf --- .project | 34 ++--- etc/profile.xml | 8 +- schema/XMLCollectionAccess.wsdl | 70 +++++++++- .../AggregatorPersistentResource.java | 121 ++++++++++++++---- .../impl/porttypes/XMLCollectionAccess.java | 56 ++++---- .../xmlstorage/exist/XMLStorageManager.java | 24 +++- .../xmlcollectionaccess/GetProfileTester.java | 60 +++++++++ .../GetResourceTester.java | 61 +++++++++ 8 files changed, 353 insertions(+), 81 deletions(-) create mode 100644 src/org/gcube/informationsystem/collector/stubs/testsuite/xmlcollectionaccess/GetProfileTester.java create mode 100644 src/org/gcube/informationsystem/collector/stubs/testsuite/xmlcollectionaccess/GetResourceTester.java diff --git a/.project b/.project index 58b6503..db224a5 100644 --- a/.project +++ b/.project @@ -1,17 +1,17 @@ - - - InformationCollector_previous - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + InformationCollector_branched + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/etc/profile.xml b/etc/profile.xml index 1ea081a..46a0572 100644 --- a/etc/profile.xml +++ b/etc/profile.xml @@ -20,7 +20,7 @@ sink by collecting and exposing the information published by the registered gCube services IS-Collector-service - 2.0.0 + 2.1.0 @@ -29,7 +29,7 @@ 1.0.0 IS-Collector-stubs - [2.0.0] + [2.1.0] false @@ -76,7 +76,7 @@ InformationCollector Stubs IS-Collector-stubs - 2.0.0 + 2.1.0 @@ -88,7 +88,7 @@ Test-suite for IS-Collector: provide sample usages of interaction with a IS-Collector instance IS-Collector-test-suite - 1.0.0 + 1.1.0 application diff --git a/schema/XMLCollectionAccess.wsdl b/schema/XMLCollectionAccess.wsdl index cdbfdd8..2fcaeef 100755 --- a/schema/XMLCollectionAccess.wsdl +++ b/schema/XMLCollectionAccess.wsdl @@ -4,6 +4,7 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:asgt="http://mds.globus.org/aggregator/types" + xmlns:corefaults="http://gcube-system.org/namespaces/common/core/faults" xmlns:wsrlw="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceLifetime-1.2-draft-01.wsdl" xmlns:wsdlpp="http://www.globus.org/namespaces/2004/10/WSDLPreprocessor" xmlns:gtwsdl1="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ServiceGroup-1.2-draft-01.wsdl" @@ -16,7 +17,7 @@ - + - + @@ -73,6 +107,14 @@ + + + + + + + + @@ -81,9 +123,21 @@ + + + + + + + + + + + +