perfsonar-dev - r1906 - in trunk/perfsonar/ant: . sqlma
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: r1906 - in trunk/perfsonar/ant: . sqlma
- Date: Mon, 15 Jan 2007 10:41:31 -0500
Author: roman
Date: 2007-01-15 10:41:30 -0500 (Mon, 15 Jan 2007)
New Revision: 1906
Added:
trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
Modified:
trunk/perfsonar/ant/build-sqlma.xml
trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-client-run-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-exist-xmldb-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-java-compile-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-libs-download-targets.xml
trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml
Log:
changes to support new installation procedure
Modified: trunk/perfsonar/ant/build-sqlma.xml
===================================================================
--- trunk/perfsonar/ant/build-sqlma.xml 2007-01-15 15:21:21 UTC (rev 1905)
+++ trunk/perfsonar/ant/build-sqlma.xml 2007-01-15 15:41:30 UTC (rev 1906)
@@ -17,7 +17,7 @@
-<project basedir="../" default="compile-sqlma" name="perfsonar-sqlma">
+<project basedir="../" name="perfsonar-sqlma">
<property file="ant/const.properties" />
@@ -27,7 +27,8 @@
<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 +42,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,20 +50,19 @@
<!-- dependencies -->
- <import file="rrdma/rrdma-java-compile-targets.xml"/>
<import file="rrdma/rrdma-exist-xmldb-targets.xml"/>
-
<!-- SQL MA imports -->
+ <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"/>
<import file="sqlma/sqlma-exist-xmldb-targets.xml"/>
<import file="sqlma/sqlma-test-run-targets.xml"/>
<import file="sqlma/sqlma-configure-targets.xml"/>
- <import file="sqlma/sqlma-release-targets.xml"/>
+ <!--<import file="sqlma/sqlma-release-targets.xml"/> -->
<import file="sqlma/sqlma-libs-download-targets.xml"/>
Modified: trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml 2007-01-15
15:21:21 UTC (rev 1905)
+++ trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml 2007-01-15
15:41:30 UTC (rev 1906)
@@ -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"/>
+ <!--
+ they are already removed by delete-deploy-root in
delete-jars-for-service
+
<delete>
- <fileset dir="${axis.home}/WEB-INF/classes"
includes="ibatis-*.xml"/>
+ <fileset dir="${service.home}/${deploy.root}/WEB-INF/classes"
includes="ibatis-*.xml"/>
</delete>
- <delete file="${axis.home}/WEB-INF/classes/eventType-map.xml" />
- <delete file="${axis.home}/WEB-INF/classes/eventType-rules.xml" />
+ <delete
file="${service.home}${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-map.xml"
/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-rules.xml"
/>
+ -->
+ <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>
+
+
+ <!-- the main targets -->
+
+ <!--
+
+ xslt does not work for everyone (don't know why) so use of it is
commented
+
+ <target name="deploy" depends="copy-sqlma-jar, add-context-listener"
+ description="Deploys SQL MA service">
+
+ <echo>Deploying the service...</echo>
+
+ <antcall target="tomcat-start-for-sqlma" />
+
+ <antcall target="xmldb-adduser-sqlma" />
+
+ <antcall target="deploy-adminclient" />
+
+ </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" />
+
+ <!-- xslt does not work for everyone (don't know why) so use of it
is commented -->
+ <!-- <antcall target="rem-context-listener" /> -->
+
<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: trunk/perfsonar/ant/sqlma/sqlma-client-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-client-run-targets.xml 2007-01-15
15:21:21 UTC (rev 1905)
+++ trunk/perfsonar/ant/sqlma/sqlma-client-run-targets.xml 2007-01-15
15:41:30 UTC (rev 1906)
@@ -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"/>
+
<!-- utilization -->
<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: trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml 2007-01-15
15:21:21 UTC (rev 1905)
+++ trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml 2007-01-15
15:41:30 UTC (rev 1906)
@@ -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>
- <!--http://localhost:8090/exist/rest/db/sqlmaconfig -->
+ <!-- getting the sql metadata configuration file -->
+
<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">
+
+ <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>
- <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>
-
<!-- creating const.properties file -->
- <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,162 @@
</propertyfile>
- <echo message="const.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>
-
<!-- creating service.properties file -->
+
<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>
+
+
+ <!-- creating components.properties file -->
+
+
+ <target name="copy-components-properties">
+
+ <copy file="conf/components.properties.sqlma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
+ </target>
+
+
+ <!-- configuring store functionality -->
+
+
+ <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>
+
+
+ <!-- configuring LS register functionality -->
+
+
+ <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>
+ <!-- initializing xml database eXist -->
- <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>
+
+
+ <!-- the main 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="store-fuctionality-for-sqlma"/>
+ <antcall target="register-fuctionality-for-sqlma"/>
+
</target>
-</project>
-
+</project>
\ No newline at end of file
Modified: trunk/perfsonar/ant/sqlma/sqlma-exist-xmldb-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-exist-xmldb-targets.xml 2007-01-15
15:21:21 UTC (rev 1905)
+++ trunk/perfsonar/ant/sqlma/sqlma-exist-xmldb-targets.xml 2007-01-15
15:41:30 UTC (rev 1906)
@@ -30,6 +30,11 @@
</target>
+ <target name="xmldb-adduser-sqlma">
+ <antcall target="xmldb-adduser-rrdma"/>
+ </target>
+
+
</project>
Modified: trunk/perfsonar/ant/sqlma/sqlma-java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-java-compile-targets.xml 2007-01-15
15:21:21 UTC (rev 1905)
+++ trunk/perfsonar/ant/sqlma/sqlma-java-compile-targets.xml 2007-01-15
15:41:30 UTC (rev 1906)
@@ -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.">
+ <!-- the main target -->
+
+
+ <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: trunk/perfsonar/ant/sqlma/sqlma-libs-download-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-libs-download-targets.xml 2007-01-15
15:21:21 UTC (rev 1905)
+++ trunk/perfsonar/ant/sqlma/sqlma-libs-download-targets.xml 2007-01-15
15:41:30 UTC (rev 1906)
@@ -53,7 +53,7 @@
- <target name="libs-sqlma">
+ <target name="lib">
<antcall target="libs-generic"/>
<antcall target="libs-for-sqlma"/>
Added: trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
Property changes on: trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml 2007-01-15
15:21:21 UTC (rev 1905)
+++ trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml 2007-01-15
15:41:30 UTC (rev 1906)
@@ -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"
- r1906 - in trunk/perfsonar/ant: . sqlma, svnlog, 01/15/2007
Archive powered by MHonArc 2.6.16.