perfsonar-dev - perfsonar: r2572 - branches/new-structure/trunk/geant2_java-rrd-ma/ant
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: perfsonar: r2572 - branches/new-structure/trunk/geant2_java-rrd-ma/ant
- Date: Wed, 25 Jul 2007 05:18:29 -0400
Author: roman
Date: 2007-07-25 05:18:29 -0400 (Wed, 25 Jul 2007)
New Revision: 2572
Modified:
branches/new-structure/trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
branches/new-structure/trunk/geant2_java-rrd-ma/ant/build.xml
branches/new-structure/trunk/geant2_java-rrd-ma/ant/configure-targets.xml
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml
Log:
loading properties updated
Modified:
branches/new-structure/trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
2007-07-25 08:41:01 UTC (rev 2571)
+++
branches/new-structure/trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
2007-07-25 09:18:29 UTC (rev 2572)
@@ -91,7 +91,7 @@
<echo>inside existing xml tag 'Host':</echo>
<echo></echo>
<echo message=" <Context path='/${deploy.root}'"/>
- <echo message=" docBase='${service.home}/${service.name}'>"/>
+ <echo message=" docBase='${service.home}/${deploy.root}'>"/>
<echo message=" </Context>"/>
<echo></echo>
<input message="Please do it now and press Enter when finished"/>
@@ -224,6 +224,8 @@
<target name="deploy"
xmlns:antcontrib="antlib:net.sf.antcontrib">
+ <property file="${basedir}/ant/const.properties"/>
+
<antcall target="copy-service-jar"/>
<antcall target="tomcat-start"/>
@@ -258,6 +260,8 @@
<target name="undeploy">
+ <property file="${basedir}/ant/const.properties"/>
+
<antcall target="undeploy-adminclient" />
<antcall target="delete-deploy-root"/>
<antcall target="tomcat-shutdown"/>
Modified: branches/new-structure/trunk/geant2_java-rrd-ma/ant/build.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/ant/build.xml
2007-07-25 08:41:01 UTC (rev 2571)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/build.xml
2007-07-25 09:18:29 UTC (rev 2572)
@@ -17,7 +17,7 @@
basedir="..">
- <property file="${basedir}/ant/const.properties"/>
+ <property file="${basedir}/ant/const.properties.template"/>
<property name="antcontrib.jar"
value="${basedir}/lib/misc/ant-contrib-1.0b3.jar"/>
Modified:
branches/new-structure/trunk/geant2_java-rrd-ma/ant/configure-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/ant/configure-targets.xml
2007-07-25 08:41:01 UTC (rev 2571)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/configure-targets.xml
2007-07-25 09:18:29 UTC (rev 2572)
@@ -20,6 +20,10 @@
<import file="exist-targets.xml"/>
+ <!--
===================================================================================
-->
+ <!-- getting metadata configuration -->
+
+
<target name="get-rrd-metaconfig-file"
xmlns:antcontrib="antlib:net.sf.antcontrib">
@@ -158,6 +162,8 @@
<target name="configure"
xmlns:psbase="psbase:/base.perfsonar.org">
+ <property file="${basedir}/ant/const.properties"/>
+
<psbase:template-use template-file="conf/components.properties.template"
dest-file="conf/components.properties"/>
<antcall target="get-rrd-metaconfig-file"/>
Modified:
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
===================================================================
---
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
2007-07-25 08:41:01 UTC (rev 2571)
+++
branches/new-structure/trunk/geant2_java-rrd-ma/ant/pre-install-targets.xml
2007-07-25 09:18:29 UTC (rev 2572)
@@ -490,7 +490,7 @@
<property file="${basedir}/ant/const.properties"/> <!-- loading
service.name property -->
- <psbase:get-service-name default-service-name="${service.name}"
+ <psbase:get-service-name
default-service-name="${service.name}-${version}"
dest-config-file="ant/const.properties"/>
<psbase:get-service-home dest-config-file="ant/const.properties"/>
<psbase:get-tomcat dest-config-file="ant/const.properties"
Modified: branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml
===================================================================
--- branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml
2007-07-25 08:41:01 UTC (rev 2571)
+++ branches/new-structure/trunk/geant2_java-rrd-ma/ant/test-targets.xml
2007-07-25 09:18:29 UTC (rev 2572)
@@ -17,10 +17,6 @@
basedir="..">
- <property name="ma.local"
-
value="http://${target.server}:${target.port}/${deploy.root}/services/MeasurementArchiveService"/>
-
-
<path id="classpath">
<fileset dir="${basedir}/lib/repository">
<include name="**/*.jar"/>
@@ -28,7 +24,15 @@
</path>
- <target name="echo-test">
+ <target name="init-test">
+ <property file="${basedir}/ant/const.properties"/>
+ <property name="ma.local"
+
value="http://${target.server}:${target.port}/${deploy.root}/services/MeasurementArchiveService"/>
+ </target>
+
+
+ <target name="echo-test"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -39,7 +43,8 @@
</target>
- <target name="lookup-info-test">
+ <target name="lookup-info-test"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -52,7 +57,8 @@
<!-- fetching metadata key -->
- <target name="metadata-key-fetch-test-1">
+ <target name="metadata-key-fetch-test-1"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -63,7 +69,8 @@
</target>
- <target name="metadata-key-fetch-test-2">
+ <target name="metadata-key-fetch-test-2"
+ depends="init-test">
<replace file="${basedir}/samples/requests/MetadataKey-Filter-Req-2.xml"
token="__BASEPATH__"
value="${basedir}"/>
@@ -77,7 +84,8 @@
</target>
- <target name="metadata-key-fetch-test-3">
+ <target name="metadata-key-fetch-test-3"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -91,7 +99,8 @@
<!-- fetching data -->
- <target name="data-fetch-test-1">
+ <target name="data-fetch-test-1"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -102,7 +111,8 @@
</target>
- <target name="data-fetch-test-2">
+ <target name="data-fetch-test-2"
+ depends="init-test">
<replace
file="${basedir}/samples/requests/SetupDataRequest-FilterRRDSelect.xml"
token="__BASEPATH__"
value="${basedir}"/>
@@ -116,7 +126,8 @@
</target>
- <target name="data-fetch-test-3">
+ <target name="data-fetch-test-3"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -127,7 +138,8 @@
</target>
- <target name="data-fetch-test-4">
+ <target name="data-fetch-test-4"
+ depends="init-test">
<replace
file="${basedir}/samples/requests/SetupDataRequest-FilterRRDSelect-3.xml"
token="__BASEPATH__"
value="${basedir}"/>
@@ -141,7 +153,8 @@
</target>
- <target name="data-fetch-test-5">
+ <target name="data-fetch-test-5"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -152,7 +165,8 @@
</target>
- <target name="data-fetch-test-6">
+ <target name="data-fetch-test-6"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -165,7 +179,8 @@
<!--storing data -->
- <target name="data-store-test-1">
+ <target name="data-store-test-1"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -176,7 +191,8 @@
</target>
- <target name="data-store-test-2">
+ <target name="data-store-test-2"
+ depends="init-test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
- perfsonar: r2572 - branches/new-structure/trunk/geant2_java-rrd-ma/ant, svnlog, 07/25/2007
Archive powered by MHonArc 2.6.16.