Skip to Content.
Sympa Menu

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

Subject: perfsonar development work

List archive

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


Chronological Thread 
  • From:
  • To:
  • Subject: r1715 - in branches/romradz-ant4rel-20061017/ant: . rrdma
  • Date: Wed, 25 Oct 2006 06:51:04 -0400
Author: roman
Date: 2006-10-25 06:51:03 -0400 (Wed, 25 Oct 2006)
New Revision: 1715

Removed:
branches/romradz-ant4rel-20061017/ant/exist-xmldb-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/java-compile-targets.xml
branches/romradz-ant4rel-20061017/ant/javadoc-targets.xml
branches/romradz-ant4rel-20061017/ant/libs-download-targets.xml
branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-java-compile-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-junit-test-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-libs-download-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml
branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
Log:
Cleaning. Preparing for the release.

Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -6,7 +6,7 @@
author: romradz

Notes:
- A set of targets for deployment of web service in the Axis.
+ A set of targets for deployment of Axis web service.

</description>
==================================================================== -->
@@ -56,9 +56,9 @@

<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="${service.home}/${deploy.root}/WEB-INF/classes"/>
-
+
<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"/>

@@ -162,10 +162,10 @@


<!-- adding/removing a new listener to/from the Axis file web.xml -->
-
+
<!-- Add service (un)initialization context listener class to AXIS
web.xml -->
<target name="add-context-listener">
-
+
<copy file="${axisWebXml}" tofile="${axisWebXml}.bak"
overwrite="yes" />
<style in="${axisWebXml}" out="${axisWebXml}.out"
style="ant/add-context-listener.xsl" />
<copy file="${axisWebXml}.out" tofile="${axisWebXml}"
overwrite="yes" />
@@ -212,6 +212,7 @@
<echo message="
docBase='${service.home}/${service.name}'&gt;"/>
<echo message=" &lt;/Context&gt;"/>
<echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
<input message="Press Return key ..."/>

<exec dir="${tomcat.home}/bin"

Modified: branches/romradz-ant4rel-20061017/ant/build-rrdma.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/build-rrdma.xml 2006-10-24
16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/build-rrdma.xml 2006-10-25
10:51:03 UTC (rev 1715)
@@ -4,14 +4,14 @@
<!-- ===================================================================
<description>
perfSONAR generic service
-
+
$Id$
project: perfSONAR
author: romradz
-
+
Notes:
This is a build file for RRD MA.
-
+
</description>
==================================================================== -->

@@ -44,16 +44,13 @@
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>
<import file="libs-download-targets.xml"/>
- <import file="exist-xmldb-targets.xml"/>



<!-- RRD MA imports -->

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

Modified: branches/romradz-ant4rel-20061017/ant/configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-24
16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-25
10:51:03 UTC (rev 1715)
@@ -72,7 +72,7 @@
<echo>for the http communication. If not then configure the Tomcat
in order</echo>
<echo>to use this port number.</echo>
<echo></echo>
- <echo>Please, do it now.</echo>
+ <echo>Please, do it now. I will wait for you.</echo>
<input message="Press Return key ..."/>

</target>
@@ -93,25 +93,25 @@


<target name="_get-tomcat-directory_1" depends="__get-tomcat-directory"
if="tomcat.home.present">
-
+
<input message="Enter the path for the Tomcat installation:
[${tomcat.home}]:"
addproperty="tomcat.install.location"
defaultvalue="${tomcat.home}" />
-
+
</target>


<target name="_get-tomcat-directory_2" depends="__get-tomcat-directory"
unless="tomcat.home.present">
-
+
<input message="Enter the path for the Tomcat installation:
[/usr/local/rrdtool]:"
addproperty="tomcat.install.location"
defaultvalue="/usr/local/rrdtool" />
-
+
</target>


<target name="get-tomcat-directory"
- depends="_get-tomcat-directory_1, _get-tomcat-directory_2">
+ depends="_get-tomcat-directory_1, _get-tomcat-directory_2">
</target>


@@ -121,7 +121,7 @@
<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}" />
@@ -143,51 +143,51 @@

<entry key="log4j.rootLogger" value="INFO, rootAppender"/>
<entry key="log4j.logger.perfsonar-debug" value="DEBUG,
debugAppender"/>
- <entry key="log4j.logger.perfsonar-info" value="INFO,
infoAppender"/>
- <entry key="log4j.logger.perfsonar-warn" value="WARN,
warnAppender"/>
+ <entry key="log4j.logger.perfsonar-info" value="INFO,
infoAppender"/>
+ <entry key="log4j.logger.perfsonar-warn" value="WARN,
warnAppender"/>
<entry key="log4j.logger.perfsonar-error" value="ERROR,
errorAppender"/>
<entry key="log4j.logger.perfsonar-fatal" value="FATAL,
fatalAppender"/>

- <entry key="log4j.appender.rootAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.rootAppender.File"
value="${logDir}/perfsonar.log"/>
- <entry key="log4j.appender.rootAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.rootAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.rootAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.rootAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.rootAppender.File"
value="${logDir}/perfsonar.log"/>
+ <entry key="log4j.appender.rootAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.rootAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.rootAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.rootAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.debugAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.debugAppender.File"
value="${logDir}/perfsonar_debug.log"/>
- <entry key="log4j.appender.debugAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.debugAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.debugAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.debugAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.debugAppender.File"
value="${logDir}/perfsonar_debug.log"/>
+ <entry key="log4j.appender.debugAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.debugAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.debugAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.debugAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.infoAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.infoAppender.File"
value="${logDir}/perfsonar_info.log"/>
- <entry key="log4j.appender.infoAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.infoAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.infoAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.infoAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.infoAppender.File"
value="${logDir}/perfsonar_info.log"/>
+ <entry key="log4j.appender.infoAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.infoAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.infoAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.infoAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.warnAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.warnAppender.File"
value="${logDir}/perfsonar_warn.log"/>
- <entry key="log4j.appender.warnAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.warnAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.warnAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.warnAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.warnAppender.File"
value="${logDir}/perfsonar_warn.log"/>
+ <entry key="log4j.appender.warnAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.warnAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.warnAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.warnAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.errorAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.errorAppender.File"
value="${logDir}/perfsonar_error.log"/>
- <entry key="log4j.appender.errorAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.errorAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.errorAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.errorAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.errorAppender.File"
value="${logDir}/perfsonar_error.log"/>
+ <entry key="log4j.appender.errorAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.errorAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.errorAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.errorAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

- <entry key="log4j.appender.fatalAppender"
value="org.apache.log4j.RollingFileAppender"/>
- <entry key="log4j.appender.fatalAppender.File"
value="${logDir}/perfsonar_fatal.log"/>
- <entry key="log4j.appender.fatalAppender.MaxFileSize"
value="500KB"/>
- <entry key="log4j.appender.fatalAppender.MaxBackupIndex"
value="1000"/>
- <entry key="log4j.appender.fatalAppender.layout"
value="org.apache.log4j.PatternLayout"/>
+ <entry key="log4j.appender.fatalAppender"
value="org.apache.log4j.RollingFileAppender"/>
+ <entry key="log4j.appender.fatalAppender.File"
value="${logDir}/perfsonar_fatal.log"/>
+ <entry key="log4j.appender.fatalAppender.MaxFileSize"
value="500KB"/>
+ <entry key="log4j.appender.fatalAppender.MaxBackupIndex"
value="1000"/>
+ <entry key="log4j.appender.fatalAppender.layout"
value="org.apache.log4j.PatternLayout"/>
<entry
key="log4j.appender.fatalAppender.layout.ConversionPattern" value="%d %5p -
%m%n"/>

</propertyfile>
@@ -207,7 +207,7 @@
</target>


- <!-- switching on LS registration functionality -->
+ <!-- configuring LS register functionality -->


<target name="register-fuctionality-question">
@@ -247,11 +247,169 @@
<entry key="component.registrator.interval"
value="${functionality.register.interval}"/>

</propertyfile>
-

+
</target>


+ <!-- configuring xml database eXist-->

+
+ <target name="exist-install-question">
+
+ <input message="Do you want to install the xml database eXist? "
+ addproperty="_exist.install.decision"
+ validargs="y,n"
+ defaultvalue="n" />
+
+ <condition property="exist.install.decision">
+ <equals arg1="y" arg2="${_exist.install.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="exist-install"
+ depends="exist-install-question"
+ if="exist.install.decision">
+
+ <echo>Visit the download page
http://prdownloads.sourceforge.net/exist</echo>
+ <echo>and download the file eXist-1.0.jar. </echo>
+ <echo></echo>
+ <echo>Install the application executing the following command:</echo>
+ <echo></echo>
+ <echo> java -jar eXist-1.0.jar</echo>
+ <echo></echo>
+ <echo>By dafault eXist is available on the port 8080.</echo>
+ <echo>To change this number open the file bin/startup.sh</echo>
+ <echo>and replace the line:</echo>
+ <echo></echo>
+ <echo> OPTIONS="-Dexist.home=$EXIST_HOME"</echo>
+ <echo></echo>
+ <echo>with the line:</echo>
+ <echo></echo>
+ <echo> OPTIONS="-Dexist.home=$EXIST_HOME -Djetty.port=8585"</echo>
+ <echo></echo>
+ <echo>(port number 8585 is only an example).</echo>
+ <echo></echo>
+ <echo>When installed run the application executing</echo>
+ <echo>the script startup.sh .</echo>
+ <echo></echo>
+ <echo>Please, do it now.</echo>
+
+ <echo></echo>
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ <target name="exist-use-question">
+
+ <input message="Do you want to use the xml database eXist as a
metadata configuration storage? "
+ addproperty="_exist.use.decision"
+ validargs="y,n"
+ defaultvalue="n" />
+
+ <condition property="exist.use.decision">
+ <equals arg1="y" arg2="${_exist.use.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="exist-location-question">
+
+ <input message="Enter the path of eXist [/usr/local/eXist] ? "
+ addproperty="_exist.home"
+ defaultvalue="/usr/local/eXist" />
+
+ <propertyfile file="ant/const.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="exist.home" value="${_exist.home}"/>
+
+ </propertyfile>
+
+ </target>
+
+
+ <target name="exist-use"
+ depends="exist-use-question"
+ if="exist.use.decision">
+
+ <antcall target="exist-location-question"/>
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="component.ma.xmldb.db_status" value="on"/>
+ <entry key="component.ma.xmldb.db_access" value="xmlrpc"/>
+
+ </propertyfile>
+
+ </target>
+
+
+ <target name="exist-adduser">
+
+ <property file="ant/const.properties" />
+
+ <echo>Add new user in your xml database eXist.</echo>
+ <echo>You can do it using client application which can be
found</echo>
+ <echo>in eXist installation (${exist.home}/bin/client.sh).</echo>
+ <echo></echo>
+ <echo>Example use:</echo>
+ <echo> client.sh -s
-ouri=xmldb:exist://localhost:8585/exist/xmlrpc</echo>
+ <echo> exist:/db>adduser pSservice</echo>
+ <echo> password: </echo>
+ <echo> re-enter password:</echo>
+ <echo> home collection [none]:</echo>
+ <echo> enter groups: dba</echo>
+ <echo></echo>
+ <echo>(user name, hostname and port number 8585 are only
examples)</echo>
+ <echo></echo>
+
+ <echo>Please, do it now.</echo>
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ <target name="exist-datails-question">
+
+ <input message="Enter the host name of xml database eXist
[localhost]:"
+ addproperty="_exist.hostname"
+ defaultvalue="localhost" />
+
+ <input message="Enter the port number of xml database eXist [8080]:"
+ addproperty="_exist.port"
+ defaultvalue="8080" />
+
+ <input message="Enter the user name []:"
+ addproperty="_exist.username"/>
+
+ <input message="Enter the pasword for user name []:"
+ addproperty="_exist.password"/>
+
+ <propertyfile file="ant/const.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="exist.hostname" value="${_exist.hostname}"/>
+ <entry key="exist.port" value="${_exist.port}"/>
+
+ </propertyfile>
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="component.ma.xmldb.db_username"
value="${_exist.username}"/>
+ <entry key="component.ma.xmldb.db_password"
value="${_exist.password}"/>
+
+ </propertyfile>
+
+ </target>
+
+
+
</project>


Deleted: branches/romradz-ant4rel-20061017/ant/exist-xmldb-targets.xml

Modified: branches/romradz-ant4rel-20061017/ant/java-compile-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/java-compile-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/java-compile-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -18,55 +18,65 @@
<project name="java-compile-targets">


- <!-- all sources -->

-
<target name="clean-all"
description="Removes build directories.">
+
<delete dir="${build}/org"/>
<delete>
<fileset dir="${build}" includes="**/*.jar"/>
<fileset dir="${build}" includes="**/*.xml"/>
</delete>
+
</target>


<target name="clean-jar-all">
+
<delete file="${build}/perfSONAR-all.jar" failonerror="false"/>
+
</target>


<target name="compile-all"
depends="clean-all"
description="Compiles all Java files">
+
<javac srcdir="src" destdir="${build}" deprecation="yes">
<include name="**/*.java" />
<classpath refid="classpath"/>
</javac>
+
<copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
<fileset dir="src/${package.root}/${wsdd.home}">
<include name="*.wsdd" />
</fileset>
</copy>
+
</target>


<target name="jar-all" depends="clean-jar-all, compile-all"
description="Creates JAR file for all perfSONAR classes">
+
<jar destfile="${build}/perfSONAR-all.jar" basedir="${build}" />
+
</target>


-
<!-- generic -->

+
<target name="clean-jar-generic">
+
<delete file="${build}/perfSONAR-generic.jar" failonerror="false"/>
+
</target>


<target name="compile-generic"
description="Compiles generic Java files">
+
<javac srcdir="src" destdir="${build}" deprecation="yes">
<include name="org/perfsonar/commons/**" />
<include name="org/perfsonar/service/commons/**" />
@@ -77,11 +87,13 @@
<include name="org/ggf/**" />
<classpath refid="classpath"/>
</javac>
+
</target>


<target name="jar-generic" depends="clean-jar-generic, compile-generic"
description="Creates JAR file for generic">
+
<jar destfile="${build}/perfSONAR-generic.jar">
<fileset dir="${build}">
<include name="org/perfsonar/commons/**" />
@@ -93,6 +105,7 @@
<include name="org/ggf/**" />
</fileset>
</jar>
+
</target>



Modified: branches/romradz-ant4rel-20061017/ant/javadoc-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/javadoc-targets.xml 2006-10-24
16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/javadoc-targets.xml 2006-10-25
10:51:03 UTC (rev 1715)
@@ -20,15 +20,19 @@


<target name="clean-javadoc"
- description="Removes Java doc API">
- <property file="ant/const.properties" />
+ description="Removes Java doc API">
+
+ <property file="ant/const.properties" />
<delete dir="${api.location}"/>
+
</target>


- <target name="javadoc" depends="init,clean-javadoc"
- description="Generates Javadoc API">
- <property file="ant/const.properties" />
+ <target name="javadoc"
+ depends="init,clean-javadoc"
+ description="Generates Javadoc API">
+
+ <property file="ant/const.properties" />
<javadoc
packagenames="org.*"
destdir="${api.location}"
@@ -42,6 +46,7 @@
doctitle="${api.title}"
windowtitle="${api.windowtitle}">
</javadoc>
+
</target>



Modified: branches/romradz-ant4rel-20061017/ant/libs-download-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/libs-download-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/libs-download-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -2,17 +2,17 @@

<!-- ===================================================================
<description>
-
+
$Id$
project: perfSONAR
author: romradz
-
+
Notes: Targets to download needed libraries
-
+
</description>
==================================================================== -->
-
-
+
+
<project basedir="../" name="libs-download-targets"
xmlns:artifact="urn:maven-artifact-ant">



Modified: branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -2,13 +2,13 @@

<!-- ===================================================================
<description>
-
+
$Id$
project: perfSONAR
author: romradz
-
+
Notes: Targets to pre-install the service.
-
+
</description>
==================================================================== -->

@@ -21,7 +21,9 @@

<propertyfile file="ant/const.properties"
comment="This file was created by the ant script.">
+
<entry key="service.home" value="${service.home}"/>
+
</propertyfile>

</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-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -99,12 +99,15 @@
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>Please, insert now the following xml tag Context</echo>
+ <echo>into Tomcat configuration file server.xml
(${tomcat.home}/conf/server.xml)</echo>
+ <echo>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>
+ <echo>Please, do it now. I will wait for you.</echo>
<input message="Press Return key ..."/>

<exec dir="${tomcat.home}/bin"
@@ -118,25 +121,28 @@

<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="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>Please, insert now the following xml tag Context</echo>
+ <echo>into Tomcat configuration file server.xml
(${tomcat.home}/conf/server.xml)</echo>
+ <echo>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>
+ <echo>Please, do it now. I will wait for you.</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 (re)start the Tomcat.</echo>
-
+
<echo>${line.separator}Example:</echo>
<echo> export
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrdtool_path}/lib:${rrdjdir}/build</echo>
<echo>${line.separator} Please, do it now.</echo>
@@ -162,27 +168,30 @@
</target>


+ <target name="undeploy-adminclient">
+
+ <java classname="org.apache.axis.client.AdminClient">
+ <arg line="-l ${adminService} ${undeployFile}"/>
+ <classpath refid="classpath"/>
+ </java>
+
+ </target>
+
+
+ <!-- the main targets -->
+
+
<target name="deploy" depends="copy-rrdma-jar, add-context-listener"
- description="Deploys RRD MA service">
+ description="Deploys RRD MA service">

<echo>Deploying the service...</echo>

<antcall target="tomcat-start-for-rrdma" />
<antcall target="deploy-adminclient" />
-
+
</target>


- <target name="undeploy-adminclient">
-
- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${undeployFile}"/>
- <classpath refid="classpath"/>
- </java>
-
- </target>
-
-
<target name="undeploy"
description="Undeploys RRD MA service">


Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -1,5 +1,4 @@

-
<!-- ===================================================================
<description>

@@ -16,30 +15,32 @@
<project name="rrdma-client-run-targets">


- <property name="ma.esnet"
value="http://mea1.es.net:8080/axis/services/MeasurementArchiveService"/>
- <property name="ma.geant"
value="http://mu.dante.org.uk:8090/axis/services/MeasurementArchiveService"/>
- <property name="ma.udel"
value="http://stout.pc.cis.udel.edu:8080/axis/services/MeasurementArchiveService"/>
- <property name="ma.abilene"
value="http://thunderbird.internet2.edu:8080/axis/services/MeasurementArchiveService"/>

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


+
<!-- fetching -->

+
<target name="run-rrdma-client" description="Runs Java client2">
+
<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"/>
</java>
+
</target>



<!--storing -->

+
<target name="run-rrdma-client-store" description="Runs Java client">
+
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -47,10 +48,12 @@
<arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-1.xml"/>
<arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
</java>
+
</target>


<target name="run-rrdma-client-store-with-key" description="Runs Java
client">
+
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -58,21 +61,22 @@
<arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-Key-1.xml"/>
<arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
</java>
+
</target>



<target name="run-echo">
+
<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"/>
</java>
+
</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-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -25,25 +25,34 @@


<target name="__get-rrd-config-file">
+
<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"
/>
<available file="${rrd.config.file}"
property="rrd.config.file.present"/>
+
</target>


- <target name="_get-rrd-config-file_1" depends="__get-rrd-config-file"
if="rrd.config.file.present">
+ <target name="_get-rrd-config-file_1"
+ depends="__get-rrd-config-file"
+ if="rrd.config.file.present">
</target>


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


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


@@ -80,8 +89,8 @@


<!-- creating service.properties file -->
-

+
<target name="set-service-properties-for-rrdma"
depends="get-rrd-config-file">

@@ -90,40 +99,40 @@
<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://${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.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 RRD MA"/>
+ <entry key="service.r.service_type" value="RRD MA"/>
<entry key="service.r.service_description" value="Java RRD 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.r.ma.characteristic" value="utitlization"/>
+ <entry key="service.r.ma.characteristic"
value="utitlization"/>
<entry key="service.r.ma.measurement_tool"
value="cricket,mrtg,cacti"/>
- <entry key="service.r.ma.format" value="rrd"/>
+ <entry key="service.r.ma.format" value="rrd"/>

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

- <entry key="component.ma.xmldb.db_status" value="off"/>
- <entry key="component.ma.xmldb.db_access" value="http"/>
- <entry key="component.ma.xmldb.db_uri" value=""/>
+ <entry key="component.ma.xmldb.db_status" value="off"/>
+ <entry key="component.ma.xmldb.db_access" value="http"/>
+ <entry key="component.ma.xmldb.db_uri" value=""/>
<entry key="component.ma.xmldb.db_uri.xmlrpc" value=""/>
- <entry key="component.ma.xmldb.db_username"
value="rrdmaservice"/>
- <entry key="component.ma.xmldb.db_password"
value="rrdmaservice"/>
+ <entry key="component.ma.xmldb.db_username"
value="rrdmaservice"/>
+ <entry key="component.ma.xmldb.db_password"
value="rrdmaservice"/>

<entry key="service.ma.xmldb.db_store" value="off"/>

<entry key="service.ma.rrd.xmldb.db_store.data_dir"
value="${basedir}/"/>

<entry
key="service.ma.rrd.rrd_storage_manager_rrd_DS_type_default"
value="COUNTER:1800:0:10000000000000"/>
- <entry
key="service.ma.rrd.rrd_storage_manager_rrd_step_default" value="300"/>
- <entry key="service.ma.rrd.rrd_storage_manager_rrd_RRA_default"
value="MAX:0.5:1:600,MAX:0.5:6:600,MAX:0.5:24:600,AVERAGE:0.5:288:600,AVERAGE:0.5:1:600,AVERAGE:0.5:24:600,MAX:0.5:288:600,AVERAGE:0.5:6:600"/>
+ <entry
key="service.ma.rrd.rrd_storage_manager_rrd_step_default" value="300"/>
+ <entry key="service.ma.rrd.rrd_storage_manager_rrd_RRA_default"

value="MAX:0.5:1:600,MAX:0.5:6:600,MAX:0.5:24:600,AVERAGE:0.5:288:600,AVERAGE:0.5:1:600,AVERAGE:0.5:24:600,MAX:0.5:288:600,AVERAGE:0.5:6:600"/>

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

</propertyfile>
@@ -142,6 +151,9 @@
</target>


+ <!-- creating components.properties file -->
+
+
<target name="copy-components-properties">

<copy file="conf/components.properties.rrdma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
@@ -149,6 +161,9 @@
</target>


+ <!-- configuring store functionality -->
+
+
<target name="store-fuctionality-question-for-rrdma">

<input message="Do you want the service to accept messages with
measurement data and store them? "
@@ -181,6 +196,9 @@
</target>


+ <!-- configuring LS register functionality -->
+
+
<target name="register-fuctionality-for-rrdma"
depends="register-fuctionality"
if="functionality.register.decision">
@@ -192,7 +210,7 @@
<entry key="service.r.service_type" value="MA"/>
<entry key="component.registrator.scheduler_component"
value="ma_scheduler"/>

- </propertyfile>
+ </propertyfile>

<propertyfile file="conf/components.properties"
comment="This file was created by the Ant configuration script.">
@@ -200,9 +218,9 @@
<entry key="ma_scheduler"
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
<entry key="registrator"
value="org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>

- </propertyfile>
+ </propertyfile>

- </target>
+ </target>


<!-- the main target -->

Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -14,6 +14,7 @@
<project name="rrdma-exist-xmldb-targets">


+
<property file="conf/service.properties" />


@@ -30,46 +31,67 @@


<target name="getresource-rrdma">
+
<basename property="xmlresource" file="${service.ma.conf_file}"/>
+
</target>


<target name="get-xmldb-collection">
- <basename property="ma-collection"
file="${component.ma.xmldb.db_uri.xmlrpc}" />
+
+ <basename property="ma-collection"
file="${component.ma.xmldb.db_uri.xmlrpc}" />
+
</target>


+ <target name="_xmldb-list-rrdma">

- <target name="_xmldb-list-rrdma">
- <list uri="${component.ma.xmldb.db_uri.xmlrpc}"
+ <list uri="${component.ma.xmldb.db_uri.xmlrpc}"
resources="true"
outputproperty="resource.list"
separator=", "/>
+
</target>


- <target name="xmldb-list-rrdma_1" depends="_xmldb-list-rrdma"
if="resource.list">
- <echo>Available resources: ${resource.list}</echo>
+ <target name="xmldb-list-rrdma_1"
+ depends="_xmldb-list-rrdma"
+ if="resource.list">
+
+ <echo>Available resources: ${resource.list}</echo>
+
</target>

- <target name="xmldb-list-rrdma_2" depends="_xmldb-list-rrdma"
unless="resource.list">
- <echo>No available resources</echo>
+
+ <target name="xmldb-list-rrdma_2"
+ depends="_xmldb-list-rrdma"
+ unless="resource.list">
+
+ <echo>No available resources</echo>
+
</target>


- <target name="xmldb-list-rrdma" depends="xmldb-list-rrdma_1,
xmldb-list-rrdma_2" unless="resource.list">
+ <target name="xmldb-list-rrdma"
+ depends="xmldb-list-rrdma_1, xmldb-list-rrdma_2"
+ unless="resource.list">
</target>


- <target name="xmldb-exist-rrdma" depends="getresource-rrdma">
+ <target name="xmldb-exist-rrdma"
+ depends="getresource-rrdma">
+
<condition property="isExists-rrdma">
<exist uri="${component.ma.xmldb.db_uri.xmlrpc}"
resource="${xmlresource}"/>
</condition>
+
</target>


- <target name="xmldb-remove-rrdma" depends="getresource-rrdma,
get-xmldb-collection">
+ <target name="xmldb-remove-rrdma"
+ depends="getresource-rrdma, get-xmldb-collection">
+
<remove uri="${component.ma.xmldb.db_uri.xmlrpc}"
resource="${xmlresource}"
user="${component.ma.xmldb.db_username}"
@@ -78,10 +100,12 @@
collection="${ma-collection}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>


<target name="xmldb-resource-remove-rrdma">
+
<input message="Set the name a resource to remove []:"
addproperty="resource.unwanted"
defaultvalue=""
@@ -90,23 +114,30 @@
resource="${resource.unwanted}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>

+
<target name="xmldb-store-rrdma">
+
<store uri="${component.ma.xmldb.db_uri.xmlrpc}"
type="xml"
srcfile="${service.ma.conf_file}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>


- <target name="xmldb-extract-rrdma" depends="getresource-rrdma">
+ <target name="xmldb-extract-rrdma"
+ depends="getresource-rrdma">
+
<extract uri="${component.ma.xmldb.db_uri.xmlrpc}"
resource="${xmlresource}"
destfile="${basedir}/conf/dump_${xmlresource}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>


@@ -129,27 +160,39 @@
</target>


- <target name="xmldb-collection-rrdma" depends="getdbroot-rrdma,
get-xmldb-collection">
+ <target name="xmldb-collection-rrdma"
+ depends="getdbroot-rrdma, get-xmldb-collection">
+
<create uri="${dbroot}"
collection="${ma-collection}"
user="${component.ma.xmldb.db_username}"
password="${component.ma.xmldb.db_password}"/>
+
</target>


- <target name="__xmldb-init-rrdma" depends="xmldb-exist-rrdma"
if="isExists-rrdma">
+ <target name="__xmldb-init-rrdma"
+ depends="xmldb-exist-rrdma"
+ if="isExists-rrdma">
+
<antcall target="xmldb-extract-rrdma"/>
<antcall target="xmldb-remove-rrdma"/>
+
</target>


- <target name="xmldb-init-rrdma" depends="__xmldb-init-rrdma">
+ <target name="xmldb-init-rrdma"
+ depends="__xmldb-init-rrdma">
+
<antcall target="xmldb-collection-rrdma"/>
<antcall target="xmldb-store-rrdma"/>
+
</target>


- <target name="exist-use-rrdma" depends="exist-use"
if="exist.use.decision">
+ <target name="exist-use-rrdma"
+ depends="exist-use"
+ if="exist.use.decision">

<antcall target="exist-adduser"/>
<antcall target="exist-datails-question"/>
@@ -158,10 +201,10 @@

<propertyfile file="conf/service.properties"
comment="This file was created by the Ant configuration script.">
-
+
<entry key="component.ma.xmldb.db_uri"
value="http://${exist.hostname}:${exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
<entry key="component.ma.xmldb.db_uri.xmlrpc"
value="http://${exist.hostname}:${exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
-
+
</propertyfile>

<antcall target="xmldb-init-rrdma"/>
@@ -171,4 +214,3 @@


</project>
-

Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-java-compile-targets.xml
===================================================================
---
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-java-compile-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-java-compile-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -19,17 +19,19 @@



-
<!-- RRD MA -->


<target name="clean-jar-rrdma">
+
<delete file="${build}/perfSONAR-rrdma.jar" failonerror="false"/>
+
</target>


<target name="compile-rrdma"
description="Compiles Java files of RRD MA">
+
<javac srcdir="src" destdir="${build}" deprecation="yes">
<include name="org/perfsonar/service/measurementArchive/**" />
<include name="org/perfsonar/service/web/**" />
@@ -38,16 +40,19 @@
<include
name="org/perfsonar/service/testHarness/RRDStorageManagerTester.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-rrdma" depends="clean-jar-rrdma, compile-rrdma"
description="Creates JAR file for RRD MA">
+
<jar destfile="${build}/perfSONAR-rrdma.jar">
<fileset dir="${build}">
<include name="org/perfsonar/service/measurementArchive/**"
/>
@@ -57,19 +62,24 @@
<include
name="org/perfsonar/service/testHarness/RRDStorageManagerTester.class" />
</fileset>
</jar>
+
</target>


- <target name="build-rrdma"
+ <!-- the main target -->
+
+
+ <target name="build"
description="Builds RRD MA.">
+
<antcall target="clean-all"/>
<antcall target="jar-generic"/>
<antcall target="jar-rrdma"/>
+
</target>



-
</project>



Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-junit-test-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-junit-test-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-junit-test-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -16,17 +16,22 @@
<project name="rrdma-junit-test-targets">


+
<target name="set-path-of-rrdtestfile">
+
<replace
file="test/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManagerTest.java"
token="__BASEPATH__"
value="${basedir}"/>
+
</target>


<target name="set-path-of-rrdconfigfile">
+
<replace
file="test/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManagerTest.java"
token="__BASEPATH__"
value="${basedir}"/>
+
</target>


@@ -109,5 +114,4 @@



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

Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-libs-download-targets.xml
===================================================================
---
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-libs-download-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-libs-download-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

-
-
<!-- ===================================================================
<description>

@@ -16,8 +14,6 @@



-
-
<project basedir="../" name="rrdma-libs-download-targets"
xmlns:artifact="urn:maven-artifact-ant">


@@ -59,6 +55,7 @@
</target>


+
</project>



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-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -2,13 +2,13 @@

<!-- ===================================================================
<description>
-
+
$Id$
project: perfSONAR
author: romradz
-
+
Notes: Targets to pre-install the RRD MA service.
-
+
</description>
==================================================================== -->

@@ -22,50 +22,59 @@


<target name="_get-rrdtool-path">
+
<exec executable="which"
os="Linux"
errorproperty="rrdtool.path.error"
outputproperty="full.rrdtool.path">
<arg line="rrdtool"/>
</exec>
+
</target>
-
-
- <target name="get-rrdtool-path" depends="_get-rrdtool-path"
if="full.rrdtool.path">
+
+
+ <target name="get-rrdtool-path"
+ depends="_get-rrdtool-path"
+ if="full.rrdtool.path">
+
<dirname property="__rrdtool.path" file="${full.rrdtool.path}"/>
<dirname property="rrdtool.path" file="${__rrdtool.path}"/>
<!--<echo message="Accepted RRDTool base path: ${rrdtool.path}"/>-->
+
</target>


<!-- building rrdjtool library -->


- <target name="rrdjtool-question" depends="get-rrdtool-path">
+ <target name="rrdjtool-question"
+ depends="get-rrdtool-path">

<input message="What OS platform do you use: "
addproperty="_os.platform"
validargs="linux,freebsd,solaris"
defaultvalue="linux" />
-
+
<input message="Enter the directory where the rrdtool application is
installed [${rrdtool.path}]: "
addproperty="_rrdtool_path"
defaultvalue="${rrdtool.path}" />
+
</target>


- <target name="rrdjtool-call" depends="rrdjtool-question, get-java-path">
+ <target name="rrdjtool-call"
+ depends="rrdjtool-question, get-java-path">

<propertyfile file="ant/const.properties"
comment="This file was created by the Ant configuration script.">
-
+
<entry key="rrdjdir" value="${basedir}/contrib/rrdjtool"/>
<entry key="rrdtool_path" value="${_rrdtool_path}"/>
<entry key="jdk_path" value="${java.path}"/>
-
+
</propertyfile>
-

+
<condition property="linux.os.platform">
<equals arg1="linux" arg2="${_os.platform}"/>
</condition>
@@ -81,18 +90,30 @@
</target>


- <target name="rrdjtool-call-for-linux" depends="rrdjtool-call"
if="linux.os.platform">
+ <target name="rrdjtool-call-for-linux"
+ depends="rrdjtool-call"
+ if="linux.os.platform">
+
<antcall target="build-rrdjtool" />
+
</target>


- <target name="rrdjtool-call-for-freebsd" depends="rrdjtool-call"
if="freebsd.os.platform">
+ <target name="rrdjtool-call-for-freebsd"
+ depends="rrdjtool-call"
+ if="freebsd.os.platform">
+
<antcall target="build-rrdjtool-freebsd" />
+
</target>


- <target name="rrdjtool-call-for-solaris" depends="rrdjtool-call"
if="solaris.os.platform">
+ <target name="rrdjtool-call-for-solaris"
+ depends="rrdjtool-call"
+ if="solaris.os.platform">
+
<antcall target="build-rrdjtool-solaris" />
+
</target>


@@ -122,4 +143,5 @@
</target>


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

Modified:
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -21,7 +21,7 @@

<!-- source release of RRD MA -->

- <target name="rrdma-release-src"
+ <target name="release-src"
description="Build src release.">


@@ -31,8 +31,8 @@

<!-- binary release of RRD MA -->

- <target name="rrdma-release-bin"
- depends="build-rrdma"
+ <target name="release-bin"
+ depends="build"
description="Build bin release.">



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-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -16,12 +16,16 @@
<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"
fork="true">
@@ -30,10 +34,12 @@
<jvmarg
value="-Dservice.properties=${basedir}/conf/service.properties"/>
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
</java>
+
</target>


<target name="run-rrdma-test2" description="Test of RRDStorageManager
component">
+
<java
classname="org.perfsonar.service.testHarness.RRDStorageManagerTester"
classpathref="classpath"
fork="true">
@@ -49,10 +55,12 @@
<jvmarg
value="-Dservice.properties=${basedir}/conf/service.properties"/>
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
</java>
+
</target>


<target name="run-rrdma-test3" description="Test of
RRDConfigurationStorageManager component">
+
<java
classname="org.perfsonar.service.testHarness.RRDConfigurationStorageManagerTester"
classpathref="classpath"
fork="true">
@@ -71,10 +79,12 @@
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>

</java>
+
</target>


<target name="run-rrdma-test4" description="Test of
SimpleRRDConfigurationStorageManager component">
+
<java
classname="org.perfsonar.service.testHarness.SimpleRRDConfigurationStorageManagerTester"
classpathref="classpath"
fork="true">
@@ -92,10 +102,12 @@
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>

</java>
+
</target>


<target name="run-rrdma-test5" description="Test of RRDStorageManager
write functionality">
+
<java
classname="org.perfsonar.service.testHarness.RRDStorageManagerTester"
classpathref="classpath"
fork="true">
@@ -113,9 +125,9 @@
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>

</java>
+
</target>



</project>
-

Modified: branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
2006-10-24 16:33:13 UTC (rev 1714)
+++ branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
2006-10-25 10:51:03 UTC (rev 1715)
@@ -5,7 +5,7 @@
project: perfSONAR
author: romradz

- Notes: Targets to download and install Tomcat and Axis
+ Notes: Targets to download and install Tomcat

</description>
==================================================================== -->
@@ -14,6 +14,7 @@
<project name="webservice-env-targets">


+
<!-- Download URLs -->

<property name="_tomcat.download.url"
@@ -21,6 +22,7 @@
<property name="tomcat.dir" value="apache-tomcat-5.5.20" />


+
<!-- targets -->




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

Archive powered by MHonArc 2.6.16.

Top of Page