perfsonar-dev - r2077 - in branches/SSHTelnet-MP-STABLE: ant ant/clmp ant/flowmp ant/rrdma ant/sqlma ant/ssh ant/tcmp ant/tops conf

Subject: perfsonar development work

List archive

r2077 - in branches/SSHTelnet-MP-STABLE: ant ant/clmp ant/flowmp ant/rrdma ant/sqlma ant/ssh ant/tcmp ant/tops conf

From:
To:
Subject: r2077 - in branches/SSHTelnet-MP-STABLE: ant ant/clmp ant/flowmp ant/rrdma ant/sqlma ant/ssh ant/tcmp ant/tops conf
Date: Thu, 15 Feb 2007 04:53:40 -0500

Author: stijn
Date: 2007-02-15 04:53:38 -0500 (Thu, 15 Feb 2007)
New Revision: 2077

Added:
branches/SSHTelnet-MP-STABLE/ant/flowmp/flowmp-axis-deploy-targets.xml
branches/SSHTelnet-MP-STABLE/conf/log4j.properties.template
Modified:
branches/SSHTelnet-MP-STABLE/ant/axis-deploy-targets.xml
branches/SSHTelnet-MP-STABLE/ant/build-flowmp.xml
branches/SSHTelnet-MP-STABLE/ant/build-rrdma.xml
branches/SSHTelnet-MP-STABLE/ant/build-sqlma.xml
branches/SSHTelnet-MP-STABLE/ant/build-tcmp.xml
branches/SSHTelnet-MP-STABLE/ant/build-tops.xml
branches/SSHTelnet-MP-STABLE/ant/build-xmlls.xml
branches/SSHTelnet-MP-STABLE/ant/clmp/clmp-configure-targets.xml
branches/SSHTelnet-MP-STABLE/ant/clmp/clmp-release-targets.xml
branches/SSHTelnet-MP-STABLE/ant/configure-targets.xml
branches/SSHTelnet-MP-STABLE/ant/const.properties
branches/SSHTelnet-MP-STABLE/ant/const.properties.mp.ssh
branches/SSHTelnet-MP-STABLE/ant/libs-download-targets.xml
branches/SSHTelnet-MP-STABLE/ant/pre-install-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdjtool-compile-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-client-run-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-configure-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-libs-download-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-release-targets.xml
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-test-run-targets.xml
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-axis-deploy-targets.xml
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-client-run-targets.xml
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-configure-targets.xml
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-exist-xmldb-targets.xml
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-java-compile-targets.xml
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-libs-download-targets.xml
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-release-targets.xml
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-test-run-targets.xml
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tcmp/mapijni-compile-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-axis-deploy-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-client-run-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-configure-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-java-compile-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-libs-download-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tops/tops-axis-deploy-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tops/tops-client-run-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tops/tops-java-compile-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tops/tops-libs-download-targets.xml
branches/SSHTelnet-MP-STABLE/ant/tops/tops-test-run-targets.xml
Log:
The Ant targets have been updated to reflect the new defaults to be used.

Modified: branches/SSHTelnet-MP-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/axis-deploy-targets.xml 2007-02-14
17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/axis-deploy-targets.xml 2007-02-15
09:53:38 UTC (rev 2077)
@@ -34,6 +34,7 @@
<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/logs"/>
<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"/>
@@ -61,6 +62,8 @@

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

</target>

@@ -121,7 +124,7 @@
<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}/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"/>
@@ -133,6 +136,7 @@

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

</target>

@@ -215,8 +219,7 @@
<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 ..."/>
+ <input message="Press Enter when finished"/>

<exec dir="${tomcat.home}/bin"
executable="sh"
@@ -224,8 +227,12 @@
error="${basedir}/log/tomcat.log">
<arg line="startup.sh"/>
<env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ <env key="CATALINA_HOME" path=""/>
+ <env key="CATALINA_BASE" path=""/>
</exec>

+ <echo>Please, make sure that Tomcat is running.</echo>
+
</target>

@@ -270,7 +277,7 @@
<echo> than default one use ctrl+c to stop the script in this
moment)</echo>
<echo></echo>

- <input message="Press Return key ..."/>
+ <input message="Press Enter"/>

</target>

@@ -296,5 +303,19 @@
</target>

+ <target name="start">

+ <antcall target="deploy-adminclient" />
+
+ </target>
+
+
+ <target name="stop">
+
+ <antcall target="undeploy-adminclient" />
+
+ </target>
+
+
+
</project>
\ No newline at end of file

Modified: branches/SSHTelnet-MP-STABLE/ant/build-flowmp.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-flowmp.xml 2007-02-14 17:06:48
UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/build-flowmp.xml 2007-02-15 09:53:38
UTC (rev 2077)
@@ -3,7 +3,7 @@
<property file="ant/const.properties" />

<path id="classpath">
- <fileset dir="../../">
+ <fileset dir="../">
<include name="**/*.jar"/>
</fileset>
<pathelement location="build"/>
@@ -13,18 +13,20 @@
<tstamp/>
</target>

- 
+ 
+ <import file="pre-install-targets.xml"/>
<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ 
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>

- 
- <import file="flowmp/flowTypeMP-test-targets.xml"/>
- <import file="flowmp/flowTypeMP-java-compile-targets.xml"/>
- <import file="flowmp/flowTypeMP-axis-deploy-targets.xml"/>
- <import file="flowmp/flowTypeMP-configure-targets.xml"/>
- <import file="flowmp/flowTypeMP-doc-targets.xml"/>
- <import file="flowmp/flowTypeMP-release-targets.xml"/>
-</project>
\ No newline at end of file
+ 
+ <import file="flowmp/flowmp-pre-install-targets.xml"/>
+ <import file="flowmp/flowmp-junit-test-targets.xml"/>
+ <import file="flowmp/flowmp-java-compile-targets.xml"/>
+ <import file="flowmp/flowmp-axis-deploy-targets.xml"/>
+ <import file="flowmp/flowmp-configure-targets.xml"/>
+ 
+ <import file="flowmp/flowmp-release-targets.xml"/>
+</project>

Modified: branches/SSHTelnet-MP-STABLE/ant/build-rrdma.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-rrdma.xml 2007-02-14 17:06:48
UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/build-rrdma.xml 2007-02-15 09:53:38
UTC (rev 2077)
@@ -25,7 +25,8 @@
<fileset dir="./lib/repository">
<include name="**/*.jar"/>
</fileset>
- <pathelement location="build"/>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ <pathelement location="build/perfSONAR-rrdma.jar"/>
</path>

Modified: branches/SSHTelnet-MP-STABLE/ant/build-sqlma.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-sqlma.xml 2007-02-14 17:06:48
UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/build-sqlma.xml 2007-02-15 09:53:38
UTC (rev 2077)
@@ -17,17 +17,16 @@

-<project basedir="../" default="compile-sqlma" name="perfsonar-sqlma">
+<project basedir="../" name="perfsonar-sqlma">

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

-
<path id="classpath">
<fileset dir="./lib/repository">
<include name="**/*.jar"/>
</fileset>
- <pathelement location="build"/>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ <pathelement location="build/perfSONAR-sqlma.jar"/>
</path>

@@ -41,7 +40,7 @@

<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ <import file="pre-install-targets.xml"/>
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>
<import file="libs-download-targets.xml"/>
@@ -49,13 +48,12 @@



- <import file="rrdma/rrdma-java-compile-targets.xml"/>
<import file="rrdma/rrdma-exist-xmldb-targets.xml"/>

-


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

Modified: branches/SSHTelnet-MP-STABLE/ant/build-tcmp.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-tcmp.xml 2007-02-14 17:06:48
UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/build-tcmp.xml 2007-02-15 09:53:38
UTC (rev 2077)
@@ -40,7 +40,7 @@

<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ <import file="pre-install-targets.xml"/>
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>
<import file="libs-download-targets.xml"/>
@@ -49,10 +49,16 @@



+ <import file="tcmp/tcmp-pre-install-targets.xml"/>
<import file="tcmp/mapijni-compile-targets.xml"/>
<import file="tcmp/tcmp-axis-deploy-targets.xml"/>
<import file="tcmp/tcmp-java-compile-targets.xml"/>
<import file="tcmp/tcmp-client-run-targets.xml"/>
+ 
<import file="tcmp/tcmp-configure-targets.xml"/>
<import file="tcmp/tcmp-libs-download-targets.xml"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/build-tops.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-tops.xml 2007-02-14 17:06:48
UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/build-tops.xml 2007-02-15 09:53:38
UTC (rev 2077)
@@ -1,28 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
<project basedir="../" default="compile-tops" name="perfsonar-tops">
-
-
<property file="ant/const.properties" />

-
<path id="classpath">
<fileset dir="./lib">
<include name="**/*.jar"/>
@@ -30,31 +9,25 @@
<pathelement location="build"/>
</path>

-
<target name="init">
<tstamp/>
</target>

-
-

-
<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="tops/tops-java-compile-targets.xml"/>
<import file="tops/tops-axis-deploy-targets.xml"/>
- <import file="tops/tops-client-run-targets.xml"/>
- <import file="tops/tops-test-run-targets.xml"/>
+ <import file="tops/tops-configure-targets.xml"/>
+ <import file="tops/tops-pre-install-targets.xml"/>
<import file="tops/tops-libs-download-targets.xml"/>
-
+ <import file="tops/tops-test-run-targets.xml"/>
+ <import file="tops/tops-client-run-targets.xml"/>
+ <import file="tops/tops-java-compile-targets.xml"/>
+ <import file="tops/tops-release-targets.xml"/>
</project>
\ No newline at end of file

Modified: branches/SSHTelnet-MP-STABLE/ant/build-xmlls.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-xmlls.xml 2007-02-14 17:06:48
UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/build-xmlls.xml 2007-02-15 09:53:38
UTC (rev 2077)
@@ -1,65 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="../" default="default" name="perfsonar-xmlls">

+ 

-
+ 

+ 

-<project basedir="../" default="build-xmlls" name="perfsonar-xmlls">
+ <import file="java-compile-targets.xml"/>
+ <import file="axis-deploy-targets.xml"/>
+ <import file="libs-download-targets.xml"/>

+ 

- <property file="ant/const.properties" />
+ <import file="xmlls/pre-install-targets.xml"/>
+ <import file="xmlls/configure-targets.xml"/>
+ <import file="xmlls/build-targets.xml"/>
+ <import file="xmlls/deploy-targets.xml"/>
+ <import file="xmlls/undeploy-targets.xml"/>
+ <import file="xmlls/test-targets.xml"/>
+ <import file="xmlls/release-targets.xml"/>

+ <import file="xmlls/libs-download-targets.xml"/>
+
+ 
+
+ 
+
<path id="classpath">
<fileset dir="./lib/repository">
<include name="**/*.jar"/>
</fileset>
- <pathelement location="build"/>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ <pathelement location="build/perfSONAR-xmlls.jar"/>
</path>

- <target name="init">
- <tstamp/>
+ <target name="load-const-properties">
+ <property file="ant/const.properties" />
</target>

+ 

- 
+ <target name="init">
+ <tstamp/>
+ </target>

- <import file="configure-targets.xml"/>
- <import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
- <import file="java-compile-targets.xml"/>
- <import file="axis-deploy-targets.xml"/>
- <import file="libs-download-targets.xml"/>
+ 

+ <target name="default" />

- 
-
- <import file="xmlls/xmlls-java-compile-targets.xml"/>
- <import file="xmlls/xmlls-axis-deploy-targets.xml"/>
- <import file="xmlls/xmlls-client-run-targets.xml"/>
- <import file="xmlls/xmlls-test-run-targets.xml" />
- <import file="xmlls/xmlls-junit-test-targets.xml"/>
- <import file="xmlls/xmlls-configure-targets.xml"/>
- <import file="xmlls/xmlls-libs-download-targets.xml"/>
-
- 
- 
-
</project>
-
-
-
-

Modified: branches/SSHTelnet-MP-STABLE/ant/clmp/clmp-configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/clmp/clmp-configure-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/clmp/clmp-configure-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -87,18 +87,55 @@


- <target name="copy-components-properties">
+ <target name="copy-components-properties"
unless="functionality.register.decision">

<copy file="conf/components.properties.clmp"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>

</target>

+ <target name="resource-protection-for-clmp">

+ <echo>The CL-MP implements simple resource protection limiting</echo>
+ <echo>the number of concurrent processes of a specific tool.</echo>
+ <echo>This only applies to a particular tool, being the tools</echo>
+ <echo>independent of each other. If you want to disable a
tool,</echo>
+ <echo>define a number less than one for it's configuration. If</echo>
+ <echo>you don't want any limits, hit enter to accept the
default.</echo>
+ <echo></echo>
+ <echo></echo>
+ <echo>How many concurrent ping measurements do you want?</echo>
+ <input message="[enter for no limit]:"
+ addproperty="ping" defaultvalue="99999" />
+
+ <echo>How many concurrent traceroute measurements do you
want?</echo>
+ <input message="[enter for no limit]:"
+ addproperty="traceroute" defaultvalue="99999" />
+
+ <echo>How many concurrent OWAMP measurements do you want?</echo>
+ <input message="[enter for no limit]:"
+ addproperty="owamp" defaultvalue="99999" />
+
+ <echo>How many concurrent BWCTL measurements do you want?</echo>
+ <input message="[enter for no limit]:"
+ addproperty="bwctl" defaultvalue="99999" />
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.mp.clmp.rp.maxthreads.ping"
value="${ping}"/>
+ <entry key="service.mp.clmp.rp.maxthreads.traceroute"
value="${traceroute}"/>
+ <entry key="service.mp.clmp.rp.maxthreads.owamp"
value="${owamp}"/>
+ <entry key="service.mp.clmp.rp.maxthreads.bwctl"
value="${bwctl}"/>
+
+ </propertyfile>
+
+ </target>
+


<target name="register-fuctionality-for-clmp"
- depends="register-fuctionality"
+ depends="register-fuctionality,copy-components-properties"
if="functionality.register.decision">

<propertyfile file="conf/service.properties"
@@ -109,14 +146,18 @@
<entry key="component.registrator.scheduler_component"
value="scheduler"/>

</propertyfile>
-
- <propertyfile file="conf/components.properties"
+
+ <copy file="conf/components.properties.clmpr"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+ 

</target>

@@ -128,9 +169,9 @@

<echo>Configuring...</echo>

- <antcall target="copy-components-properties"/>
<antcall target="set-const-properties-for-clmp"/>
<antcall target="set-service-properties-for-clmp"/>
+ <antcall target="resource-protection-for-clmp"/>
<antcall target="set-log4j-properties"/>
<antcall target="register-fuctionality-for-clmp"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/clmp/clmp-release-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/clmp/clmp-release-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/clmp/clmp-release-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -59,6 +59,7 @@
<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/flowmp"/>
<delete dir="tmp/${service.name}/perfsonar/ant/tops"/>
<delete dir="tmp/${service.name}/perfsonar/ant/xmlls"/>

@@ -74,6 +75,7 @@

<fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.ma"/>
<fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.mp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.flowmp"/>
<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"/>
@@ -81,6 +83,7 @@
<fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.rrdma"/>
<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="**/*.flowmp"/>
<fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tops"/>
<fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tcmp"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/configure-targets.xml 2007-02-14
17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/configure-targets.xml 2007-02-15
09:53:38 UTC (rev 2077)
@@ -23,64 +23,11 @@

<target name="set-log4j-properties">

- <property name="logDir" value="${basedir}/log"/>
+ <property name="logDir"
value="${service.home}/${deploy.root}/WEB-INF/logs"/>

- <propertyfile file="conf/log4j.properties"
- comment="This file was created by the ant script.">
+ <copy file="${basedir}/conf/log4j.properties.template"
tofile="${basedir}/conf/log4j.properties"/>
+ <replace file="${basedir}/conf/log4j.properties"
token="_LOGPATH_" value="${logDir}"/>

- <entry key="logDir" value="${logDir}"/>
-
- <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-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.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.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.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.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.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.layout.ConversionPattern" value="%d %5p -
%m%n"/>
-
- </propertyfile>
-
</target>

@@ -101,9 +48,10 @@

<target name="register-fuctionality-question">

- <input message="Do you want the service to register in LS? "
+ <input message="Turn on service registration to Lookup Service? "
addproperty="_functionality.register.decision"
- validargs="y,n" />
+ validargs="y,n"
+ defaultvalue="n"/>

<condition property="functionality.register.decision">
<equals arg1="y" arg2="${_functionality.register.decision}"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/const.properties
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/const.properties 2007-02-14 17:06:48
UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/const.properties 2007-02-15 09:53:38
UTC (rev 2077)
@@ -5,11 +5,11 @@
target.port=8080
api.windowtitle=perfSONAR
release.basename=perfSONAR
-deploy.root=TelnetSSHMP
-service.name=TelnetSSHMP
+deploy.root=perfSONAR-SSHTelnet-MP-1.0
+service.name=perfSONAR-SSHTelnet-MP-1.0
api.bottom=JRA1 GEANT2 Project
wsdd.path=org/perfsonar/service/web/wsdd
-release.servicename=TelnetSSHMP
+release.servicename=perfSONAR-SSHTelnet-MP-1.0
build=build
api.title=perfSONAR
tomcat.home=/opt/apache-tomcat-5.5.20

Modified: branches/SSHTelnet-MP-STABLE/ant/const.properties.mp.ssh
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/const.properties.mp.ssh 2007-02-14
17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/const.properties.mp.ssh 2007-02-15
09:53:38 UTC (rev 2077)
@@ -8,7 +8,7 @@
jdk_path=C\:\\Program Files\\Java\\jdk1.5.0_09
api.bottom=JRA1 GEANT2 Project
wsdd.path=org/perfsonar/service/web/wsdd
-release.servicename=TelnetSSHMP
+release.servicename=perfSONAR-SSHTelnet-MP-1.0
build=build
api.title=perfSONAR
tomcat.home=/opt/apache-tomcat-5.5.17

Added: branches/SSHTelnet-MP-STABLE/ant/flowmp/flowmp-axis-deploy-targets.xml

Property changes on:
branches/SSHTelnet-MP-STABLE/ant/flowmp/flowmp-axis-deploy-targets.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision

Modified: branches/SSHTelnet-MP-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/libs-download-targets.xml 2007-02-14
17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/libs-download-targets.xml 2007-02-15
09:53:38 UTC (rev 2077)
@@ -61,6 +61,12 @@

<dependency groupId="log4j" artifactId="log4j"
version="1.2.9"/>

+ <dependency groupId="exist"
artifactId="exist-xmldb" version="1.0rc"/>
+ <dependency groupId="exist"
artifactId="exist-db" version="1.0rc"/>
+ <dependency groupId="exist"
artifactId="exist-xmlrpc" version="1.0rc"/>
+ <dependency groupId="exist"
artifactId="exist-optional" version="1.0rc"/>
+
+
<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/pre-install-targets.xml 2007-02-14
17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/pre-install-targets.xml 2007-02-15
09:53:38 UTC (rev 2077)
@@ -18,10 +18,10 @@


-
+
<property name="_tomcat.download.url"
-
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
/>
- <property name="tomcat.dir" value="apache-tomcat-5.5.20" />
+
value="http://apache.forall.pl/tomcat/tomcat-6/v6.0.7/bin/apache-tomcat-6.0.7.tar.gz";
/>
+ <property name="tomcat.dir" value="apache-tomcat-6.0.7" />

<property name="exist.war.file" value="exist-1.0.1.war" />

@@ -72,7 +72,8 @@

<target name="_get-service-home">

- <dirname property="__service.home" file="${basedir}"/>
+ <dirname property="___service.home" file="${basedir}"/>
+ <dirname property="__service.home" file="${___service.home}"/>

<input message="Enter the path where you want to install the service
[${__service.home}/webapps]:"
addproperty="_service.home"
@@ -126,7 +127,7 @@
addproperty="tomcat.download.url"
defaultvalue="${_tomcat.download.url}"
/>
- <echo message="Installing the Tomcat..."/>
+ <echo message="Installing the Tomcat (please be patient, this can
take some time) ..."/>

</target>

@@ -156,7 +157,7 @@

<target name="webservice-container-question">

- <input message="Do you want me to download and install the
application server Tomcat for you? "
+ <input message="Do you want me to download and install the
application server Tomcat (${tomcat.dir}) for you? "
addproperty="_tomcat.install.decision"
validargs="y,n"
defaultvalue="n" />
@@ -172,7 +173,9 @@
depends="webservice-container-question"
if="tomcat.install.decision">

- <dirname property="_tomcat.install.location" file="${basedir}"/>
+ 
+ <property file="ant/const.properties" />
+ <dirname property="_tomcat.install.location" file="${service.home}"/>

<input message="Enter the path for the Tomcat installation:
[${_tomcat.install.location}/${tomcat.dir}]:"
addproperty="tomcat.install.location"
@@ -197,7 +200,7 @@
unless="tomcat.install.decision">

<antcall target="get-tomcat-directory"/>
-
+
</target>

@@ -212,7 +215,7 @@
<isset property="tomcat.home"/>
</condition>

- </target>
+ </target>

<target name="_get-tomcat-directory_1" depends="__get-tomcat-directory"
if="tomcat.home.present">
@@ -251,7 +254,7 @@

<target name="get-server-address">

- <input message="Enter the address of your application server Tomcat
[localhost]:"
+ <input message="Enter the address (ip or hostname) of your
application server Tomcat [localhost]:"
addproperty="server.address"
defaultvalue="localhost"
/>
@@ -280,8 +283,7 @@
<echo>for the http communication. If not then configure the Tomcat
in order</echo>
<echo>to use this port number.</echo>
<echo></echo>
- <echo>Please, do it now. I will wait for you.</echo>
- <input message="Press Return key ..."/>
+ <input message="Please do it now and press Enter when finished"/>

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

Modified: branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdjtool-compile-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdjtool-compile-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -35,8 +35,6 @@
<target name="init-rrdjtool" depends="init">

<property file="ant/const.properties" />
- <property name="rrd_h_path" value="${rrdtool_path}/include" />
- <property name="rrd_lib_path" value="${rrdtool_path}/lib" />

</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -39,6 +39,14 @@
<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="${service.ma.conf_file}"

todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+
+ <basename property="rrd.config.file.basename"
file="${service.ma.conf_file}" />
+ <propertyfile
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"
+ comment="This file was created by the ant script.">
+ <entry key="service.ma.conf_file"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/${rrd.config.file.basename}"/>
+ </propertyfile>
+
<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"/>

@@ -108,8 +116,7 @@
<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 ..."/>
+ <input message="Please do it now and press Enter when finished"/>

<exec dir="${tomcat.home}/bin"
executable="sh"
@@ -118,11 +125,16 @@
<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"/>
+ <env key="CATALINA_HOME" path=""/>
+ <env key="CATALINA_BASE" path=""/>
</exec>

- <echo>Please, make sure that the Tomcat is running. Use the address
http://${target.server}:${target.port} .</echo>
- <input message="Press Return key ..."/>
+ <echo>Please, make sure that Tomcat is running.</echo>
+ <echo>You can do it using your web browser and connect the address
http://${target.server}:${target.port}</echo>
+ <echo>or looking at Tomcat's log file (catalina.out).</echo>

+ <input message="Press Enter when finished"/>
+
</target>

@@ -138,8 +150,7 @@
<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 ..."/>
+ <input message="Please do it now and press Enter when finished"/>

<echo>${line.separator}You have to manually set up the env variable
LD_LIBRARY_PATH</echo>
@@ -148,10 +159,10 @@
<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> export
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrd_lib_path}:${rrdjdir}/build</echo>
<echo>${line.separator} Please, do it now. I will wait for
you.</echo>

- <input message="Press Return key ..."/>
+ <input message="Please do it now and press Enter when finished"/>

</target>

@@ -164,7 +175,10 @@



+ 

+ <target name="deploy" depends="copy-rrdma-jar"
+ 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">

@@ -186,7 +214,9 @@

<antcall target="undeploy-adminclient" />

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

<delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-client-run-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-client-run-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -28,8 +28,8 @@
<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"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-1.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -42,13 +42,13 @@

<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}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/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"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Filter-Req-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -61,13 +61,13 @@

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

- <replace
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"
token="__BASEPATH__" value="${basedir}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/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"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -83,8 +83,8 @@
<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-4.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -97,13 +97,13 @@

<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}"/>
+ <replace
file="${basedir}/schema/example-instances/perfSONAR/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"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-5.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -119,8 +119,8 @@
<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"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-chaining-1.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -136,8 +136,8 @@
<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"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-Chaining-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-chaining-2.xml"/>

<classpath>
<pathelement location="build/perfSONAR-generic.jar"/>
@@ -157,8 +157,8 @@
classpathref="classpath"
fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>
@@ -170,8 +170,8 @@
classpathref="classpath"
fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-Key-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-Key-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>
@@ -183,8 +183,8 @@
<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"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/Echo-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>

</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-configure-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-configure-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -99,8 +99,8 @@
<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.sax_parser.config"
value="${basedir}/src/objects.config"/>
+ <entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+ <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>

<entry key="service.r.ma.characteristic"
value="utitlization"/>
<entry key="service.r.ma.measurement_tool"
value="cricket,mrtg,cacti"/>
@@ -112,7 +112,7 @@

<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.xmldb.db_store.data_dir"
value="${service.home}/${deploy.root}/WEB-INF/logs/"/>

<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"/>
@@ -155,7 +155,8 @@

<input message="Do you want the service to accept messages with
measurement data and store them? "
addproperty="_functionality.store.decision"
- validargs="y,n" />
+ validargs="y,n"
+ defaultvalue="n"/>

<condition property="functionality.store.decision">
<equals arg1="y" arg2="${_functionality.store.decision}"/>
@@ -168,7 +169,7 @@
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}]?"
+ <input message="Enter location of new RRD files created when
measurement data is sent to the service [${service.home}]?"
addproperty="functionality.store.path"
defaultvalue="${service.home}"/>

@@ -199,14 +200,14 @@

</propertyfile>

- <propertyfile file="conf/components.properties"
- comment="This file was created by the Ant configuration script.">
+ <replace file="conf/components.properties"
+
token="#ma_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"
+
value="ma_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>

- <entry key="ma_scheduler"
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
- <entry key="registrator"
value="org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+ <replace file="conf/components.properties"
+
token="#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"
+
value="registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>

- </propertyfile>
-
</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -207,7 +207,7 @@
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.) ? "
+ <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 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" />

Modified:
branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-libs-download-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-libs-download-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-libs-download-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -22,11 +22,6 @@

<artifact:dependencies>

- <dependency groupId="exist" artifactId="exist-xmldb"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-db"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-xmlrpc"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-optional"
version="1.0rc"/>
-
<dependency groupId="com.ibatis" artifactId="ibatis-sqlmap"
version="2.1.7.597"/>
<dependency groupId="com.ibatis" artifactId="ibatis-common"
version="2.1.7.597"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -18,11 +18,11 @@

- <property name="service.name" value="perfSONAR-RRDMA-1.1-beta" />
+ <property name="service.name" value="perfSONAR-RRD-MA-2.0-beta" />

<property name="_exist.war.download.url"
-
value="http://downloads.sourceforge.net/exist/exist-1.0.1.war?modtime=1161732157&big_mirror=1";
/>
+
value="http://prdownloads.sourceforge.net/exist/exist-1.0.1.war"; />
<property name="exist.war.file" value="exist-1.0.1.war" />

<property file="ant/const.properties" />
@@ -33,15 +33,20 @@

<target name="get-rrdjtool-home">

- <input message="Enter the home directory where the rrdtool is
installed (I need the home directory and not the directory where the
executable binary is present) [/usr/local/rrdtool]: "
- addproperty="_rrdtool_path"
- defaultvalue="/usr/local/rrdtool" />
+ <input message="Enter the directory path where header file of the
rrdtool (rrd.h) can be found [/usr/local/rrdtool/include]: "
+ addproperty="_rrd_h_path"
+ defaultvalue="/usr/local/rrdtool/include" />

+ <input message="Enter the directory path where library files of the
rrdtool (librrd*) can be found [/usr/local/rrdtool/lib]: "
+ addproperty="_rrd_lib_path"
+ defaultvalue="/usr/local/rrdtool/lib" />
+
<propertyfile file="ant/const.properties"
comment="This file was created by the Ant configuration script.">

- <entry key="rrdjdir" value="${basedir}/contrib/rrdjtool"/>
- <entry key="rrdtool_path" value="${_rrdtool_path}"/>
+ <entry key="rrdjdir" value="${basedir}/contrib/rrdjtool"/>
+ <entry key="rrd_h_path" value="${_rrd_h_path}"/>
+ <entry key="rrd_lib_path" value="${_rrd_lib_path}"/>

</propertyfile>

@@ -61,9 +66,9 @@
</target>

- <target name="rrdjtool-question">
+ <target name="rrdjtool-platform-question">

- <input message="Which OS platform do you use: "
+ <input message="Enter operating system type: "
addproperty="_os.platform"
validargs="linux,linux-64bit,freebsd,solaris,other"
defaultvalue="linux" />
@@ -72,7 +77,7 @@

<target name="rrdjtool-call"
- depends="rrdjtool-question">
+ depends="rrdjtool-platform-question">

<condition property="linux.os.platform">
<equals arg1="linux" arg2="${_os.platform}"/>
@@ -156,19 +161,41 @@
<echo>that you will start later on in deploy action (Tomcat will
have to be started manually,</echo>
<echo>not by the installtion script)</echo>
<echo></echo>
- <echo>Please, do it now. I will wait for you.</echo>
- <input message="Press Return key ..."/>
+ <input message="Please do it now and press Enter when finished"/>
<echo></echo>

</target>

+ <target name="rrdjtool-build-question">
+
+ <input message="Do you want me to compile rrdjtool library for you
(if not you will have to do it manually in ${basedir}/contrib/rrdjtool after
pre-install step)? "
+ addproperty="_rrdjtool.build.decision"
+ validargs="y,n"
+ defaultvalue="y" />
+
+ <condition property="rrdjtool.build.decision">
+ <equals arg1="y" arg2="${_rrdjtool.build.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="_rrdjtool"
+ depends="rrdjtool-call-for-linux,
+ rrdjtool-call-for-linux64,
+ rrdjtool-call-for-freebsd,
+ rrdjtool-call-for-solaris,
+ rrdjtool-call-for-other">
+ </target>
+
+
<target name="rrdjtool"
- depends="rrdjtool-call-for-linux,
- rrdjtool-call-for-linux64,
- rrdjtool-call-for-freebsd,
- rrdjtool-call-for-solaris,
- rrdjtool-call-for-other">
+ depends="rrdjtool-build-question"
+ if="rrdjtool.build.decision">
+
+ <antcall target="_rrdjtool"/>
+
</target>

@@ -215,7 +242,7 @@
<input message="Usage of eXist xml database is recommended for the
service. Installing/configuring this database as a web application in your
Tomcat is also suggested. Do you want me to do this for you? "
addproperty="_exist.war.install.decision"
validargs="y,n"
- defaultvalue="n" />
+ defaultvalue="y" />

<condition property="exist.war.install.decision">
<equals arg1="y" arg2="${_exist.war.install.decision}"/>
@@ -251,8 +278,7 @@
<echo>and download eXist war file. Suggested is
exist-1.0.1.war.</echo>
<echo></echo>

- <echo>Please, do it now. I will wait for you.</echo>
- <input message="Press Return key ..."/>
+ <input message="Please do it now and press Enter when finished"/>

<input message="Enter the name of downloaded eXist war file
[${exist.war.file}]:"
addproperty="__exist.war.file"
@@ -265,7 +291,8 @@
</propertyfile>

- <dirname property="_exist.war.install.location" file="${basedir}"/>
+ <dirname property="__exist.war.install.location" file="${basedir}"/>
+ <dirname property="_exist.war.install.location"
file="${__exist.war.install.location}"/>

<input message="Enter the path of directory where downloaded eXist
war file is located [${_exist.war.install.location}]:"
addproperty="exist.war.install.location"
@@ -293,7 +320,8 @@
</propertyfile>

- <dirname property="_exist.war.install.location" file="${basedir}"/>
+ <dirname property="__exist.war.install.location" file="${basedir}"/>
+ <dirname property="_exist.war.install.location"
file="${__exist.war.install.location}"/>

<input message="Enter the path of directory where eXist war file
will be located [${_exist.war.install.location}]:"
addproperty="exist.war.install.location"
@@ -304,7 +332,7 @@
<entry key="exist.home" value="${exist.war.install.location}"/>
</propertyfile>

- <echo message="Downloading eXist war file..."/>
+ <echo message="Downloading eXist war file (please be patient, this
can take some time) ..."/>

<get src="${exist.war.download.url}"
dest="${_exist.war.install.location}/${exist.war.file}"
@@ -335,8 +363,7 @@
<echo message="
docBase='${exist.home}/${exist.war.file}'>"/>
<echo message=" </Context>"/>
<echo></echo>
- <echo>Please, do it now. I will wait for you.</echo>
- <input message="Press Return key ..."/>
+ <input message="Please do it now and press Enter when finished"/>

<propertyfile file="conf/service.properties"
comment="This file was created by the Ant configuration script.">
@@ -346,10 +373,10 @@

</propertyfile>

- <input message="Enter the eXist user name []:"
+ <input message="Enter the eXist user name:"
addproperty="_exist.username"/>

- <input message="Enter the pasword for eXist user name
${_exist.username} []:"
+ <input message="Enter the pasword for eXist user name
${_exist.username}:"
addproperty="_exist.password"/>

<input message="Enter the password for admin eXist user []:"
@@ -425,8 +452,7 @@
<echo>Once you have installed run the application executing</echo>
<echo>the script startup.sh .</echo>
<echo></echo>
- <echo>Please, do it now. I will wait for you.</echo>
- <input message="Press Return key ..."/>
+ <input message="Please do it now and press Enter when finished"/>

<propertyfile file="conf/service.properties"
comment="This file was created by the Ant configuration script.">
@@ -475,8 +501,7 @@
<echo>(user name, hostname and port number 8585 are only
examples)</echo>
<echo></echo>

- <echo>Please, do it now and make sure the xml database is running. I
will wait for you.</echo>
- <input message="Press Return key ..."/>
+ <input message="Please do it now and and make sure the xml database
is running. Press Enter when finished."/>

</target>

@@ -566,7 +591,6 @@
<antcall target="get-server-address"/>
<antcall target="get-server-port"/>

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

<echo></echo>

Modified: branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-release-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-release-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-release-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -30,7 +30,7 @@

<target name="release"
- depends="init-release, build"
+ depends="init-release, lib, build"
description="Build the release.">

<property file="ant/const.properties" />
@@ -42,8 +42,17 @@
</copy>
<delete dir="tmp/${service.name}/perfsonar/tmp"/>

+
+ <move todir="tmp/${service.name}/perfsonar/doc-rrdma">
+ <fileset dir="tmp/${service.name}/perfsonar/doc/ma/rrdTypeMA"/>
+ </move>
+ <delete dir="tmp/${service.name}/perfsonar/doc"/>
+ <move todir="tmp/${service.name}/perfsonar/doc/ma/rrdTypeMA">
+ <fileset dir="tmp/${service.name}/perfsonar/doc-rrdma"/>
+ </move>
+
+
<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"/>
@@ -55,6 +64,7 @@
<delete file="tmp/${service.name}/perfsonar/ant/changes-rrdma"/>

<delete dir="tmp/${service.name}/perfsonar/ant/clmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/flowmp"/>
<delete dir="tmp/${service.name}/perfsonar/ant/nmsmp"/>
<delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
<delete dir="tmp/${service.name}/perfsonar/ant/sqlma"/>
@@ -77,12 +87,14 @@
<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"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.flowmp"/>

<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/conf"
includes="**/*.flowmp"/>

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

Modified: branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-test-run-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-test-run-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/rrdma/rrdma-test-run-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -19,6 +19,12 @@

<target name="test">

+ <echo>The test will send a set of example messages.</echo>
+ <echo>Please, analyze the responses to make sure the service has
been installed correctly.</echo>
+ <echo></echo>
+
+ <antcall target="run-echo"/>
+
<antcall target="run-rrdma-client-1"/>
<antcall target="run-rrdma-client-2"/>
<antcall target="run-rrdma-client-3"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-axis-deploy-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-axis-deploy-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-axis-deploy-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -21,51 +21,69 @@

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

- <copy
file="./lib/repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.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/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.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/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.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/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.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/exist/exist-db/1.0rc/exist-db-1.0rc.jar"
todir="${axis.home}/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="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-xmldb/1.0rc/exist-xmldb-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib/repository/exist/exist-xmlrpc/1.0rc/exist-xmlrpc-1.0rc.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <copy todir="${axis.home}/WEB-INF/classes">
+ <copy todir="${service.home}/${deploy.root}/WEB-INF/classes">
<fileset dir="./conf">
<include name="ibatis-*.xml"/>
</fileset>
</copy>

- <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="${service.ma.conf_file}"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+
+ <basename property="sql.config.file.basename"
file="${service.ma.conf_file}" />
+ <propertyfile
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"
+ comment="This file was created by the ant script.">
+ <entry key="service.ma.conf_file"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/${sql.config.file.basename}"/>
+ </propertyfile>
+
+ <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-sqlma" depends="delete-jars-for-service">

- <delete
file="${axis.home}/WEB-INF/lib/mysql-connector-java-5.0.3.jar"/>
- <delete
file="${axis.home}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/ibatis-common-2.1.7.597.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/ibatis-sqlmap-2.1.7.597.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="${service.home}/${deploy.root}/WEB-INF/lib/mysql-connector-java-5.0.3.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/ibatis-common-2.1.7.597.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/ibatis-sqlmap-2.1.7.597.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="${axis.home}/WEB-INF/lib/exist-db-1.0rc.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="${service.home}/${deploy.root}/WEB-INF/lib/exist-db-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}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
+
</target>

@@ -87,43 +105,128 @@
if="jar.perfsonar.sqlma.present"
description="Copy sqlma jar to Tomcat">

- <copy file="${build}/perfSONAR-sqlma.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ <copy file="${build}/perfSONAR-sqlma.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-sqlma-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>
+ <input message="Please do it now and press Enter when finished"/>
+
+ <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="CATALINA_HOME" path=""/>
+ <env key="CATALINA_BASE" path=""/>
+ </exec>
+
+ <echo>Please, make sure that Tomcat is running.</echo>
+ <echo>You can do it using your web browser and connect the address
http://${target.server}:${target.port}</echo>
+ <echo>or looking at Tomcat's log file (catalina.out).</echo>
+
+ <input message="Press Enter when finished"/>
+
</target>

- <target name="deploy-sqlma" depends="copy-sqlma-jar"
+ <target name="tomcat-start-for-sqlma-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>
+ <input message="Please do it now and press Enter when finished"/>
+
+ <echo></echo>
+ <echo>(Re)Start the Tomcat.</echo>
+
+ <echo></echo>
+ <echo>Please, make sure that Tomcat is running.</echo>
+
+ <echo></echo>
+ <input message="Please do it now and press Enter when finished"/>
+
+ </target>
+
+
+ <target name="tomcat-start-for-sqlma"
+ depends="tomcat-start-for-sqlma-true,tomcat-start-for-sqlma-false">
+
+ </target>
+
+
+ 
+
+ 
+
+
+ <target name="deploy" depends="copy-sqlma-jar"
description="Deploys SQL MA service">
- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${deployFile}"/>
- <classpath refid="classpath"/>
- </java>
+
+ <echo>Deploying the service...</echo>
+
+ <antcall target="tomcat-start-for-sqlma" />
+
+ <antcall target="xmldb-adduser-sqlma" />
+
+ <antcall target="deploy-adminclient" />
+
</target>

- <target name="undeploy-sqlma"
+ <target name="undeploy"
description="Undeploys SQL 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="delete-jars-for-sqlma"/>

- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-sqlma.jar"/>
+ <antcall target="tomcat-shutdown" />

</target>

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

Modified: branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-client-run-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-client-run-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-client-run-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -17,17 +17,18 @@
<project name="sqlma-client-run-targets">

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

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

+


<target name="run-sqlma-client-key-util">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-Req.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-1.xml"/>
</java>
</target>

@@ -36,8 +37,8 @@
<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/perfSONAR/SetupDataRequest-FilterRRDSelect-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-2.xml"/>
</java>
</target>

@@ -46,8 +47,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-4.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-4.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-3.xml"/>
</java>
</target>

@@ -56,8 +57,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-5.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupDataRequest-FilterRRDSelect-5.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-4.xml"/>
</java>
</target>

@@ -66,8 +67,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStoreRequest-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStoreRequest-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-5.xml"/>
</java>
</target>

@@ -79,8 +80,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-L2status-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-6.xml"/>
</java>
</target>

@@ -89,8 +90,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-L2status-Req-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-7.xml"/>
</java>
</target>

@@ -99,8 +100,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MetadataKey-L2status-Req-3.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MetadataKey-L2status-Req-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-8.xml"/>
</java>
</target>

@@ -109,8 +110,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupData-L2status-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-9.xml"/>
</java>
</target>

@@ -119,8 +120,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupData-L2status-Req-2.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-10.xml"/>
</java>
</target>

@@ -129,8 +130,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupData-L2status-Req-3.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-3.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-11.xml"/>
</java>
</target>

@@ -139,8 +140,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupData-L2status-Req-4.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-4.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-12.xml"/>
</java>
</target>

@@ -149,8 +150,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupData-L2status-Req-5.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-5.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-13.xml"/>
</java>
</target>

@@ -159,8 +160,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/SetupData-L2status-Req-6.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/SetupData-L2status-Req-6.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-14.xml"/>
</java>
</target>

@@ -169,8 +170,8 @@
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${ma.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/MeasurementArchiveStore-L2status-Req-1.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/MeasurementArchiveStore-L2status-Req-1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response-15.xml"/>
</java>
</target>

@@ -179,8 +180,8 @@
<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"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/Echo-Req.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>
</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-configure-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-configure-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -16,84 +16,65 @@

- <target name="get-xmldb-address">
- <input message="Enter the address of xmldb eXist [localhost]:"
- addproperty="xmldb.address"
- defaultvalue="localhost"
- />
- <input message="Enter the port of xmldb eXist [8090]:"
- addproperty="xmldb.port"
- defaultvalue="8090"
- />
- <input message="Enter the type of access to xmldb eXist (xmlrpc or
http) [xmlrpc]:"
- addproperty="_xmldb.access"
- defaultvalue="xmlrpc"
- />
+ <property file="ant/const.properties" />

- <condition property="xmldb.access" value="xmldb:exist">
- <equals arg1="xmlrpc" arg2="${_xmldb.access}"/>
- </condition>
- <condition property="xmldb.access" value="http">
- <equals arg1="http" arg2="${_xmldb.access}"/>
- </condition>
+ <property name="deploy.root" value="${service.name}" />

- <condition property="uri.resource.id" value="rest">
- <equals arg1="http" arg2="${xmldb.access}"/>
- </condition>
- <condition property="uri.resource.id" value="xmlrpc">
- <equals arg1="xmlrpc" arg2="${_xmldb.access}"/>
- </condition>
- <echo message="Accepted xmldb server is
${xmldb.access}://${xmldb.address}:${xmldb.port}/exist/${uri.resource.id}/db/sqlmaconfig"/>

- </target>
- 
+ 

+
<target name="__get-sql-config-file">
+
<input message="Enter the path of sql metadata config file
[${basedir}/conf/sql-database_TEST.xml]:"
- addproperty="sql.config.file"
- defaultvalue="${basedir}/conf/sql-database_TEST.xml"
+ addproperty="sql.config.file"
+ defaultvalue="${basedir}/conf/sql-database_TEST.xml"
/>
<available file="${sql.config.file}"
property="sql.config.file.present"/>
+
</target>

- <target name="_get-sql-config-file_1" depends="__get-sql-config-file"
if="sql.config.file.present">
- <echo message="Accepted sql metadata config file:
${sql.config.file}"/>
+
+ <target name="_get-sql-config-file_1"
+ depends="__get-sql-config-file"
+ if="sql.config.file.present">
+
+ 
+
</target>

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

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

-


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

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

- <entry key="axis.home" value="${axis.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"/>
@@ -101,73 +82,193 @@

</propertyfile>

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

-


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

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

- <entry key="service.r.type" value="ma"/>
- <entry key="service.r.access_point"
value="http://${server.address}:8080/axis/services/MeasurementArchiveService"/>
+ <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 SQL MA"/>
<entry key="service.r.service_type" value="SQL MA"/>
<entry key="service.r.service_description" value="Java SQL MA,
perfSONAR project"/>

- <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.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+ <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>

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

- <entry key="component.ma.xmldb.db_status" value="on"/>
- <entry key="component.ma.xmldb.db_uri"
value="${xmldb.access}://${xmldb.address}:${xmldb.port}/exist/${uri.resource.id}/db/sqlmaconfig"/>
- <entry key="component.ma.xmldb.db_uri.xmlrpc"
value="xmldb:exist://${xmldb.address}:${xmldb.port}/exist/xmlrpc/db/sqlmaconfig"/>
- <entry key="component.ma.xmldb.db_username"
value="sqlmaservice"/>
- <entry key="component.ma.xmldb.db_password"
value="sqlmaservice"/>
- <entry key="component.ma.xmldb.db_access"
value="${_xmldb.access}"/>
-
<entry key="service.ma.xmldb.db_store" value="off"/>

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

- <entry key="service.r.ls_url" value=""/>
- <entry key="component.registrator.interval" value="30000"/>
+ </propertyfile>
+
+ </target>
+
+
+ 
+
+
+ <target name="copy-components-properties">
+
+ <copy file="conf/components.properties.sqlma"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
+ </target>
+
+
+ 
+
+
+ <target name="store-fuctionality-question-for-sqlma">
+
+ <input message="Do you want the service to accept messages with
measurement data and store them? "
+ addproperty="_functionality.store.decision"
+ validargs="y,n"
+ defaultvalue="n"/>
+
+ <condition property="functionality.store.decision">
+ <equals arg1="y" arg2="${_functionality.store.decision}"/>
+ </condition>
+
+ </target>
+
+
+ <target name="store-fuctionality-for-sqlma"
+ depends="store-fuctionality-question-for-sqlma"
+ if="functionality.store.decision">
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.ma.xmldb.db_store" value="on"/>
+
+ </propertyfile>
+
+ </target>
+
+
+ 
+
+
+ <target name="register-fuctionality-for-sqlma"
+ 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>

- <echo message="service.properties file created"/>
- <input message="Press Return key ..."/>
+ <replace file="conf/components.properties"
+
token="#ma_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"
+
value="ma_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>

+ <replace file="conf/components.properties"
+
token="#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"
+
value="registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+
</target>

+ 

- <target name="copy-initconfig-for-sqlma">
- <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="__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="configure-sqlma">
- <antcall target="copy-initconfig-for-sqlma"/>
- <antcall target="copy-properties"/>
+ <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="accessing-relational-database-setup">
+
+ <echo>You must provide correct database connection
information.</echo>
+
+ <echo></echo>
+ <echo>If you want the service to support data of utilization
metric</echo>
+ <echo>update connection parameters in
ibatis-SqlMapConfig-utilization.xml file</echo>
+ <echo>that you can find in conf directory of perfSONAR SQL MA
package.</echo>
+
+ <echo></echo>
+ <echo>If you want the service to support data of L2 path status
metric</echo>
+ <echo>update connection parameters in
ibatis-SqlMapConfig-L2-status-domain.xml</echo>
+ <echo>and ibatis-SqlMapConfig-L2-status-interdomain.xml files</echo>
+ <echo>that you can find in conf directory of perfSONAR SQL MA
package.</echo>
+
+ <echo></echo>
+ <echo>Each parameter in these files is represented by property
element.</echo>
+ <echo>Check value attribute of each property and if it is needed
alter it</echo>
+ <echo>to have correct connection with the database.</echo>
+
+ <echo></echo>
+ <input message="Please do it now and press Enter when finished"/>
+
+ </target>
+
+
+ 
+
+
+ <target name="configure">
+
+ <antcall target="copy-components-properties"/>
<antcall target="set-const-properties-for-sqlma"/>
<antcall target="set-service-properties-for-sqlma"/>
<antcall target="set-log4j-properties"/>
- <antcall target="set-tomcat-properties"/>
+ <antcall target="exist-init"/>
+ <antcall target="accessing-relational-database-setup"/>
+ <antcall target="store-fuctionality-for-sqlma"/>
+ <antcall target="register-fuctionality-for-sqlma"/>
+
</target>

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

Modified: branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-exist-xmldb-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-exist-xmldb-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-exist-xmldb-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -30,6 +30,11 @@
</target>

+ <target name="xmldb-adduser-sqlma">
+ <antcall target="xmldb-adduser-rrdma"/>
+ </target>

+
+
</project>

Modified:
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-java-compile-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-java-compile-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-java-compile-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -9,7 +9,6 @@

Notes:
A set of targets for building the application.
- This file is imported by the main file build.xml.

</description>
==================================================================== -->
@@ -26,26 +25,52 @@

<target name="compile-sqlma"
description="Compiles Java files of SQL MA">
- <antcall target="compile-rrdma"/>
+
+ <javac srcdir="src" destdir="${build}" deprecation="yes">
+
+ <include name="org/perfsonar/service/measurementArchive/**" />
+ <include name="org/perfsonar/service/web/**" />
+ <include
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.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-sqlma" depends="clean-jar-sqlma, compile-sqlma"
description="Creates JAR file for RRD MA">
- <antcall target="jar-rrdma"/>
- <copy file="${build}/perfSONAR-rrdma.jar"
tofile="${build}/perfSONAR-sqlma.jar"/>
+
+ <jar destfile="${build}/perfSONAR-sqlma.jar">
+
+ <fileset dir="${build}">
+ <include name="org/perfsonar/service/measurementArchive/**"
/>
+ <include name="org/perfsonar/service/web/**" />
+ <include
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.class"
/>
+ </fileset>
+
+ </jar>
+
</target>

- <target name="build-sqlma" description="Builds SQL MA.">
+ 
+
+
+ <target name="build" description="Builds SQL MA.">
+
<antcall target="clean-all"/>
<antcall target="jar-generic"/>
<antcall target="jar-sqlma"/>
+
</target>

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

Modified:
branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-libs-download-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-libs-download-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-libs-download-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -26,11 +26,6 @@

<artifact:dependencies>

- <dependency groupId="exist" artifactId="exist-xmldb"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-db"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-xmlrpc"
version="1.0rc"/>
- <dependency groupId="exist" artifactId="exist-optional"
version="1.0rc"/>
-
<dependency groupId="com.ibatis" artifactId="ibatis-sqlmap"
version="2.1.7.597"/>
<dependency groupId="com.ibatis" artifactId="ibatis-common"
version="2.1.7.597"/>

@@ -41,6 +36,8 @@
<dependency groupId="net.sf.saxon" artifactId="saxon"
version="8.7"/>
<dependency groupId="saxon" artifactId="saxon-jdom"
version="6.5.3"/>

+ <dependency groupId="antlr" artifactId="antlr"
version="2.7.6"/>
+
<dependency groupId="mysql"
artifactId="mysql-connector-java" version="5.0.3"/>
<dependency groupId="postgresql" artifactId="postgresql"
version="8.1-407.jdbc3"/>

@@ -53,7 +50,7 @@

- <target name="libs-sqlma">
+ <target name="lib">

<antcall target="libs-generic"/>
<antcall target="libs-for-sqlma"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-release-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-release-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-release-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -14,108 +14,118 @@
==================================================================== -->

- <project name="sqlma-release-targets">
+<project name="sqlma-release-targets">

- 
+ <target name="init-release">

- <target name="sqlma-release-src"
- depends="copy-initconfig-for-sqlma"
- description="Build src 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>

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

- <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, lib, build"
+ description="Build the release.">

- <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/conf"
includes="**/*.ls"/>
- <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="**/*.cl"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.rrdma"/>
- <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"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tops"/>
- </delete>
+ <property file="ant/const.properties" />

- <tar
destfile="${release.basename}-${release.servicename}-src-${release.version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"
- />
+ <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"/>

- <delete dir="tmp"/>

- <gzip
zipfile="${release.basename}-${release.servicename}-src-${release.version}.tar.gz"
-
src="${release.basename}-${release.servicename}-src-${release.version}.tar"
- />
+ <move todir="tmp/${service.name}/perfsonar/doc-sqlma">
+ <fileset dir="tmp/${service.name}/perfsonar/doc/ma/sqlTypeMA"/>
+ </move>
+ <delete dir="tmp/${service.name}/perfsonar/doc"/>
+ <move todir="tmp/${service.name}/perfsonar/doc/ma/sqlTypeMA">
+ <fileset dir="tmp/${service.name}/perfsonar/doc-sqlma"/>
+ </move>
+

- <delete
file="${release.basename}-${release.servicename}-src-${release.version}.tar"/>
+ <delete dir="tmp/${service.name}/perfsonar/src/org"/>
+ <delete dir="tmp/${service.name}/perfsonar/test"/>
+ <delete dir="tmp/${service.name}/perfsonar/releng"/>
+ <delete dir="tmp/${service.name}/perfsonar/build/org"/>

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

+ <delete file="tmp/${service.name}/perfsonar/ant/changes-rrdma"/>

+ <delete dir="tmp/${service.name}/perfsonar/ant/clmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/flowmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/nmsmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/tcmp"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/tops"/>
+ <delete dir="tmp/${service.name}/perfsonar/ant/xmlls"/>

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

- <target name="sqlma-release-bin"
- depends="copy-initconfig-for-sqlma, build-sqlma"
- description="Build bin release.">
+ <move file="tmp/${service.name}/perfsonar/ant/build-sqlma.xml"
+ tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>

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

- <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/log"
includes="**/*.log"/>

+ <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="**/*.rrdma"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.tops"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.tcmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/*.flowmp"/>

- <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="**/*.rrdma"/>
- <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"/>
- <fileset
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
includes="**/*.tops"/>
- </delete>
+ <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="**/*.rrdma"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tops"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.tcmp"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/*.flowmp"/>

- <tar
destfile="${release.basename}-${release.servicename}-bin-${release.version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"
- />
+ <fileset dir="tmp/${service.name}/perfsonar/ant"
includes="**/build-*.xml"/>

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

- <gzip
zipfile="${release.basename}-${release.servicename}-bin-${release.version}.tar.gz"
-
src="${release.basename}-${release.servicename}-bin-${release.version}.tar"
- />
+ <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="**/tcmp-*.wsdd"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd"
includes="**/tops-*.wsdd"/>

- <delete
file="${release.basename}-${release.servicename}-bin-${release.version}.tar"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/tcmp-*.*"/>
+ <fileset dir="tmp/${service.name}/perfsonar/conf"
includes="**/rrd-*.*"/>

+ </delete>

- </target>
+ <tar destfile="${service.name}.tar"
+ basedir="tmp/"
+ longfile="gnu"
+ excludes=".svn/**"
+ />

+ <delete dir="tmp"/>

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

- </project>
+ <delete file="${service.name}.tar"/>
+
+ </target>
+
+
+
+</project>
\ No newline at end of file

Modified: branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-test-run-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-test-run-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/sqlma/sqlma-test-run-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -18,6 +18,30 @@

+ <target name="test">
+
+ <echo>The test will send a set of example messages.</echo>
+ <echo>Please, analyze the responses to make sure the service has
been installed correctly.</echo>
+ <echo></echo>
+
+ <antcall target="run-echo"/>
+ <antcall target="run-sqlma-client-key-util"/>
+ <antcall target="run-sqlma-client-data-util-1"/>
+ <antcall target="run-sqlma-client-data-util-2"/>
+ <antcall target="run-sqlma-client-data-util-3"/>
+ <antcall target="run-sqlma-client-key-L2status-1"/>
+ <antcall target="run-sqlma-client-key-L2status-2"/>
+ <antcall target="run-sqlma-client-key-L2status-3"/>
+ <antcall target="run-sqlma-client-data-L2status-1"/>
+ <antcall target="run-sqlma-client-data-L2status-2"/>
+ <antcall target="run-sqlma-client-data-L2status-3"/>
+ <antcall target="run-sqlma-client-data-L2status-4"/>
+ <antcall target="run-sqlma-client-data-L2status-5"/>
+ <antcall target="run-sqlma-client-data-L2status-6"/>
+
+ </target>
+
+
<target name="run-mysql-sqlma-test1">
<sql
driver="com.mysql.jdbc.Driver"
@@ -27,6 +51,7 @@
print="true"
classpathref="classpath">
select version();
+ select * from domain_link;
</sql>
</target>

Modified:
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -54,8 +54,8 @@
<entry key="service.r.service_type" value="SSH/Telnet
MP"/>
<entry key="service.r.service_description" value="Java
SSH/Telnet MP, perfSONAR project"/>

- <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.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+ <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>

<entry key="service.r.ls_url"
value=""/>
@@ -91,6 +91,33 @@

</target>

+ 
+
+
+ <target name="register-fuctionality-for-sshtelnetmp"
+ 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="MP"/>
+ <entry key="component.registrator.scheduler_component"
value="scheduler"/>
+
+ </propertyfile>
+
+ <replace file="conf/components.properties"
+
token="#scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"
+
value="scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
+
+ <replace file="conf/components.properties"
+
token="#registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent"
+
value="registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent"/>
+
+ </target>
+
+


@@ -102,6 +129,7 @@
<antcall target="set-const-properties-for-sshtelnetmp"/>
<antcall target="set-service-properties-for-sshtelnetmp"/>
<antcall target="set-log4j-properties"/>
+ <antcall target="register-fuctionality-for-sshtelnetmp"/>

</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/tcmp/mapijni-compile-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tcmp/mapijni-compile-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tcmp/mapijni-compile-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -29,12 +29,17 @@



+ <target name="init-mapijni" depends="init">

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

- <target name="clean-mapijni" depends="init"
+ </target>
+
+
+ <target name="clean-mapijni" depends="init-mapijni"
description="Removes build directories.">
<echo message="Cleaning mapi-jni Java files." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="clean" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="clean" />
</target>

@@ -43,7 +48,7 @@
description="Compiles all Java files">

<echo message="Compiling mapi-jni Java files." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="compile" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="compile" />

</target>

@@ -52,9 +57,9 @@
<target name="jar-mapijni" depends="compile-mapijni">

<echo message="Creating mapi-jni JAR file." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="dist" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="dist" />
<mkdir dir="lib/repository/mapi-jni" />
- <copy file="contrib/mapi-jni/java/dist/mapi-jni.jar"
todir="lib/repository/mapi-jni" />
+ <copy file="${mapijnidir}/java/dist/mapi-jni.jar"
todir="lib/repository/mapi-jni" />

</target>

@@ -62,25 +67,25 @@



- <target name="build-native-mapijni" depends="init">
+ <target name="build-native-mapijni" depends="init-mapijni">

- <exec dir="contrib/mapi-jni/native/src" executable="/usr/bin/make">
+ <exec dir="${mapijnidir}/native/src" executable="/usr/bin/make">
<arg line="clean" />
</exec>
- <exec dir="contrib/mapi-jni/native/src" executable="/usr/bin/make">
- <arg line="MAPI_INC='-I${mapi_path}/include'
- MAPI_LIB='${mapi_path}/lib/libmapi.so'
+ <exec dir="${mapijnidir}/native/src" executable="/usr/bin/make">
+ <arg line="MAPI_INC='-I${mapi_h_path}'
+ MAPI_LIB='${mapi_lib_path}/libmapi.so'
JAVA_INC='-I${jdk_path}/include
-I${jdk_path}/include/linux'
DEBUG_OPTS=''"/>
</exec>

- <copy file="contrib/mapi-jni/native/src/dist/libmapijni.so"
todir="${mapijni_libpath}" />
+ <copy file="${mapijnidir}/native/src/dist/libmapijni.so"
todir="${mapi_lib_path}" />

<echo message="" />
<echo message="" />
<echo
message="-----------------------------------------------------------" />
<echo message="Now you need to setup LD_LIBRARY_PATH env variable
which should contain" />
- <echo message="${mapijni_libpath}" />
+ <echo message="${mapi_lib_path}" />
<echo
message="-----------------------------------------------------------" />

</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-axis-deploy-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-axis-deploy-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-axis-deploy-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -18,25 +18,41 @@
<project name="tcmp-axis-deploy-targets">

-

<target name="copy-jars-for-tcmp" depends="copy-jars-for-service">
- <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/mapi-jni/mapi-jni/1.0-0001/mapi-jni-1.0-0001.jar"
todir="${axis.home}/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/mapi-jni/mapi-jni/1.0-0001/mapi-jni-1.0-0001.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="./lib//repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
+ todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+
+ <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-tcmp" depends="delete-jars-for-service">
- <delete file="${axis.home}/WEB-INF/lib/jdom-1.0b8.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xalan-2.7.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/mapi-jni-1.0-0001.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/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/mapi-jni-1.0-0001.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/mysql-connector-java-5.0.3.jar"/>
+
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}"/>
</target>

@@ -62,8 +78,8 @@
if="jar.perfsonar.tcmp.present"
description="Copy tcmp jar to Tomcat">

- <copy file="${build}/${app.jar}" todir="${axis.home}/WEB-INF/lib"/>
- <copy file="${build}/${app.servlets.jar}"
todir="${axis.home}/WEB-INF/lib" failonerror="false"/>
+ <copy file="${build}/${app.jar}"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="${build}/${app.servlets.jar}"
todir="${service.home}/${deploy.root}/WEB-INF/lib" failonerror="false"/>

<echo/>
<echo>------------------------------ WARNING
---------------------------</echo>
@@ -75,30 +91,72 @@
</target>

- <target name="deploy-tcmp" depends="copy-tcmp-jar, add-context-listener"
+ <target name="create-tomcat-context-for-tcmp">
+
+ <copy file="conf/tomcat-tcmp-tmpl.xml"
tofile="${tomcat.home}/conf/Catalina/localhost/tcmp.xml" overwrite="true"
failonerror="false"/>
+ <replace file="${tomcat.home}/conf/Catalina/localhost/tcmp.xml">
+ <replacefilter token="__PATH__" value="/${deploy.root}" />
+ <replacefilter token="__DOC_BASE__"
value="${service.home}/${service.name}" />
+ </replace>
+
+ <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}:${mapi_lib_path}"/>
+ <env key="CATALINA_HOME" path=""/>
+ <env key="CATALINA_BASE" path=""/>
+ </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" depends="copy-tcmp-jar, add-context-listener"
description="Deploys TC MP service">
+
+ <echo>Deploying the service...</echo>
+
+ <antcall target="create-tomcat-context-for-tcmp" />
+
+ <antcall target="deploy-adminclient" />
+
+ 
+
</target>

- <target name="undeploy-tcmp"
+ <target name="undeploy"
description="Undeploys TC MP service">

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

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

- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tcmp.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tcmp-servlets.jar"
failonerror="false"/>
- <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-tcmp.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-tcmp-servlets.jar"
failonerror="false"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>
+ <delete file="${tomcat.home}/conf/Catalina/localhost/tcmp.xml"/>

</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-client-run-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-client-run-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-client-run-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -24,29 +24,29 @@
<property name="ma.abilene"
value="http://thunderbird.internet2.edu:8080/axis/services/MeasurementArchiveService"/>
-->

- <property name="mp.local"
value="http://${target.server}:${target.port}/axis/services/TCMPService"/>
+ <property name="mp.local"
value="http://${target.server}:${target.port}/${service.name}/services/${webservice.name}"/>



- <target name="run-tcmp-client" description="Runs TCMP measurement
request test">
+ <target name="run-client" description="Runs TCMP measurement request
test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${mp.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
</java>
</target>

- <target name="run-tcmp-demo" description="Runs TCMP measurement request
demo presented at GEANT2 conference">
+ <target name="run-demo" description="Runs TCMP measurement request demo
presented at GEANT2 conference">
<java classname="org.perfsonar.client.testHarness.SOAPClientMulti"
classpathref="classpath" fork="true">
<arg value="${mp.local}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response1.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response1.xml"/>
<arg
value="http://jra1-2.cesnet.cz:8080/axis/services/TCMPService"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/response2.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/response2.xml"/>
</java>
</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-configure-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-configure-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -14,84 +14,51 @@

<project name="tcmp-configure-targets">

- <target name="get-mapi-path">
- <input message="Set the path of MAPI installation directory
[/opt/mapi]:"
- addproperty="mapi.path"
- defaultvalue="/opt/mapi"
- />
- <echo message="Accepted MAPI installation directory: ${mapi.path}"/>
- </target>

- <target name="get-mapijni-libpath">
- <input message="Set the path of MAPI-JNI library (should be in
loader path) [/opt/mapi/lib]:"
- addproperty="mapijni.libpath"
- defaultvalue="/opt/mapi/lib"
- />
- <echo message="Accepted MAPI-JNI library path: ${mapijni.libpath}"/>
- </target>
+ <property file="ant/const.properties" />

- <target name="get-tomcat-path">
- <input message="Set the path of Tomcat home directory
[/opt/jakarta-tomcat-5.0.28]:"
- addproperty="tomcat.path"
- defaultvalue="/opt/jakarta-tomcat-5.0.28"
- />
- <echo message="Accepted Tomcat home directory: ${tomcat.path}"/>
- </target>
+ <property name="deploy.root" value="${service.name}" />

- <target name="get-current-path-tcmp">
- <dirname property="current.path.tcmp" file="."/>
- </target>
+ <target name="__get-tcmp-config-file">

-
- <target name="__get-config-file">
- <input message="Enter the path of metadata config file
[${basedir}/conf/tcmp-service-content.xml]:"
- addproperty="config.file"
+ <input message="TCMP 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/tcmp-service-content.xml]:"
+ addproperty="tcmp.config.file"
defaultvalue="${basedir}/conf/tcmp-service-content.xml"/>
- <available file="${config.file}" property="config.file.present"/>
+ <available file="${tcmp.config.file}"
property="tcmp.config.file.present"/>
+
</target>

- <target name="_get-config-file_1" depends="__get-config-file"
if="config.file.present">
- <echo message="Accepted metadata config file: ${config.file}"/>
+ <target name="_get-tcmp-config-file_1"
+ depends="__get-tcmp-config-file" if="tcmp.config.file.present">
</target>

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

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



- <target name="set-const-properties-for-tcmp"
- depends="get-message-1,
- get-current-path,
- get-java-path,
- get-mapi-path,
- get-mapijni-libpath,
- get-tomcat-path,
- get-axis-path,
- get-server-address">
+ <target name="set-const-properties-for-tcmp">

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

- <entry key="tomcat.home" value="${tomcat.path}"/>
- <entry key="axis.home" value="${axis.path}"/>
- <entry key="jdk_path" value="${java.path}"/>
- <entry key="mapi_path" value="${mapi.path}"/>
- <entry key="mapijni_libpath" value="${mapijni.libpath}"/>
- <entry key="target.server" value="${server.address}"/>
- <entry key="target.port" value="8080"/>
- <entry key="webservice.name" value="TCMPService"/>
+ <entry key="service.name" value="${service.name}"/>
+ <entry key="deploy.root" value="${deploy.root}"/>
+ <entry key="webservice.name" value="MeasurementPointService"/>
<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="tcmp-service-deploy.wsdd"/>
<entry key="wsdd.file.undeploy"
value="tcmp-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"/>
@@ -99,9 +66,6 @@

</propertyfile>

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

@@ -143,28 +107,26 @@


<target name="set-service-properties-for-tcmp"
- depends="get-message-2,
- get-current-path,
- get-current-path-tcmp,
- get-server-address,
- get-pcap-storage-dir,
+ depends="get-tcmp-config-file,
get-local-ifs,
get-remote-ifs,
- get-config-file">
+ get-pcap-storage-dir">

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

<entry key="service.r.type" value="mp"/>
- <entry key="service.r.access_point"
value="http://${server.address}:8080/axis/services/TCMPService"/>
+ <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 TC MP"/>
<entry key="service.r.service_type" value="TC MP"/>
<entry key="service.r.service_description" value="Java TC MP,
perfSONAR project"/>

- <entry key="service.conf_file" value="${config.file}"/>
+ <entry key="service.conf_file" value="${tcmp.config.file}"/>

- <entry key="service.log.log4j.config"
value="${current.path.tcmp}/perfsonar/conf/log4j.properties"/>
- <entry key="service.sax_parser.config"
value="${current.path.tcmp}/perfsonar/src/objects.config"/>
+ <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.mp.message_types" value="SetupDataRequest"/>
<entry key="service.mp.class_name"
value="org.perfsonar.service.measurementPoint.tracefileCaptureType.TCMPTypeServiceEngine"/>
@@ -179,25 +141,54 @@

</propertyfile>

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

+
+ <target name="copy-components-properties">
+
+ <copy file="conf/components.properties.mp"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
</target>

+ 

- <target name="copy-initconfig-for-tcmp">
- <copy file="ant/const.properties.tcmp" tofile="ant/const.properties"
overwrite="true" failonerror="false"/>
- <copy file="conf/components.properties.mp"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
+ <target name="register-fuctionality-for-tcmp"
+ 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="MP"/>
+ <entry key="component.registrator.scheduler_component"
value="scheduler"/>
+
+ </propertyfile>
+
+ 
+
</target>

- <target name="configure-tcmp">
- <antcall target="copy-properties"/>
- <antcall target="copy-initconfig-for-tcmp"/>
+ <target name="configure">
+
+ <echo>Configuring...</echo>
+
+ <antcall target="copy-components-properties"/>
<antcall target="set-const-properties-for-tcmp"/>
<antcall target="set-service-properties-for-tcmp"/>
<antcall target="set-log4j-properties"/>
- <antcall target="set-tomcat-properties"/>
+ <antcall target="register-fuctionality-for-tcmp"/>
+
</target>

Modified: branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-java-compile-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-java-compile-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-java-compile-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -38,6 +38,7 @@
<include name="org/perfsonar/service/web/**" />
<exclude
name="org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/**"
/>
<classpath refid="classpath"/>
+ 
</javac>
<copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
<fileset dir="src/${package.root}/${wsdd.home}">
@@ -60,14 +61,6 @@
</target>

- <target name="build-tcmp"
- description="Builds TC MP.">
- <antcall target="clean-all"/>
- <antcall target="jar-generic"/>
- <antcall target="jar-tcmp"/>
- </target>
-
-


<property name="app.servlets.jar" value="perfSONAR-tcmp-servlets.jar" />
@@ -100,7 +93,7 @@
</target>

- <target name="build-tcmp-servlets"
+ <target name="build-servlets"
description="Builds TC MP Servlets.">
<antcall target="clean-jar-tcmp-servlets"/>
<antcall target="jar-tcmp-servlets"/>
@@ -159,6 +152,16 @@

<echo>------------------------------------------------------------------</echo>
</target>

+ 
+
+ <target name="build"
+ description="Builds TC MP.">
+ <antcall target="clean-all"/>
+ <antcall target="jar-generic"/>
+ <antcall target="jar-tcmp"/>
+ </target>
+
+
</project>

Modified: branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-libs-download-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-libs-download-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tcmp/tcmp-libs-download-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -32,6 +32,8 @@
<dependency groupId="exist" artifactId="exist-db"
version="1.0rc"/>
<dependency groupId="exist" artifactId="exist-xmlrpc"
version="1.0rc"/>
<dependency groupId="exist" artifactId="exist-optional"
version="1.0rc"/>
+
+ <dependency groupId="mysql"
artifactId="mysql-connector-java" version="5.0.3"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>
@@ -42,7 +44,7 @@

- <target name="libs-tcmp">
+ <target name="lib">

<antcall target="libs-generic"/>
<antcall target="libs-for-tcmp"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/tops/tops-axis-deploy-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tops/tops-axis-deploy-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tops/tops-axis-deploy-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -1,11 +1,9 @@
-
-

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

-
- <property name="adminService"
value="http://${target.server}:${target.port}/axis/services/AdminService"; />
- 
- 
-
- <target name="copy-jars-for-tops" depends="jar-tops">
-
- 
- <copy file="./lib/xml/jdom.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/xml/resolver.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/xml/xalan.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/xml/xercesImpl.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/xml/xercesSamples.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/xml/xml-apis.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/xml/xmlParserAPIs.jar"
todir="${axis.home}/WEB-INF/lib"/>
-
- <copy file="./lib/xml/commons-pool-1.1.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/xml/xmldb.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/xml/xmlrpc-1.2-patched.jar"
todir="${axis.home}/WEB-INF/lib"/>
-
- <copy file="./lib//misc/activation.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/misc/mail.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/misc/xmlsec.jar"
todir="${axis.home}/WEB-INF/lib"/>
-
- 
-
- <copy
file="./lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${axis.home}/WEB-INF/lib"/>
-
</target>

+ <target name="delete-jars-for-tops" depends="delete-jars-for-service">
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/exist-xmldb-1.0rc.jar" />

- <target name="delete-jars-for-tops">
+ <delete
file="${service.home}${deploy.root}/WEB-INF/classes/perfsonar/conf/TOPSRegisterRequest.xml"
/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/interfaces-description.xml"
/>

- <delete file="${axis.home}/WEB-INF/lib/jdom.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/resolver.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xalan.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xercesImpl.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xercesSamples.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xml-apis.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs.jar"/>
-
- <delete file="${axis.home}/WEB-INF/lib/commons-pool-1.1.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmldb.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlrpc-1.2-patched.jar"/>
-
- <delete file="${axis.home}/WEB-INF/lib/activation.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/mail.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlsec.jar"/>
-
- 
-
- <delete
file="${axis.home}/WEB-INF/lib/postgresql-8.1-407.jdbc3.jar"/>
-
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
</target>

+ 

+ <available file="${build}/perfSONAR-tops.jar"
property="jar.perfsonar.tops.present"/>

- 
-
- <available file="${build}/perfSONAR-generic.jar"
property="jar.perfsonar.generic.present"/>
-
-
- <target name="does-jar-generic-exist"
unless="jar.perfsonar.generic.present">
+ <target name="does-jar-tops-exist" unless="jar.perfsonar.tops.present">
<echo>------------------------------ WARNING
---------------------------</echo>
<echo/>
- <echo>You don't have perfSONAR-generic.jar file in ${build}
directory!!!</echo>
+ <echo>You don't have perfSONAR-tops.jar file in ${build}
directory!!!</echo>
<echo/>

<echo>------------------------------------------------------------------</echo>
</target>

+ <target name="copy-tops-jar" depends="copy-generic-jar,
copy-jars-for-tops, does-jar-tops-exist"
+ if="jar.perfsonar.tops.present"
+ description="Copy tops jar to Tomcat">

- <target name="copy-generic-jar"
- depends="copy-jars-for-tops,
- does-jar-generic-exist"
- if="jar.perfsonar.generic.present"
- description="Copy generic jar to Tomcat">
+ <copy file="${build}/perfSONAR-tops.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

- <copy file="${build}/perfSONAR-generic.jar"
todir="${axis.home}/WEB-INF/lib"/>
-
</target>

+ <target name="tomcat-start-for-tops-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:."/>
+ </exec>

- <available file="${build}/perfSONAR-tops.jar"
property="jar.perfsonar.tops.present"/>
+ <echo>Please, make sure that the Tomcat is running. Use the address
http://${target.server}:${target.port} .</echo>
+ <input message="Press Return key ..."/>

-
- <target name="does-jar-tops-exist" unless="jar.perfsonar.tops.present">
- <echo>------------------------------ WARNING
---------------------------</echo>
- <echo/>
- <echo>You don't have perfSONAR-tops.jar file in ${build}
directory!!!</echo>
- <echo/>
-
<echo>------------------------------------------------------------------</echo>
</target>

+ <target name="tomcat-start-for-tops-false"
+ unless="tomcat.start.decision">

- <target name="copy-tops-jar"
- description="Copy tops jar of Tomcat">
+ <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 ..."/>

- <copy file="${build}/perfSONAR-tops.jar"
todir="${axis.home}/WEB-INF/lib"/>
+ </target>

- <echo/>
- <echo>------------------------------ WARNING
---------------------------</echo>
- <echo/>
- <echo>Restart your application server (container of perfSONAR
service)!!!</echo>
- <echo/>
-
<echo>------------------------------------------------------------------</echo>
+ <target name="tomcat-start-for-tops"
+ depends="tomcat-start-for-tops-true,tomcat-start-for-tops-false">

</target>

+ <target name="deploy" depends="copy-tops-jar, add-context-listener"
+ description="Deploys ToS service">

- <target name="deploy-tops"
- description="Deploys Topology Service">
- <java classname="org.apache.axis.client.AdminClient">
- <arg line="-l ${adminService} ${deployFile}"/>
- <classpath refid="classpath"/>
- </java>
+ <echo>Deploying the service...</echo>
+
+ <antcall target="tomcat-start-for-tops" />
+
+ <antcall target="deploy-adminclient" />
+
</target>

- <target name="undeploy-tops"
- description="Undeploys Topology Service">
+ <target name="undeploy"
+ description="Undeploys ToS 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" />

- 
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tops.jar"/>
- 
+ <antcall target="rem-context-listener" />
+ <antcall target="delete-jars-for-tops"/>

+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-tops.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>
+
+ <antcall target="tomcat-shutdown" />
+
</target>

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

Modified: branches/SSHTelnet-MP-STABLE/ant/tops/tops-client-run-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tops/tops-client-run-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tops/tops-client-run-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -3,9 +3,8 @@

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

+ <target name="run-tops-client" description="Runs Java client2">

- 
- <target name="tops-initialize"
- description="Sends void message to Tomcat">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath" fork="true">
+ classpathref="classpath" fork="true">
+ <arg value="${tops.local}"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadRequest.xml"/>
+ <arg
value="${basedir}/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadResponse.xml"/>

- 
+ <classpath>
+ <pathelement location="build/perfSONAR-generic.jar"/>
+ </classpath>

- <arg value="${tops.test.server}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/Void.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/Void.xml"/>
</java>
- </target>
+
+ <echo>Test ended successfully.</echo>
+ <echo>Message used for request:
${basedir}/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadRequest.xml</echo>
+ <echo>You can check the response at:
${basedir}/schema/example-instances/perfSONAR/TOPS/test/TOPSDownloadResponse.xml</echo>

-
- <target name="tops-download-db"
- description="Sends request to Tomcat: full database download">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath" fork="true">
-
- 
-
- <arg value="${tops.test.server}"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/TOPSDownloadDBRequest.xml"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/TOPSDownloadDBResponse.xml"/>
- </java>
</target>

</project>

Modified: branches/SSHTelnet-MP-STABLE/ant/tops/tops-java-compile-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tops/tops-java-compile-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tops/tops-java-compile-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -3,9 +3,8 @@

-
<include name="org/perfsonar/service/topologyService/**" />
<include name="org/perfsonar/service/web/**" />
-
- 
-
- 
-
<classpath refid="classpath"/>
-
- <compilerarg value="-Xlint:unchecked"/>
+ <compilerarg value="-Xlint:unchecked"/>
</javac>

- <copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
+ <copy failonerror="true"
todir="${build}/${package.root}/${wsdd.home}">
<fileset dir="src/${package.root}/${wsdd.home}">
<include name="tops-*.wsdd" />
</fileset>
</copy>
+
</target>

+ <target name="jar-tops" depends="clean-jar-tops, compile-tops"
+ description="Creates JAR file for ToS">

- <target name="jar-tops" description="Creates JAR file for Topology
Service">
<jar destfile="${build}/perfSONAR-tops.jar">
<fileset dir="${build}">
-
- 
-
<include name="org/perfsonar/service/topologyService/**" />
<include name="org/perfsonar/service/web/**" />
-
- 
-
- 
-
</fileset>
</jar>
+
</target>

+ <target name="build"
+ description="Builds ToS.">

- <target name="build-tops"
- description="Builds Topology Service">
- <antcall target="clean-jar-tops"/>
- <antcall target="clean-tops"/>
- <antcall target="compile-tops"/>
+ <antcall target="clean-all"/>
+ <antcall target="jar-generic"/>
<antcall target="jar-tops"/>
- <antcall target="copy-tops-jar"/>
+
</target>

+
+
</project>

Modified: branches/SSHTelnet-MP-STABLE/ant/tops/tops-libs-download-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tops/tops-libs-download-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tops/tops-libs-download-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -1,31 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-


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

+ <target name="libs-for-tops" depends="init-libs">

+ <artifact:dependencies>
+ <dependency groupId="exist" artifactId="exist-xmldb"
version="1.0rc"/>

- <target name="libs-for-tops" depends="init-libs">
-
- <artifact:dependencies>
- <dependency groupId="postgresql" artifactId="postgresql"
version="8.1-407.jdbc3"/>
+ <dependency groupId="postgresql"
artifactId="postgresql" version="8.1-407.jdbc3"/>

<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>
@@ -34,8 +26,6 @@

</target>

-
-
<target name="libs-tops">

<antcall target="libs-generic"/>
@@ -43,8 +33,4 @@

</target>

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

Modified: branches/SSHTelnet-MP-STABLE/ant/tops/tops-test-run-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/tops/tops-test-run-targets.xml
2007-02-14 17:06:48 UTC (rev 2076)
+++ branches/SSHTelnet-MP-STABLE/ant/tops/tops-test-run-targets.xml
2007-02-15 09:53:38 UTC (rev 2077)
@@ -1,36 +1,19 @@
-
-
+<?xml version="1.0" encoding="UTF-8"?>


-
<project name="tops-test-run-targets">

+ <target name="test">

- 
+ <antcall target="run-tops-client"/>

- 
-
-
- <target name="tops-test-query"
- description="Run TOPS pseudo Test">
- <java classname="org.perfsonar.client.testHarness.LSTestClient"
classpathref="classpath" fork="true">
- <jvmarg
value="-Dcomponents.properties=${basedir}/conf/components.properties"/>
- <jvmarg
value="-Dservice.properties=${basedir}/conf/service.properties"/>
- <arg value="query"/>
- <arg value="RequestHandler"/>
- <arg
value="${basedir}/schema/example-instances/sonar/TOPS/test/TOPSDownloadDBRequest.xml"/>
- </java>
</target>

</project>

Added: branches/SSHTelnet-MP-STABLE/conf/log4j.properties.template

r2077 - in branches/SSHTelnet-MP-STABLE: ant ant/clmp ant/flowmp ant/rrdma ant/sqlma ant/ssh ant/tcmp ant/tops conf, svnlog, 02/15/2007

List archive

r2077 - in branches/SSHTelnet-MP-STABLE: ant ant/clmp ant/flowmp ant/rrdma ant/sqlma ant/ssh ant/tcmp ant/tops conf