Skip to Content.
Sympa Menu

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

Subject: perfsonar development work

List archive

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


Chronological Thread 
  • From:
  • To:
  • Subject: r1706 - in branches/romradz-ant4rel-20061017/ant: . rrdma
  • Date: Fri, 20 Oct 2006 09:04:01 -0400
Author: roman
Date: 2006-10-20 09:04:00 -0400 (Fri, 20 Oct 2006)
New Revision: 1706

Added:
branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
Modified:
branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
branches/romradz-ant4rel-20061017/ant/build-rrdma.xml
branches/romradz-ant4rel-20061017/ant/configure-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-pre-install-targets.xml
branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
Log:

Deployment action improved. Now the service and its jars don't not have to be
located under $TOMCAT/webapps dir.
They can be anywhere but the right information must be inserted in the Tomcat
configuration (server.xml) about the service location.

Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
2006-10-20 09:18:09 UTC (rev 1705)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
2006-10-20 13:04:00 UTC (rev 1706)
@@ -23,95 +23,95 @@


<property name="adminService"
value="http://${target.server}:${target.port}/${deploy.root}/services/AdminService";
/>
- <property name="deployFile"
value="${tomcat.home}/webapps/${deploy.root}/wsdd/${wsdd.file.deploy}" />
- <property name="undeployFile"
value="${tomcat.home}/webapps/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
- <property name="axisWebXml"
value="${tomcat.home}/webapps/${deploy.root}/WEB-INF/web.xml" />
+ <property name="deployFile"
value="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <property name="undeployFile"
value="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
+ <property name="axisWebXml"
value="${service.home}/${deploy.root}/WEB-INF/web.xml" />


<target name="create-deploy-root">

- <mkdir dir="${tomcat.home}/webapps/${deploy.root}"/>
- <mkdir dir="${tomcat.home}/webapps/${deploy.root}/wsdd"/>
- <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"/>
+ <mkdir dir="${service.home}/${deploy.root}"/>
+ <mkdir dir="${service.home}/${deploy.root}/wsdd"/>
+ <mkdir dir="${service.home}/${deploy.root}/WEB-INF"/>
+ <mkdir dir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <mkdir dir="${service.home}/${deploy.root}/WEB-INF/classes"/>
+ <mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar"/>
+ <mkdir
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

</target>


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


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

- <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/fingerprint.jsp"
todir="${service.home}/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/happyaxis.jsp"
todir="${service.home}/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/i18nLib.jsp"
todir="${service.home}/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/index.html"
todir="${service.home}/${deploy.root}"/>
+ <copy file="./conf/axis-1.4/index.jsp"
todir="${service.home}/${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/axis-1.4/WEB-INF/users.lst"
todir="${service.home}/${deploy.root}/WEB-INF"/>
+ <copy file="./conf/axis-1.4/WEB-INF/web.xml"
todir="${service.home}/${deploy.root}/WEB-INF"/>

- <copy file="./conf/axis-1.4/WEB-INF/classes/i18n.properties"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes"/>
+ <copy file="./conf/axis-1.4/WEB-INF/classes/i18n.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes"/>

- <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"/>
+ <copy file="./conf/service.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./conf/components.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

</target>


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

- <copy file="./lib/repository/axis/axis/1.4/axis-1.4.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
- <copy
file="./lib/repository/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
- <copy file="./lib/repository/axis/axis-saaj/1.4/axis-saaj-1.4.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
- <copy
file="./lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
- <copy
file="./lib/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/axis/axis/1.4/axis-1.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/axis/axis-saaj/1.4/axis-saaj-1.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>


- <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"/>
+ <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/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <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/javax/activation/activation/1.0.2/activation-1.0.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="./lib/repository/javax/mail/mail/1.3.2/mail-1.3.2.jar"
todir="${service.home}/${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"/>
+ <copy file="./lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"
todir="${service.home}/${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/axis-jaxrpc-1.4.jar"/>
- <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-saaj-1.4.jar"/>
- <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-wsdl4j-1.5.1.jar"/>
- <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-discovery-0.2.jar"/>
- <delete
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-1.4.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-jaxrpc-1.4.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-saaj-1.4.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/axis-wsdl4j-1.5.1.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-discovery-0.2.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/commons-logging-1.0.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="${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/lib/xml-apis-1.3.02.jar"/>
+ <delete
file="${service.home}/${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="${service.home}/${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="${service.home}/${deploy.root}/WEB-INF/lib/activation-1.0.2.jar"/>
+ <delete
file="${service.home}/${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"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/log4j-1.2.9.jar"/>

<antcall target="delete-deploy-root"/>

@@ -120,19 +120,19 @@

<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="${service.home}/${deploy.root}/fingerprint.jsp"/>
+ <delete file="${service.home}/${deploy.root}happyaxis.jsp"/>
+ <delete file="${service.home}/${deploy.root}/i18nLib.jsp"/>
+ <delete file="${service.home}/${deploy.root}/index.html"/>
+ <delete file="${service.home}/${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="${service.home}/${deploy.root}/WEB-INF/users.lst"/>
+ <delete file="${service.home}/${deploy.root}/WEB-INF/web.xml"/>

- <delete
file=".${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/i18n.properties"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/i18n.properties"/>

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

</target>

@@ -156,7 +156,7 @@
if="jar.perfsonar.generic.present"
description="Copy generic jar to Tomcat">

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

</target>

@@ -206,6 +206,14 @@
depends="tomcat-start-question"
if="tomcat.start.decision">

+ <echo>Please, insert now the following xml tag Context into Tomcat
configuration file server.xml (${tomcat.home}/conf/server.xml) inside
existing xml tag Host:</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <input message="Press Return key ..."/>
+
<exec dir="${tomcat.home}/bin"
executable="sh"
output="${basedir}/log/tomcat.log"

Modified: branches/romradz-ant4rel-20061017/ant/build-rrdma.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/build-rrdma.xml 2006-10-20
09:18:09 UTC (rev 1705)
+++ branches/romradz-ant4rel-20061017/ant/build-rrdma.xml 2006-10-20
13:04:00 UTC (rev 1706)
@@ -40,6 +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"/>

Modified: branches/romradz-ant4rel-20061017/ant/configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-20
09:18:09 UTC (rev 1705)
+++ branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-20
13:04:00 UTC (rev 1706)
@@ -68,7 +68,7 @@
defaultvalue="8080"
/>

- <echo message="Make sure that your application server Tomcat has the
same port for the http communication. If not then configure the Tomcat in
order to use this port number."/>
+ <echo message="Make sure that your application server Tomcat has the
same port for the http communication. If not then configure the Tomcat in
order to use this port number (Please, do it now. After the change continue
the installation.)."/>
<input message="Press Return key ..."/>

</target>
@@ -111,6 +111,20 @@
</target>


+ <!-- getting the service directory -->
+
+
+ <target name="get-service-directory">
+
+ <dirname property="_service.home" file="${basedir}"/>
+
+ <input message="Enter the path where you want to install the service
[${_service.home}]:"
+ addproperty="service.home"
+ defaultvalue="${_service.home}" />
+
+ </target>
+
+
<!-- creating log4j.properties file -->



Added: branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml


Property changes on:
branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
2006-10-20 09:18:09 UTC (rev 1705)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
2006-10-20 13:04:00 UTC (rev 1706)
@@ -83,12 +83,13 @@
-lc -lrrd"/>
</exec>

+ <!--
<echo message="" />
<echo message="" />
- <echo
message="-----------------------------------------------------------" />
<echo message="Now you need to setup LD_LIBRARY_PATH env variable
which should contain" />
<echo message="${rrd_lib_path}:${rrdjdir}/build" />
- <echo
message="-----------------------------------------------------------" />
+ <echo message="" />
+ -->

</target>


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-20 09:18:09 UTC (rev 1705)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
2006-10-20 13:04:00 UTC (rev 1706)
@@ -21,52 +21,52 @@

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

- <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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.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/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/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/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
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-optional/1.0rc/exist-optional-1.0rc.jar"
todir="${service.home}/${deploy.root}/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="./lib/repository/net/sf/saxon/saxon/8.7/saxon-8.7.jar"

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

- <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"/>
+ <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="${tomcat.home}/webapps/${deploy.root}/wsdd"/>
- <copy file="./conf/wsdd/${wsdd.file.undeploy}"

todir="${tomcat.home}/webapps/${deploy.root}/wsdd"/>
+ <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-rrdma" depends="delete-jars-for-service">

- <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="${service.home}/${deploy.root}/WEB-INF/lib/rrdjtool-1.0.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="${service.home}/${deploy.root}/WEB-INF/lib/ibatis-common-2.1.7.597.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="${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}/WEB-INF/lib/exist-db-1.0rc.jar" />
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-optional-1.0rc.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="${service.home}/${deploy.root}/WEB-INF/lib/saxon-8.7.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-jdom-8.7.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/saxon-dom-8.7.jar"/>

- <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"
/>
+ <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="${tomcat.home}/webapps/${deploy.root}/wsdd/${wsdd.file.deploy}" />
- <delete
file="${tomcat.home}/webapps/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />

</target>

@@ -90,7 +90,7 @@
if="jar.perfsonar.rrdma.present"
description="Copy rrdma jar to Tomcat">

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

</target>

@@ -98,7 +98,15 @@
<target name="tomcat-start-for-rrdma-true"
depends="tomcat-start-question"
if="tomcat.start.decision">
-
+
+ <echo>Please, insert now the following xml tag Context into Tomcat
configuration file server.xml (${tomcat.home}/conf/server.xml) inside
existing xml tag Host:</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <input message="Press Return key ..."/>
+
<exec dir="${tomcat.home}/bin"
executable="sh"
output="${basedir}/log/tomcat.log"
@@ -114,8 +122,17 @@
<target name="tomcat-start-for-rrdma-false"
unless="tomcat.start.decision">

+ <echo>Please, insert now the following xml tag Context into Tomcat
configuration file server.xml (${tomcat.home}/conf/server.xml) inside
existing xml tag Host:</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <input message="Press Return key ..."/>
+
+
<echo>${line.separator}You have to manually set up the env variable
LD_LIBRARY_PATH which should be seen by the Tomcat instance.</echo>
- <echo>After setting up the variable restart the Tomcat.</echo>
+ <echo>After setting up the variable (re)start the Tomcat.</echo>

<echo>${line.separator}Example:</echo>
<echo> export
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrdtool_path}/lib:${rrdjdir}/build</echo>
@@ -145,6 +162,8 @@
<target name="deploy" depends="copy-rrdma-jar, add-context-listener"
description="Deploys RRD MA service">

+ <echo>Deploying the service...</echo>
+
<antcall target="tomcat-start-for-rrdma" />
<antcall target="deploy-adminclient" />

@@ -164,14 +183,16 @@
<target name="undeploy"
description="Undeploys RRD MA service">

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

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

- <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"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-rrdma.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>

<antcall target="tomcat-shutdown" />


Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
2006-10-20 09:18:09 UTC (rev 1705)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
2006-10-20 13:04:00 UTC (rev 1706)
@@ -16,14 +16,16 @@



- <property name="deploy.root" value="pS-1.0-RRDMA" />
+ <property name="service.name" value="pS-1.0-RRDMA" />
+ <property name="deploy.root" value="${service.name}" />


+
<!-- getting the rrd metadata configuration file -->


<target name="__get-rrd-config-file">
- <input message="Enter the path of rrd config file
[${basedir}/conf/rrd-database_TEST.xml]:"
+ <input message="Enter the path of rrd metadata configuration file
[${basedir}/conf/rrd-database_TEST.xml]:"
addproperty="rrd.config.file"
defaultvalue="${basedir}/conf/rrd-database_TEST.xml"
/>
@@ -56,6 +58,7 @@
<propertyfile file="ant/const.properties"
comment="This file was created by the Ant
configuration script.">

+ <entry key="service.name" value="${service.name}"/>
<entry key="deploy.root" value="${deploy.root}"/>
<entry key="tomcat.home" value="${tomcat.install.location}"/>
<entry key="target.server" value="${server.address}"/>
@@ -132,8 +135,10 @@


<target name="create-testrrdconfig-for-rrdma">
- <copy file="conf/rrd-database_TEST.xml"
tofile="conf/rrd-database_TEST-old.xml" overwrite="true" failonerror="false"/>
- <replace file="conf/rrd-database_TEST.xml" token="__BASEPATH__"
value="${basedir}"/>
+
+ <copy file="conf/rrd-database_TEST.xml"
tofile="conf/rrd-database_TEST-old.xml" overwrite="true" failonerror="false"/>
+ <replace file="conf/rrd-database_TEST.xml" token="__BASEPATH__"
value="${basedir}"/>
+
</target>


@@ -141,10 +146,14 @@


<target name="configure">
+
+ <echo>Configuring...</echo>
+
<antcall target="set-const-properties-for-rrdma"/>
<antcall target="set-service-properties-for-rrdma"/>
<antcall target="set-log4j-properties"/>
<antcall target="create-testrrdconfig-for-rrdma"/>
+
</target>



Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
2006-10-20 09:18:09 UTC (rev 1705)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
2006-10-20 13:04:00 UTC (rev 1706)
@@ -108,9 +108,13 @@

<target name="pre-install">

+ <echo>Preparing the installation of ${service.name}...</echo>
+
+ <antcall target="get-service-home"/>
+
<antcall target="webservice-container-download"/>

- <echo>Building the rrdjtool library...</echo>
+ <echo>${line.separator}Building the rrdjtool library...</echo>
<antcall target="rrdjtool"/>

</target>

Modified: branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
2006-10-20 09:18:09 UTC (rev 1705)
+++ branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
2006-10-20 13:04:00 UTC (rev 1706)
@@ -17,8 +17,8 @@
<!-- Download URLs -->

<property name="_tomcat.download.url"
-
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.tar.gz";
/>
- <property name="tomcat.dir" value="apache-tomcat-5.5.17" />
+
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
/>
+ <property name="tomcat.dir" value="apache-tomcat-5.5.20" />


<!-- targets -->
@@ -70,9 +70,11 @@
depends="webservice-container-question"
if="tomcat.install.decision">

- <input message="Enter the path for the Tomcat installation:
[${basedir}/../${tomcat.dir}]:"
+ <dirname property="_tomcat.install.location" file="${basedir}"/>
+
+ <input message="Enter the path for the Tomcat installation:
[${_tomcat.install.location}/${tomcat.dir}]:"
addproperty="tomcat.install.location"
- defaultvalue="${basedir}/../${tomcat.dir}" />
+ defaultvalue="${_tomcat.install.location}/${tomcat.dir}" />

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


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

Archive powered by MHonArc 2.6.16.

Top of Page