Skip to Content.
Sympa Menu

perfsonar-dev - r1687 - in branches/romradz-ant4rel-20061017/ant: . rrdma

Subject: perfsonar development work

List archive

r1687 - in branches/romradz-ant4rel-20061017/ant: . rrdma


Chronological Thread 
  • From:
  • To:
  • Subject: r1687 - in branches/romradz-ant4rel-20061017/ant: . rrdma
  • Date: Wed, 18 Oct 2006 09:00:38 -0400
Author: roman
Date: 2006-10-18 09:00:35 -0400 (Wed, 18 Oct 2006)
New Revision: 1687

Modified:
branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml
Log:
Changes of deploy targets. It's connected with new proposed location of the
service in the Tomcat.

Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
2006-10-18 09:14:37 UTC (rev 1686)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
2006-10-18 13:00:35 UTC (rev 1687)
@@ -25,50 +25,102 @@
<property name="adminService"
value="http://${target.server}:${target.port}/axis/services/AdminService"; />
<property name="deployFile"
value="../${build}/${wsdd.path}/${wsdd.file.deploy}" />
<property name="undeployFile"
value="../${build}/${wsdd.path}/${wsdd.file.undeploy}" />
- <property name="axisWebXml" value="${axis.home}/WEB-INF/web.xml" />
+ <property name="axisWebXml"
value="${tomcat.home}/webapps/${deploy.root}/WEB-INF/web.xml" />


<target name="create-deploy-root">
- <mkdir dir="${service.tomcat.home}/webapps/${service.deploy.root}"/>
+
+ <mkdir dir="${tomcat.home}/webapps/${deploy.root}"/>
+ <mkdir dir="${tomcat.home}/webapps/${deploy.root}/WEB-INF"/>
+ <mkdir dir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <mkdir dir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes"/>
+ <mkdir
dir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar"/>
+ <mkdir
dir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+
</target>


+ <target name="delete-deploy-root">
+ <delete dir="${tomcat.home}/webapps/${deploy.root}"/>
+ </target>


- <target name="copy-jars-for-service" depends="create-deploy-root">
+ <target name="copy-axis-for-service" depends="create-deploy-root">

- <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/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="./conf/axis-1.4/fingerprint.jsp"
todir="${tomcat.home}/webapps/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/happyaxis.jsp"
todir="${tomcat.home}/webapps/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/i18nLib.jsp"
todir="${tomcat.home}/webapps/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/index.html"
todir="${tomcat.home}/webapps/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/index.jsp"
todir="${tomcat.home}/webapps/${deploy.root}"/>

+ <copy file="./conf/axis-1.4/WEB-INF/users.lst"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF"/>
+ <copy file="./conf/axis-1.4/WEB-INF/web.xml"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF"/>
+
+ <copy file="./conf/service.properties"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./conf/components.properties"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+
</target>


- <target name="delete-jars-for-service">
+ <target name="copy-jars-for-service" depends="copy-axis-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"/>
+ <copy file="./lib/repository/axis/axis/1.4/axis-1.4.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>

- <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.1.jar"/>
+ <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>

- <delete file="${axis.home}/WEB-INF/lib/activation-1.0.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/mail-1.3.2.jar"/>
+ <copy
file="./lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>

- <delete file="${axis.home}/WEB-INF/lib/log4j-1.2.9.jar"/>
+ <copy
file="./lib/repository/javax/activation/activation/1.0.2/activation-1.0.2.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>

+ <copy file="./lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+
</target>


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

+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-1.4.jar"/>
+
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/jdom-1.0b8.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/xalan-2.7.0.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/lib/xml-apis-1.3.02.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
+
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-pool-1.1.jar"/>
+
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/activation-1.0.2.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/mail-1.3.2.jar"/>
+
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/log4j-1.2.9.jar"/>
+
+ <antcall target="delete-deploy-root"/>
+
+ </target>
+
+
+ <target name="delete-axis-for-service">
+
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/fingerprint.jsp"/>
+ <delete file="${tomcat.home}/webapps/${deploy.root}happyaxis.jsp"/>
+ <delete file="${tomcat.home}/webapps/${deploy.root}/i18nLib.jsp"/>
+ <delete file="${tomcat.home}/webapps/${deploy.root}/index.html"/>
+ <delete file="${tomcat.home}/webapps/${deploy.root}/index.jsp"/>
+
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/users.lst"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/web.xml"/>
+
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf/components.properties"/>
+
+ </target>
+
+
<!-- generic -->

<available file="${build}/perfSONAR-generic.jar"
property="jar.perfsonar.generic.present"/>
@@ -88,9 +140,10 @@
if="jar.perfsonar.generic.present"
description="Copy generic jar to Tomcat">

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

</target>
+

<!-- Add service (un)initialization context listener class to AXIS
web.xml -->
<target name="add-context-listener">
@@ -104,6 +157,7 @@

</target>

+
<!-- Remove service (un)initialization context listener class from AXIS
web.xml -->
<target name="rem-context-listener">

@@ -114,6 +168,33 @@
<copy file="${axisWebXml}.out" tofile="${axisWebXml}"
overwrite="yes" />

</target>
+
+
+ <!-- running and stopping the Tomcat -->
+
+ <property environment="env"/>

+ <target name="tomcat-start">
+ <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:."/>
+ </exec>
+ </target>
+
+
+ <target name="tomcat-shutdown">
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="shutdown.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ </exec>
+ </target>

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

Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
2006-10-18 09:14:37 UTC (rev 1686)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
2006-10-18 13:00:35 UTC (rev 1687)
@@ -27,14 +27,8 @@


<property name="lib_name" value="libjrrd.so" />
- <!--
- <property name="rrd_h_path" value="${rrdtool_path}/include" />
- <property name="rrd_lib_path" value="${rrdtool_path}/lib" />
- -->


-
-
<!-- targets -->



Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
2006-10-18 09:14:37 UTC (rev 1686)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
2006-10-18 13:00:35 UTC (rev 1687)
@@ -21,46 +21,46 @@

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

- <copy file="./lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.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/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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"

todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
todir="${tomcat.home}/webapps/${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="${tomcat.home}/webapps/${deploy.root}/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="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/exist/exist-optional/1.0rc/exist-optional-1.0rc.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"

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

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

todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-optional/1.0rc/exist-optional-1.0rc.jar"

todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>

- <copy file="./lib/repository/net/sf/saxon/saxon/8.7/saxon-8.7.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/net/sf/saxon/saxon-jdom/8.7/saxon-jdom-8.7.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="./lib/repository/net/sf/saxon/saxon/8.7/saxon-8.7.jar"

todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/net/sf/saxon/saxon-jdom/8.7/saxon-jdom-8.7.jar"

todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar"

todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>

- <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="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./conf/eventType-rules.xml"

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

</target>


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

- <delete file="${axis.home}/WEB-INF/lib/rrdjtool-1.0.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="${axis.home}/WEB-INF/lib/ibatis-common-2.1.7.597.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/rrdjtool-1.0.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-digester-1.7.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-collections-3.2.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/ibatis-common-2.1.7.597.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="${axis.home}/WEB-INF/lib/exist-db-1.0rc.jar" />
- <delete file="${axis.home}/WEB-INF/lib/exist-optional-1.0rc.jar" />
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/exist-xmldb-1.0rc.jar"
/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/exist-xmlrpc-1.0rc.jar"
/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/exist-db-1.0rc.jar" />
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/exist-optional-1.0rc.jar"
/>

- <delete file="${axis.home}/WEB-INF/lib/saxon-8.7.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/saxon-jdom-8.7.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/saxon-dom-8.7.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/saxon-8.7.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/saxon-jdom-8.7.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/saxon-dom-8.7.jar"/>

- <delete file="${axis.home}/WEB-INF/classes/eventType-map.xml" />
- <delete file="${axis.home}/WEB-INF/classes/eventType-rules.xml" />
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-map.xml"
/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-rules.xml"
/>

</target>

@@ -84,45 +84,46 @@
if="jar.perfsonar.rrdma.present"
description="Copy rrdma jar to Tomcat">

- <copy file="${build}/perfSONAR-rrdma.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="${build}/perfSONAR-rrdma.jar"
todir="${tomcat.home}/webapps/${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="deploy-rrdma" depends="copy-rrdma-jar,
add-context-listener"
+ <target name="deploy" depends="copy-rrdma-jar, add-context-listener"
description="Deploys RRD MA service">
+
+ <antcall target="tomcat-start" />
+
+ <!--
<java classname="org.apache.axis.client.AdminClient">
<arg line="-l ${adminService} ${deployFile}"/>
<classpath refid="classpath"/>
</java>
+ -->
</target>


- <target name="undeploy-rrdma"
+ <target name="undeploy"
description="Undeploys RRD MA service">

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

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

- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-rrdma.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/perfSONAR-rrdma.jar"/>
+ <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>

+ <antcall target="tomcat-shutdown" />
+
</target>



-
</project>

Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
2006-10-18 09:14:37 UTC (rev 1686)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
2006-10-18 13:00:35 UTC (rev 1687)
@@ -91,7 +91,7 @@
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://${target.server}:${target.port}/${deploy.root}/${webservice.name}"/>
+ <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 RRD MA"/>
<entry key="service.r.service_type" value="RRD MA"/>
<entry key="service.r.service_description" value="Java RRD MA,
perfSONAR project"/>

Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml
2006-10-18 09:14:37 UTC (rev 1686)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml
2006-10-18 13:00:35 UTC (rev 1687)
@@ -16,6 +16,11 @@
<project name="rrdma-test-run-targets">


+ <target name="test">
+ <antcall target="run-rrdma-client"/>
+ </target>
+
+
<target name="run-rrdma-test1" description="Runs test3">
<java
classname="org.perfsonar.service.testHarness.RequestHandlerTester"
classpathref="classpath"


  • r1687 - in branches/romradz-ant4rel-20061017/ant: . rrdma, svnlog, 10/18/2006

Archive powered by MHonArc 2.6.16.

Top of Page