Skip to Content.
Sympa Menu

perfsonar-dev - r1897 - in branches/JAVA-RRD-MA-STABLE: ant ant/rrdma schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/netflow schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/commons/messages

Subject: perfsonar development work

List archive

r1897 - in branches/JAVA-RRD-MA-STABLE: ant ant/rrdma schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/netflow schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/commons/messages


Chronological Thread 
  • From:
  • To:
  • Subject: r1897 - in branches/JAVA-RRD-MA-STABLE: ant ant/rrdma schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/netflow schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/commons/messages
  • Date: Tue, 9 Jan 2007 06:40:31 -0500
Author: roman
Date: 2007-01-09 06:40:27 -0500 (Tue, 09 Jan 2007)
New Revision: 1897

Added:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Req.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Resp.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSStore.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataRequestKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataResponseKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPKeyRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPKeyResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Req.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Resp.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Req1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Req2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Resp1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Resp2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadDBRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/Void.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/link-status-store.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/rrdTypeMA/
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/store.xml

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/SubscriptionKeepaliveRequest.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/SubscriptionRequest.java

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/UnSubscriptionRequest.java
Removed:

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Req.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Resp.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSStore.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataRequestKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataResponseKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPKeyRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPKeyResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Req.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Resp.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Req1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Req2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Resp1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Resp2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadDBRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/Void.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/link-status-store.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/rrdTypeMA/
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml

branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/store.xml
Modified:
branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-client-run-targets.xml

branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
Log:

merging tested recent updates from trunk to STABLE




Modified: branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml 2007-01-09
10:29:07 UTC (rev 1896)
+++ branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml 2007-01-09
11:40:27 UTC (rev 1897)
@@ -172,7 +172,9 @@
depends="webservice-container-question"
if="tomcat.install.decision">

- <dirname property="_tomcat.install.location" file="${basedir}"/>
+ <!-- <dirname property="_tomcat.install.location"
file="${basedir}"/> -->
+ <property file="ant/const.properties" />
+ <dirname property="_tomcat.install.location" file="${service.home}"/>

<input message="Enter the path for the Tomcat installation:
[${_tomcat.install.location}/${tomcat.dir}]:"
addproperty="tomcat.install.location"

Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-client-run-targets.xml
2007-01-09 10:29:07 UTC (rev 1896)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-client-run-targets.xml
2007-01-09 11:40:27 UTC (rev 1897)
@@ -28,8 +28,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-1.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -42,13 +42,13 @@

<target name="run-rrdma-client-2" description="Runs Java client">

- <replace
file="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml"
token="__BASEPATH__" value="${basedir}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml"
token="__BASEPATH__" value="${basedir}"/>

<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -61,13 +61,13 @@

<target name="run-rrdma-client-3" description="Runs Java client">

- <replace
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"
token="__BASEPATH__" value="${basedir}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml"
token="__BASEPATH__" value="${basedir}"/>

<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -83,8 +83,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-4.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -97,13 +97,13 @@

<target name="run-rrdma-client-5" description="Runs Java client">

- <replace
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml"
token="__BASEPATH__" value="${basedir}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml"
token="__BASEPATH__" value="${basedir}"/>

<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-5.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-5.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -119,8 +119,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-chaining-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-chaining-1.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -136,8 +136,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response-chaining-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-chaining-2.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -157,8 +157,8 @@
classpathref="classpath"
fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>
@@ -170,8 +170,8 @@
classpathref="classpath"
fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-Key-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>
@@ -183,8 +183,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/Echo-Req.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/Echo-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>

Copied: branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR (from
rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Req.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Req.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/Echo-Req.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Resp.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/Echo-Resp.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/Echo-Resp.xml)

Copied: branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS
(from rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/LS)

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test (from
rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/LS/test)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSStore-control.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSStore.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSStore.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/LSStore.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MPDataRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataRequestKey.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataRequestKey.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MPDataRequestKey.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataResponse.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataResponse.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MPDataResponse.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataResponseKey.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPDataResponseKey.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MPDataResponseKey.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPKeyRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPKeyRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MPKeyRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPKeyResponse.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MPKeyResponse.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MPKeyResponse.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Filter-Resp.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Req.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Req.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Req.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Resp.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/MetadataKey-Resp.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/MetadataKey-Resp.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Req1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Req1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-Req1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Req2.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Req2.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-Req2.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Resp1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Resp1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-Resp1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Resp2.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupData-Resp2.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupData-Resp2.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-2.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect-3.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/SetupDataResponse-FilterRRDSelect.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml)

Copied: branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS
(from rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/TOPS)

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test
(from rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadDBRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadDBRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadDBRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/Void.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/Void.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/TOPS/test/Void.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/link-status-store.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/link-status-store.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/link-status-store.xml)

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow (from
rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/netflow)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPKeepaliveResponse.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPSubscribeResponse.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/ClientMPUnSubscribeResponse.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/MPLSRegistrationRequest.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/netflow/MPLSRegistrationResponse.xml)

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP
(from rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/DataRequest-exampleMetadata-noKey.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-data-store)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/GEANT2-link-status-with-key-store)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-emptyMetadata.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/KeyRequest-exampleMetadata.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml)

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/rrdTypeMA
(from rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/rrdTypeMA)

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP
(from rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-exampleMetadata-noKey.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/KeyRequest-exampleMetadata.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
(from rev 1896,
trunk/perfsonar/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml)

Deleted:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/store.xml

Copied:
branches/JAVA-RRD-MA-STABLE/schema/example-instances/perfSONAR/store.xml
(from rev 1896, trunk/perfsonar/schema/example-instances/perfSONAR/store.xml)

Modified:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
===================================================================
---
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
2007-01-09 10:29:07 UTC (rev 1896)
+++
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
2007-01-09 11:40:27 UTC (rev 1897)
@@ -72,27 +72,52 @@

Service service = new Service();
service.setId("serviceParameters");
-
- //subject.setChild(service); //INCORRECT!
subject.addChild(service);

+ //access point -- mandatory
+ String
accessPointString=(String)commonParameters.get("access_point");
+ if (accessPointString==null) throw new SystemException(
+ "error.lsregistrator.no_accesspoint",
+ "AccessPoint parameter was not found. Registration failed");
+ if ("".equals(accessPointString)) throw new SystemException(
+ "error.lsregistrator.no_accesspoint",
+ "AccessPoint parameter was empty. Registration failed");
AccessPoint ap = new AccessPoint();
-
- ap.setAccessPoint((String)commonParameters.get("access_point"));
+ ap.setAccessPoint(accessPointString);
service.setAccessPoint(ap);

+ //service name -- mandatory
+ String
serviceNameString=(String)commonParameters.get("service_name");
+ if (serviceNameString==null) throw new SystemException(
+ "error.lsregistrator.no_servicename",
+ "ServiceName parameter was not found. Registration failed");
+ if ("".equals(serviceNameString)) throw new SystemException(
+ "error.lsregistrator.no_servicename",
+ "ServiceName parameter was empty. Registration failed");

ServiceName sn = new ServiceName();
- sn.setServiceName((String)commonParameters.get("service_name"));
+ sn.setServiceName(serviceNameString);
service.setServiceName(sn);

+ //service type -- mandatory
+ String
serviceTypeString=(String)commonParameters.get("service_type");
+ if (serviceTypeString==null) throw new SystemException(
+ "error.lsregistrator.no_servicetype",
+ "ServiceType parameter was not found. Registration failed");
+ if ("".equals(serviceTypeString)) throw new SystemException(
+ "error.lsregistrator.no_servicename",
+ "ServiceType parameter was empty. Registration failed");

ServiceType st = new ServiceType();
- st.setServiceType((String)commonParameters.get("service_type"));
+ st.setServiceType(serviceTypeString);
service.setServiceType(st);

- ServiceDescription sd = new ServiceDescription();
-
sd.setServiceDescription((String)commonParameters.get("service_description"));
- service.setServiceDescription(sd);
-
+ //service description -- optional
+ String
serviceDescString=(String)commonParameters.get("service_description");
+ if (serviceDescString==null) {
+ ServiceDescription sd = new ServiceDescription();
+ sd.setServiceDescription(serviceDescString);
+ service.setServiceDescription(sd);
+ }
+
//data fields

System.out.println("LSRegisterRequestGenerator: ");

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/SubscriptionKeepaliveRequest.java
(from rev 1888,
trunk/perfsonar/src/org/perfsonar/commons/messages/SubscriptionKeepaliveRequest.java)

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/SubscriptionRequest.java
(from rev 1888,
trunk/perfsonar/src/org/perfsonar/commons/messages/SubscriptionRequest.java)

Copied:
branches/JAVA-RRD-MA-STABLE/src/org/perfsonar/commons/messages/UnSubscriptionRequest.java
(from rev 1888,
trunk/perfsonar/src/org/perfsonar/commons/messages/UnSubscriptionRequest.java)


  • r1897 - in branches/JAVA-RRD-MA-STABLE: ant ant/rrdma schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/netflow schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/commons/messages, svnlog, 01/09/2007

Archive powered by MHonArc 2.6.16.

Top of Page