perfsonar-dev - r1929 - in branches/ulisseskan: ant ant/rrdma ant/sqlma ant/tcmp ant/xmlls conf conf/template conf/wsdd contrib contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager doc doc/ls doc/ma/rrdTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/metadataConfig src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementPoint/tracefileCaptureType src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security src/org/perfsonar/service/web/wsdd

Subject: perfsonar development work

List archive

r1929 - in branches/ulisseskan: ant ant/rrdma ant/sqlma ant/tcmp ant/xmlls conf conf/template conf/wsdd contrib contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager doc doc/ls doc/ma/rrdTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/metadataConfig src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementPoint/tracefileCaptureType src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security src/org/perfsonar/service/web/wsdd

From:
To:
Subject: r1929 - in branches/ulisseskan: ant ant/rrdma ant/sqlma ant/tcmp ant/xmlls conf conf/template conf/wsdd contrib contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager doc doc/ls doc/ma/rrdTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/metadataConfig src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementPoint/tracefileCaptureType src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security src/org/perfsonar/service/web/wsdd
Date: Wed, 17 Jan 2007 10:12:13 -0500

Author: rodriguez
Date: 2007-01-17 10:12:11 -0500 (Wed, 17 Jan 2007)
New Revision: 1929

Added:
branches/ulisseskan/ant/sqlma/sqlma-pre-install-targets.xml
branches/ulisseskan/ant/tcmp/tcmp-pre-install-targets.xml
branches/ulisseskan/ant/xmlls/build-targets.xml
branches/ulisseskan/ant/xmlls/configure-targets.xml
branches/ulisseskan/ant/xmlls/deploy-targets.xml
branches/ulisseskan/ant/xmlls/libs-download-targets.xml
branches/ulisseskan/ant/xmlls/pre-install-targets.xml
branches/ulisseskan/ant/xmlls/test-targets.xml
branches/ulisseskan/ant/xmlls/undeploy-targets.xml
branches/ulisseskan/conf/components.properties.flowmp
branches/ulisseskan/conf/tomcat-tcmp-tmpl.xml
branches/ulisseskan/contrib/FlowMP-client/
branches/ulisseskan/contrib/FlowMP-client/README
branches/ulisseskan/contrib/FlowMP-client/client.py
branches/ulisseskan/contrib/FlowMP-client/common.py
branches/ulisseskan/contrib/FlowMP-client/config.py
branches/ulisseskan/contrib/FlowMP-client/flowmpclient.py
branches/ulisseskan/contrib/FlowMP-client/schemas/
branches/ulisseskan/contrib/FlowMP-client/schemas/keepalive.xml
branches/ulisseskan/contrib/FlowMP-client/schemas/subscribe.xml
branches/ulisseskan/contrib/FlowMP-client/schemas/unsubscribe.xml
branches/ulisseskan/contrib/FlowMP-client/soapclient.py
branches/ulisseskan/contrib/FlowMP-manager/
branches/ulisseskan/contrib/FlowMP-manager/README
branches/ulisseskan/contrib/FlowMP-manager/common.py
branches/ulisseskan/contrib/FlowMP-manager/config.py
branches/ulisseskan/contrib/FlowMP-manager/manager.py
branches/ulisseskan/contrib/FlowMP-manager/process.log
branches/ulisseskan/contrib/FlowMP-manager/process.py
branches/ulisseskan/doc/deployment.xml
branches/ulisseskan/doc/ls/LS_configuration_files.doc
branches/ulisseskan/doc/ls/LS_functionality_specificatio.doc
branches/ulisseskan/doc/ls/LS_instalaltion_actions.doc
branches/ulisseskan/doc/ls/LS_interface_specification.doc
branches/ulisseskan/doc/ma/rrdTypeMA/Configuration_Files_Specification.doc
branches/ulisseskan/doc/ma/rrdTypeMA/Functional_Specification.doc
branches/ulisseskan/doc/ma/rrdTypeMA/Installation_Actions_Specification.doc
branches/ulisseskan/doc/ma/rrdTypeMA/Interface_Specification.doc

branches/ulisseskan/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc

branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/SqlManager.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/MySqlManager.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/Credentials.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/CredentialsException.java
Removed:
branches/ulisseskan/ant/xmlls/xmlls-axis-deploy-targets.xml
branches/ulisseskan/ant/xmlls/xmlls-client-run-targets.xml
branches/ulisseskan/ant/xmlls/xmlls-configure-targets.xml
branches/ulisseskan/ant/xmlls/xmlls-exist-xmldb-targets.xml
branches/ulisseskan/ant/xmlls/xmlls-java-compile-targets.xml
branches/ulisseskan/ant/xmlls/xmlls-junit-test-targets.xml
branches/ulisseskan/ant/xmlls/xmlls-libs-download-targets.xml
branches/ulisseskan/ant/xmlls/xmlls-release-targets.xml
branches/ulisseskan/ant/xmlls/xmlls-test-run-targets.xml
branches/ulisseskan/contrib/FlowMP-client/README
branches/ulisseskan/contrib/FlowMP-client/client.py
branches/ulisseskan/contrib/FlowMP-client/common.py
branches/ulisseskan/contrib/FlowMP-client/config.py
branches/ulisseskan/contrib/FlowMP-client/flowmpclient.py
branches/ulisseskan/contrib/FlowMP-client/schemas/
branches/ulisseskan/contrib/FlowMP-client/schemas/keepalive.xml
branches/ulisseskan/contrib/FlowMP-client/schemas/subscribe.xml
branches/ulisseskan/contrib/FlowMP-client/schemas/unsubscribe.xml
branches/ulisseskan/contrib/FlowMP-client/soapclient.py
branches/ulisseskan/contrib/FlowMP-manager/README
branches/ulisseskan/contrib/FlowMP-manager/common.py
branches/ulisseskan/contrib/FlowMP-manager/config.py
branches/ulisseskan/contrib/FlowMP-manager/manager.py
branches/ulisseskan/contrib/FlowMP-manager/process.log
branches/ulisseskan/contrib/FlowMP-manager/process.py

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/SqlManager.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/MySqlManager.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/Credentials.java

branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/CredentialsException.java
Modified:
branches/ulisseskan/ant/build-flowmp.xml
branches/ulisseskan/ant/build-sqlma.xml
branches/ulisseskan/ant/build-tcmp.xml
branches/ulisseskan/ant/pre-install-targets.xml
branches/ulisseskan/ant/rrdma/rrdma-client-run-targets.xml
branches/ulisseskan/ant/sqlma/sqlma-axis-deploy-targets.xml
branches/ulisseskan/ant/sqlma/sqlma-client-run-targets.xml
branches/ulisseskan/ant/sqlma/sqlma-configure-targets.xml
branches/ulisseskan/ant/sqlma/sqlma-exist-xmldb-targets.xml
branches/ulisseskan/ant/sqlma/sqlma-java-compile-targets.xml
branches/ulisseskan/ant/sqlma/sqlma-libs-download-targets.xml
branches/ulisseskan/ant/sqlma/sqlma-release-targets.xml
branches/ulisseskan/ant/sqlma/sqlma-test-run-targets.xml
branches/ulisseskan/ant/tcmp/mapijni-compile-targets.xml
branches/ulisseskan/ant/tcmp/tcmp-axis-deploy-targets.xml
branches/ulisseskan/ant/tcmp/tcmp-client-run-targets.xml
branches/ulisseskan/ant/tcmp/tcmp-configure-targets.xml
branches/ulisseskan/ant/tcmp/tcmp-java-compile-targets.xml
branches/ulisseskan/ant/tcmp/tcmp-libs-download-targets.xml
branches/ulisseskan/conf/log4j.properties
branches/ulisseskan/conf/template/const.properties.ls-template
branches/ulisseskan/conf/template/service.properties.ls-template
branches/ulisseskan/conf/wsdd/tcmp-service-deploy.wsdd
branches/ulisseskan/conf/wsdd/tcmp-service-undeploy.wsdd
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Req.xml

branches/ulisseskan/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java

branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java

branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java

branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java

branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java

branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java

branches/ulisseskan/src/org/perfsonar/service/web/wsdd/tcmp-service-deploy.wsdd

branches/ulisseskan/src/org/perfsonar/service/web/wsdd/tcmp-service-undeploy.wsdd
Log:
Update the topology service

Modified: branches/ulisseskan/ant/build-flowmp.xml
===================================================================
--- branches/ulisseskan/ant/build-flowmp.xml 2007-01-17 11:31:55 UTC (rev
1928)
+++ branches/ulisseskan/ant/build-flowmp.xml 2007-01-17 15:12:11 UTC (rev
1929)
@@ -3,7 +3,7 @@
<property file="ant/const.properties" />

<path id="classpath">
- <fileset dir="../../">
+ <fileset dir="../">
<include name="**/*.jar"/>
</fileset>
<pathelement location="build"/>
@@ -13,18 +13,20 @@
<tstamp/>
</target>

- 
+ 
+ <import file="pre-install-targets.xml"/>
<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ 
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>

- 
- <import file="flowmp/flowTypeMP-test-targets.xml"/>
- <import file="flowmp/flowTypeMP-java-compile-targets.xml"/>
- <import file="flowmp/flowTypeMP-axis-deploy-targets.xml"/>
- <import file="flowmp/flowTypeMP-configure-targets.xml"/>
- <import file="flowmp/flowTypeMP-doc-targets.xml"/>
- <import file="flowmp/flowTypeMP-release-targets.xml"/>
-</project>
\ No newline at end of file
+ 
+ <import file="flowmp/flowmp-pre-install-targets.xml"/>
+ <import file="flowmp/flowmp-junit-test-targets.xml"/>
+ <import file="flowmp/flowmp-java-compile-targets.xml"/>
+ <import file="flowmp/flowmp-axis-deploy-targets.xml"/>
+ <import file="flowmp/flowmp-configure-targets.xml"/>
+ 
+ <import file="flowmp/flowmp-release-targets.xml"/>
+</project>

Modified: branches/ulisseskan/ant/build-sqlma.xml
===================================================================
--- branches/ulisseskan/ant/build-sqlma.xml 2007-01-17 11:31:55 UTC (rev
1928)
+++ branches/ulisseskan/ant/build-sqlma.xml 2007-01-17 15:12:11 UTC (rev
1929)
@@ -17,17 +17,16 @@

-<project basedir="../" default="compile-sqlma" name="perfsonar-sqlma">
+<project basedir="../" name="perfsonar-sqlma">

- <property file="ant/const.properties" />

-
<path id="classpath">
<fileset dir="./lib/repository">
<include name="**/*.jar"/>
</fileset>
- <pathelement location="build"/>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ <pathelement location="build/perfSONAR-sqlma.jar"/>
</path>

@@ -41,7 +40,7 @@

<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ <import file="pre-install-targets.xml"/>
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>
<import file="libs-download-targets.xml"/>
@@ -49,13 +48,12 @@



- <import file="rrdma/rrdma-java-compile-targets.xml"/>
<import file="rrdma/rrdma-exist-xmldb-targets.xml"/>

-


+ <import file="sqlma/sqlma-pre-install-targets.xml"/>
<import file="sqlma/sqlma-java-compile-targets.xml"/>
<import file="sqlma/sqlma-axis-deploy-targets.xml"/>
<import file="sqlma/sqlma-client-run-targets.xml"/>

Modified: branches/ulisseskan/ant/build-tcmp.xml
===================================================================
--- branches/ulisseskan/ant/build-tcmp.xml 2007-01-17 11:31:55 UTC (rev
1928)
+++ branches/ulisseskan/ant/build-tcmp.xml 2007-01-17 15:12:11 UTC (rev
1929)
@@ -40,7 +40,7 @@

<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ <import file="pre-install-targets.xml"/>
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>
<import file="libs-download-targets.xml"/>
@@ -49,10 +49,16 @@



+ <import file="tcmp/tcmp-pre-install-targets.xml"/>
<import file="tcmp/mapijni-compile-targets.xml"/>
<import file="tcmp/tcmp-axis-deploy-targets.xml"/>
<import file="tcmp/tcmp-java-compile-targets.xml"/>
<import file="tcmp/tcmp-client-run-targets.xml"/>
+ 
<import file="tcmp/tcmp-configure-targets.xml"/>
<import file="tcmp/tcmp-libs-download-targets.xml"/>

Modified: branches/ulisseskan/ant/pre-install-targets.xml
===================================================================
--- branches/ulisseskan/ant/pre-install-targets.xml 2007-01-17 11:31:55
UTC (rev 1928)
+++ branches/ulisseskan/ant/pre-install-targets.xml 2007-01-17 15:12:11
UTC (rev 1929)
@@ -172,7 +172,9 @@
depends="webservice-container-question"
if="tomcat.install.decision">

- <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/ulisseskan/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/rrdma/rrdma-client-run-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/rrdma/rrdma-client-run-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -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>

Modified: branches/ulisseskan/ant/sqlma/sqlma-axis-deploy-targets.xml
===================================================================
--- branches/ulisseskan/ant/sqlma/sqlma-axis-deploy-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/sqlma/sqlma-axis-deploy-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -21,51 +21,61 @@

<target name="copy-jars-for-sqlma" depends="copy-jars-for-service">

- <copy
file="./lib/repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/com/ibatis/ibatis-common/2.1.7.597/ibatis-common-2.1.7.597.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/com/ibatis/ibatis-common/2.1.7.597/ibatis-common-2.1.7.597.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <copy
file="./lib/repository/exist/exist-db/1.0rc/exist-db-1.0rc.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/exist/exist-xmlrpc/1.0rc/exist-xmlrpc-1.0rc.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-db/1.0rc/exist-db-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-xmlrpc/1.0rc/exist-xmlrpc-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <copy todir="${axis.home}/WEB-INF/classes">
+ <copy todir="${service.home}/${deploy.root}/WEB-INF/classes">
<fileset dir="./conf">
<include name="ibatis-*.xml"/>
</fileset>
</copy>

- <copy file="./conf/eventType-map.xml"
todir="${axis.home}/WEB-INF/classes"/>
- <copy file="./conf/eventType-rules.xml"
todir="${axis.home}/WEB-INF/classes"/>
+ <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="./conf/wsdd/${wsdd.file.deploy}"
todir="${service.home}/${deploy.root}/wsdd"/>
+ <copy file="./conf/wsdd/${wsdd.file.undeploy}"
todir="${service.home}/${deploy.root}/wsdd"/>
+
</target>

<target name="delete-jars-for-sqlma" depends="delete-jars-for-service">

- <delete
file="${axis.home}/WEB-INF/lib/mysql-connector-java-5.0.3.jar"/>
- <delete
file="${axis.home}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/ibatis-common-2.1.7.597.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/ibatis-sqlmap-2.1.7.597.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/commons-digester-1.7.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/commons-collections-3.2.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/mysql-connector-java-5.0.3.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/ibatis-common-2.1.7.597.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/ibatis-sqlmap-2.1.7.597.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-digester-1.7.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-collections-3.2.jar"/>

- <delete file="${axis.home}/WEB-INF/lib/exist-db-1.0rc.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/exist-xmldb-1.0rc.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/exist-xmlrpc-1.0rc.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-db-1.0rc.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-xmldb-1.0rc.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-xmlrpc-1.0rc.jar"/>

+ 

+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
+
</target>

@@ -87,43 +97,124 @@
if="jar.perfsonar.sqlma.present"
description="Copy sqlma jar to Tomcat">

- <copy file="${build}/perfSONAR-sqlma.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="${build}/perfSONAR-sqlma.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <echo/>
- <echo>------------------------------ WARNING
---------------------------</echo>
- <echo/>
- <echo>Restart your application server (container of perfSONAR
service)!!!</echo>
- <echo/>
-
<echo>------------------------------------------------------------------</echo>
+ </target>

+
+ <target name="tomcat-start-for-sqlma-true"
+ depends="tomcat-start-question"
+ if="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>
+ <echo>inside existing xml tag 'Host':</echo>
+ <echo></echo>
+ <echo message=" <Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'>"/>
+ <echo message=" </Context>"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="startup.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ <env key="CATALINA_HOME" path=""/>
+ <env key="CATALINA_BASE" path=""/>
+ </exec>
+
+ <echo>Please, make sure that the Tomcat is running. Use the address
http://${target.server}:${target.port} .</echo>
+ <input message="Press Return key ..."/>
+
</target>

- <target name="deploy-sqlma" depends="copy-sqlma-jar"
+ <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>
+ <echo>inside existing xml tag 'Host':</echo>
+ <echo></echo>
+ <echo message=" <Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'>"/>
+ <echo message=" </Context>"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+ <echo></echo>
+ <echo>After setting up the variable (re)start the Tomcat.</echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ <target name="tomcat-start-for-sqlma"
+ depends="tomcat-start-for-sqlma-true,tomcat-start-for-sqlma-false">
+
+ </target>
+
+
+ 
+
+ 
+
+
+ <target name="deploy" depends="copy-sqlma-jar"
description="Deploys SQL MA service">
- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${deployFile}"/>
- <classpath refid="classpath"/>
- </java>
+
+ <echo>Deploying the service...</echo>
+
+ <antcall target="tomcat-start-for-sqlma" />
+
+ <antcall target="xmldb-adduser-sqlma" />
+
+ <antcall target="deploy-adminclient" />
+
</target>

- <target name="undeploy-sqlma"
+ <target name="undeploy"
description="Undeploys SQL MA service">

- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${undeployFile}"/>
- <classpath refid="classpath"/>
- </java>
+ <echo>Undeploying the service...</echo>

+ <antcall target="undeploy-adminclient" />
+
+ 
+ 
+
<antcall target="delete-jars-for-sqlma"/>

- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-sqlma.jar"/>
+ <antcall target="tomcat-shutdown" />

</target>

-
</project>
\ No newline at end of file

Modified: branches/ulisseskan/ant/sqlma/sqlma-client-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/sqlma/sqlma-client-run-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/sqlma/sqlma-client-run-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -17,17 +17,18 @@
<project name="sqlma-client-run-targets">

- <property name="ma.local"
value="http://${target.server}:${target.port}/axis/services/MeasurementArchiveService"/>

+ <property name="ma.local"
value="http://${target.server}:${target.port}/${deploy.root}/services/MeasurementArchiveService"/>

+


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

@@ -36,8 +37,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.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>
</java>
</target>

@@ -46,8 +47,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-4.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>
</java>
</target>

@@ -56,8 +57,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-5.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>
</java>
</target>

@@ -66,8 +67,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
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-5.xml"/>
</java>
</target>

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

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

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

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

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

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

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

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

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

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

@@ -179,8 +180,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>

Modified: branches/ulisseskan/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- branches/ulisseskan/ant/sqlma/sqlma-configure-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/sqlma/sqlma-configure-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -16,84 +16,65 @@

- <target name="get-xmldb-address">
- <input message="Enter the address of xmldb eXist [localhost]:"
- addproperty="xmldb.address"
- defaultvalue="localhost"
- />
- <input message="Enter the port of xmldb eXist [8090]:"
- addproperty="xmldb.port"
- defaultvalue="8090"
- />
- <input message="Enter the type of access to xmldb eXist (xmlrpc or
http) [xmlrpc]:"
- addproperty="_xmldb.access"
- defaultvalue="xmlrpc"
- />
+ <property file="ant/const.properties" />

- <condition property="xmldb.access" value="xmldb:exist">
- <equals arg1="xmlrpc" arg2="${_xmldb.access}"/>
- </condition>
- <condition property="xmldb.access" value="http">
- <equals arg1="http" arg2="${_xmldb.access}"/>
- </condition>
+ <property name="deploy.root" value="${service.name}" />

- <condition property="uri.resource.id" value="rest">
- <equals arg1="http" arg2="${xmldb.access}"/>
- </condition>
- <condition property="uri.resource.id" value="xmlrpc">
- <equals arg1="xmlrpc" arg2="${_xmldb.access}"/>
- </condition>
- <echo message="Accepted xmldb server is
${xmldb.access}://${xmldb.address}:${xmldb.port}/exist/${uri.resource.id}/db/sqlmaconfig"/>

- </target>
- 
+ 

+
<target name="__get-sql-config-file">
+
<input message="Enter the path of sql metadata config file
[${basedir}/conf/sql-database_TEST.xml]:"
- addproperty="sql.config.file"
- defaultvalue="${basedir}/conf/sql-database_TEST.xml"
+ addproperty="sql.config.file"
+ defaultvalue="${basedir}/conf/sql-database_TEST.xml"
/>
<available file="${sql.config.file}"
property="sql.config.file.present"/>
+
</target>

- <target name="_get-sql-config-file_1" depends="__get-sql-config-file"
if="sql.config.file.present">
- <echo message="Accepted sql metadata config file:
${sql.config.file}"/>
+
+ <target name="_get-sql-config-file_1"
+ depends="__get-sql-config-file"
+ if="sql.config.file.present">
+
+ 
+
</target>

- <target name="_get-sql-config-file_2" depends="__get-sql-config-file"
unless="sql.config.file.present">
+
+ <target name="_get-sql-config-file_2"
+ depends="__get-sql-config-file"
+ unless="sql.config.file.present">
+
<echo message="!!!!!! ERROR: Provided sql metadata config file does
not exist !!!!!!"/>
<property name="sql.config.file" value="xxxxxxxx"/>
+
</target>

- <target name="get-sql-config-file" depends="_get-sql-config-file_1,
_get-sql-config-file_2">
+
+ <target name="get-sql-config-file"
+ depends="_get-sql-config-file_1, _get-sql-config-file_2">
</target>

-


- <target name="set-const-properties-for-sqlma"
- depends="get-message-1,
- get-java-path,
- get-axis-path,
- get-server-address,
- get-server-port">

+ <target name="set-const-properties-for-sqlma">
+
<propertyfile file="ant/const.properties"
comment="This file was created by the Ant
configuration script.">

- <entry key="axis.home" value="${axis.path}"/>
- <entry key="jdk_path" value="${java.path}"/>
- <entry key="target.server" value="${server.address}"/>
- <entry key="target.port" value="${server.port}"/>
+ <entry key="service.name" value="${service.name}"/>
+ <entry key="deploy.root" value="${deploy.root}"/>
<entry key="webservice.name" value="MeasurementArchiveService"/>
<entry key="build" value="build"/>
<entry key="package.root" value="org/perfsonar"/>
<entry key="package.nmwg.root" value="org/ggf"/>
- <entry key="wsdd.home" value="service/web/wsdd"/>
<entry key="wsdd.file.deploy" value="ma-service-deploy.wsdd"/>
<entry key="wsdd.file.undeploy"
value="ma-service-undeploy.wsdd"/>
- <entry key="wsdd.path" value="org/perfsonar/service/web/wsdd"/>
<entry key="api.location" value="doc/api"/>
<entry key="api.title" value="perfSONAR"/>
<entry key="api.windowtitle" value="perfSONAR"/>
@@ -101,73 +82,193 @@

</propertyfile>

- <echo message="const.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>

-


+
<target name="set-service-properties-for-sqlma"
- depends="get-message-2, get-server-address, get-xmldb-address,
get-sql-config-file">
+ depends="get-sql-config-file">

+ <property file="ant/const.properties" />
+
<propertyfile file="conf/service.properties"
comment="This file was created by the Ant
configuration script.">

- <entry key="service.r.type" value="ma"/>
- <entry key="service.r.access_point"
value="http://${server.address}:8080/axis/services/MeasurementArchiveService"/>
+ <entry key="service.r.type" value="ma"/>
+ <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
<entry key="service.r.service_name" value="Java SQL MA"/>
<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.log.log4j.config"
value="${basedir}/conf/log4j.properties"/>
<entry key="service.sax_parser.config"
value="${basedir}/src/objects.config"/>

- <entry key="service.ma.conf_file" value="${sql.config.file}"/>
+ <entry key="service.ma.conf_file"
value="${sql.config.file}"/>
<entry key="service.ma.message_types"
value="MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest"/>
- <entry key="service.ma.class_name"
value="org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine"/>
+ <entry key="service.ma.class_name"
value="org.perfsonar.service.measurementArchive.sqlType.SQLTypeMAServiceEngine"/>

- <entry key="component.ma.xmldb.db_status" value="on"/>
- <entry key="component.ma.xmldb.db_uri"
value="${xmldb.access}://${xmldb.address}:${xmldb.port}/exist/${uri.resource.id}/db/sqlmaconfig"/>
- <entry key="component.ma.xmldb.db_uri.xmlrpc"
value="xmldb:exist://${xmldb.address}:${xmldb.port}/exist/xmlrpc/db/sqlmaconfig"/>
- <entry key="component.ma.xmldb.db_username"
value="sqlmaservice"/>
- <entry key="component.ma.xmldb.db_password"
value="sqlmaservice"/>
- <entry key="component.ma.xmldb.db_access"
value="${_xmldb.access}"/>
-
<entry key="service.ma.xmldb.db_store" value="off"/>

+ <entry key="service.r.ls_url"
value=""/>
+ <entry key="component.registrator.interval"
value="30000"/>
+ <entry key="component.registrator.scheduler_component"
value="ma_scheduler"/>

- <entry key="service.r.ls_url" value=""/>
- <entry key="component.registrator.interval" value="30000"/>
+ </propertyfile>
+
+ </target>
+
+
+ 
+
+
+ <target name="copy-components-properties">
+
+ <copy file="conf/components.properties.sqlma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
+ </target>
+
+
+ 
+
+
+ <target name="store-fuctionality-question-for-sqlma">
+
+ <input message="Do you want the service to accept messages with
measurement data and store them? "
+ addproperty="_functionality.store.decision"
+ validargs="y,n" />
+
+ <condition property="functionality.store.decision">
+ <equals arg1="y" arg2="${_functionality.store.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="store-fuctionality-for-sqlma"
+ depends="store-fuctionality-question-for-sqlma"
+ if="functionality.store.decision">
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.ma.xmldb.db_store" value="on"/>
+
+ </propertyfile>
+
+ </target>
+
+
+ 
+
+
+ <target name="register-fuctionality-for-sqlma"
+ depends="register-fuctionality"
+ if="functionality.register.decision">
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.r.service_name" value="${service.name}"/>
+ <entry key="service.r.service_type" value="MA"/>
<entry key="component.registrator.scheduler_component"
value="ma_scheduler"/>

</propertyfile>

- <echo message="service.properties file created"/>
- <input message="Press Return key ..."/>
+ <replace file="conf/components.properties"
+
token="#ma_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"
+
value="ma_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>

+ <replace file="conf/components.properties"
+
token="#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"
+
value="registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+
</target>

+ 

- <target name="copy-initconfig-for-sqlma">
- <copy file="ant/const.properties.ma" tofile="ant/const.properties"
overwrite="true" failonerror="false"/>
- <copy file="conf/components.properties.ma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
+ <target name="__exist-init">
+
+ <property file="conf/service.properties" />
+
+ <condition property="component.ma.xmldb.db_status.present"
value="true">
+ <isset property="component.ma.xmldb.db_status"/>
+ </condition>
+
</target>

- <target name="configure-sqlma">
- <antcall target="copy-initconfig-for-sqlma"/>
- <antcall target="copy-properties"/>
+ <target name="_exist-init"
+ depends="__exist-init"
+ if="component.ma.xmldb.db_status.present">
+
+ <condition property="component.ma.xmldb.db_status.type_standalone">
+ <equals arg1="stand-alone" arg2="${component.ma.xmldb.type}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="exist-init"
+ depends="_exist-init"
+ if="component.ma.xmldb.db_status.type_standalone">
+
+ <echo>Initializing the xml database eXist...</echo>
+
+ <antcall target="xmldb-init-rrdma"/>
+
+ </target>
+
+
+ 
+
+
+ <target name="accessing-relational-database-setup">
+
+ <echo>You must provide correct database connection
information.</echo>
+
+ <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></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></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>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ 
+
+
+ <target name="configure">
+
+ <antcall target="copy-components-properties"/>
<antcall target="set-const-properties-for-sqlma"/>
<antcall target="set-service-properties-for-sqlma"/>
<antcall target="set-log4j-properties"/>
- <antcall target="set-tomcat-properties"/>
+ <antcall target="exist-init"/>
+ <antcall target="accessing-relational-database-setup"/>
+ <antcall target="store-fuctionality-for-sqlma"/>
+ <antcall target="register-fuctionality-for-sqlma"/>
+
</target>

-</project>
-
+</project>
\ No newline at end of file

Modified: branches/ulisseskan/ant/sqlma/sqlma-exist-xmldb-targets.xml
===================================================================
--- branches/ulisseskan/ant/sqlma/sqlma-exist-xmldb-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/sqlma/sqlma-exist-xmldb-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -30,6 +30,11 @@
</target>

+ <target name="xmldb-adduser-sqlma">
+ <antcall target="xmldb-adduser-rrdma"/>
+ </target>

+
+
</project>

Modified: branches/ulisseskan/ant/sqlma/sqlma-java-compile-targets.xml
===================================================================
--- branches/ulisseskan/ant/sqlma/sqlma-java-compile-targets.xml
2007-01-17 11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/sqlma/sqlma-java-compile-targets.xml
2007-01-17 15:12:11 UTC (rev 1929)
@@ -9,7 +9,6 @@

Notes:
A set of targets for building the application.
- This file is imported by the main file build.xml.

</description>
==================================================================== -->
@@ -26,26 +25,52 @@

<target name="compile-sqlma"
description="Compiles Java files of SQL MA">
- <antcall target="compile-rrdma"/>
+
+ <javac srcdir="src" destdir="${build}" deprecation="yes">
+
+ <include name="org/perfsonar/service/measurementArchive/**" />
+ <include name="org/perfsonar/service/web/**" />
+ <include
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java"
/>
+
+ <classpath refid="classpath"/>
+ </javac>
+
+ <copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
+ <fileset dir="src/${package.root}/${wsdd.home}">
+ <include name="ma-*.wsdd" />
+ </fileset>
+ </copy>
+
</target>

<target name="jar-sqlma" depends="clean-jar-sqlma, compile-sqlma"
description="Creates JAR file for RRD MA">
- <antcall target="jar-rrdma"/>
- <copy file="${build}/perfSONAR-rrdma.jar"
tofile="${build}/perfSONAR-sqlma.jar"/>
+
+ <jar destfile="${build}/perfSONAR-sqlma.jar">
+
+ <fileset dir="${build}">
+ <include name="org/perfsonar/service/measurementArchive/**"
/>
+ <include name="org/perfsonar/service/web/**" />
+ <include
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.class"
/>
+ </fileset>
+
+ </jar>
+
</target>

- <target name="build-sqlma" description="Builds SQL MA.">
+ 
+
+
+ <target name="build" description="Builds SQL MA.">
+
<antcall target="clean-all"/>
<antcall target="jar-generic"/>
<antcall target="jar-sqlma"/>
+
</target>

-
-</project>
-
-
+</project>
\ No newline at end of file

Modified: branches/ulisseskan/ant/sqlma/sqlma-libs-download-targets.xml
===================================================================
--- branches/ulisseskan/ant/sqlma/sqlma-libs-download-targets.xml
2007-01-17 11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/sqlma/sqlma-libs-download-targets.xml
2007-01-17 15:12:11 UTC (rev 1929)
@@ -53,7 +53,7 @@

- <target name="libs-sqlma">
+ <target name="lib">

<antcall target="libs-generic"/>
<antcall target="libs-for-sqlma"/>

Copied: branches/ulisseskan/ant/sqlma/sqlma-pre-install-targets.xml (from rev
1928, trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml)

Modified: branches/ulisseskan/ant/sqlma/sqlma-release-targets.xml
===================================================================
--- branches/ulisseskan/ant/sqlma/sqlma-release-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/sqlma/sqlma-release-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -14,108 +14,109 @@
==================================================================== -->

- <project name="sqlma-release-targets">
+<project name="sqlma-release-targets">

- 
+ <target name="init-release">

- <target name="sqlma-release-src"
- depends="copy-initconfig-for-sqlma"
- description="Build src release.">
+ <propertyfile file="ant/const.properties"
+ comment="This file was created by the Ant configuration script.">
+ <entry key="service.name" value="${service.name}"/>
+ <entry key="build" value="build"/>
+ </propertyfile>

- <property file="ant/const.properties" />
+ </target>

- <delete dir="tmp"/>
- <mkdir
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar"/>
- <copy
todir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar">
- <fileset dir="../perfsonar"/>
- </copy>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/tmp"/>

+ <target name="release"
+ depends="init-release, build"
+ description="Build the release.">

- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/lookupService"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/measurementPoint"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/topologyService"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build/org"/>
- <delete>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build"
includes="**/*.jar"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/log"
includes="**/*.log"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/ls-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.ls"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/mp-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/tcmp-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.cl"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.rrdma"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tcmp"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.mp"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tops"/>
- </delete>
+ <property file="ant/const.properties" />

- <tar
destfile="${release.basename}-${release.servicename}-src-${release.version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"
- />
+ <delete dir="tmp"/>
+ <mkdir dir="tmp/${service.name}/perfsonar"/>
+ <copy todir="tmp/${service.name}/perfsonar">
+ <fileset dir="${basedir}"/>
+ </copy>
+ <delete dir="tmp/${service.name}/perfsonar/tmp"/>

- <delete dir="tmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/src/org"/>
+ <delete dir="tmp/${service.name}/perfsonar/doc"/>
+ <delete dir="tmp/${service.name}/perfsonar/test"/>
+ <delete dir="tmp/${service.name}/perfsonar/releng"/>
+ <delete dir="tmp/${service.name}/perfsonar/build/org"/>

- <gzip
zipfile="${release.basename}-${release.servicename}-src-${release.version}.tar.gz"
-
src="${release.basename}-${release.servicename}-src-${release.version}.tar"
- />
+ <delete
file="tmp/${service.name}/perfsonar/conf/components.properties"/>
+ <delete
file="tmp/${service.name}/perfsonar/conf/service.properties"/>
+ <delete file="tmp/${service.name}/perfsonar/ant/const.properties"/>

- <delete
file="${release.basename}-${release.servicename}-src-${release.version}.tar"/>
+ <delete file="tmp/${service.name}/perfsonar/ant/changes-rrdma"/>

- </target>
+ <delete dir="tmp/${service.name}/perfsonar/ant/clmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/flowmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/nmsmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/tcmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/tops"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/xmlls"/>

+ <delete dir="tmp/${service.name}/perfsonar/conf/template"/>

+ <move file="tmp/${service.name}/perfsonar/ant/build-sqlma.xml"
+ tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>

- 
+ <delete>

- <target name="sqlma-release-bin"
- depends="copy-initconfig-for-sqlma, build-sqlma"
- description="Build bin release.">
+ <fileset dir="tmp/${service.name}/perfsonar/log"
includes="**/*.log"/>

- <property file="ant/const.properties" />
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.cl"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.mp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.rrdma"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.tops"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.tcmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.flowmp"/>

- <delete dir="tmp"/>
- <mkdir
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar"/>
- <copy
todir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar">
- <fileset dir="../perfsonar"/>
- </copy>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/tmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.cl"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.mp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.rrdma"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tops"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tcmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.flowmp"/>

+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/build-*.xml"/>

- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/src/org"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/doc"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/test"/>
- <delete>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/log"
includes="**/*.log"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/conf"
includes="**/*.ls"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.cl"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.rrdma"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tcmp"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.mp"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tops"/>
- </delete>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*-old.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*-old.*"/>

- <tar
destfile="${release.basename}-${release.servicename}-bin-${release.version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"
- />
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/clmp-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/ls-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/mp-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/tcmp-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/tops-*.wsdd"/>

- <delete dir="tmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/tcmp-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/rrd-*.*"/>

- <gzip
zipfile="${release.basename}-${release.servicename}-bin-${release.version}.tar.gz"
-
src="${release.basename}-${release.servicename}-bin-${release.version}.tar"
- />
+ </delete>

- <delete
file="${release.basename}-${release.servicename}-bin-${release.version}.tar"/>
+ <tar destfile="${service.name}.tar"
+ basedir="tmp/"
+ longfile="gnu"
+ excludes=".svn/**"
+ />

+ <delete dir="tmp"/>

- </target>
+ <gzip zipfile="${service.name}.tar.gz"
+ src="${service.name}.tar"
+ />

+ <delete file="${service.name}.tar"/>

+ </target>

- </project>
+
+
+</project>
\ No newline at end of file

Modified: branches/ulisseskan/ant/sqlma/sqlma-test-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/sqlma/sqlma-test-run-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/sqlma/sqlma-test-run-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -18,6 +18,26 @@

+ <target name="test">
+
+ <antcall target="run-echo"/>
+ <antcall target="run-sqlma-client-key-util"/>
+ <antcall target="run-sqlma-client-data-util-1"/>
+ <antcall target="run-sqlma-client-data-util-2"/>
+ <antcall target="run-sqlma-client-data-util-3"/>
+ <antcall target="run-sqlma-client-key-L2status-1"/>
+ <antcall target="run-sqlma-client-key-L2status-2"/>
+ <antcall target="run-sqlma-client-key-L2status-3"/>
+ <antcall target="run-sqlma-client-data-L2status-1"/>
+ <antcall target="run-sqlma-client-data-L2status-2"/>
+ <antcall target="run-sqlma-client-data-L2status-3"/>
+ <antcall target="run-sqlma-client-data-L2status-4"/>
+ <antcall target="run-sqlma-client-data-L2status-5"/>
+ <antcall target="run-sqlma-client-data-L2status-6"/>
+
+ </target>
+
+
<target name="run-mysql-sqlma-test1">
<sql
driver="com.mysql.jdbc.Driver"

Modified: branches/ulisseskan/ant/tcmp/mapijni-compile-targets.xml
===================================================================
--- branches/ulisseskan/ant/tcmp/mapijni-compile-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/tcmp/mapijni-compile-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -29,12 +29,17 @@



+ <target name="init-mapijni" depends="init">

+ <property file="ant/const.properties" />

- <target name="clean-mapijni" depends="init"
+ </target>
+
+
+ <target name="clean-mapijni" depends="init-mapijni"
description="Removes build directories.">
<echo message="Cleaning mapi-jni Java files." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="clean" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="clean" />
</target>

@@ -43,7 +48,7 @@
description="Compiles all Java files">

<echo message="Compiling mapi-jni Java files." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="compile" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="compile" />

</target>

@@ -52,9 +57,9 @@
<target name="jar-mapijni" depends="compile-mapijni">

<echo message="Creating mapi-jni JAR file." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="dist" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="dist" />
<mkdir dir="lib/repository/mapi-jni" />
- <copy file="contrib/mapi-jni/java/dist/mapi-jni.jar"
todir="lib/repository/mapi-jni" />
+ <copy file="${mapijnidir}/java/dist/mapi-jni.jar"
todir="lib/repository/mapi-jni" />

</target>

@@ -62,25 +67,25 @@



- <target name="build-native-mapijni" depends="init">
+ <target name="build-native-mapijni" depends="init-mapijni">

- <exec dir="contrib/mapi-jni/native/src" executable="/usr/bin/make">
+ <exec dir="${mapijnidir}/native/src" executable="/usr/bin/make">
<arg line="clean" />
</exec>
- <exec dir="contrib/mapi-jni/native/src" executable="/usr/bin/make">
- <arg line="MAPI_INC='-I${mapi_path}/include'
- MAPI_LIB='${mapi_path}/lib/libmapi.so'
+ <exec dir="${mapijnidir}/native/src" executable="/usr/bin/make">
+ <arg line="MAPI_INC='-I${mapi_h_path}'
+ MAPI_LIB='${mapi_lib_path}/libmapi.so'
JAVA_INC='-I${jdk_path}/include
-I${jdk_path}/include/linux'
DEBUG_OPTS=''"/>
</exec>

- <copy file="contrib/mapi-jni/native/src/dist/libmapijni.so"
todir="${mapijni_libpath}" />
+ <copy file="${mapijnidir}/native/src/dist/libmapijni.so"
todir="${mapi_lib_path}" />

<echo message="" />
<echo message="" />
<echo
message="-----------------------------------------------------------" />
<echo message="Now you need to setup LD_LIBRARY_PATH env variable
which should contain" />
- <echo message="${mapijni_libpath}" />
+ <echo message="${mapi_lib_path}" />
<echo
message="-----------------------------------------------------------" />

</target>

Modified: branches/ulisseskan/ant/tcmp/tcmp-axis-deploy-targets.xml
===================================================================
--- branches/ulisseskan/ant/tcmp/tcmp-axis-deploy-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/tcmp/tcmp-axis-deploy-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -18,25 +18,41 @@
<project name="tcmp-axis-deploy-targets">

-

<target name="copy-jars-for-tcmp" depends="copy-jars-for-service">
- <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib//repository/mapi-jni/mapi-jni/1.0-0001/mapi-jni-1.0-0001.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib//repository/mapi-jni/mapi-jni/1.0-0001/mapi-jni-1.0-0001.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib//repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
+ <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"/>
</target>

<target name="delete-jars-for-tcmp" depends="delete-jars-for-service">
- <delete file="${axis.home}/WEB-INF/lib/jdom-1.0b8.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xalan-2.7.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/mapi-jni-1.0-0001.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/jdom-1.0b8.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xalan-2.7.0.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/mapi-jni-1.0-0001.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/mysql-connector-java-5.0.3.jar"/>
+
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}"/>
</target>

@@ -62,8 +78,8 @@
if="jar.perfsonar.tcmp.present"
description="Copy tcmp jar to Tomcat">

- <copy file="${build}/${app.jar}" todir="${axis.home}/WEB-INF/lib"/>
- <copy file="${build}/${app.servlets.jar}"
todir="${axis.home}/WEB-INF/lib" failonerror="false"/>
+ <copy file="${build}/${app.jar}"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="${build}/${app.servlets.jar}"
todir="${service.home}/${deploy.root}/WEB-INF/lib" failonerror="false"/>

<echo/>
<echo>------------------------------ WARNING
---------------------------</echo>
@@ -75,30 +91,72 @@
</target>

- <target name="deploy-tcmp" depends="copy-tcmp-jar, add-context-listener"
+ <target name="create-tomcat-context-for-tcmp">
+
+ <copy file="conf/tomcat-tcmp-tmpl.xml"
tofile="${tomcat.home}/conf/Catalina/localhost/tcmp.xml" overwrite="true"
failonerror="false"/>
+ <replace file="${tomcat.home}/conf/Catalina/localhost/tcmp.xml">
+ <replacefilter token="__PATH__" value="/${deploy.root}" />
+ <replacefilter token="__DOC_BASE__"
value="${service.home}/${service.name}" />
+ </replace>
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="startup.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ <env key="LD_LIBRARY_PATH"
path="${env.LD_LIBRARY_PATH}:${mapi_lib_path}"/>
+ <env key="CATALINA_HOME" path=""/>
+ <env key="CATALINA_BASE" path=""/>
+ </exec>
+
+ <echo>Please, make sure that the Tomcat is running. Use the address
http://${target.server}:${target.port} .</echo>
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ <target name="deploy" depends="copy-tcmp-jar, add-context-listener"
description="Deploys TC MP service">
+
+ <echo>Deploying the service...</echo>
+
+ <antcall target="create-tomcat-context-for-tcmp" />
+
+ <antcall target="deploy-adminclient" />
+
+ 
+
</target>

- <target name="undeploy-tcmp"
+ <target name="undeploy"
description="Undeploys TC MP service">

+ <echo>Undeploying the service...</echo>
+
+ <antcall target="undeploy-adminclient" />
+
+ 

<antcall target="rem-context-listener" />
<antcall target="delete-jars-for-tcmp"/>

- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tcmp.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tcmp-servlets.jar"
failonerror="false"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-tcmp.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-tcmp-servlets.jar"
failonerror="false"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>
+ <delete file="${tomcat.home}/conf/Catalina/localhost/tcmp.xml"/>

</target>

Modified: branches/ulisseskan/ant/tcmp/tcmp-client-run-targets.xml
===================================================================
--- branches/ulisseskan/ant/tcmp/tcmp-client-run-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/tcmp/tcmp-client-run-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -24,29 +24,29 @@
<property name="ma.abilene"
value="http://thunderbird.internet2.edu:8080/axis/services/MeasurementArchiveService"/>
-->

- <property name="mp.local"
value="http://${target.server}:${target.port}/axis/services/TCMPService"/>
+ <property name="mp.local"
value="http://${target.server}:${target.port}/${service.name}/services/${webservice.name}"/>



- <target name="run-tcmp-client" description="Runs TCMP measurement
request test">
+ <target name="run-client" description="Runs TCMP measurement request
test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${mp.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>
</target>

- <target name="run-tcmp-demo" description="Runs TCMP measurement request
demo presented at GEANT2 conference">
+ <target name="run-demo" description="Runs TCMP measurement request demo
presented at GEANT2 conference">
<java classname="org.perfsonar.client.testHarness.SOAPClientMulti"
classpathref="classpath" fork="true">
<arg value="${mp.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response1.xml"/>
<arg
value="http://jra1-2.cesnet.cz:8080/axis/services/TCMPService"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response2.xml"/>
</java>
</target>

Modified: branches/ulisseskan/ant/tcmp/tcmp-configure-targets.xml
===================================================================
--- branches/ulisseskan/ant/tcmp/tcmp-configure-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/tcmp/tcmp-configure-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -14,84 +14,51 @@

<project name="tcmp-configure-targets">

- <target name="get-mapi-path">
- <input message="Set the path of MAPI installation directory
[/opt/mapi]:"
- addproperty="mapi.path"
- defaultvalue="/opt/mapi"
- />
- <echo message="Accepted MAPI installation directory: ${mapi.path}"/>
- </target>

- <target name="get-mapijni-libpath">
- <input message="Set the path of MAPI-JNI library (should be in
loader path) [/opt/mapi/lib]:"
- addproperty="mapijni.libpath"
- defaultvalue="/opt/mapi/lib"
- />
- <echo message="Accepted MAPI-JNI library path: ${mapijni.libpath}"/>
- </target>
+ <property file="ant/const.properties" />

- <target name="get-tomcat-path">
- <input message="Set the path of Tomcat home directory
[/opt/jakarta-tomcat-5.0.28]:"
- addproperty="tomcat.path"
- defaultvalue="/opt/jakarta-tomcat-5.0.28"
- />
- <echo message="Accepted Tomcat home directory: ${tomcat.path}"/>
- </target>
+ <property name="deploy.root" value="${service.name}" />

- <target name="get-current-path-tcmp">
- <dirname property="current.path.tcmp" file="."/>
- </target>
+ <target name="__get-tcmp-config-file">

-
- <target name="__get-config-file">
- <input message="Enter the path of metadata config file
[${basedir}/conf/tcmp-service-content.xml]:"
- addproperty="config.file"
+ <input message="TCMP metadata configuration file is required. More
information about this is available in the installation guide. It is
suggested that you use the TEST metadata configuration file for now and you
can change it later on with your own file. Enter the path of rrd metadata
configuration file [${basedir}/conf/tcmp-service-content.xml]:"
+ addproperty="tcmp.config.file"
defaultvalue="${basedir}/conf/tcmp-service-content.xml"/>
- <available file="${config.file}" property="config.file.present"/>
+ <available file="${tcmp.config.file}"
property="tcmp.config.file.present"/>
+
</target>

- <target name="_get-config-file_1" depends="__get-config-file"
if="config.file.present">
- <echo message="Accepted metadata config file: ${config.file}"/>
+ <target name="_get-tcmp-config-file_1"
+ depends="__get-tcmp-config-file" if="tcmp.config.file.present">
</target>

- <target name="_get-config-file_2" depends="__get-config-file"
unless="config.file.present">
- <echo message="!!!!!! ERROR: Provided metadata config file does not
exist !!!!!!"/>
- <property name="config.file" value="xxxxxxxx"/>
+ <target name="_get-tcmp-config-file_2"
+ depends="__get-tcmp-config-file" unless="tcmp.config.file.present">
+
+ <echo message="!!!!!! ERROR: Provided tcmp metadata config file does
not exist !!!!!!"/>
+ <property name="tcmp.config.file" value="xxxxxxxx"/>
+
</target>

- <target name="get-config-file" depends="_get-config-file_1,
_get-config-file_2">
+ <target name="get-tcmp-config-file"
+ depends="_get-tcmp-config-file_1, _get-tcmp-config-file_2">
</target>



- <target name="set-const-properties-for-tcmp"
- depends="get-message-1,
- get-current-path,
- get-java-path,
- get-mapi-path,
- get-mapijni-libpath,
- get-tomcat-path,
- get-axis-path,
- get-server-address">
+ <target name="set-const-properties-for-tcmp">

<propertyfile file="ant/const.properties"
- comment="This file was created by the ant script.">
+ comment="This file was created by the Ant
configuration script.">

- <entry key="tomcat.home" value="${tomcat.path}"/>
- <entry key="axis.home" value="${axis.path}"/>
- <entry key="jdk_path" value="${java.path}"/>
- <entry key="mapi_path" value="${mapi.path}"/>
- <entry key="mapijni_libpath" value="${mapijni.libpath}"/>
- <entry key="target.server" value="${server.address}"/>
- <entry key="target.port" value="8080"/>
- <entry key="webservice.name" value="TCMPService"/>
+ <entry key="service.name" value="${service.name}"/>
+ <entry key="deploy.root" value="${deploy.root}"/>
+ <entry key="webservice.name" value="MeasurementPointService"/>
<entry key="build" value="build"/>
<entry key="package.root" value="org/perfsonar"/>
<entry key="package.nmwg.root" value="org/ggf"/>
- <entry key="wsdd.home" value="service/web/wsdd"/>
<entry key="wsdd.file.deploy" value="tcmp-service-deploy.wsdd"/>
<entry key="wsdd.file.undeploy"
value="tcmp-service-undeploy.wsdd"/>
- <entry key="wsdd.path" value="org/perfsonar/service/web/wsdd"/>
<entry key="api.location" value="doc/api"/>
<entry key="api.title" value="perfSONAR"/>
<entry key="api.windowtitle" value="perfSONAR"/>
@@ -99,9 +66,6 @@

</propertyfile>

- <echo message="const.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>

@@ -143,28 +107,26 @@


<target name="set-service-properties-for-tcmp"
- depends="get-message-2,
- get-current-path,
- get-current-path-tcmp,
- get-server-address,
- get-pcap-storage-dir,
+ depends="get-tcmp-config-file,
get-local-ifs,
get-remote-ifs,
- get-config-file">
+ get-pcap-storage-dir">

+ <property file="ant/const.properties" />
+
<propertyfile file="conf/service.properties"
- comment="This file was created by the ant script.">
+ comment="This file was created by the Ant
configuration script.">

<entry key="service.r.type" value="mp"/>
- <entry key="service.r.access_point"
value="http://${server.address}:8080/axis/services/TCMPService"/>
+ <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
<entry key="service.r.service_name" value="Java TC MP"/>
<entry key="service.r.service_type" value="TC MP"/>
<entry key="service.r.service_description" value="Java TC MP,
perfSONAR project"/>

- <entry key="service.conf_file" value="${config.file}"/>
+ <entry key="service.conf_file" value="${tcmp.config.file}"/>

- <entry key="service.log.log4j.config"
value="${current.path.tcmp}/perfsonar/conf/log4j.properties"/>
- <entry key="service.sax_parser.config"
value="${current.path.tcmp}/perfsonar/src/objects.config"/>
+ <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.mp.message_types" value="SetupDataRequest"/>
<entry key="service.mp.class_name"
value="org.perfsonar.service.measurementPoint.tracefileCaptureType.TCMPTypeServiceEngine"/>
@@ -179,25 +141,54 @@

</propertyfile>

- <echo message="service.properties file created"/>
- <input message="Press Return key ..."/>
+ </target>

+
+ <target name="copy-components-properties">
+
+ <copy file="conf/components.properties.mp"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
</target>

+ 

- <target name="copy-initconfig-for-tcmp">
- <copy file="ant/const.properties.tcmp" tofile="ant/const.properties"
overwrite="true" failonerror="false"/>
- <copy file="conf/components.properties.mp"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
+ <target name="register-fuctionality-for-tcmp"
+ depends="register-fuctionality"
+ if="functionality.register.decision">
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.r.service_name" value="${service.name}"/>
+ <entry key="service.r.service_type" value="MP"/>
+ <entry key="component.registrator.scheduler_component"
value="scheduler"/>
+
+ </propertyfile>
+
+ 
+
</target>

- <target name="configure-tcmp">
- <antcall target="copy-properties"/>
- <antcall target="copy-initconfig-for-tcmp"/>
+ <target name="configure">
+
+ <echo>Configuring...</echo>
+
+ <antcall target="copy-components-properties"/>
<antcall target="set-const-properties-for-tcmp"/>
<antcall target="set-service-properties-for-tcmp"/>
<antcall target="set-log4j-properties"/>
- <antcall target="set-tomcat-properties"/>
+ <antcall target="register-fuctionality-for-tcmp"/>
+
</target>

Modified: branches/ulisseskan/ant/tcmp/tcmp-java-compile-targets.xml
===================================================================
--- branches/ulisseskan/ant/tcmp/tcmp-java-compile-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/tcmp/tcmp-java-compile-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -38,6 +38,7 @@
<include name="org/perfsonar/service/web/**" />
<exclude
name="org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/**"
/>
<classpath refid="classpath"/>
+ 
</javac>
<copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
<fileset dir="src/${package.root}/${wsdd.home}">
@@ -60,14 +61,6 @@
</target>

- <target name="build-tcmp"
- description="Builds TC MP.">
- <antcall target="clean-all"/>
- <antcall target="jar-generic"/>
- <antcall target="jar-tcmp"/>
- </target>
-
-


<property name="app.servlets.jar" value="perfSONAR-tcmp-servlets.jar" />
@@ -100,7 +93,7 @@
</target>

- <target name="build-tcmp-servlets"
+ <target name="build-servlets"
description="Builds TC MP Servlets.">
<antcall target="clean-jar-tcmp-servlets"/>
<antcall target="jar-tcmp-servlets"/>
@@ -159,6 +152,16 @@

<echo>------------------------------------------------------------------</echo>
</target>

+ 
+
+ <target name="build"
+ description="Builds TC MP.">
+ <antcall target="clean-all"/>
+ <antcall target="jar-generic"/>
+ <antcall target="jar-tcmp"/>
+ </target>
+
+
</project>

Modified: branches/ulisseskan/ant/tcmp/tcmp-libs-download-targets.xml
===================================================================
--- branches/ulisseskan/ant/tcmp/tcmp-libs-download-targets.xml 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/ant/tcmp/tcmp-libs-download-targets.xml 2007-01-17
15:12:11 UTC (rev 1929)
@@ -32,6 +32,8 @@
<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="mysql"
artifactId="mysql-connector-java" version="5.0.3"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>
@@ -42,7 +44,7 @@

- <target name="libs-tcmp">
+ <target name="lib">

<antcall target="libs-generic"/>
<antcall target="libs-for-tcmp"/>

Copied: branches/ulisseskan/ant/tcmp/tcmp-pre-install-targets.xml (from rev
1928, trunk/perfsonar/ant/tcmp/tcmp-pre-install-targets.xml)

Copied: branches/ulisseskan/ant/xmlls/build-targets.xml (from rev 1928,
trunk/perfsonar/ant/xmlls/build-targets.xml)

Copied: branches/ulisseskan/ant/xmlls/configure-targets.xml (from rev 1928,
trunk/perfsonar/ant/xmlls/configure-targets.xml)

Copied: branches/ulisseskan/ant/xmlls/deploy-targets.xml (from rev 1928,
trunk/perfsonar/ant/xmlls/deploy-targets.xml)

Copied: branches/ulisseskan/ant/xmlls/libs-download-targets.xml (from rev
1928, trunk/perfsonar/ant/xmlls/libs-download-targets.xml)

Copied: branches/ulisseskan/ant/xmlls/pre-install-targets.xml (from rev 1928,
trunk/perfsonar/ant/xmlls/pre-install-targets.xml)

Copied: branches/ulisseskan/ant/xmlls/test-targets.xml (from rev 1928,
trunk/perfsonar/ant/xmlls/test-targets.xml)

Copied: branches/ulisseskan/ant/xmlls/undeploy-targets.xml (from rev 1928,
trunk/perfsonar/ant/xmlls/undeploy-targets.xml)

Deleted: branches/ulisseskan/ant/xmlls/xmlls-axis-deploy-targets.xml

Deleted: branches/ulisseskan/ant/xmlls/xmlls-client-run-targets.xml

Deleted: branches/ulisseskan/ant/xmlls/xmlls-configure-targets.xml

Deleted: branches/ulisseskan/ant/xmlls/xmlls-exist-xmldb-targets.xml

Deleted: branches/ulisseskan/ant/xmlls/xmlls-java-compile-targets.xml

Deleted: branches/ulisseskan/ant/xmlls/xmlls-junit-test-targets.xml

Deleted: branches/ulisseskan/ant/xmlls/xmlls-libs-download-targets.xml

Deleted: branches/ulisseskan/ant/xmlls/xmlls-release-targets.xml

Deleted: branches/ulisseskan/ant/xmlls/xmlls-test-run-targets.xml

Copied: branches/ulisseskan/conf/components.properties.flowmp (from rev 1928,
trunk/perfsonar/conf/components.properties.flowmp)

Modified: branches/ulisseskan/conf/log4j.properties
===================================================================
--- branches/ulisseskan/conf/log4j.properties 2007-01-17 11:31:55 UTC (rev
1928)
+++ branches/ulisseskan/conf/log4j.properties 2007-01-17 15:12:11 UTC (rev
1929)
@@ -1,5 +1,5 @@
#This file was created by the ant script.
-#Mon Dec 25 17:57:16 CET 2006
+#Wed Jan 17 15:58:31 CET 2007
log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
log4j.appender.debugAppender.MaxBackupIndex=1000
@@ -36,15 +36,15 @@
log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
log4j.appender.fatalAppender.MaxFileSize=500KB
log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.sonar-debug=DEBUG, debugAppender
log4j.logger.perfsonar-debug=DEBUG, debugAppender
-log4j.logger.sonar-debug=DEBUG, debugAppender
log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.sonar-error=ERROR, errorAppender
log4j.logger.perfsonar-error=ERROR, errorAppender
-log4j.logger.sonar-error=ERROR, errorAppender
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
log4j.logger.perfsonar-warn=WARN, warnAppender
+log4j.logger.sonar-info=INFO, infoAppender
log4j.appender.infoAppender.MaxFileSize=500KB
-log4j.logger.sonar-info=INFO, infoAppender
log4j.appender.infoAppender.File=/Users/kan/Proyectos/workspace/RedIRIS -
perfSONAR private branch/log/perfsonar_info.log
+log4j.logger.sonar-fatal=FATAL, fatalAppender
log4j.logger.perfsonar-fatal=FATAL, fatalAppender
-log4j.logger.sonar-fatal=FATAL, fatalAppender

Modified: branches/ulisseskan/conf/template/const.properties.ls-template
===================================================================
--- branches/ulisseskan/conf/template/const.properties.ls-template
2007-01-17 11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/conf/template/const.properties.ls-template
2007-01-17 15:12:11 UTC (rev 1929)
@@ -6,18 +6,18 @@
# Project: perfSONAR
#

+service.home=%SERVICE_HOME%
+deploy.root=%DEPLOY_ROOT%
+tomcat.home=%TOMCAT_HOME%

-### the path to Axis deployment
-axis.home=%AXIS_HOME%

-
### Axis params for web service deployment:

# name the host to admin
-target.server=localhost
+target.server=%TARGET_SERVER%

# the port to connect to
-target.port=8080
+target.port=%TARGET_PORT%

# name of deployed webservice
webservice.name=LookupService
@@ -28,15 +28,10 @@
release.servicename=XML_LS
release.version=0.2

-### JUnit testing Lookup Service
-ls.test.server=%R_ACCESS_POINT%
-
-
#############################################################
### the following does not need to be changed !
#############################################################

-
build=build
package.root=org/perfsonar
package.nmwg.root=org/ggf

Modified: branches/ulisseskan/conf/template/service.properties.ls-template
===================================================================
--- branches/ulisseskan/conf/template/service.properties.ls-template
2007-01-17 11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/conf/template/service.properties.ls-template
2007-01-17 15:12:11 UTC (rev 1929)
@@ -1,6 +1,6 @@

###############################################################################
##
-## Service configuration file
+## Service configuration file
## for Lookup Service
##
##
---------------------------------------------------------------------------
@@ -21,9 +21,10 @@
service.basepath=%SERVICE_BASEPATH%
service.log.log4j.config=%LOG4J_PROPERTIES%
service.sax_parser.config=%SAX_PARSER_CONFIG%
+service.log.dir=%LOG_DIR%

# --- registration
------------------------------------------------------------------------
-# name of parameter which starts with "service.r." indicates that
+# name of parameter which starts with "service.r." indicates that
# this parameter belongs to the Lookup Information

service.r.type=ls
@@ -61,9 +62,13 @@
#Allow re-registration (simple update)
service.ls.allow_replace=yes

+#test
+ls.test.server=%LS_TEST_SERVER%
+
+
# --- Service properties
---------------------------------------------------------------

service.ls.class_name=org.perfsonar.service.lookupService.xmlType.XmlTypeLSServiceEngine
-service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest
+service.ls.message_types=LSQueryRequest,LSRegisterRequest,LSDeregisterRequest,LSKeepaliveRequest,EchoRequest

# ------- END
--------------------------------------------------------------------------
\ No newline at end of file

Copied: branches/ulisseskan/conf/tomcat-tcmp-tmpl.xml (from rev 1928,
trunk/perfsonar/conf/tomcat-tcmp-tmpl.xml)

Modified: branches/ulisseskan/conf/wsdd/tcmp-service-deploy.wsdd
===================================================================
--- branches/ulisseskan/conf/wsdd/tcmp-service-deploy.wsdd 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/conf/wsdd/tcmp-service-deploy.wsdd 2007-01-17
15:12:11 UTC (rev 1929)
@@ -1,7 +1,7 @@
<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>

-<service name="TCMPService" style="message">
+<service name="MeasurementPointService" style="message">
<Documentation>Defines the name of the service and the type of service. The
style if message which for some reason makes communication cleaner and does
not affect anything. It implicitly uses Document style </Documentation>

<parameter name="className"
value="org.perfsonar.service.web.RequestHandler"/>

Modified: branches/ulisseskan/conf/wsdd/tcmp-service-undeploy.wsdd
===================================================================
--- branches/ulisseskan/conf/wsdd/tcmp-service-undeploy.wsdd 2007-01-17
11:31:55 UTC (rev 1928)
+++ branches/ulisseskan/conf/wsdd/tcmp-service-undeploy.wsdd 2007-01-17
15:12:11 UTC (rev 1929)
@@ -1,3 +1,3 @@
<undeployment xmlns="http://xml.apache.org/axis/wsdd/";>
- <service name="TCMPService"/>
+ <service name="MeasurementPointService"/>
</undeployment>

Copied: branches/ulisseskan/contrib/FlowMP-client (from rev 1928,
trunk/perfsonar/contrib/FlowMP-client)

Deleted: branches/ulisseskan/contrib/FlowMP-client/README

Copied: branches/ulisseskan/contrib/FlowMP-client/README (from rev 1928,
trunk/perfsonar/contrib/FlowMP-client/README)

Deleted: branches/ulisseskan/contrib/FlowMP-client/client.py

Copied: branches/ulisseskan/contrib/FlowMP-client/client.py (from rev 1928,
trunk/perfsonar/contrib/FlowMP-client/client.py)

Deleted: branches/ulisseskan/contrib/FlowMP-client/common.py

Copied: branches/ulisseskan/contrib/FlowMP-client/common.py (from rev 1928,
trunk/perfsonar/contrib/FlowMP-client/common.py)

Deleted: branches/ulisseskan/contrib/FlowMP-client/config.py

Copied: branches/ulisseskan/contrib/FlowMP-client/config.py (from rev 1928,
trunk/perfsonar/contrib/FlowMP-client/config.py)

Deleted: branches/ulisseskan/contrib/FlowMP-client/flowmpclient.py

Copied: branches/ulisseskan/contrib/FlowMP-client/flowmpclient.py (from rev
1928, trunk/perfsonar/contrib/FlowMP-client/flowmpclient.py)

Copied: branches/ulisseskan/contrib/FlowMP-client/schemas (from rev 1928,
trunk/perfsonar/contrib/FlowMP-client/schemas)

Deleted: branches/ulisseskan/contrib/FlowMP-client/schemas/keepalive.xml

Copied: branches/ulisseskan/contrib/FlowMP-client/schemas/keepalive.xml (from
rev 1928, trunk/perfsonar/contrib/FlowMP-client/schemas/keepalive.xml)

Deleted: branches/ulisseskan/contrib/FlowMP-client/schemas/subscribe.xml

Copied: branches/ulisseskan/contrib/FlowMP-client/schemas/subscribe.xml (from
rev 1928, trunk/perfsonar/contrib/FlowMP-client/schemas/subscribe.xml)

Deleted: branches/ulisseskan/contrib/FlowMP-client/schemas/unsubscribe.xml

Copied: branches/ulisseskan/contrib/FlowMP-client/schemas/unsubscribe.xml
(from rev 1928, trunk/perfsonar/contrib/FlowMP-client/schemas/unsubscribe.xml)

Deleted: branches/ulisseskan/contrib/FlowMP-client/soapclient.py

Copied: branches/ulisseskan/contrib/FlowMP-client/soapclient.py (from rev
1928, trunk/perfsonar/contrib/FlowMP-client/soapclient.py)

Copied: branches/ulisseskan/contrib/FlowMP-manager (from rev 1928,
trunk/perfsonar/contrib/FlowMP-manager)

Deleted: branches/ulisseskan/contrib/FlowMP-manager/README

Copied: branches/ulisseskan/contrib/FlowMP-manager/README (from rev 1928,
trunk/perfsonar/contrib/FlowMP-manager/README)

Deleted: branches/ulisseskan/contrib/FlowMP-manager/common.py

Copied: branches/ulisseskan/contrib/FlowMP-manager/common.py (from rev 1928,
trunk/perfsonar/contrib/FlowMP-manager/common.py)

Deleted: branches/ulisseskan/contrib/FlowMP-manager/config.py

Copied: branches/ulisseskan/contrib/FlowMP-manager/config.py (from rev 1928,
trunk/perfsonar/contrib/FlowMP-manager/config.py)

Deleted: branches/ulisseskan/contrib/FlowMP-manager/manager.py

Copied: branches/ulisseskan/contrib/FlowMP-manager/manager.py (from rev 1928,
trunk/perfsonar/contrib/FlowMP-manager/manager.py)

Deleted: branches/ulisseskan/contrib/FlowMP-manager/process.log

Copied: branches/ulisseskan/contrib/FlowMP-manager/process.log (from rev
1928, trunk/perfsonar/contrib/FlowMP-manager/process.log)

Deleted: branches/ulisseskan/contrib/FlowMP-manager/process.py

Copied: branches/ulisseskan/contrib/FlowMP-manager/process.py (from rev 1928,
trunk/perfsonar/contrib/FlowMP-manager/process.py)

Copied: branches/ulisseskan/doc/deployment.xml (from rev 1928,
trunk/perfsonar/doc/deployment.xml)

Copied: branches/ulisseskan/doc/ls/LS_configuration_files.doc (from rev 1928,
trunk/perfsonar/doc/ls/LS_configuration_files.doc)

Copied: branches/ulisseskan/doc/ls/LS_functionality_specificatio.doc (from
rev 1928, trunk/perfsonar/doc/ls/LS_functionality_specificatio.doc)

Copied: branches/ulisseskan/doc/ls/LS_instalaltion_actions.doc (from rev
1928, trunk/perfsonar/doc/ls/LS_instalaltion_actions.doc)

Copied: branches/ulisseskan/doc/ls/LS_interface_specification.doc (from rev
1928, trunk/perfsonar/doc/ls/LS_interface_specification.doc)

Copied:
branches/ulisseskan/doc/ma/rrdTypeMA/Configuration_Files_Specification.doc
(from rev 1928,
trunk/perfsonar/doc/ma/rrdTypeMA/Configuration_Files_Specification.doc)

Copied: branches/ulisseskan/doc/ma/rrdTypeMA/Functional_Specification.doc
(from rev 1928, trunk/perfsonar/doc/ma/rrdTypeMA/Functional_Specification.doc)

Copied:
branches/ulisseskan/doc/ma/rrdTypeMA/Installation_Actions_Specification.doc
(from rev 1928,
trunk/perfsonar/doc/ma/rrdTypeMA/Installation_Actions_Specification.doc)

Copied: branches/ulisseskan/doc/ma/rrdTypeMA/Interface_Specification.doc
(from rev 1928, trunk/perfsonar/doc/ma/rrdTypeMA/Interface_Specification.doc)

Copied:
branches/ulisseskan/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc
(from rev 1928,
trunk/perfsonar/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc)

Copied:
branches/ulisseskan/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
(from rev 1928,
trunk/perfsonar/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml)

Modified:
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Req.xml
===================================================================
---
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Req.xml
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/schema/example-instances/perfSONAR/MetadataKey-Req.xml
2007-01-17 15:12:11 UTC (rev 1929)
@@ -24,8 +24,8 @@
<nmwg:metadata id="meta1">
<netutil:subject id="subj1">
<nmwgt:interface>
- <nmwgt:ifAddress type="ipv4">198.32.8.34</nmwgt:ifAddress>
- <nmwgt:hostName>atlang-hstnng.abilene.ucaid.edu</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
</nmwgt:interface>
</netutil:subject>
<nmwg:eventType>utilization</nmwg:eventType>

Modified:
branches/ulisseskan/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/src/org/perfsonar/client/commons/requests/lookupService/LSRegisterRequestGenerator.java
2007-01-17 15:12:11 UTC (rev 1929)
@@ -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: ");

Modified:
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/src/org/perfsonar/service/lookupService/xmlType/XmlTypeLSServiceEngine.java
2007-01-17 15:12:11 UTC (rev 1929)
@@ -12,12 +12,14 @@
import org.perfsonar.service.commons.engine.ActionType;
import org.perfsonar.service.commons.engine.ServiceEngine;
import org.perfsonar.service.commons.exceptions.DataFormatException;
+import org.perfsonar.service.commons.exceptions.PerfSONARException;
import org.perfsonar.service.commons.exceptions.RequestException;
import org.perfsonar.service.commons.exceptions.SystemException;
import org.perfsonar.service.commons.storage.xmldb.XmlDbDataRepository;
import org.perfsonar.service.commons.storage.xmldb.XmlDbStorageManager;
import org.perfsonar.service.commons.storage.xmldb.exist.ExistDbFactory;
import org.perfsonar.service.commons.storage.xmldb.XmlDbConstants;
+import org.perfsonar.service.commons.util.ResultCodesUtil;

/**
* ServiceEngine class for LookupService. (The heart of the LookupService)
@@ -94,7 +96,8 @@
ActionType.LS_REGISTER,
ActionType.LS_LOOKUP,
ActionType.LS_DEREGISTER,
- ActionType.LS_KEEPALIVE
+ ActionType.LS_KEEPALIVE,
+ ActionType.ECHO
};

smType = config.getProperty("service.ls.db_type");
@@ -202,7 +205,11 @@
getStorageManager(smType);
LSAction action = new LSKeepaliveAction(xmlDbStorageManager);
response = action.performAction(request);
-
+
+ } else if (actionType.equals(ActionType.ECHO)) {
+
+ response = getEcho(request);
+
} else {

throw new SystemException("error.ls.action_not_suported",
@@ -247,5 +254,22 @@

}

+ protected Message getEcho(Message request)
+ throws SystemException, RequestException, DataFormatException {
+
+ Message response = new Message();

+ PerfSONARException pex =
+ new PerfSONARException(
+ "success.echo",
+ "This is the echo response from the Lookup Service");
+
+ ResultCodesUtil.createResultCodeMetadata(response, pex);
+
+ return response;
+
+ }
+
+
+
} //XmlTypeLSServiceEngine

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2007-01-17 15:12:11 UTC (rev 1929)
@@ -133,7 +133,7 @@
throw new SystemException(
"error.ma.query",
"MetadataConfigurationStorageManager.fetch: "
- + "Empty query to get data from rrd metadata
configuration file");
+ + "Empty query to get data from the metadata
configuration");

Object object = null;
@@ -165,14 +165,14 @@
throw new SystemException(
"warning.ma.metadata_configuration",
"MetadataConfigurationStorageManager.fetch: "
- + "No metadata in rrd metadata configuration file");
+ + "No metadata in the metadata configuration");

if (xmlResults.length == 1)
if (xmlResults[0].trim().equals(""))
throw new SystemException(
"warning.ma.metadata_configuration",
"MetadataConfigurationStorageManager.fetch: "
- + "No metadata in rrd metadata configuration file");
+ + "No metadata in the metadata configuration");

for (int i = 0; i < xmlResults.length; i++) {

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/Transformations.java
2007-01-17 15:12:11 UTC (rev 1929)
@@ -15,6 +15,7 @@
import
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;

import org.perfsonar.service.commons.exceptions.SystemException;
+import org.perfsonar.service.commons.exceptions.PerfSONARException;
import org.perfsonar.service.commons.exceptions.RequestException;

import org.ggf.ns.nmwg.base.v2_0.Element;
@@ -142,8 +143,32 @@
// genarate correct metadata query
MetadataQueryGenerator metadataQueryGenerator =

MetadataQueryGeneratorFactory.getMetadataQueryGenerator(eventType);
- String mq = metadataQueryGenerator.getMetadataQuery(query);

+ String mq = "";
+ try {
+
+ mq = metadataQueryGenerator.getMetadataQuery(query);
+
+ } catch (PerfSONARException pex) {
+
+ throw new SystemException(pex.getResultCode(),
pex.getMessage());
+
+ } catch (Exception ex) {
+
+ logger.error("Transformations.getMetadataQuery: "
+ + "Unable to generate xquery statement "
+ + "for the metadata configuration "
+ + "from the request metadata. "
+ + ex.toString());
+ throw new RequestException(
+ "error.ma.query",
+ "Unable to generate xquery statement "
+ + "for the metadata configuration "
+ + "from the request metadata. "
+ + ex.toString());
+
+ }
+
return mq;

}

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-01-17 15:12:11 UTC (rev 1929)
@@ -128,7 +128,7 @@
+ " for $k in $metaids
\n"
+ " let $d :=
\n"
+ " for $l in //nmwg:data
\n"
- + " where $l/@metadataIdRef = $k
\n"
+ + " where fn:data($l/@metadataIdRef) = $k
\n"
+ " return $l
\n"
+ " return $d
\n"
+ "
\n"
@@ -175,8 +175,8 @@
+ " let $nodeMetadata :=
\n"
+ " if ($linkMetadata != '') then
\n"
+ " for $n in //nmwg:metadata
\n"
- + " where $n/nmwg:subject/nmwgtopo3:node/@id =
\n"
- + "
$linkMetadata/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef
\n"
+ + " where
fn:data($n/nmwg:subject/nmwgtopo3:node/@id) =
\n"
+ + "
fn:data($linkMetadata/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef)
\n"
+ " return $n
\n"
+ " else
\n"
+ " ''
\n"
@@ -189,7 +189,7 @@
+ " for $k in $metaids
\n"
+ " let $d :=
\n"
+ " for $l in //nmwg:data
\n"
- + " where $l/@metadataIdRef = $k
\n"
+ + " where fn:data($l/@metadataIdRef) = $k
\n"
+ " return $l
\n"
+ " return $d
\n"
+ "
\n"
@@ -233,20 +233,20 @@
node1 = " let $node1_metadata := '' \n"
+ " let $node1_id := '' ";
else
- node1 = " let $node1_metadata :=
\n"
- + " for $i in //nmwg:metadata
\n"
- + " where 1
\n"
+ node1 = " let $node1_metadata :=
\n"
+ + " for $i in //nmwg:metadata
\n"
+ + " where 1
\n"
+ (node1Name != "" ? " and
fn:lower-case($i/nmwg:subject/nmwgtopo3:node/nmwgtopo3:name) =
fn:lower-case('" + node1Name + "') \n" : "")
+ (node1Country != "" ? " and
fn:lower-case($i/nmwg:subject/nmwgtopo3:node/nmwgtopo3:country) =
fn:lower-case('" + node1Country + "') \n" : "")
+ (node1City != "" ? " and
fn:lower-case($i/nmwg:subject/nmwgtopo3:node/nmwgtopo3:city) =
fn:lower-case('" + node1City + "') \n" : "")
+ (node1Institution != "" ? " and
fn:lower-case($i/nmwg:subject/nmwgtopo3:node/nmwgtopo3:institution) =
fn:lower-case('" + node1Institution + "') \n" : "")
- + " return $i
\n"
- + "
\n"
- + " let $node1_id :=
\n"
- + " if ($node1_metadata) then
\n"
- + "
$node1_metadata/nmwg:subject/nmwgtopo3:node/@id \n"
- + " else
\n"
- + " ''
\n";
+ + " return $i
\n"
+ + "
\n"
+ + " let $node1_id :=
\n"
+ + " if ($node1_metadata) then
\n"
+ + "
fn:data($node1_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ + " else
\n"
+ + " ''
\n";

String node2 = null;
@@ -254,20 +254,20 @@
node2 = " let $node2_metadata := '' \n"
+ " let $node2_id := '' ";
else
- node2 = " let $node2_metadata :=
\n"
- + " for $j in //nmwg:metadata
\n"
- + " where 1
\n"
+ node2 = " let $node2_metadata :=
\n"
+ + " for $j in //nmwg:metadata
\n"
+ + " where 1
\n"
+ (node2Name != "" ? " and
fn:lower-case($j/nmwg:subject/nmwgtopo3:node/nmwgtopo3:name) =
fn:lower-case('" + node2Name + "') \n" : "")
+ (node2Country != "" ? " and
fn:lower-case($j/nmwg:subject/nmwgtopo3:node/nmwgtopo3:country) =
fn:lower-case('" + node2Country + "') \n" : "")
+ (node2City != "" ? " and
fn:lower-case($j/nmwg:subject/nmwgtopo3:node/nmwgtopo3:city) =
fn:lower-case('" + node2City + "') \n" : "")
+ (node2Institution != "" ? " and
fn:lower-case($j/nmwg:subject/nmwgtopo3:node/nmwgtopo3:institution) =
fn:lower-case('" + node2Institution + "') \n" : "")
- + " return $j
\n"
- + "
\n"
- + " let $node2_id :=
\n"
- + " if ($node2_metadata) then
\n"
- + "
$node2_metadata/nmwg:subject/nmwgtopo3:node/@id \n"
- + " else
\n"
- + " ''
\n";
+ + " return $j
\n"
+ + "
\n"
+ + " let $node2_id :=
\n"
+ + " if ($node2_metadata) then
\n"
+ + "
fn:data($node2_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ + " else
\n"
+ + " ''
\n";

xQuery = "
\n "
@@ -278,20 +278,20 @@
+ " let $linkMetadata :=
\n"
+ " if ($node1_id != '' and $node2_id != '') then
\n"
+ " for $k in //nmwg:metadata
\n"
- + " where
$k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef = $node1_id
\n"
- + " and
$k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef = $node2_id
\n"
+ + " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node1_id
\n"
+ + " and
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node2_id
\n"
+ " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
+ " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ " return $k
\n"
+ " else if ($node1_id != '' and $node2_id = '') then
\n"
+ " for $k in //nmwg:metadata
\n"
- + " where
$k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef = $node1_id
\n"
+ + " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node1_id
\n"
+ " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
+ " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ " return $k
\n"
+ " else if ($node1_id = '' and $node2_id != '') then
\n"
+ " for $k in //nmwg:metadata
\n"
- + " where
$k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef = $node2_id
\n"
+ + " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node2_id
\n"
+ " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
+ " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ " return $k
\n"
@@ -306,7 +306,7 @@
+ " for $k in $metaids
\n"
+ " let $d :=
\n"
+ " for $l in //nmwg:data
\n"
- + " where $l/@metadataIdRef = $k
\n"
+ + " where fn:data($l/@metadataIdRef) = $k
\n"
+ " return $l
\n"
+ " return $d
\n"
+ "
\n"

Modified:
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2007-01-17 15:12:11 UTC (rev 1929)
@@ -184,21 +184,21 @@

xQuery += "\n"
- + " return $i \n"
- + " \n"
- + " let $metaids := \n"
- + " for $j in $res \n"
- + " return fn:data($j/@id) \n"
- + " \n"
- + " let $datas := \n"
- + " for $k in $metaids \n"
- + " let $d := \n"
- + " for $l in //nmwg:data \n"
- + " where $l/@metadataIdRef = $k \n"
- + " return $l \n"
- + " return $d \n"
- + " \n"
- + " return ($res, $datas) \n";
+ + " return $i \n"
+ + " \n"
+ + " let $metaids := \n"
+ + " for $j in $res \n"
+ + " return fn:data($j/@id) \n"
+ + " \n"
+ + " let $datas := \n"
+ + " for $k in $metaids \n"
+ + " let $d := \n"
+ + " for $l in //nmwg:data \n"
+ + " where fn:data($l/@metadataIdRef) = $k \n"
+ + " return $l \n"
+ + " return $d \n"
+ + " \n"
+ + " return ($res, $datas) \n";

//logger.debug(

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db
(from rev 1928,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db)

Deleted:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/SqlManager.java

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/SqlManager.java
(from rev 1928,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/SqlManager.java)

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql
(from rev 1928,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql)

Deleted:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/MySqlManager.java

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/MySqlManager.java
(from rev 1928,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/MySqlManager.java)

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security
(from rev 1928,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security)

Deleted:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/Credentials.java

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/Credentials.java
(from rev 1928,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/Credentials.java)

Deleted:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/CredentialsException.java

Copied:
branches/ulisseskan/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/CredentialsException.java
(from rev 1928,
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/CredentialsException.java)

Modified:
branches/ulisseskan/src/org/perfsonar/service/web/wsdd/tcmp-service-deploy.wsdd
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/web/wsdd/tcmp-service-deploy.wsdd
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/src/org/perfsonar/service/web/wsdd/tcmp-service-deploy.wsdd
2007-01-17 15:12:11 UTC (rev 1929)
@@ -1,7 +1,7 @@
<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>

-<service name="TCMPService" style="message">
+<service name="MeasurementPointService" style="message">
<Documentation>Defines the name of the service and the type of service. The
style if message which for some reason makes communication cleaner and does
not affect anything. It implicitly uses Document style </Documentation>

<parameter name="className"
value="org.perfsonar.service.web.RequestHandler"/>

Modified:
branches/ulisseskan/src/org/perfsonar/service/web/wsdd/tcmp-service-undeploy.wsdd
===================================================================
---
branches/ulisseskan/src/org/perfsonar/service/web/wsdd/tcmp-service-undeploy.wsdd
2007-01-17 11:31:55 UTC (rev 1928)
+++
branches/ulisseskan/src/org/perfsonar/service/web/wsdd/tcmp-service-undeploy.wsdd
2007-01-17 15:12:11 UTC (rev 1929)
@@ -1,3 +1,3 @@
<undeployment xmlns="http://xml.apache.org/axis/wsdd/";>
- <service name="TCMPService"/>
+ <service name="MeasurementPointService"/>
</undeployment>

r1929 - in branches/ulisseskan: ant ant/rrdma ant/sqlma ant/tcmp ant/xmlls conf conf/template conf/wsdd contrib contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager doc doc/ls doc/ma/rrdTypeMA schema/example-instances/perfSONAR schema/example-instances/perfSONAR/LS/test src/org/perfsonar/client/commons/requests/lookupService src/org/perfsonar/service/lookupService/xmlType src/org/perfsonar/service/measurementArchive/metadataConfig src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator src/org/perfsonar/service/measurementPoint/tracefileCaptureType src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security src/org/perfsonar/service/web/wsdd, svnlog, 01/17/2007

List archive