perfsonar-dev - r2091 - in branches/JAVA-SQL-MA-STABLE: ant ant/rrdma ant/sqlma conf doc/ma/sqlTypeMA doc/ma/sqlTypeMA/protocol doc/ma/sqlTypeMA/protocol/lightPathStatus doc/ma/sqlTypeMA/protocol/lightPathStatus/samples schema schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP

Subject: perfsonar development work

List archive

r2091 - in branches/JAVA-SQL-MA-STABLE: ant ant/rrdma ant/sqlma conf doc/ma/sqlTypeMA doc/ma/sqlTypeMA/protocol doc/ma/sqlTypeMA/protocol/lightPathStatus doc/ma/sqlTypeMA/protocol/lightPathStatus/samples schema schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP

From:
To:
Subject: r2091 - in branches/JAVA-SQL-MA-STABLE: ant ant/rrdma ant/sqlma conf doc/ma/sqlTypeMA doc/ma/sqlTypeMA/protocol doc/ma/sqlTypeMA/protocol/lightPathStatus doc/ma/sqlTypeMA/protocol/lightPathStatus/samples schema schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP
Date: Tue, 20 Feb 2007 06:52:52 -0500

Author: roman
Date: 2007-02-20 06:52:51 -0500 (Tue, 20 Feb 2007)
New Revision: 2091

Added:
branches/JAVA-SQL-MA-STABLE/conf/log4j.properties.template
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoResponse.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterResponse.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreResponse.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyResponse.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoRequest.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoResponse.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterRequest.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterResponse.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example4.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example4.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example5.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example6.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example4.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example5.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example6.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataResponse.rnc
Removed:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoResponse.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterResponse.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreResponse.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyResponse.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoRequest.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoResponse.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterRequest.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterResponse.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example4.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example4.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example5.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example6.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example1.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example2.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example3.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example4.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example5.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example6.xml

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataRequest.rnc

branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataResponse.rnc
branches/JAVA-SQL-MA-STABLE/schema/clean.sh
branches/JAVA-SQL-MA-STABLE/schema/example-instances/nmwg/
branches/JAVA-SQL-MA-STABLE/schema/example-instances/old/
branches/JAVA-SQL-MA-STABLE/schema/nmwg/
branches/JAVA-SQL-MA-STABLE/schema/service.rnc
branches/JAVA-SQL-MA-STABLE/schema/sonar.rnc
Modified:
branches/JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/configure-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/pre-install-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-libs-download-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-axis-deploy-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-configure-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-libs-download-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-pre-install-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-test-run-targets.xml

branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml

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

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

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

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

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

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

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

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

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

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

branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml

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

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

Recent changes in the trunk copied to the stable branch

svn merge -r 2020:2090
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar

Modified: branches/JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml 2007-02-20
10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml 2007-02-20
11:52:51 UTC (rev 2091)
@@ -34,6 +34,7 @@
<mkdir dir="${service.home}/${deploy.root}/wsdd"/>
<mkdir dir="${service.home}/${deploy.root}/WEB-INF"/>
<mkdir dir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <mkdir dir="${service.home}/${deploy.root}/WEB-INF/logs"/>
<mkdir dir="${service.home}/${deploy.root}/WEB-INF/classes"/>
<mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar"/>
<mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
@@ -61,6 +62,8 @@

<copy file="./conf/service.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="./conf/components.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./conf/log4j.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./src/objects.config"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

</target>

@@ -133,6 +136,7 @@

<delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"/>
<delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/components.properties"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>

</target>

@@ -300,9 +304,9 @@

<target name="start">
-
+
<antcall target="deploy-adminclient" />
-
+
</target>

Modified: branches/JAVA-SQL-MA-STABLE/ant/configure-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/configure-targets.xml 2007-02-20
10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/configure-targets.xml 2007-02-20
11:52:51 UTC (rev 2091)
@@ -23,64 +23,12 @@

<target name="set-log4j-properties">

- <property name="logDir" value="${basedir}/log"/>
+ <property name="logDir"
value="${service.home}/${deploy.root}/WEB-INF/logs"/>

- <propertyfile file="conf/log4j.properties"
- comment="This file was created by the ant script.">
+ <delete file="${basedir}/conf/log4j.properties"/>
+ <copy file="${basedir}/conf/log4j.properties.template"
tofile="${basedir}/conf/log4j.properties"/>
+ <replace file="${basedir}/conf/log4j.properties"
token="_LOGPATH_" value="${logDir}"/>

- <entry key="logDir" value="${logDir}"/>
-
- <entry key="log4j.rootLogger" value="INFO, rootAppender"/>
- <entry key="log4j.logger.perfsonar-debug" value="DEBUG,
debugAppender"/>
- <entry key="log4j.logger.perfsonar-info" value="INFO,
infoAppender"/>
- <entry key="log4j.logger.perfsonar-warn" value="WARN,
warnAppender"/>
- <entry key="log4j.logger.perfsonar-error" value="ERROR,
errorAppender"/>
- <entry key="log4j.logger.perfsonar-fatal" value="FATAL,
fatalAppender"/>
-
- <entry key="log4j.appender.rootAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.rootAppender.File"
value="${logDir}/perfsonar.log"/>
- <entry key="log4j.appender.rootAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.rootAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.rootAppender.layout"
value="org.apache.log4j.PatternLayout"/>
- <entry
key="log4j.appender.rootAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>
-
- <entry key="log4j.appender.debugAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.debugAppender.File"
value="${logDir}/perfsonar_debug.log"/>
- <entry key="log4j.appender.debugAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.debugAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.debugAppender.layout"
value="org.apache.log4j.PatternLayout"/>
- <entry
key="log4j.appender.debugAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>
-
- <entry key="log4j.appender.infoAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.infoAppender.File"
value="${logDir}/perfsonar_info.log"/>
- <entry key="log4j.appender.infoAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.infoAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.infoAppender.layout"
value="org.apache.log4j.PatternLayout"/>
- <entry
key="log4j.appender.infoAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>
-
- <entry key="log4j.appender.warnAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.warnAppender.File"
value="${logDir}/perfsonar_warn.log"/>
- <entry key="log4j.appender.warnAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.warnAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.warnAppender.layout"
value="org.apache.log4j.PatternLayout"/>
- <entry
key="log4j.appender.warnAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>
-
- <entry key="log4j.appender.errorAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.errorAppender.File"
value="${logDir}/perfsonar_error.log"/>
- <entry key="log4j.appender.errorAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.errorAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.errorAppender.layout"
value="org.apache.log4j.PatternLayout"/>
- <entry
key="log4j.appender.errorAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>
-
- <entry key="log4j.appender.fatalAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.fatalAppender.File"
value="${logDir}/perfsonar_fatal.log"/>
- <entry key="log4j.appender.fatalAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.fatalAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.fatalAppender.layout"
value="org.apache.log4j.PatternLayout"/>
- <entry
key="log4j.appender.fatalAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>
-
- </propertyfile>
-
</target>

@@ -103,7 +51,8 @@

<input message="Turn on service registration to Lookup Service? "
addproperty="_functionality.register.decision"
- validargs="y,n" />
+ validargs="y,n"
+ defaultvalue="n"/>

<condition property="functionality.register.decision">
<equals arg1="y" arg2="${_functionality.register.decision}"/>

Modified: branches/JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml 2007-02-20
10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml 2007-02-20
11:52:51 UTC (rev 2091)
@@ -61,6 +61,12 @@

<dependency groupId="log4j" artifactId="log4j"
version="1.2.9"/>

+ <dependency groupId="exist"
artifactId="exist-xmldb" version="1.0rc"/>
+ <dependency groupId="exist"
artifactId="exist-db" version="1.0rc"/>
+ <dependency groupId="exist"
artifactId="exist-xmlrpc" version="1.0rc"/>
+ <dependency groupId="exist"
artifactId="exist-optional" version="1.0rc"/>
+
+
<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>

Modified: branches/JAVA-SQL-MA-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/pre-install-targets.xml 2007-02-20
10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/pre-install-targets.xml 2007-02-20
11:52:51 UTC (rev 2091)
@@ -18,7 +18,7 @@


-
+
<property name="_tomcat.download.url"

value="http://apache.forall.pl/tomcat/tomcat-6/v6.0.7/bin/apache-tomcat-6.0.7.tar.gz";
/>
<property name="tomcat.dir" value="apache-tomcat-6.0.7" />
@@ -72,7 +72,8 @@

<target name="_get-service-home">

- <dirname property="__service.home" file="${basedir}"/>
+ <dirname property="___service.home" file="${basedir}"/>
+ <dirname property="__service.home" file="${___service.home}"/>

<input message="Enter the path where you want to install the service
[${__service.home}/webapps]:"
addproperty="_service.home"
@@ -199,7 +200,7 @@
unless="tomcat.install.decision">

<antcall target="get-tomcat-directory"/>
-
+
</target>

@@ -214,7 +215,7 @@
<isset property="tomcat.home"/>
</condition>

- </target>
+ </target>

<target name="_get-tomcat-directory_1" depends="__get-tomcat-directory"
if="tomcat.home.present">

Modified: branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -39,6 +39,14 @@
<copy file="./conf/eventType-map.xml"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="./conf/eventType-rules.xml"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

+ <copy file="${service.ma.conf_file}"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+
+ <basename property="rrd.config.file.basename"
file="${service.ma.conf_file}" />
+ <propertyfile
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"
+ comment="This file was created by the ant script.">
+ <entry key="service.ma.conf_file"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/${rrd.config.file.basename}"/>
+ </propertyfile>
+
<copy file="./conf/wsdd/${wsdd.file.deploy}"

todir="${service.home}/${deploy.root}/wsdd"/>
<copy file="./conf/wsdd/${wsdd.file.undeploy}"

todir="${service.home}/${deploy.root}/wsdd"/>

Modified: branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -99,8 +99,8 @@
<entry key="service.r.service_type" value="RRD MA"/>
<entry key="service.r.service_description" value="Java RRD MA,
perfSONAR project"/>

- <entry key="service.log.log4j.config"
value="${basedir}/conf/log4j.properties"/>
- <entry key="service.sax_parser.config"
value="${basedir}/src/objects.config"/>
+ <entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+ <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>

<entry key="service.r.ma.characteristic"
value="utitlization"/>
<entry key="service.r.ma.measurement_tool"
value="cricket,mrtg,cacti"/>
@@ -112,7 +112,7 @@

<entry key="service.ma.xmldb.db_store" value="off"/>

- <entry key="service.ma.rrd.xmldb.db_store.data_dir"
value="${basedir}/"/>
+ <entry key="service.ma.rrd.xmldb.db_store.data_dir"
value="${service.home}/${deploy.root}/WEB-INF/logs/"/>

<entry
key="service.ma.rrd.rrd_storage_manager_rrd_DS_type_default"
value="COUNTER:1800:0:10000000000000"/>
<entry
key="service.ma.rrd.rrd_storage_manager_rrd_step_default" value="300"/>
@@ -155,7 +155,8 @@

<input message="Do you want the service to accept messages with
measurement data and store them? "
addproperty="_functionality.store.decision"
- validargs="y,n" />
+ validargs="y,n"
+ defaultvalue="n"/>

<condition property="functionality.store.decision">
<equals arg1="y" arg2="${_functionality.store.decision}"/>

Modified:
branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-libs-download-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-libs-download-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-libs-download-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -22,11 +22,6 @@

<artifact:dependencies>

- <dependency groupId="exist" artifactId="exist-xmldb"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-db"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-xmlrpc"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-optional"
version="1.0rc"/>
-
<dependency groupId="com.ibatis" artifactId="ibatis-sqlmap"
version="2.1.7.597"/>
<dependency groupId="com.ibatis" artifactId="ibatis-common"
version="2.1.7.597"/>

Modified: branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -22,7 +22,7 @@

<property name="_exist.war.download.url"
-
value="http://downloads.sourceforge.net/exist/exist-1.0.1.war?modtime=1161732157&big_mirror=1";
/>
+
value="http://prdownloads.sourceforge.net/exist/exist-1.0.1.war"; />
<property name="exist.war.file" value="exist-1.0.1.war" />

<property file="ant/const.properties" />
@@ -172,7 +172,7 @@
<input message="Do you want me to compile rrdjtool library for you
(if not you will have to do it manually in ${basedir}/contrib/rrdjtool after
pre-install step)? "
addproperty="_rrdjtool.build.decision"
validargs="y,n"
- defaultvalue="n" />
+ defaultvalue="y" />

<condition property="rrdjtool.build.decision">
<equals arg1="y" arg2="${_rrdjtool.build.decision}"/>
@@ -242,7 +242,7 @@
<input message="Usage of eXist xml database is recommended for the
service. Installing/configuring this database as a web application in your
Tomcat is also suggested. Do you want me to do this for you? "
addproperty="_exist.war.install.decision"
validargs="y,n"
- defaultvalue="n" />
+ defaultvalue="y" />

<condition property="exist.war.install.decision">
<equals arg1="y" arg2="${_exist.war.install.decision}"/>
@@ -291,7 +291,8 @@
</propertyfile>

- <dirname property="_exist.war.install.location" file="${basedir}"/>
+ <dirname property="__exist.war.install.location" file="${basedir}"/>
+ <dirname property="_exist.war.install.location"
file="${__exist.war.install.location}"/>

<input message="Enter the path of directory where downloaded eXist
war file is located [${_exist.war.install.location}]:"
addproperty="exist.war.install.location"
@@ -319,7 +320,8 @@
</propertyfile>

- <dirname property="_exist.war.install.location" file="${basedir}"/>
+ <dirname property="__exist.war.install.location" file="${basedir}"/>
+ <dirname property="_exist.war.install.location"
file="${__exist.war.install.location}"/>

<input message="Enter the path of directory where eXist war file
will be located [${_exist.war.install.location}]:"
addproperty="exist.war.install.location"

Modified: branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-axis-deploy-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-axis-deploy-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-axis-deploy-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -42,6 +42,14 @@
<copy file="./conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="./conf/eventType-rules.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

+ <copy file="${service.ma.conf_file}"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+
+ <basename property="sql.config.file.basename"
file="${service.ma.conf_file}" />
+ <propertyfile
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"
+ comment="This file was created by the ant script.">
+ <entry key="service.ma.conf_file"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/${sql.config.file.basename}"/>
+ </propertyfile>
+
<copy file="./conf/wsdd/${wsdd.file.deploy}"
todir="${service.home}/${deploy.root}/wsdd"/>
<copy file="./conf/wsdd/${wsdd.file.undeploy}"
todir="${service.home}/${deploy.root}/wsdd"/>

@@ -129,7 +137,7 @@

<echo>Please, make sure that Tomcat is running.</echo>
<echo>You can do it using your web browser and connect the address
http://${target.server}:${target.port}</echo>
- <echo>or looking at Tomcat's log file (catalina.out).</echo>
+ <echo>or looking at Tomcat's log file
(${tomcat.home}/logs/catalina.out).</echo>

<input message="Press Enter when finished"/>

@@ -138,7 +146,7 @@

<target name="tomcat-start-for-sqlma-false"
unless="tomcat.start.decision">
-
+
<echo>Please, insert now the following xml tag 'Context'</echo>
<echo>into Tomcat configuration file server.xml</echo>
<echo>(${tomcat.home}/conf/server.xml)</echo>
@@ -155,10 +163,10 @@

<echo></echo>
<echo>Please, make sure that Tomcat is running.</echo>
-
+
<echo></echo>
<input message="Please do it now and press Enter when finished"/>
-
+
</target>

Modified: branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-configure-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-configure-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -102,8 +102,8 @@
<entry key="service.r.service_type" value="SQL MA"/>
<entry key="service.r.service_description" value="Java SQL MA,
perfSONAR project"/>

- <entry key="service.log.log4j.config"
value="${basedir}/conf/log4j.properties"/>
- <entry key="service.sax_parser.config"
value="${basedir}/src/objects.config"/>
+ <entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+ <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>

<entry key="service.ma.conf_file"
value="${sql.config.file}"/>
<entry key="service.ma.message_types"
value="MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest"/>
@@ -137,7 +137,8 @@

<input message="Do you want the service to accept messages with
measurement data and store them? "
addproperty="_functionality.store.decision"
- validargs="y,n" />
+ validargs="y,n"
+ defaultvalue="n"/>

<condition property="functionality.store.decision">
<equals arg1="y" arg2="${_functionality.store.decision}"/>
@@ -233,23 +234,25 @@
<echo></echo>
<echo>If you want the service to support data of utilization
metric</echo>
<echo>update connection parameters in
ibatis-SqlMapConfig-utilization.xml file</echo>
- <echo>that you can find in conf directory of perfSONAR SQL MA
package.</echo>
+ <echo>that you can find in conf directory (${basedir}/conf)</echo>
+ <echo>of perfSONAR SQL MA installation package.</echo>

<echo></echo>
<echo>If you want the service to support data of L2 path status
metric</echo>
<echo>update connection parameters in
ibatis-SqlMapConfig-L2-status-domain.xml</echo>
<echo>and ibatis-SqlMapConfig-L2-status-interdomain.xml files</echo>
- <echo>that you can find in conf directory of perfSONAR SQL MA
package.</echo>
+ <echo>that you can find in conf directory (${basedir}/conf)</echo>
+ <echo>of perfSONAR SQL MA installation package.</echo>

<echo></echo>
<echo>Each parameter in these files is represented by property
element.</echo>
<echo>Check value attribute of each property and if it is needed
alter it</echo>
<echo>to have correct connection with the database.</echo>
-
+
<echo></echo>
<input message="Please do it now and press Enter when finished"/>

- </target>
+ </target>



Modified:
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-libs-download-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-libs-download-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-libs-download-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -26,11 +26,6 @@

<artifact:dependencies>

- <dependency groupId="exist" artifactId="exist-xmldb"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-db"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-xmlrpc"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-optional"
version="1.0rc"/>
-
<dependency groupId="com.ibatis" artifactId="ibatis-sqlmap"
version="2.1.7.597"/>
<dependency groupId="com.ibatis" artifactId="ibatis-common"
version="2.1.7.597"/>

Modified: branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-pre-install-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-pre-install-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-pre-install-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -22,7 +22,7 @@

<property name="_exist.war.download.url"
-
value="http://downloads.sourceforge.net/exist/exist-1.0.1.war?modtime=1161732157&big_mirror=1";
/>
+
value="http://prdownloads.sourceforge.net/exist/exist-1.0.1.war"; />
<property name="exist.war.file" value="exist-1.0.1.war" />

<property file="ant/const.properties" />
@@ -44,7 +44,7 @@
<entry key="component.ma.xmldb.db_username"
value="sqlmaservice"/>
<entry key="component.ma.xmldb.db_password"
value="sqlmaservice"/>

- </propertyfile>
+ </propertyfile>

</target>

@@ -72,7 +72,7 @@
<input message="Usage of eXist xml database is recommended for the
service. Installing/configuring this database as a web application in your
Tomcat is also suggested. Do you want me to do this for you? "
addproperty="_exist.war.install.decision"
validargs="y,n"
- defaultvalue="n" />
+ defaultvalue="y" />

<condition property="exist.war.install.decision">
<equals arg1="y" arg2="${_exist.war.install.decision}"/>
@@ -84,7 +84,7 @@
<target name="exist-war-question"
depends="_exist-war-question"
if="exist.war.install.decision">
-
+
<input message="Do you want me to download eXist web application
package (if not you have to do it manually)? "
addproperty="exist.war.install.type.decision"
validargs="y,n"
@@ -121,7 +121,8 @@
</propertyfile>

- <dirname property="_exist.war.install.location" file="${basedir}"/>
+ <dirname property="__exist.war.install.location" file="${basedir}"/>
+ <dirname property="_exist.war.install.location"
file="${__exist.war.install.location}"/>

<input message="Enter the path of directory where downloaded eXist
war file is located [${_exist.war.install.location}]:"
addproperty="exist.war.install.location"
@@ -149,7 +150,8 @@
</propertyfile>

- <dirname property="_exist.war.install.location" file="${basedir}"/>
+ <dirname property="__exist.war.install.location" file="${basedir}"/>
+ <dirname property="_exist.war.install.location"
file="${__exist.war.install.location}"/>

<input message="Enter the path of directory where eXist war file
will be located [${_exist.war.install.location}]:"
addproperty="exist.war.install.location"
@@ -365,7 +367,7 @@

<propertyfile file="conf/service.properties"
comment="This file was created by the Ant configuration script.">
-
+
<entry key="component.ma.xmldb.db_username"
value="${_exist.username}"/>
<entry key="component.ma.xmldb.db_password"
value="${_exist.password}"/>

@@ -416,7 +418,8 @@
<echo>In order to maintain data of utilization metric and/or L2 path
status metric,</echo>
<echo>please, prepare your relational database.</echo>
<echo>In case of mySQL use simple script file
mysql-sqlma-dbsetup.sql</echo>
- <echo>that you can find in conf directory of perfSONAR SQL MA
package.</echo>
+ <echo>that you can find in conf directory (${basedir}/conf)</echo>
+ <echo>of perfSONAR SQL MA installation package.</echo>
<echo>In case of postgreSQL use psql-sqlma-dbsetup.sql. </echo>
<echo>(Warning: remember to change the password for perfsonar_ma
user!)</echo>
<echo></echo>

Modified: branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-test-run-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-test-run-targets.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++ branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-test-run-targets.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -51,6 +51,7 @@
print="true"
classpathref="classpath">
select version();
+ select * from domain_link;
</sql>
</target>

Copied: branches/JAVA-SQL-MA-STABLE/conf/log4j.properties.template (from rev
2090, trunk/perfsonar/conf/log4j.properties.template)

Copied: branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol (from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol)

Copied: branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus
(from rev 2090, trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoRequest.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoRequest.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoRequest.rnc)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoResponse.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoResponse.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/echoResponse.rnc)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterRequest.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterRequest.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterRequest.rnc)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterResponse.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterResponse.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/lsRegisterResponse.rnc)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreRequest.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreRequest.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreRequest.rnc)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreResponse.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreResponse.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/measurementArchiveStoreResponse.rnc)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyRequest.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyRequest.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyRequest.rnc)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyResponse.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyResponse.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/metadataKeyResponse.rnc)

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoRequest.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoRequest.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoRequest.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoResponse.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoResponse.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-echoResponse.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterRequest.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterRequest.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterRequest.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterResponse.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterResponse.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-lsRegisterResponse.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example1.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example1.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example1.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example2.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example2.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example2.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example3.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example3.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example3.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example4.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example4.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-measurementArchiveStoreRequest-example4.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example1.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example1.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example1.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example2.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example2.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example2.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example3.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example3.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyRequest-example3.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example1.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example1.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example1.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example2.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example2.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example2.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example3.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example3.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-metadataKeyResponse-example3.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example1.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example1.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example1.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example2.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example2.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example2.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example3.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example3.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example3.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example4.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example4.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example4.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example5.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example5.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example5.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example6.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example6.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataRequest-example6.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example1.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example1.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example1.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example2.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example2.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example2.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example3.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example3.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example3.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example4.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example4.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example4.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example5.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example5.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example5.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example6.xml

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example6.xml
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/samples/sqlTypeMA-setupDataResponse-example6.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataRequest.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataRequest.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataRequest.rnc)

Deleted:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataResponse.rnc

Copied:
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataResponse.rnc
(from rev 2090,
trunk/perfsonar/doc/ma/sqlTypeMA/protocol/lightPathStatus/setupDataResponse.rnc)

Deleted: branches/JAVA-SQL-MA-STABLE/schema/clean.sh

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/CommandLineMP-Ping-Request.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -1,24 +1,44 @@
+
<nmwg:message type="MeasurementRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
- xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
+ xmlns:ping="http://ggf.org/ns/nmwg/tools/ping/2.0/";>

+ <nmwg:metadata id="test">
+ <ping:subject id="sub1">
+ <nmwgt:endPointPair>
+
+ 
+
+ <nmwgt:src type="dummy"/>
+ <nmwgt:dst type="ipv4" value="www.perfsonar.net"/>
+ </nmwgt:endPointPair>
+ </ping:subject>
+ <nmwg:eventType>ping</nmwg:eventType>
+ <ping:parameters id="param1">
+ <nmwg:parameter name="count">10</nmwg:parameter>
+ <nmwg:parameter name="interval">1</nmwg:parameter>
+ <nmwg:parameter name="packetSize">64</nmwg:parameter>
+ <nmwg:parameter name="ttl">255</nmwg:parameter>
+ </ping:parameters>
+ </nmwg:metadata>
+
+ <nmwg:data id="1" metadataIdRef="test" />

-<nmwg:metadata id="test">
- <ping:subject id="sub1">
- <nmwgt:endPointPair>
- <nmwgt:dst type="ipv4" value="www.perfsonar.net"/>
- </nmwgt:endPointPair>
- </ping:subject>
- <nmwg:eventType>ping</nmwg:eventType>
- <ping:parameters id="param1">
- <nmwg:parameter name="count">10</nmwg:parameter>
- <nmwg:parameter name="interval">1</nmwg:parameter>
- <nmwg:parameter name="packetSize">64</nmwg:parameter>
- <nmwg:parameter name="ttl">255</nmwg:parameter>
- </ping:parameters>
-
-</nmwg:metadata>
-<nmwg:data id="1" metadataIdRef="test" />
</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -4,15 +4,13 @@


<nmwg:message type="EchoRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

- <nmwg:metadata id="meta">
- <nmwg:eventType>echo</nmwg:eventType>
- </nmwg:metadata>
+ <nmwg:metadata id="meta">
+ <nmwg:eventType>echo</nmwg:eventType>
+ </nmwg:metadata>

- <nmwg:data id="data" metadataIdRef="meta"/>
+ <nmwg:data id="data" metadataIdRef="meta"/>

-
-
</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSDeregisterRequest.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -4,17 +4,17 @@


<nmwg:message type="LSDeregisterRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

- <nmwg:metadata id="deregister">
- <nmwg:key>
- <nmwg:parameters id="keys">
- <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
+ <nmwg:metadata id="deregister">
+ <nmwg:key>
+ <nmwg:parameters id="keys">
+ <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>

- <nmwg:data metadataIdRef="deregister"/>
+ <nmwg:data metadataIdRef="deregister" id="d1"/>

</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSKeepaliveRequest.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -4,17 +4,17 @@


<nmwg:message type="LSKeepaliveRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>

- <nmwg:metadata id="key_to_keepalive">
- <nmwg:key>
- <nmwg:parameters id="keys">
- <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>
- </nmwg:metadata>
+ <nmwg:metadata id="key_to_keepalive">
+ <nmwg:key>
+ <nmwg:parameters id="keys">
+ <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>
+ </nmwg:metadata>

- <nmwg:data metadataIdRef="key_to_keepalive"/>
+ <nmwg:data metadataIdRef="key_to_keepalive" id="d1"/>

</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSQueryRequest.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -14,12 +14,10 @@



-
-<nmwg:message
- type="LSQueryRequest"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-
xmlns:xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";>
+<nmwg:message type="LSQueryRequest"
+ id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+
xmlns:xquery="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";>

<nmwg:metadata id="meta1">

@@ -36,6 +34,6 @@

</nmwg:metadata>

- <nmwg:data metadataIdRef="meta1"/>
+ <nmwg:data metadataIdRef="meta1" id="d1"/>

</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest-Update.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -8,96 +8,86 @@

xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";

xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>
+
+ <nmwg:metadata id="serviceLookupInfo">

-
+ 
+ <nmwg:key>
+ <nmwg:parameters id="param1">
+ <nmwg:parameter
name="lsKey">http://reed.man.poznan.pl:8080/axis/services/MA</nmwg:parameter>
+ </nmwg:parameters>
+ </nmwg:key>

-

- <nmwg:metadata id="serviceLookupInfo">
+ 
+ <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
+ <psservice:serviceName>My_test_MA</psservice:serviceName>
+
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
+ <psservice:serviceType>MA</psservice:serviceType>
+ <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
+ </psservice:service>
+ </perfsonar:subject>
+ </nmwg:metadata>
+
+ <nmwg:data id="data0" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="meta1">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>

- 
- <nmwg:key>
- <nmwg:parameters id="param1">
- <nmwg:parameter name="lsKey">
- http://reed.man.poznan.pl:8080/axis/services/MA
- </nmwg:parameter>
- </nmwg:parameters>
- </nmwg:key>

-
- 
-
- <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
- <psservice:serviceName>My_test_MA</psservice:serviceName>
-
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
- </psservice:service>
- </perfsonar:subject>
+ <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="meta2">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
</nmwg:metadata>
-
- <nmwg:data id="data0" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
+ </nmwg:data>

- <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="meta2">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
-
-


-
</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/LSRegisterRequest.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -9,80 +9,76 @@
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";

xmlns:netutil="http://ggf.org/ns/nmwg/characteristic/utilization/2.0/";>

- <nmwg:metadata id="serviceLookupInfo">
- <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
- <psservice:serviceName>My_test_MA</psservice:serviceName>
-
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
- <psservice:serviceType>MA</psservice:serviceType>
- <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
- </psservice:service>
- </perfsonar:subject>
- </nmwg:metadata>
+ <nmwg:metadata id="serviceLookupInfo">
+ <perfsonar:subject id="commonParameters"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <psservice:service id="serviceParameters"
xmlns:psservice="http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";>
+ <psservice:serviceName>My_test_MA</psservice:serviceName>
+
<psservice:accessPoint>http://reed.man.poznan.pl:8080/axis/services/MA</psservice:accessPoint>
+ <psservice:serviceType>MA</psservice:serviceType>
+ <psservice:serviceDescription>This is my testing
MA</psservice:serviceDescription>
+ </psservice:service>
+ </perfsonar:subject>
+ </nmwg:metadata>

- <nmwg:data id="data0" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="meta1">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
+ <nmwg:data id="data0" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="meta1">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>

- <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
- <nmwg:metadata id="meta2">
- <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
- <nmwgt:interface
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
-
<nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
- <nmwgt:ifName>unknown</nmwgt:ifName>
-
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
- <nmwgt:ifAddress
type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:direction>in</nmwgt:direction>
- <nmwgt:capacity>10000000000</nmwgt:capacity>
- </nmwgt:interface>
- </perfsonar:subject>
- <nmwg:eventType>utilization</nmwg:eventType>
- </nmwg:metadata>
- </nmwg:data>
+ <nmwg:data id="data1" metadataIdRef="serviceLookupInfo">
+ <nmwg:metadata id="meta2">
+ <perfsonar:subject id="subj1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";>
+ <nmwgt:interface xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
+ <nmwgt:hostName>atlang22-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifName>unknown</nmwgt:ifName>
+
<nmwgt:ifDescription>hstn:oc192(p2p)::show:intracloud</nmwgt:ifDescription>
+ <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
+ <nmwgt:direction>in</nmwgt:direction>
+ <nmwgt:capacity>10000000000</nmwgt:capacity>
+ </nmwgt:interface>
+ </perfsonar:subject>
+ <nmwg:eventType>utilization</nmwg:eventType>
+ </nmwg:metadata>
+ </nmwg:data>

-

-
-
+
</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -4,7 +4,6 @@
may be be multiple blocks) for storage into a
MeasurementArchive -->

-
<nmwg:message id="msg4"
type="MeasurementArchiveStoreRequest"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
@@ -12,7 +11,6 @@
xmlns:select="http://ggf.org/ns/nmwg/ops/select/2.0/";
xmlns:ifevt="http://ggf.org/ns/nmwg/event/status/base/2.0/";>

-
<nmwg:metadata id="meta1">
<nmwg:subject id="subject1">
<nmtl2:link>
@@ -22,7 +20,6 @@
<nmwg:eventType>Path.Status</nmwg:eventType>
</nmwg:metadata>

-
<nmwg:data id="data1" metadataIdRef="meta1">
<ifevt:datum timeType="unix" timeValue="1157107685">
<ifevt:stateAdmin>TEST2</ifevt:stateAdmin>
@@ -30,5 +27,4 @@
</ifevt:datum>
</nmwg:data>

-
</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -26,7 +26,6 @@
<nmwgt:direction>in</nmwgt:direction>
<nmwgt:hostName>test-hostName</nmwgt:hostName>
<nmwgt:ifName>test-0</nmwgt:ifName>
- <nmwgt:direction>in</nmwgt:direction>
<nmwgt:authRealm>TestRealm</nmwgt:authRealm>
<nmwgt:capacity>1000BaseT</nmwgt:capacity>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/Void.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/Void.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/TOPS/test/Void.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -4,10 +4,12 @@
and register the Topology Service in the LS.
-->

-<nmwg:message
- type="TopsVoid"
- id="msg1"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-

+<nmwg:message type="TopsVoid" id="msg1"
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+
+ <nmwg:metadata id="void0" />
+
+ <nmwg:data id="void1" metadataIdRef="void0"/>
+

</nmwg:message>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/link-status-store.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/link-status-store.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/link-status-store.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -1,92 +1,92 @@
<nmwg:store type="E2E_Link_status_information"
- xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
- xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
-
xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
- xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
- xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";>
+ xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
+ xmlns:nmtm="http://ggf.org/ns/nmwg/time/2.0/";
+ xmlns:nmwgtopo3="http://ggf.org/ns/nmwg/topology/base/3.0/";
+ xmlns:nmtl2="http://ggf.org/ns/nmwg/topology/l2/3.0/";
+ xmlns:nmtl3="http://ggf.org/ns/nmwg/topology/l3/3.0/";>

<nmwg:parameters id="storeId">
- <nmwg:parameter name="DomainName">DFN</nmwg:parameter>
+ <nmwg:parameter name="DomainName">DFN</nmwg:parameter>
</nmwg:parameters>

<nmwg:metadata id="md1">
- <nmwg:subject id="sub-DFN-LRZ">
- <nmwgtopo3:node id="DFN-LRZ">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Munich</nmwgtopo3:city>
- <nmwgtopo3:institution>Leibniz
Rechenzentrum</nmwgtopo3:institution>
- <nmwgtopo3:latitude>X</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>Y</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
+ <nmwg:subject id="sub-DFN-LRZ">
+ <nmwgtopo3:node id="DFN-LRZ">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-LRZ</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Munich</nmwgtopo3:city>
+ <nmwgtopo3:institution>Leibniz Rechenzentrum</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>1.11</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>1.11</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
</nmwg:metadata>

<nmwg:metadata id="md2">
- <nmwg:subject id="sub-DFN-MUE">
- <nmwgtopo3:node id="DFN-MUE">
- <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
- <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
- <nmwgtopo3:country>Germany</nmwgtopo3:country>
- <nmwgtopo3:city>Muenster</nmwgtopo3:city>
- <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
- <nmwgtopo3:latitude>X</nmwgtopo3:latitude>
- <nmwgtopo3:longitude>Y</nmwgtopo3:longitude>
- </nmwgtopo3:node>
- </nmwg:subject>
+ <nmwg:subject id="sub-DFN-MUE">
+ <nmwgtopo3:node id="DFN-MUE">
+ <nmwgtopo3:type>TopologyPoint</nmwgtopo3:type>
+ <nmwgtopo3:name type="logical">DFN-MUE</nmwgtopo3:name>
+ <nmwgtopo3:country>Germany</nmwgtopo3:country>
+ <nmwgtopo3:city>Muenster</nmwgtopo3:city>
+ <nmwgtopo3:institution>DFN-Verein</nmwgtopo3:institution>
+ <nmwgtopo3:latitude>1.11</nmwgtopo3:latitude>
+ <nmwgtopo3:longitude>1.11</nmwgtopo3:longitude>
+ </nmwgtopo3:node>
+ </nmwg:subject>
</nmwg:metadata>

<nmwg:metadata id="md-link-LRZ-SARA-DEISA-001">
- <nmwg:subject id="sub1">
- <nmtl2:link>
- <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
- <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
- <nmtl2:type>NREN_Link</nmtl2:type>
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+ <nmtl2:name type="logical">DFN-link-1234</nmtl2:name>
+ <nmtl2:globalName type="logical">LRZ-SARA-DEISA-001</nmtl2:globalName>
+ <nmtl2:type>NREN_Link</nmtl2:type>

- <nmwgtopo3:node nodeIdRef="DFN-LRZ">
- <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
+ <nmwgtopo3:node nodeIdRef="DFN-LRZ">
+ <nmwgtopo3:role>EndPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>

- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
-
- </nmtl2:link>
- </nmwg:subject>
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>
+
+ </nmtl2:link>
+ </nmwg:subject>
</nmwg:metadata>

<nmwg:metadata id="md-link-LRZ-SARA-DEISA-002">
- <nmwg:subject id="sub1">
- <nmtl2:link>
- <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
- <nmtl2:globalName
type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
- <nmtl2:type>ID_Link</nmtl2:type>
+ <nmwg:subject id="sub1">
+ <nmtl2:link>
+ <nmtl2:name type="logical">DFN-Surfnet-Link-5678</nmtl2:name>
+ <nmtl2:globalName type="logical">LRZ-SARA-DEISA-002</nmtl2:globalName>
+ <nmtl2:type>ID_Link</nmtl2:type>

- <nmwgtopo3:node nodeIdRef="DFN-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
+ <nmwgtopo3:node nodeIdRef="DFN-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>

- <nmwgtopo3:node nodeIdRef="SURFnet-MUE">
- <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
- </nmwgtopo3:node>
+ <nmwgtopo3:node nodeIdRef="SURFnet-MUE">
+ <nmwgtopo3:role>DemarcPoint</nmwgtopo3:role>
+ </nmwgtopo3:node>

- </nmtl2:link>
- </nmwg:subject>
+ </nmtl2:link>
+ </nmwg:subject>
</nmwg:metadata>

<nmwg:data id="d1" metadataIdRef="md-link-LRZ-SARA-DEISA-001">
- <nmwg:datum timeType="ISO" time="2006-04-20T17:20:00.0+1:00">
- <nmwg:stateOper>Up</nmwg:stateOper>
- <nmwg:stateAdmin>NormalOperation</nmwg:stateAdmin>
- </nmwg:datum>
+ <nmwg:datum timeType="ISO" time="2006-04-20T17:20:00.0+1:00">
+ <nmwg:stateOper>Up</nmwg:stateOper>
+ <nmwg:stateAdmin>NormalOperation</nmwg:stateAdmin>
+ </nmwg:datum>
</nmwg:data>

<nmwg:data id="d2" metadataIdRef="md-link-LRZ-SARA-DEISA-002">
- <nmwg:datum timeType="ISO" time="2006-04-20T17:20:00.0+1:00">
- <nmwg:stateOper>Down</nmwg:stateOper>
- <nmwg:stateAdmin>Maintenance</nmwg:stateAdmin>
- </nmwg:datum>
+ <nmwg:datum timeType="ISO" time="2006-04-20T17:20:00.0+1:00">
+ <nmwg:stateOper>Down</nmwg:stateOper>
+ <nmwg:stateAdmin>Maintenance</nmwg:stateAdmin>
+ </nmwg:datum>
</nmwg:data>

</nmwg:store>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/nmsTypeMP/nmsTypeMP-store-beta1.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -1,4 +1,4 @@
-<perfsonar:store id="msg1"
+<nmwg:store type="sometype" id="msg1"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
@@ -24,7 +24,7 @@

<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.fra-ams.fra.de/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -51,7 +51,7 @@

<nmwg:data id="data2" metadataIdRef="meta2">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.ams-fra.ams.nl/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -79,7 +79,7 @@

<nmwg:data id="data3" metadataIdRef="meta3">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.par-gen.par.fr/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -106,7 +106,7 @@

<nmwg:data id="data4" metadataIdRef="meta4">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.gen-par.gen.ch/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -134,7 +134,7 @@

<nmwg:data id="data5" metadataIdRef="meta5">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.par-lon.par.fr/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -161,7 +161,7 @@

<nmwg:data id="data6" metadataIdRef="meta6">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.lon-par.lon.uk/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -189,7 +189,7 @@

<nmwg:data id="data7" metadataIdRef="meta7">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.bud-bra.bud.hu/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -216,7 +216,7 @@

<nmwg:data id="data8" metadataIdRef="meta8">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.bra-bud.bra.sk/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -244,7 +244,7 @@

<nmwg:data id="data9" metadataIdRef="meta9">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.pra-fra.pra.cz/(odu2TTPId,11170102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -271,7 +271,7 @@

<nmwg:data id="data10" metadataIdRef="meta10">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.fra-pra.fra.de/(odu2TTPId,11170102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -299,7 +299,7 @@

<nmwg:data id="data11" metadataIdRef="meta11">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.mil-gen.mil.it/(odu2TTPId,11180102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -326,7 +326,7 @@

<nmwg:data id="data12" metadataIdRef="meta12">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.gen-mil.gen.ch/(odu2TTPId,11180102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -354,7 +354,7 @@

<nmwg:data id="data13" metadataIdRef="meta13">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.mil-gen.mil.it/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -381,7 +381,7 @@

<nmwg:data id="data14" metadataIdRef="meta14">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter name="wavelength_descr">

ter.gen-mil.gen.ch/(odu2TTPId,11160102),(ochgdcCTPId,1),(rsTrailMonitorId,2),(scannerId,3)
</nmwg:parameter>
@@ -390,4 +390,4 @@
</nmwg:data>

-</perfsonar:store>
+</nmwg:store>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/DataRequest-withKey.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -8,7 +8,7 @@


<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter
name="OIDNumeric">.1.3.6.1.2.1.2.2.1.10</nmwg:parameter>
<nmwg:parameter
name="ifIndex">42</nmwg:parameter>
<nmwg:parameter
name="SNMPAgent">uk1.uk.geant.net</nmwg:parameter>

Modified:
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
===================================================================
---
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
2007-02-20 10:56:11 UTC (rev 2090)
+++
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/snmpTypeMP/snmpTypeMP-store-beta1.xml
2007-02-20 11:52:51 UTC (rev 2091)
@@ -1,4 +1,4 @@
-<perfsonar:store id="msg1"
+<nmwg:store id="msg1" type="sometype"
xmlns:perfsonar="http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";
@@ -27,7 +27,7 @@

<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter
name="OIDNumeric">.1.3.6.1.2.1.2.2.1.10</nmwg:parameter>
<nmwg:parameter
name="ifIndex">42</nmwg:parameter>
<nmwg:parameter
name="SNMPAgent">uk1.uk.geant.net</nmwg:parameter>
@@ -59,7 +59,7 @@

<nmwg:data id="data2" metadataIdRef="meta2">
<nmwg:key>
- <nmwg:parameters>
+ <nmwg:parameters id="someid">
<nmwg:parameter
name="OIDNumeric">.1.3.6.1.2.1.2.2.1.10</nmwg:parameter>
<nmwg:parameter
name="ifIndex">58</nmwg:parameter>
<nmwg:parameter
name="SNMPAgent">uk1.uk.geant.net</nmwg:parameter>
@@ -69,4 +69,4 @@
</nmwg:data>

-</perfsonar:store>
+</nmwg:store>

Deleted: branches/JAVA-SQL-MA-STABLE/schema/service.rnc

Deleted: branches/JAVA-SQL-MA-STABLE/schema/sonar.rnc

r2091 - in branches/JAVA-SQL-MA-STABLE: ant ant/rrdma ant/sqlma conf doc/ma/sqlTypeMA doc/ma/sqlTypeMA/protocol doc/ma/sqlTypeMA/protocol/lightPathStatus doc/ma/sqlTypeMA/protocol/lightPathStatus/samples schema schema/example-instances schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test schema/example-instances/perfSONAR/TOPS/test schema/example-instances/perfSONAR/nmsTypeMP schema/example-instances/perfSONAR/snmpTypeMP, svnlog, 02/20/2007

List archive