perfsonar-dev - r1803 - in trunk/perfsonar: ant ant/clmp ant/rrdma conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/wsdd schema/example-instances/sonar src/org/perfsonar/commons/auxiliary src/org/perfsonar/commons/auxiliary/components/configuration/properties src/org/perfsonar/service/measurementArchive/eventTypeConfig

Subject: perfsonar development work

List archive

r1803 - in trunk/perfsonar: ant ant/clmp ant/rrdma conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/wsdd schema/example-instances/sonar src/org/perfsonar/commons/auxiliary src/org/perfsonar/commons/auxiliary/components/configuration/properties src/org/perfsonar/service/measurementArchive/eventTypeConfig

From:
To:
Subject: r1803 - in trunk/perfsonar: ant ant/clmp ant/rrdma conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/wsdd schema/example-instances/sonar src/org/perfsonar/commons/auxiliary src/org/perfsonar/commons/auxiliary/components/configuration/properties src/org/perfsonar/service/measurementArchive/eventTypeConfig
Date: Thu, 7 Dec 2006 03:54:44 -0500

Author: roman
Date: 2006-12-07 03:54:42 -0500 (Thu, 07 Dec 2006)
New Revision: 1803

Added:
trunk/perfsonar/ant/clmp/clmp-axis-deploy-targets.xml
trunk/perfsonar/ant/clmp/clmp-client-run-targets.xml
trunk/perfsonar/ant/clmp/clmp-configure-targets.xml
trunk/perfsonar/ant/clmp/clmp-java-compile-targets.xml
trunk/perfsonar/ant/clmp/clmp-libs-download-targets.xml
trunk/perfsonar/ant/clmp/clmp-pre-install-targets.xml
trunk/perfsonar/ant/clmp/clmp-release-targets.xml
trunk/perfsonar/ant/clmp/clmp-test-run-targets.xml
trunk/perfsonar/ant/const.properties.clmp
trunk/perfsonar/ant/perfsonar-install.xml
trunk/perfsonar/ant/pre-install-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml
trunk/perfsonar/conf/axis-1.4/
trunk/perfsonar/conf/axis-1.4/WEB-INF/
trunk/perfsonar/conf/axis-1.4/WEB-INF/classes/
trunk/perfsonar/conf/axis-1.4/WEB-INF/classes/i18n.properties
trunk/perfsonar/conf/axis-1.4/WEB-INF/users.lst
trunk/perfsonar/conf/axis-1.4/WEB-INF/web.xml
trunk/perfsonar/conf/axis-1.4/fingerprint.jsp
trunk/perfsonar/conf/axis-1.4/happyaxis.jsp
trunk/perfsonar/conf/axis-1.4/i18nLib.jsp
trunk/perfsonar/conf/axis-1.4/index.html
trunk/perfsonar/conf/axis-1.4/index.jsp
trunk/perfsonar/conf/components.properties.clmp
trunk/perfsonar/conf/components.properties.rrdma
trunk/perfsonar/conf/components.properties.sqlma
trunk/perfsonar/conf/service.properties.clmp
trunk/perfsonar/conf/wsdd/
trunk/perfsonar/conf/wsdd/clmp-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/clmp-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/ls-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/ls-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/ma-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/ma-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/mp-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/mp-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/tops-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/tops-service-undeploy.wsdd

trunk/perfsonar/schema/example-instances/sonar/CommandLineMP-Ping-Request.xml
trunk/perfsonar/schema/example-instances/sonar/MetadataKey-Filter-Req-1.xml
trunk/perfsonar/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml
Removed:
trunk/perfsonar/ant/clmp/commandLineMP-axis-deploy-targets.xml
trunk/perfsonar/ant/clmp/commandLineMP-client-run-targets.xml
trunk/perfsonar/ant/clmp/commandLineMP-configure-targets.xml
trunk/perfsonar/ant/clmp/commandLineMP-doc-targets.xml
trunk/perfsonar/ant/clmp/commandLineMP-java-compile-targets.xml
trunk/perfsonar/ant/clmp/commandLineMP-libs-download-targets.xml
trunk/perfsonar/ant/clmp/commandLineMP-release-targets.xml
trunk/perfsonar/ant/clmp/commandLineMP-test-targets.xml
trunk/perfsonar/ant/const.properties.cl
trunk/perfsonar/ant/webservice-env-targets.xml
trunk/perfsonar/conf/axis-1.4/WEB-INF/
trunk/perfsonar/conf/axis-1.4/WEB-INF/classes/
trunk/perfsonar/conf/axis-1.4/WEB-INF/classes/i18n.properties
trunk/perfsonar/conf/axis-1.4/WEB-INF/users.lst
trunk/perfsonar/conf/axis-1.4/WEB-INF/web.xml
trunk/perfsonar/conf/axis-1.4/fingerprint.jsp
trunk/perfsonar/conf/axis-1.4/happyaxis.jsp
trunk/perfsonar/conf/axis-1.4/i18nLib.jsp
trunk/perfsonar/conf/axis-1.4/index.html
trunk/perfsonar/conf/axis-1.4/index.jsp
trunk/perfsonar/conf/components.properties.cl
trunk/perfsonar/conf/components.properties.ma
trunk/perfsonar/conf/service.properties.cl
trunk/perfsonar/conf/wsdd/clmp-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/clmp-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/ls-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/ls-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/ma-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/ma-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/mp-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/mp-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd
trunk/perfsonar/conf/wsdd/tops-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/tops-service-undeploy.wsdd
trunk/perfsonar/schema/example-instances/sonar/MetadataKey-Filter-Req.xml
Modified:
trunk/perfsonar/ant/axis-deploy-targets.xml
trunk/perfsonar/ant/build-clmp.xml
trunk/perfsonar/ant/build-rrdma.xml
trunk/perfsonar/ant/configure-targets.xml
trunk/perfsonar/ant/java-compile-targets.xml
trunk/perfsonar/ant/javadoc-targets.xml
trunk/perfsonar/ant/libs-download-targets.xml
trunk/perfsonar/ant/rrdma/rrdjtool-compile-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-client-run-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-exist-xmldb-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-java-compile-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-junit-test-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-libs-download-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-release-targets.xml
trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml
trunk/perfsonar/conf/log4j.properties
trunk/perfsonar/conf/rrd-database_TEST.xml

trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml

trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-1.xml

trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-2.xml

trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml

trunk/perfsonar/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java

trunk/perfsonar/src/org/perfsonar/commons/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java

trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
Log:
Changes made to apply the aggrement on the new installation procedure. Mainly
Ant files for RRD MA have changed
but also those which are used for other services (service developers must
check the changes and update their Ant scripts,
changes in RRD MA scripts might be examples for other services).

The main target have been defined:
- pre-install (downloading and installing all required applications and
libraries used by a service, setting env variables)
- configure (setting up parameters in service configuration files)
- lib (downloading libraries from the library repository)
- build (compiling a service)
- deploy (deploying a service in Tomcat)
- undeploy (undeploy a service)
- test (testing a service)
- release (creating binary service release)

Example use for RRD MA:
ant -f build-rrdma.xml pre-install
ant -f build-rrdma.xml configure
ant -f build-rrdma.xml lib
ant -f build-rrdma.xml build
...
...

Having binary service release one can install a service. Example commands for
RRD MA release:
ant -q pre-install
ant -q configure
ant -q deploy
testing:
ant test
undeploying:
ant -q undeploy

Modified: trunk/perfsonar/ant/axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/axis-deploy-targets.xml 2006-12-06 10:27:39 UTC (rev
1802)
+++ trunk/perfsonar/ant/axis-deploy-targets.xml 2006-12-07 08:54:42 UTC (rev
1803)
@@ -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>
==================================================================== -->
@@ -14,50 +14,129 @@
<project name="axis-deploy-targets">

+
+ <property file="conf/service.properties" />
+ <property file="ant/const.properties" />
+
+
<taskdef resource="axis-tasks.properties" classpathref="classpath"
onerror="ignore"/>

- <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="adminService"
value="http://${target.server}:${target.port}/${deploy.root}/services/AdminService";
/>
+ <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">

- <target name="copy-jars-for-service">
+ <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"/>

- <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"/>
+ </target>

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

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

- <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="./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}"/>

- <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.1.jar"/>
+ <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"/>

- <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="./conf/axis-1.4/WEB-INF/classes/i18n.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes"/>

- <delete file="${axis.home}/WEB-INF/lib/log4j-1.2.9.jar"/>
+ <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="${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="${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="${service.home}/${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="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
+ </target>
+
+
+ <target name="delete-jars-for-service"
depends="delete-axis-for-service">
+
+ <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="${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="${service.home}/${deploy.root}/WEB-INF/lib/commons-pool-1.1.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="${service.home}/${deploy.root}/WEB-INF/lib/log4j-1.2.9.jar"/>
+
+ <antcall target="delete-deploy-root"/>
+
+ </target>
+
+
+ <target name="delete-axis-for-service">
+
+ <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="${service.home}/${deploy.root}/WEB-INF/users.lst"/>
+ <delete file="${service.home}/${deploy.root}/WEB-INF/web.xml"/>
+
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/i18n.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>
+
+


<available file="${build}/perfSONAR-generic.jar"
property="jar.perfsonar.generic.present"/>
@@ -77,32 +156,145 @@
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="${service.home}/${deploy.root}/WEB-INF/lib"/>

</target>
-
+
+
+ 
+

<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" />
-
-
+
</target>

+

<target name="rem-context-listener">
-
+
<copy file="${axisWebXml}" tofile="${axisWebXml}.bak"
overwrite="yes" />
-
<style in="${axisWebXml}" out="${axisWebXml}.out"
style="ant/rem-context-listener.xsl" />
-
<copy file="${axisWebXml}.out" tofile="${axisWebXml}"
overwrite="yes" />
-
+
</target>
-

+
+ 
+
+ <property environment="env"/>
+
+
+ <target name="tomcat-start-question">
+
+ <input message="Do you want me to start the application server
Tomcat for you? "
+ addproperty="_tomcat.start.decision"
+ validargs="y,n"
+ defaultvalue="y" />
+
+ <condition property="tomcat.start.decision">
+ <equals arg1="y" arg2="${_tomcat.start.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="tomcat-start"
+ depends="tomcat-start-question"
+ if="tomcat.start.decision">
+
+ <echo>Please, insert now the following xml tag 'Context'</echo>
+ <echo>into Tomcat configuration file server.xml</echo>
+ <echo>(${tomcat.home}/conf/server.xml)</echo>
+ <echo>inside existing xml tag 'Host':</echo>
+ <echo></echo>
+ <echo message=" <Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'>"/>
+ <echo message=" </Context>"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="startup.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ </exec>
+
+ </target>
+
+
+ <target name="tomcat-shutdown-question">
+
+ <input message="Do you want me to shutdown the application server
Tomcat for you? "
+ addproperty="_tomcat.shutdown.decision"
+ validargs="y,n"
+ defaultvalue="y" />
+
+ <condition property="tomcat.shutdown.decision">
+ <equals arg1="y" arg2="${_tomcat.shutdown.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="tomcat-shutdown"
+ depends="tomcat-shutdown-question"
+ if="tomcat.shutdown.decision">
+
+ <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>
+
+
+ 
+
+
+ <target name="_deploy-adminclient">
+
+ <echo></echo>
+ <echo>The directory with all required service files has been
created.</echo>
+ <echo>The next step in deploy action is installing the service in
Tomcat.</echo>
+ <echo>(If you are an expert in Axis and want to install the service
other way</echo>
+ <echo> than default one use ctrl+c to stop the script in this
moment)</echo>
+ <echo></echo>
+
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ <target name="deploy-adminclient"
+ depends="_deploy-adminclient">
+
+ <java classname="org.apache.axis.client.AdminClient">
+ <arg line="-l ${adminService} ${deployFile}"/>
+ <classpath refid="classpath"/>
+ </java>
+
+ </target>
+
+
+ <target name="undeploy-adminclient">
+
+ <java classname="org.apache.axis.client.AdminClient">
+ <arg line="-l ${adminService} ${undeployFile}"/>
+ <classpath refid="classpath"/>
+ </java>
+
+ </target>
+
+
+
</project>
\ No newline at end of file

Modified: trunk/perfsonar/ant/build-clmp.xml
===================================================================
--- trunk/perfsonar/ant/build-clmp.xml 2006-12-06 10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/build-clmp.xml 2006-12-07 08:54:42 UTC (rev 1803)
@@ -6,10 +6,10 @@

$Id$
project: perfSONAR
- author: boote
+ author: fernandes

Notes:
- This is a build file for commandLine MP.
+ This is a build file for CommandLine MP.

</description>
==================================================================== -->
@@ -40,22 +40,23 @@

<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"/>
+

-


- <import file="clmp/commandLineMP-java-compile-targets.xml"/>
- <import file="clmp/commandLineMP-axis-deploy-targets.xml"/>
- <import file="clmp/commandLineMP-configure-targets.xml"/>
- <import file="clmp/commandLineMP-libs-download-targets.xml"/>
- <import file="clmp/commandLineMP-test-targets.xml"/>
- <import file="clmp/commandLineMP-release-targets.xml"/>
- <import file="clmp/commandLineMP-doc-targets.xml"/>
+ <import file="clmp/clmp-axis-deploy-targets.xml"/>
+ <import file="clmp/clmp-configure-targets.xml"/>
+ <import file="clmp/clmp-pre-install-targets.xml"/>
+ <import file="clmp/clmp-libs-download-targets.xml"/>
+ <import file="clmp/clmp-test-run-targets.xml"/>
+ <import file="clmp/clmp-client-run-targets.xml"/>
+ <import file="clmp/clmp-java-compile-targets.xml"/>
+ <import file="clmp/clmp-release-targets.xml"/>

Modified: trunk/perfsonar/ant/build-rrdma.xml
===================================================================
--- trunk/perfsonar/ant/build-rrdma.xml 2006-12-06 10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/build-rrdma.xml 2006-12-07 08:54:42 UTC (rev 1803)
@@ -4,14 +4,14 @@


@@ -20,9 +20,7 @@
<project basedir="../" default="compile-rrdma" name="perfsonar-rrdma">

- <property file="ant/const.properties" />

-
<path id="classpath">
<fileset dir="./lib/repository">
<include name="**/*.jar"/>
@@ -41,7 +39,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"/>
@@ -50,8 +48,8 @@



+ <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"/>

Copied: trunk/perfsonar/ant/clmp/clmp-axis-deploy-targets.xml (from rev 1802,
branches/romradz-ant4rel-20061017/ant/clmp/clmp-axis-deploy-targets.xml)

Copied: trunk/perfsonar/ant/clmp/clmp-client-run-targets.xml (from rev 1802,
branches/romradz-ant4rel-20061017/ant/clmp/clmp-client-run-targets.xml)

Copied: trunk/perfsonar/ant/clmp/clmp-configure-targets.xml (from rev 1802,
branches/romradz-ant4rel-20061017/ant/clmp/clmp-configure-targets.xml)

Copied: trunk/perfsonar/ant/clmp/clmp-java-compile-targets.xml (from rev
1802,
branches/romradz-ant4rel-20061017/ant/clmp/clmp-java-compile-targets.xml)

Copied: trunk/perfsonar/ant/clmp/clmp-libs-download-targets.xml (from rev
1802,
branches/romradz-ant4rel-20061017/ant/clmp/clmp-libs-download-targets.xml)

Copied: trunk/perfsonar/ant/clmp/clmp-pre-install-targets.xml (from rev 1802,
branches/romradz-ant4rel-20061017/ant/clmp/clmp-pre-install-targets.xml)

Copied: trunk/perfsonar/ant/clmp/clmp-release-targets.xml (from rev 1802,
branches/romradz-ant4rel-20061017/ant/clmp/clmp-release-targets.xml)

Copied: trunk/perfsonar/ant/clmp/clmp-test-run-targets.xml (from rev 1802,
branches/romradz-ant4rel-20061017/ant/clmp/clmp-test-run-targets.xml)

Deleted: trunk/perfsonar/ant/clmp/commandLineMP-axis-deploy-targets.xml

Deleted: trunk/perfsonar/ant/clmp/commandLineMP-client-run-targets.xml

Deleted: trunk/perfsonar/ant/clmp/commandLineMP-configure-targets.xml

Deleted: trunk/perfsonar/ant/clmp/commandLineMP-doc-targets.xml

Deleted: trunk/perfsonar/ant/clmp/commandLineMP-java-compile-targets.xml

Deleted: trunk/perfsonar/ant/clmp/commandLineMP-libs-download-targets.xml

Deleted: trunk/perfsonar/ant/clmp/commandLineMP-release-targets.xml

Deleted: trunk/perfsonar/ant/clmp/commandLineMP-test-targets.xml

Modified: trunk/perfsonar/ant/configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/configure-targets.xml 2006-12-06 10:27:39 UTC (rev
1802)
+++ trunk/perfsonar/ant/configure-targets.xml 2006-12-07 08:54:42 UTC (rev
1803)
@@ -15,93 +15,14 @@
<project name="configure-targets">

- <property name="tomcat.dir" value="apache-tomcat-5.5.17" />
+ <property file="ant/const.properties" />

-
- <target name="_get-java-path">
- <exec executable="which"
- os="Linux"
- errorproperty="java.path.error"
- outputproperty="full.java.path">
- <arg line="java"/>
- </exec>
- </target>
-
-
- <target name="get-java-path" depends="_get-java-path">
- <dirname property="__java.path" file="${full.java.path}"/>
- <dirname property="_java.path" file="${__java.path}"/>
- <input message="Enter the path of Java [${_java.path}]:"
- addproperty="java.path"
- defaultvalue="${_java.path}"
- />
- <echo message="Accepted Java path: ${java.path}"/>
- </target>
-
-
- <target name="get-current-path">
- <dirname property="_current.path" file="."/>
- <dirname property="current.path" file="${_current.path}"/>
- </target>
-
-
- <target name="get-axis-path">
- <input message="Enter the path of Axis location
[${basedir}/../${tomcat.dir}/webapps/axis]:"
- addproperty="axis.path"
- defaultvalue="${basedir}/../${tomcat.dir}/webapps/axis"
- />
- <echo message="Accepted Axis path: ${axis.path}"/>
- </target>
-
-
- <target name="get-server-address">
- <input message="Enter the address of host (perfSONAR service
location) [localhost]:"
- addproperty="server.address"
- defaultvalue="localhost"
- />
- <echo message="Accepted server address: ${server.address}"/>
- </target>
-
-
- <target name="get-server-port">
- <input message="Enter the port of server [8080]:"
- addproperty="server.port"
- defaultvalue="8080"
- />
- <echo message="Accepted server port: ${server.port}"/>
- </target>
-
-
- <target name="get-message-1">
- <echo message="Start creating ant/const.properties file"/>
- <echo
message="-----------------------------------------------------------"/>
- </target>
-
-
- <target name="get-message-2">
- <echo message="Start creating conf/service.properties file"/>
- <echo
message="-----------------------------------------------------------"/>
- </target>
-
-
- <target name="get-message-3">
- <echo message="Start creating conf/log4j.properties file"/>
- <echo
message="-----------------------------------------------------------"/>
- </target>
-
-
- <target name="get-message-4">
- <echo message="Start adding properties to Tomcat catalina.properties
file"/>
- <echo
message="-----------------------------------------------------------"/>
- </target>
-
-


- <target name="set-log4j-properties"
- depends="get-message-3">

+ <target name="set-log4j-properties">
+
<property name="logDir" value="${basedir}/log"/>

<propertyfile file="conf/log4j.properties"
@@ -111,93 +32,111 @@

<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>

- <echo message="log4j.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>

+ 
+
+
<target name="remove-properties">
+
<delete file="ant/const.properties" failonerror="false"/>
<delete file="conf/service.properties" failonerror="false"/>
<delete file="conf/log4j.properties" failonerror="false"/>
+
</target>

- <target name="copy-properties">
- <copy file="ant/const.properties"
tofile="ant/const-old.properties" overwrite="true" failonerror="false"/>
- <copy file="conf/service.properties"
tofile="conf/service-old.properties" overwrite="true" failonerror="false"/>
- <copy file="conf/log4j.properties"
tofile="conf/log4j-old.properties" overwrite="true" failonerror="false"/>
+ 
+
+
+ <target name="register-fuctionality-question">
+
+ <input message="Do you want the service to register in LS? "
+ addproperty="_functionality.register.decision"
+ validargs="y,n" />
+
+ <condition property="functionality.register.decision">
+ <equals arg1="y" arg2="${_functionality.register.decision}"/>
+ </condition>
+
</target>

- <target name="set-tomcat-properties" depends="get-message-4">
- <input message="Enter the path of Tomcat location
[${basedir}/../${tomcat.dir}]:"
- addproperty="full.tomcat.path"
- defaultvalue="${basedir}/../${tomcat.dir}"
- />
- <input message="Enter the path of service.properties file
[${basedir}/conf/service.properties]:"
- addproperty="service.properties.path"
- defaultvalue="${basedir}/conf/service.properties"
- />
- <input message="Enter the path of components.properties file
[${basedir}/conf/components.properties]:"
- addproperty="components.properties.path"
- defaultvalue="${basedir}/conf/components.properties"
- />
- <propertyfile file="${full.tomcat.path}/conf/catalina.properties"
- comment="tranformed by perfSONAR">
- <entry key="service.properties"
value="${service.properties.path}"/>
- <entry key="components.properties"
value="${components.properties.path}"/>
+ <target name="register-fuctionality"
+ depends="register-fuctionality-question"
+ if="functionality.register.decision">
+
+ <input message="Enter the URL of LS []:"
+ addproperty="functionality.register.ls_address"/>
+
+ <input message="Enter the registration interval [30000]:"
+ addproperty="functionality.register.interval"
+ defaultvalue="30000"/>
+
+ <input message="Enter the descirption of service that will be send
to the LS [perfSONAR service]:"
+ addproperty="functionality.register.description"
+ defaultvalue="perfSONAR service"/>
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
+ <entry key="service.r.service_description"
value="${functionality.register.description}"/>
+ <entry key="service.r.ls_url"
value="${functionality.register.ls_address}"/>
+ <entry key="component.registrator.interval"
value="${functionality.register.interval}"/>
+
</propertyfile>
+
</target>

Deleted: trunk/perfsonar/ant/const.properties.cl

Copied: trunk/perfsonar/ant/const.properties.clmp (from rev 1802,
branches/romradz-ant4rel-20061017/ant/const.properties.clmp)

Modified: trunk/perfsonar/ant/java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/java-compile-targets.xml 2006-12-06 10:27:39
UTC (rev 1802)
+++ trunk/perfsonar/ant/java-compile-targets.xml 2006-12-07 08:54:42
UTC (rev 1803)
@@ -18,81 +18,93 @@
<project name="java-compile-targets">

- 

-
<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>

-


+
<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/**" />
<include name="org/perfsonar/client/commons/**" />
<include name="org/perfsonar/client/axis/**" />
- <include name="org/perfsonar/client/testHarness/SOAPClient.java"
/>
- <include
name="org/perfsonar/client/testHarness/SOAPClientMulti.java" />
+ <include name="org/perfsonar/client/testHarness/**" />
+ <exclude name="**/LSTestClient.java" />
<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/**" />
<include name="org/perfsonar/service/commons/**" />
<include name="org/perfsonar/client/commons/**" />
<include name="org/perfsonar/client/axis/**" />
- <include
name="org/perfsonar/client/testHarness/SOAPClient.java" />
- <include
name="org/perfsonar/client/testHarness/SOAPClientMulti.java" />
+ <include name="org/perfsonar/client/testHarness/**" />
<include name="org/ggf/**" />
</fileset>
</jar>
+
</target>

Modified: trunk/perfsonar/ant/javadoc-targets.xml
===================================================================
--- trunk/perfsonar/ant/javadoc-targets.xml 2006-12-06 10:27:39 UTC (rev
1802)
+++ trunk/perfsonar/ant/javadoc-targets.xml 2006-12-07 08:54:42 UTC (rev
1803)
@@ -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: trunk/perfsonar/ant/libs-download-targets.xml
===================================================================
--- trunk/perfsonar/ant/libs-download-targets.xml 2006-12-06 10:27:39
UTC (rev 1802)
+++ trunk/perfsonar/ant/libs-download-targets.xml 2006-12-07 08:54:42
UTC (rev 1803)
@@ -2,17 +2,17 @@


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

Copied: trunk/perfsonar/ant/perfsonar-install.xml (from rev 1802,
branches/romradz-ant4rel-20061017/ant/perfsonar-install.xml)

Copied: trunk/perfsonar/ant/pre-install-targets.xml (from rev 1802,
branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml)

Modified: trunk/perfsonar/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdjtool-compile-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdjtool-compile-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -27,20 +27,16 @@

<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" />

-
-


<target name="init-rrdjtool" depends="init">

- <echo
message="-----------------------------------------------------------" />
- <echo message="Remember to download sources of rrdjtool library from
CVS (sonar/rrdjtool) !!!!"/>
- <echo
message="-----------------------------------------------------------" />
+ <property file="ant/const.properties" />
+ <property name="rrd_h_path" value="${rrdtool_path}/include" />
+ <property name="rrd_lib_path" value="${rrdtool_path}/lib" />

</target>

@@ -72,7 +68,7 @@

- 
+ 

<target name="build-rrdjtool" depends="jar-rrdjtool">

@@ -87,17 +83,28 @@
-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="-----------------------------------------------------------" />
-
</target>

+ 

+ <target name="build-rrdjtool-64bit" depends="jar-rrdjtool">
+
+ <exec dir="${rrdjdir}/native" executable="/usr/bin/gcc">
+ <arg line="-o ${rrdjdir}/build/${lib_name}
+ -shared -Wl,-soname,${rrdjdir}/build/${lib_name}
+ -I ${rrd_h_path}
+ -L${rrd_lib_path}
+ -I ${jdk_path}/include
+ -I ${jdk_path}/include/linux/
+ ${rrdjdir}/native/Rrd.c
+ -lc -lrrd
+ -fPIC"/>
+ </exec>
+
+ </target>
+
+


<target name="build-rrdjtool-freebsd" depends="jar-rrdjtool">
@@ -113,13 +120,6 @@
-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="-----------------------------------------------------------" />
-
</target>

@@ -139,13 +139,6 @@
-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="-----------------------------------------------------------" />
-
</target>

Modified: trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -21,47 +21,53 @@

<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="${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="${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="${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="${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="${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="${axis.home}/WEB-INF/classes"/>
- <copy file="./conf/eventType-rules.xml"
todir="${axis.home}/WEB-INF/classes"/>
+ <copy file="./conf/eventType-map.xml"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="./conf/eventType-rules.xml"

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

+ <copy file="./conf/wsdd/${wsdd.file.deploy}"

todir="${service.home}/${deploy.root}/wsdd"/>
+ <copy file="./conf/wsdd/${wsdd.file.undeploy}"

todir="${service.home}/${deploy.root}/wsdd"/>
+
</target>

<target name="delete-jars-for-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="${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="${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="${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="${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="${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="${axis.home}/WEB-INF/classes/eventType-map.xml" />
- <delete file="${axis.home}/WEB-INF/classes/eventType-rules.xml" />
+ <delete
file="${service.home}${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-map.xml"
/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-rules.xml"
/>

+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
+
</target>

@@ -84,45 +90,113 @@
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="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <echo/>
- <echo>------------------------------ WARNING
---------------------------</echo>
- <echo/>
- <echo>Restart your application server (container of perfSONAR
service)!!!</echo>
- <echo/>
-
<echo>------------------------------------------------------------------</echo>
+ </target>

+
+ <target name="tomcat-start-for-rrdma-true"
+ depends="tomcat-start-question"
+ if="tomcat.start.decision">
+
+ <echo>Please, insert now the following xml tag 'Context'</echo>
+ <echo>into Tomcat configuration file server.xml</echo>
+ <echo>(${tomcat.home}/conf/server.xml)</echo>
+ <echo>inside existing xml tag 'Host':</echo>
+ <echo></echo>
+ <echo message=" <Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'>"/>
+ <echo message=" </Context>"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="startup.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ <env key="LD_LIBRARY_PATH"
path="${env.LD_LIBRARY_PATH}:${rrd_lib_path}:${rrdjdir}/build"/>
+ </exec>
+
+ <echo>Please, make sure that the Tomcat is running. Use the address
http://${target.server}:${target.port} .</echo>
+ <input message="Press Return key ..."/>
+
</target>

- <target name="deploy-rrdma" depends="copy-rrdma-jar,
add-context-listener"
- description="Deploys RRD MA service">
- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${deployFile}"/>
- <classpath refid="classpath"/>
- </java>
+ <target name="tomcat-start-for-rrdma-false"
+ unless="tomcat.start.decision">
+
+ <echo>Please, insert now the following xml tag 'Context'</echo>
+ <echo>into Tomcat configuration file server.xml</echo>
+ <echo>(${tomcat.home}/conf/server.xml)</echo>
+ <echo>inside existing xml tag 'Host':</echo>
+ <echo></echo>
+ <echo message=" <Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'>"/>
+ <echo message=" </Context>"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+
+ <echo>${line.separator}You have to manually set up the env variable
LD_LIBRARY_PATH</echo>
+ <echo>which should be seen by the Tomcat instance.</echo>
+ <echo></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. I will wait for
you.</echo>
+
+ <input message="Press Return key ..."/>
+
</target>

- <target name="undeploy-rrdma"
+ <target name="tomcat-start-for-rrdma"
+ depends="tomcat-start-for-rrdma-true,tomcat-start-for-rrdma-false">
+
+ </target>
+
+
+ 
+
+
+ <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="xmldb-adduser-rrdma" />
+
+ <antcall target="deploy-adminclient" />
+
+ </target>
+
+
+ <target name="undeploy"
description="Undeploys RRD MA service">

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

+ <antcall target="undeploy-adminclient" />
+
<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="${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" />
+
</target>

-
</project>

Modified: trunk/perfsonar/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-client-run-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdma-client-run-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -1,5 +1,4 @@

-


- <target name="run-rrdma-client" description="Runs Java client2">
+
+ <target name="run-rrdma-client-1" description="Runs Java client">
+
<java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/response-1.xml"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-2" description="Runs Java client">
+
+ <replace
file="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml"
token="__BASEPATH__" value="${basedir}"/>
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/response-2.xml"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-3" description="Runs Java client">
+
+ <replace
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"
token="__BASEPATH__" value="${basedir}"/>
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/response-3.xml"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-4" description="Runs Java client">
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
<arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/response-4.xml"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
</java>
+
</target>

+ <target name="run-rrdma-client-5" description="Runs Java client">

+ <replace
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml"
token="__BASEPATH__" value="${basedir}"/>
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/response-5.xml"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-6" description="Runs Java client">
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/response-chaining-1.xml"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+
+ <target name="run-rrdma-client-7" description="Runs Java client">
+
+ <java classname="org.perfsonar.client.testHarness.SOAPClient"
+ classpathref="classpath" fork="true">
+ <arg value="${ma.local}"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/sonar/response-chaining-2.xml"/>
+
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>
+
+ </java>
+
+ </target>
+
+


+
<target name="run-rrdma-client-store" description="Runs Java client">
+
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath"
fork="true">
@@ -47,10 +160,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 +173,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: trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -15,75 +15,63 @@
<project name="rrdma-configure-targets">

- <target name="_get-rrdtool-path">
- <exec executable="which"
- os="Linux"
- errorproperty="rrdtool.path.error"
- outputproperty="full.rrdtool.path">
- <arg line="rrdtool"/>
- </exec>
- </target>

+ <property file="ant/const.properties" />

- <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}"/>
- <input message="Enter the base path of RRDTool [${_rrdtool.path}]:"
- addproperty="rrdtool.path"
- defaultvalue="${_rrdtool.path}"
- />
- <echo message="Accepted RRDTool base path: ${rrdtool.path}"/>
- </target>
+ <property name="deploy.root" value="${service.name}" />

+ 
+
+
<target name="__get-rrd-config-file">
- <input message="Enter the path of rrd config file
[${basedir}/conf/rrd-database_TEST.xml]:"
+
+ <input message="RRD metadata configuration file is required. More
information about this is available in the installation guide. It is
suggested that you use the TEST metadata configuration file for now and you
can change it later on with your own file. 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">
- <echo message="Accepted rrd metadata config file:
${rrd.config.file}"/>
+
+ <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>



- <target name="set-const-properties-for-rrdma"
- depends="get-message-1,
- get-java-path,
- get-rrdtool-path,
- get-axis-path,
- get-server-address,
- get-server-port">

+ <target name="set-const-properties-for-rrdma">
+
<propertyfile file="ant/const.properties"
- comment="This file was created by the Ant
configuration script.">
+ comment="This file was created by the Ant
configuration script.">

- <entry key="axis.home" value="${axis.path}"/>
- <entry key="rrdjdir" value="${basedir}/contrib/rrdjtool"/>
- <entry key="rrdtool_path" value="${rrdtool.path}"/>
- <entry key="jdk_path" value="${java.path}"/>
- <entry key="target.server" value="${server.address}"/>
- <entry key="target.port" value="${server.port}"/>
+ <entry key="service.name" value="${service.name}"/>
+ <entry key="deploy.root" value="${deploy.root}"/>
<entry key="webservice.name" value="MeasurementArchiveService"/>
<entry key="build" value="build"/>
<entry key="package.root" value="org/perfsonar"/>
<entry key="package.nmwg.root" value="org/ggf"/>
- <entry key="wsdd.home" value="service/web/wsdd"/>
<entry key="wsdd.file.deploy" value="ma-service-deploy.wsdd"/>
<entry key="wsdd.file.undeploy"
value="ma-service-undeploy.wsdd"/>
- <entry key="wsdd.path" value="org/perfsonar/service/web/wsdd"/>
<entry key="api.location" value="doc/api"/>
<entry key="api.title" value="perfSONAR"/>
<entry key="api.windowtitle" value="perfSONAR"/>
@@ -91,87 +79,189 @@

</propertyfile>

- <echo message="const.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>

-


+
<target name="set-service-properties-for-rrdma"
- depends="get-message-2,
- get-server-address,
- get-rrd-config-file">
+ depends="get-rrd-config-file">

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

- <entry key="service.r.type" value="ma"/>
- <entry key="service.r.access_point"
value="http://${server.address}:8080/axis/services/MeasurementArchiveService"/>
- <entry key="service.r.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.measurement_tool"
value="cricket,mrtg"/>
- <entry key="service.r.ma.format" value="rrd"/>
+ <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.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_uri.xmlrpc" value=""/>
- <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>

- <echo message="service.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>

+ 
+
+
<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>

- <target name="copy-initconfig-for-rrdma">
- <copy file="ant/const.properties.ma" tofile="ant/const.properties"
overwrite="true" failonerror="false"/>
- <copy file="conf/components.properties.ma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+ 
+
+
+ <target name="copy-components-properties">
+
+ <copy file="conf/components.properties.rrdma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
</target>

- <target name="configure-rrdma">
- <antcall target="copy-initconfig-for-rrdma"/>
- <antcall target="copy-properties"/>
+ 
+
+
+ <target name="store-fuctionality-question-for-rrdma">
+
+ <input message="Do you want the service to accept messages with
measurement data and store them? "
+ addproperty="_functionality.store.decision"
+ validargs="y,n" />
+
+ <condition property="functionality.store.decision">
+ <equals arg1="y" arg2="${_functionality.store.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="store-fuctionality-for-rrdma"
+ depends="store-fuctionality-question-for-rrdma"
+ if="functionality.store.decision">
+
+ <input message="Enter the path where new rrd files with measearement
data sent to the service will be located [${service.home}]?"
+ addproperty="functionality.store.path"
+ defaultvalue="${service.home}"/>
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.ma.xmldb.db_store" value="on"/>
+ <entry key="service.ma.rrd.xmldb.db_store.data_dir"
value="${functionality.store.path}/"/>
+
+ </propertyfile>
+
+ </target>
+
+
+ 
+
+
+ <target name="register-fuctionality-for-rrdma"
+ depends="register-fuctionality"
+ if="functionality.register.decision">
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.r.service_name" value="${service.name}"/>
+ <entry key="service.r.service_type" value="MA"/>
+ <entry key="component.registrator.scheduler_component"
value="ma_scheduler"/>
+
+ </propertyfile>
+
+ <propertyfile file="conf/components.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="ma_scheduler"
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
+ <entry key="registrator"
value="org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+
+ </propertyfile>
+
+ </target>
+
+
+ 
+
+
+ <target name="__exist-init">
+
+ <property file="conf/service.properties" />
+
+ <condition property="component.ma.xmldb.db_status.present"
value="true">
+ <isset property="component.ma.xmldb.db_status"/>
+ </condition>
+
+ </target>
+
+
+ <target name="_exist-init"
+ depends="__exist-init"
+ if="component.ma.xmldb.db_status.present">
+
+ <condition property="component.ma.xmldb.db_status.type_standalone">
+ <equals arg1="stand-alone" arg2="${component.ma.xmldb.type}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="exist-init"
+ depends="_exist-init"
+ if="component.ma.xmldb.db_status.type_standalone">
+
+ <echo>Initializing the xml database eXist...</echo>
+
+ <antcall target="xmldb-init-rrdma"/>
+
+ </target>
+
+
+ 
+
+
+ <target name="configure">
+
+ <echo>Configuring...</echo>
+
+ <antcall target="copy-components-properties"/>
<antcall target="set-const-properties-for-rrdma"/>
<antcall target="set-service-properties-for-rrdma"/>
<antcall target="set-log4j-properties"/>
- <antcall target="set-tomcat-properties"/>
<antcall target="create-testrrdconfig-for-rrdma"/>
+ <antcall target="exist-init"/>
+ <antcall target="store-fuctionality-for-rrdma"/>
+ <antcall target="register-fuctionality-for-rrdma"/>
+
</target>

Modified: trunk/perfsonar/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-exist-xmldb-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdma-exist-xmldb-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -14,6 +14,7 @@
<project name="rrdma-exist-xmldb-targets">

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

@@ -23,6 +24,7 @@
<taskdef name="extract" classname="org.exist.ant.XMLDBExtractTask"
classpathref="classpath" onerror="ignore"/>
<taskdef name="create" classname="org.exist.ant.XMLDBCreateTask"
classpathref="classpath" onerror="ignore"/>
<taskdef name="list" classname="org.exist.ant.XMLDBListTask"
classpathref="classpath" onerror="ignore"/>
+ <taskdef name="xquery" classname="org.exist.ant.XMLDBXQueryTask"
classpathref="classpath" onerror="ignore"/>

<property name="dump" value="dump"/>
@@ -30,46 +32,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 +101,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 +115,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,25 +161,102 @@
</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="xmldb-check-status">
+
+ <condition property="exist.check.status">
+ <and>
+ <equals arg1="on" arg2="${component.ma.xmldb.db_status}"/>
+ <equals arg1="webapp" arg2="${component.ma.xmldb.type}"/>
+ </and>
+ </condition>
+
+ </target>
+
+
+ <target name="xmldb-adduser-init-question-rrdma"
+ depends="xmldb-check-status"
+ if="exist.check.status">
+
+ <input message="Do you want me to add new user
${component.ma.xmldb.db_username} (provided in the pre-install step) and
initiate the xml database eXist (If your eXist is already configured and
initialized for RRD MA answer 'n'. But probably it's your first run of this
installation script so you have not added this user and initialized the
database yet.) ? "
+ addproperty="_exist.adduser.init"
+ validargs="y,n"
+ defaultvalue="y" />
+
+ <condition property="exist.adduser.init">
+ <equals arg1="y" arg2="${_exist.adduser.init}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="xmldb-adduser-rrdma"
+ depends="xmldb-adduser-init-question-rrdma"
+ if="exist.adduser.init">
+
+ <xquery
+
uri="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"
+ user="admin"
+ password="${component.ma.xmldb.db_adminpassword}"
+ query="xmldb:create-user('${component.ma.xmldb.db_username}',
'${component.ma.xmldb.db_password}', 'dba', '/db')" />
+
+ <antcall target="xmldb-init-rrdma"/>
+
+ </target>
+
+
+ <target name="xmldb-password-rrdma">
+
+ <input message="Enter eXist admin password []?"
+ addproperty="adminpass"
+ defaultvalue=""/>
+
+ <input message="Enter eXist username []?"
+ addproperty="username"/>
+
+ <input message="Enter new password for ${username} []?"
+ addproperty="password"/>
+
+ <input message="Enter the URL of eXist
[xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db]?"
+ addproperty="url"/>
+
+ <xquery
+ uri="${url}"
+ user="admin"
+ password="${adminpass}"
+ query="xmldb:change-user('${username}', '${password}', 'dba',
'/')" />
+
+ </target>
+
+
+
</project>
-

Modified: trunk/perfsonar/ant/rrdma/rrdma-java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-java-compile-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdma-java-compile-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -19,17 +19,19 @@

-


<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"
+ 
+
+
+ <target name="build"
description="Builds RRD MA.">
+
<antcall target="clean-all"/>
<antcall target="jar-generic"/>
<antcall target="jar-rrdma"/>
+
</target>

-
</project>

Modified: trunk/perfsonar/ant/rrdma/rrdma-junit-test-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-junit-test-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdma-junit-test-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -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: trunk/perfsonar/ant/rrdma/rrdma-libs-download-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-libs-download-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdma-libs-download-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

-
-

@@ -18,105 +18,106 @@
<project name="rrdma-release-targets">

+ <target name="init-release">

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

- <target name="rrdma-release-src"
- depends="copy-initconfig-for-rrdma"
- description="Build src release.">
+ </target>

- <property file="ant/const.properties" />

- <delete dir="tmp"/>
- <mkdir
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar"/>
- <copy
todir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar">
- <fileset dir="../perfsonar"/>
- </copy>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/tmp"/>
+ <target name="release"
+ depends="init-release, build"
+ description="Build the release.">

+ <property file="ant/const.properties" />

- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/lookupService"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/measurementPoint"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/topologyService"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build/org"/>
- <delete>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build"
includes="**/*.jar"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/log"
includes="**/*.log"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/ls-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/mp-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
includes="**/tcmp-*.wsdd"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.ls"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.cl"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.sqlma"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tcmp"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.mp"/>
- </delete>
+ <delete dir="tmp"/>
+ <mkdir dir="tmp/${service.name}/perfsonar"/>
+ <copy todir="tmp/${service.name}/perfsonar">
+ <fileset dir="${basedir}"/>
+ </copy>
+ <delete dir="tmp/${service.name}/perfsonar/tmp"/>

- <tar
destfile="${release.basename}-${release.servicename}-src-${release.version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"
- />
+ <delete dir="tmp/${service.name}/perfsonar/src/org"/>
+ <delete dir="tmp/${service.name}/perfsonar/doc"/>
+ <delete dir="tmp/${service.name}/perfsonar/test"/>
+ <delete dir="tmp/${service.name}/perfsonar/releng"/>
+ <delete dir="tmp/${service.name}/perfsonar/build/org"/>

- <delete dir="tmp"/>
+ <delete
file="tmp/${service.name}/perfsonar/conf/components.properties"/>
+ <delete file="tmp/${service.name}/perfsonar/conf/service.properties"/>
+ <delete file="tmp/${service.name}/perfsonar/ant/const.properties"/>

- <gzip
zipfile="${release.basename}-${release.servicename}-src-${release.version}.tar.gz"
-
src="${release.basename}-${release.servicename}-src-${release.version}.tar"
- />
+ <delete file="tmp/${service.name}/perfsonar/ant/changes-rrdma"/>

- <delete
file="${release.basename}-${release.servicename}-src-${release.version}.tar"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/clmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/nmsmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/sqlma"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/tcmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/tops"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/xmlls"/>

- </target>
+ <delete dir="tmp/${service.name}/perfsonar/conf/template"/>

+ <delete dir="tmp/${service.name}/perfsonar/lib/rrd"/>

+ <move file="tmp/${service.name}/perfsonar/ant/build-rrdma.xml"
tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>

- 
+ <delete>

- <target name="rrdma-release-bin"
- depends="copy-initconfig-for-rrdma, build-rrdma"
- description="Build bin release.">
+ <fileset dir="tmp/${service.name}/perfsonar/log"
includes="**/*.log"/>

- <property file="ant/const.properties" />
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.cl"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.mp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.sqlma"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.tops"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.tcmp"/>

- <delete dir="tmp"/>
- <mkdir
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar"/>
- <copy
todir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar">
- <fileset dir="../perfsonar"/>
- </copy>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/tmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.cl"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.mp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.sqlma"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tops"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tcmp"/>

+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/build-*.xml"/>

- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/src/org"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/doc"/>
- <delete
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/test"/>
- <delete>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/log"
includes="**/*.log"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/conf"
includes="**/*.ls"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.cl"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.sqlma"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tcmp"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.mp"/>
- </delete>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*-old.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*-old.*"/>

- <tar
destfile="${release.basename}-${release.servicename}-bin-${release.version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"
- />
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/clmp-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/ls-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/mp-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/tops-*.wsdd"/>

- <delete dir="tmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/ibatis-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/mysql-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/psql-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/sql-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/tcmp-*.*"/>

- <gzip
zipfile="${release.basename}-${release.servicename}-bin-${release.version}.tar.gz"
-
src="${release.basename}-${release.servicename}-bin-${release.version}.tar"
- />
+ </delete>

- <delete
file="${release.basename}-${release.servicename}-bin-${release.version}.tar"/>
+ <tar destfile="${service.name}.tar"
+ basedir="tmp/"
+ longfile="gnu"
+ excludes=".svn/**"
+ />

+ <delete dir="tmp"/>

+ <gzip zipfile="${service.name}.tar.gz"
+ src="${service.name}.tar"
+ />
+
+ <delete file="${service.name}.tar"/>
+
</target>

</project>
-
-

Modified: trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml 2006-12-06
10:27:39 UTC (rev 1802)
+++ trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml 2006-12-07
08:54:42 UTC (rev 1803)
@@ -16,7 +16,22 @@
<project name="rrdma-test-run-targets">

+
+ <target name="test">
+
+ <antcall target="run-rrdma-client-1"/>
+ <antcall target="run-rrdma-client-2"/>
+ <antcall target="run-rrdma-client-3"/>
+ <antcall target="run-rrdma-client-4"/>
+ <antcall target="run-rrdma-client-5"/>
+ <antcall target="run-rrdma-client-6"/>
+ <antcall target="run-rrdma-client-7"/>
+
+ </target>
+
+
<target name="run-rrdma-test1" description="Runs test3">
+
<java
classname="org.perfsonar.service.testHarness.RequestHandlerTester"
classpathref="classpath"
fork="true">
@@ -25,10 +40,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">
@@ -44,10 +61,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">
@@ -66,10 +85,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">
@@ -87,10 +108,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">
@@ -108,9 +131,9 @@
<jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>

</java>
+
</target>

</project>
-

Deleted: trunk/perfsonar/ant/webservice-env-targets.xml

Copied: trunk/perfsonar/conf/axis-1.4 (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4)

Copied: trunk/perfsonar/conf/axis-1.4/WEB-INF (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/WEB-INF)

Copied: trunk/perfsonar/conf/axis-1.4/WEB-INF/classes (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/WEB-INF/classes)

Deleted: trunk/perfsonar/conf/axis-1.4/WEB-INF/classes/i18n.properties

Copied: trunk/perfsonar/conf/axis-1.4/WEB-INF/classes/i18n.properties (from
rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/WEB-INF/classes/i18n.properties)

Deleted: trunk/perfsonar/conf/axis-1.4/WEB-INF/users.lst

Copied: trunk/perfsonar/conf/axis-1.4/WEB-INF/users.lst (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/WEB-INF/users.lst)

Deleted: trunk/perfsonar/conf/axis-1.4/WEB-INF/web.xml

Copied: trunk/perfsonar/conf/axis-1.4/WEB-INF/web.xml (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/WEB-INF/web.xml)

Deleted: trunk/perfsonar/conf/axis-1.4/fingerprint.jsp

Copied: trunk/perfsonar/conf/axis-1.4/fingerprint.jsp (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/fingerprint.jsp)

Deleted: trunk/perfsonar/conf/axis-1.4/happyaxis.jsp

Copied: trunk/perfsonar/conf/axis-1.4/happyaxis.jsp (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/happyaxis.jsp)

Deleted: trunk/perfsonar/conf/axis-1.4/i18nLib.jsp

Copied: trunk/perfsonar/conf/axis-1.4/i18nLib.jsp (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/i18nLib.jsp)

Deleted: trunk/perfsonar/conf/axis-1.4/index.html

Copied: trunk/perfsonar/conf/axis-1.4/index.html (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/index.html)

Deleted: trunk/perfsonar/conf/axis-1.4/index.jsp

Copied: trunk/perfsonar/conf/axis-1.4/index.jsp (from rev 1802,
branches/romradz-ant4rel-20061017/conf/axis-1.4/index.jsp)

Deleted: trunk/perfsonar/conf/components.properties.cl

Copied: trunk/perfsonar/conf/components.properties.clmp (from rev 1802,
branches/romradz-ant4rel-20061017/conf/components.properties.clmp)

Deleted: trunk/perfsonar/conf/components.properties.ma

Copied: trunk/perfsonar/conf/components.properties.rrdma (from rev 1802,
branches/romradz-ant4rel-20061017/conf/components.properties.rrdma)

Copied: trunk/perfsonar/conf/components.properties.sqlma (from rev 1802,
branches/romradz-ant4rel-20061017/conf/components.properties.sqlma)

Modified: trunk/perfsonar/conf/log4j.properties
===================================================================
--- trunk/perfsonar/conf/log4j.properties 2006-12-06 10:27:39 UTC (rev
1802)
+++ trunk/perfsonar/conf/log4j.properties 2006-12-07 08:54:42 UTC (rev
1803)
@@ -1,70 +1,50 @@
-
-## $Id$
-## project: perfSONAR
-## author: romradz
-
-
-
-
-# point the property to the directory where log files should be created.
Suggested directory is
-# $PERFSONAR/log
-
-# example path for log files
-logDir=/opt/perfsonar/log
-
-
-## --------------- The properties below do not need any changes -----------
-
-log4j.rootLogger=INFO, rootAppender
-log4j.logger.sonar-debug=DEBUG, debugAppender
-log4j.logger.sonar-info=INFO, infoAppender
-log4j.logger.sonar-warn=WARN, warnAppender
-log4j.logger.sonar-error=ERROR, errorAppender
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-
-
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.rootAppender.File=${logDir}/sonar.log
-log4j.appender.rootAppender.MaxFileSize=500KB
+#This file was created by the ant script.
+#Wed Dec 06 19:54:26 CET 2006
+log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.debugAppender.MaxBackupIndex=1000
+log4j.appender.infoAppender.MaxBackupIndex=1000
+log4j.appender.warnAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_warn.log
+log4j.appender.warnAppender.MaxBackupIndex=1000
+log4j.appender.debugAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_debug.log
log4j.appender.rootAppender.MaxBackupIndex=1000
+log4j.appender.rootAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar.log
log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-
-log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.debugAppender.File=${logDir}/sonar_debug.log
log4j.appender.debugAppender.MaxFileSize=500KB
-log4j.appender.debugAppender.MaxBackupIndex=100
-log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-
-log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.infoAppender.File=${logDir}/sonar_info.log
-log4j.appender.infoAppender.MaxFileSize=500KB
-log4j.appender.infoAppender.MaxBackupIndex=100
-log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-
-log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.warnAppender.File=${logDir}/sonar_warn.log
-log4j.appender.warnAppender.MaxFileSize=500KB
-log4j.appender.warnAppender.MaxBackupIndex=100
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-
-log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.errorAppender.File=${logDir}/sonar_error.log
-log4j.appender.errorAppender.MaxFileSize=500KB
-log4j.appender.errorAppender.MaxBackupIndex=100
+log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
+log4j.logger.sonar-warn=WARN, warnAppender
log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-
+logDir=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.fatalAppender.File=${logDir}/sonar_fatal.log
-log4j.appender.fatalAppender.MaxFileSize=500KB
-log4j.appender.fatalAppender.MaxBackupIndex=100
+log4j.appender.errorAppender.MaxBackupIndex=1000
+log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.warnAppender.MaxFileSize=500KB
+log4j.rootLogger=INFO, rootAppender
+log4j.appender.rootAppender.MaxFileSize=500KB
log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.fatalAppender.MaxBackupIndex=1000
+log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.errorAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_error.log
+log4j.appender.errorAppender.MaxFileSize=500KB
log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-
-
-
-
+log4j.logger.perfsonar-info=INFO, infoAppender
+log4j.appender.fatalAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_fatal.log
+log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.fatalAppender.MaxFileSize=500KB
+log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.sonar-debug=DEBUG, debugAppender
+log4j.logger.perfsonar-debug=DEBUG, debugAppender
+log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.sonar-error=ERROR, errorAppender
+log4j.logger.perfsonar-error=ERROR, errorAppender
+log4j.logger.perfsonar-warn=WARN, warnAppender
+log4j.logger.sonar-info=INFO, infoAppender
+log4j.appender.infoAppender.MaxFileSize=500KB
+log4j.appender.infoAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_info.log
+log4j.logger.sonar-fatal=FATAL, fatalAppender
+log4j.logger.perfsonar-fatal=FATAL, fatalAppender

Modified: trunk/perfsonar/conf/rrd-database_TEST.xml
===================================================================
--- trunk/perfsonar/conf/rrd-database_TEST.xml 2006-12-06 10:27:39 UTC (rev
1802)
+++ trunk/perfsonar/conf/rrd-database_TEST.xml 2006-12-07 08:54:42 UTC (rev
1803)
@@ -26,7 +26,7 @@
<nmwg:key>
<nmwg:parameters>

- 
+ 
<nmwg:parameter
name="file">__BASEPATH__/data/rrd/test/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">bytes</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
@@ -56,7 +56,7 @@
<nmwg:key>
<nmwg:parameters>

- 
+ 
<nmwg:parameter
name="file">__BASEPATH__/data/rrd/test/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">pkts</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

Deleted: trunk/perfsonar/conf/service.properties.cl

Copied: trunk/perfsonar/conf/service.properties.clmp (from rev 1802,
branches/romradz-ant4rel-20061017/conf/service.properties.clmp)

Copied: trunk/perfsonar/conf/wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd)

Deleted: trunk/perfsonar/conf/wsdd/clmp-service-deploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/clmp-service-deploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/clmp-service-deploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/clmp-service-undeploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/clmp-service-undeploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/clmp-service-undeploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/ls-service-deploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/ls-service-deploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/ls-service-deploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/ls-service-undeploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/ls-service-undeploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/ls-service-undeploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/ma-service-deploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/ma-service-deploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/ma-service-deploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/ma-service-undeploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/ma-service-undeploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/ma-service-undeploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/mp-service-deploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/mp-service-deploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/mp-service-deploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/mp-service-undeploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/mp-service-undeploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/mp-service-undeploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/tcmp-service-deploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/tcmp-service-undeploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/tops-service-deploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/tops-service-deploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/tops-service-deploy.wsdd)

Deleted: trunk/perfsonar/conf/wsdd/tops-service-undeploy.wsdd

Copied: trunk/perfsonar/conf/wsdd/tops-service-undeploy.wsdd (from rev 1802,
branches/romradz-ant4rel-20061017/conf/wsdd/tops-service-undeploy.wsdd)

Copied:
trunk/perfsonar/schema/example-instances/sonar/CommandLineMP-Ping-Request.xml
(from rev 1802,
branches/romradz-ant4rel-20061017/schema/example-instances/sonar/CommandLineMP-Ping-Request.xml)

Copied:
trunk/perfsonar/schema/example-instances/sonar/MetadataKey-Filter-Req-1.xml
(from rev 1802,
branches/romradz-ant4rel-20061017/schema/example-instances/sonar/MetadataKey-Filter-Req-1.xml)

Copied:
trunk/perfsonar/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml
(from rev 1802,
branches/romradz-ant4rel-20061017/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml)

Deleted:
trunk/perfsonar/schema/example-instances/sonar/MetadataKey-Filter-Req.xml

Modified:
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml
2006-12-06 10:27:39 UTC (rev 1802)
+++
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml
2006-12-07 08:54:42 UTC (rev 1803)
@@ -19,10 +19,10 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">/data/sonar/Abilene/atla-hstn.rrd</nmwg:parameter>
- <nmwg:parameter name="dataSource">output</nmwg:parameter>

- <nmwg:parameter name="startTime">1124250480</nmwg:parameter>
- <nmwg:parameter name="endTime">1124250840</nmwg:parameter>
+ <nmwg:parameter
name="file">__BASEPATH__/data/rrd/test/test.rrd</nmwg:parameter>
+ <nmwg:parameter name="dataSource">bytes</nmwg:parameter>

+ <nmwg:parameter name="startTime">1121472000</nmwg:parameter>
+ <nmwg:parameter name="endTime">1121904000</nmwg:parameter>
<nmwg:parameter name="consolidationFunction">AVERAGE</nmwg:parameter>
<nmwg:parameter name="resolution">60</nmwg:parameter>
</nmwg:parameters>

Modified:
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
2006-12-06 10:27:39 UTC (rev 1802)
+++
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-1.xml
2006-12-07 08:54:42 UTC (rev 1803)
@@ -33,7 +33,7 @@
<nmwg:metadata id="meta0" metadataIdRef="meta01">
<netutil:subject id="iusub0">
<nmwgt:interface>
- <nmwgt:authRealm>ESnet-Public</nmwgt:authRealm>
+ <nmwgt:authRealm>TestRealm</nmwgt:authRealm>
</nmwgt:interface>
</netutil:subject>
</nmwg:metadata>
@@ -42,26 +42,16 @@
<nmwg:metadata id="meta4" metadataIdRef="meta0">
<netutil:subject id="iusub1">
<nmwgt:interface>
- <nmwgt:hostName>llnl-rt1.es.net</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">128.115.190.1</nmwgt:ifAddress>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
</nmwgt:interface>
</netutil:subject>
</nmwg:metadata>

- <nmwg:metadata id="meta1" metadataIdRef="meta0">
+ <nmwg:metadata id="meta1-in" metadataIdRef="meta4">
<netutil:subject id="iusub1">
<nmwgt:interface>
- <nmwgt:hostName>atl-cr1.es.net</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.1.1</nmwgt:ifAddress>
- </nmwgt:interface>
- </netutil:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta1-in" metadataIdRef="meta1">
- <netutil:subject id="iusub1">
- <nmwgt:interface>
<nmwgt:direction>in</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
@@ -83,10 +73,10 @@
<select:subject id="iusub2" metadataIdRef="meta1-in"/>

<select:parameters id="param1">
- <nmwg:parameter name="startTime">1121644800</nmwg:parameter>
- <nmwg:parameter name="endTime">1121904000</nmwg:parameter>
+ <nmwg:parameter name="startTime">1121558400</nmwg:parameter>
+ <nmwg:parameter name="endTime">1121731200</nmwg:parameter>
<nmwg:parameter name="consolidationFunction">AVERAGE</nmwg:parameter>
- <nmwg:parameter name="resolution">300</nmwg:parameter>
+ <nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

<nmwg:eventType>select</nmwg:eventType>
@@ -98,8 +88,8 @@
<select:subject id="iusub3" metadataIdRef="meta1-out"/>

<select:parameters id="param1">
- <nmwg:parameter name="startTime">1119312000</nmwg:parameter>
- <nmwg:parameter name="endTime">1119830400</nmwg:parameter>
+ <nmwg:parameter name="startTime">1121472000</nmwg:parameter>
+ <nmwg:parameter name="endTime">1121904000</nmwg:parameter>
<nmwg:parameter name="consolidationFunction">AVERAGE</nmwg:parameter>
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

Modified:
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
2006-12-06 10:27:39 UTC (rev 1802)
+++
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-Chaining-2.xml
2006-12-07 08:54:42 UTC (rev 1803)
@@ -33,7 +33,7 @@
<nmwg:metadata id="meta0" metadataIdRef="meta01">
<netutil:subject id="iusub0">
<nmwgt:interface>
- <nmwgt:authRealm>ESnet-Public</nmwgt:authRealm>
+ <nmwgt:authRealm>TestRealm</nmwgt:authRealm>
</nmwgt:interface>
</netutil:subject>
</nmwg:metadata>
@@ -42,26 +42,16 @@
<nmwg:metadata id="meta4" metadataIdRef="meta0">
<netutil:subject id="iusub1">
<nmwgt:interface>
- <nmwgt:hostName>llnl-rt1.es.net</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">128.115.190.1</nmwgt:ifAddress>
+ <nmwgt:hostName>test-hostName</nmwgt:hostName>
+ <nmwgt:ifAddress type="ipv4">10.1.2.3</nmwgt:ifAddress>
</nmwgt:interface>
</netutil:subject>
</nmwg:metadata>

- <nmwg:metadata id="meta1" metadataIdRef="meta0">
+ <nmwg:metadata id="meta1-in" metadataIdRef="meta4">
<netutil:subject id="iusub1">
<nmwgt:interface>
- <nmwgt:hostName>atl-cr1.es.net</nmwgt:hostName>
- <nmwgt:ifAddress type="ipv4">10.1.1.1</nmwgt:ifAddress>
- </nmwgt:interface>
- </netutil:subject>
- </nmwg:metadata>
-
-
- <nmwg:metadata id="meta1-in" metadataIdRef="meta1">
- <netutil:subject id="iusub1">
- <nmwgt:interface>
<nmwgt:direction>in</nmwgt:direction>
</nmwgt:interface>
</netutil:subject>
@@ -83,10 +73,10 @@
<select:subject id="iusub2" metadataIdRef="meta1-in"/>

<select:parameters id="param1">
- <nmwg:parameter name="startTime">1121644800</nmwg:parameter>
+ <nmwg:parameter name="startTime">1121472000</nmwg:parameter>
<nmwg:parameter name="endTime">1121904000</nmwg:parameter>
<nmwg:parameter name="consolidationFunction">AVERAGE</nmwg:parameter>
- <nmwg:parameter name="resolution">300</nmwg:parameter>
+ <nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

<nmwg:eventType>select</nmwg:eventType>
@@ -96,8 +86,8 @@

<nmwg:metadata id="meta5">
<select:parameters id="param1">
- <nmwg:parameter name="startTime">1119312000</nmwg:parameter>
- <nmwg:parameter name="endTime">1119830400</nmwg:parameter>
+ <nmwg:parameter name="startTime">1121558400</nmwg:parameter>
+ <nmwg:parameter name="endTime">1121731200</nmwg:parameter>
</select:parameters>

<nmwg:eventType>select</nmwg:eventType>

Modified:
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml
===================================================================
---
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml
2006-12-06 10:27:39 UTC (rev 1802)
+++
trunk/perfsonar/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml
2006-12-07 08:54:42 UTC (rev 1803)
@@ -20,8 +20,8 @@
<nmwg:metadata id="meta1">
<nmwg:key>
<nmwg:parameters id="param1">
- <nmwg:parameter
name="file">/data/sonar/Abilene/atla-hstn.rrd</nmwg:parameter>
- <nmwg:parameter name="dataSource">output</nmwg:parameter>
+ <nmwg:parameter
name="file">__BASEPATH__/data/rrd/test/test.rrd</nmwg:parameter>
+ <nmwg:parameter name="dataSource">bytes</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:metadata>
@@ -33,8 +33,8 @@
<select:subject id="iusub2" metadataIdRef="meta1"/>

<select:parameters id="param1">
- <nmwg:parameter name="startTime">1124250480</nmwg:parameter>
- <nmwg:parameter name="endTime">1124250840</nmwg:parameter>
+ <nmwg:parameter name="startTime">1121472000</nmwg:parameter>
+ <nmwg:parameter name="endTime">1121904000</nmwg:parameter>
<nmwg:parameter name="consolidationFunction">AVERAGE</nmwg:parameter>
<nmwg:parameter name="resolution">60</nmwg:parameter>
</select:parameters>

Modified:
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
===================================================================
---
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
2006-12-06 10:27:39 UTC (rev 1802)
+++
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
2006-12-07 08:54:42 UTC (rev 1803)
@@ -5,6 +5,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
+import java.net.URL;
import java.util.Iterator;

import org.perfsonar.service.commons.exceptions.SystemException;
@@ -64,10 +65,18 @@
*/
public void initManager() throws SystemException {

- //read components from Configuration file and init them
+//read components from Configuration file and init them

//String configFileName =
"/projects/sonar/perfsonar/conf/components.properties";
- String configFileName = System.getProperty("components.properties");
+ URL urlString =
this.getClass().getClassLoader().getResource("perfsonar/conf/components.properties");
+
+ if(urlString==null || urlString.toString()==null) {
+
+ throw new
SystemException("AuxiliaryComponentManager.initManager: " +
+ "Missing or unable to locate components.properties file.
Cannot continue");
+ }
+ String configFileName = urlString.getFile();
+
System.out.println("AuxiliaryComponentManager.initManager: " +
"Read config file name as: "+configFileName);

Modified:
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
===================================================================
---
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
2006-12-06 10:27:39 UTC (rev 1802)
+++
trunk/perfsonar/src/org/perfsonar/commons/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
2006-12-07 08:54:42 UTC (rev 1803)
@@ -2,6 +2,7 @@

import java.io.File;
import java.io.FileInputStream;
+import java.net.URL;
import java.util.Properties;

import org.perfsonar.commons.auxiliary.AuxiliaryComponent;
@@ -45,8 +46,22 @@
public void initComponent() throws SystemException {

// bootstrapped absolute file location in catalina.properties file
- String fileName = System.getProperty("service.properties");
-
+ URL fileNameURL =
this.getClass().getClassLoader().getResource("perfsonar/conf/service.properties");
+
+ if(fileNameURL==null) {
+
+
System.out.println("PropertiesConfigurationComponent.initComponent:" +
+ " Missing or unable to locate service.properties file. Cannot
complete request.");
+
+ throw new
SystemException("PropertiesConfigurationComponent.initComponent:" +
+ " Missing or unable to locate service.properties file. Cannot
complete request.");
+ }
+
+ String fileName = fileNameURL.getFile();
+
+ System.out.println("PropertiesConfigurationComponent.initComponent:"
+
+ "Read the file name as: "+fileName);
+
// create a new file object with the read file name
try {

@@ -66,7 +81,6 @@
}

-
// ------------------------------------------------ public methods

Modified:
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
===================================================================
---
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
2006-12-06 10:27:39 UTC (rev 1802)
+++
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
2006-12-07 08:54:42 UTC (rev 1803)
@@ -39,9 +39,9 @@

- private String digesterRules = "eventType-rules.xml";
+ private String digesterRules = "perfsonar/conf/eventType-rules.xml";

- private String digesterInput = "eventType-map.xml";
+ private String digesterInput = "perfsonar/conf/eventType-map.xml";

private String componentName = null;

r1803 - in trunk/perfsonar: ant ant/clmp ant/rrdma conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/wsdd schema/example-instances/sonar src/org/perfsonar/commons/auxiliary src/org/perfsonar/commons/auxiliary/components/configuration/properties src/org/perfsonar/service/measurementArchive/eventTypeConfig, svnlog, 12/07/2006

List archive