perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6055 - in trunk: perfsonar-java-sql-ma/ant perfsonar-java-sql-ma/ant/ibatis-discards-jdbc-config perfsonar-java-sql-ma/ant/ibatis-errors-jdbc-config perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config perfsonar-java-sql-ma/ant/ibatis-utilization-jdbc-config perfsonar-java-sql-ma/contrib/war-creator-script perfsonar-java-sql-ma/lib/misc perfsonar_base/ant perfsonar_base/lib/misc

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6055 - in trunk: perfsonar-java-sql-ma/ant perfsonar-java-sql-ma/ant/ibatis-discards-jdbc-config perfsonar-java-sql-ma/ant/ibatis-errors-jdbc-config perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config perfsonar-java-sql-ma/ant/ibatis-utilization-jdbc-config perfsonar-java-sql-ma/contrib/war-creator-script perfsonar-java-sql-ma/lib/misc perfsonar_base/ant perfsonar_base/lib/misc

From:
To:
Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6055 - in trunk: perfsonar-java-sql-ma/ant perfsonar-java-sql-ma/ant/ibatis-discards-jdbc-config perfsonar-java-sql-ma/ant/ibatis-errors-jdbc-config perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config perfsonar-java-sql-ma/ant/ibatis-utilization-jdbc-config perfsonar-java-sql-ma/contrib/war-creator-script perfsonar-java-sql-ma/lib/misc perfsonar_base/ant perfsonar_base/lib/misc
Date: Wed, 5 Dec 2012 07:50:02 +0000 (GMT)

Author: nordunet.behrmann
Date: 2012-12-05 07:50:02 +0000 (Wed, 05 Dec 2012)
New Revision: 6055

Removed:
trunk/perfsonar-java-sql-ma/ant/axis-deploy-targets.xml
trunk/perfsonar-java-sql-ma/ant/build.xml
trunk/perfsonar-java-sql-ma/ant/compile-targets.xml
trunk/perfsonar-java-sql-ma/ant/configure-targets.xml
trunk/perfsonar-java-sql-ma/ant/const.properties.template
trunk/perfsonar-java-sql-ma/ant/exist-targets.xml

trunk/perfsonar-java-sql-ma/ant/ibatis-discards-jdbc-config/ibatis-jdbc-config-targets.xml

trunk/perfsonar-java-sql-ma/ant/ibatis-errors-jdbc-config/ibatis-jdbc-config-targets.xml
trunk/perfsonar-java-sql-ma/ant/ibatis-jdbc-config-targets.xml

trunk/perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml

trunk/perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml

trunk/perfsonar-java-sql-ma/ant/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
trunk/perfsonar-java-sql-ma/ant/libs-download-targets.xml
trunk/perfsonar-java-sql-ma/ant/pre-install-targets.xml
trunk/perfsonar-java-sql-ma/ant/release-targets.xml
trunk/perfsonar-java-sql-ma/ant/test-targets.xml
trunk/perfsonar-java-sql-ma/ant/webapp-package-targets.xml
trunk/perfsonar-java-sql-ma/contrib/war-creator-script/create-war.sh
trunk/perfsonar-java-sql-ma/lib/misc/ant-contrib-1.0b3.jar
trunk/perfsonar-java-sql-ma/lib/misc/maven-artifact-ant-2.0.4-dep.jar
trunk/perfsonar-java-sql-ma/lib/misc/perfsonar-base-ant-1.0.20080416.jar
trunk/perfsonar_base/ant/build.xml
trunk/perfsonar_base/ant/const.properties
trunk/perfsonar_base/lib/misc/ant-contrib-1.0b3.jar
trunk/perfsonar_base/lib/misc/maven-artifact-ant-2.0.4-dep.jar
Log:
perfsonar_base, perfsonar-java-sql-ma: Remove obsolete build files

It appears that before Maven, PerfSONAR used Ant. The ant build files,
jars, and related scripts are no longer needed and can be deleted.

Deleted: trunk/perfsonar-java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/axis-deploy-targets.xml 2012-12-04
15:07:28 UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/axis-deploy-targets.xml 2012-12-05
07:50:02 UTC (rev 6055)
@@ -1,456 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="axis-deploy-targets"
- basedir="..">
-
-
- <target name="create-deploy-root"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:create-deploy-root deploy-path="${service.home}/${deploy.root}"/>
-
- </target>
-
-
- <target name="copy-axis-config"
- depends="create-deploy-root"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:copy-axis-config
dest-conf-path="${service.home}/${deploy.root}"/>
-
- </target>
-
-
- <target name="copy-dep-base-service-jars"
- depends="copy-axis-config"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:copy-dep-base-service-jars
dest-jars-path="${service.home}/${deploy.root}"/>
- </target>
-
-
- <target name="copy-dep-service-jars"
- depends="copy-dep-base-service-jars">
-
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090210/perfsonar-base-1.0.20090210.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20090210/nmwg-1.0.20090210.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-
- <copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/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="${basedir}/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="${basedir}/lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-
- <copy todir="${service.home}/${deploy.root}/WEB-INF/classes">
- <fileset dir="${basedir}/conf">
- <include name="ibatis-*.xml"/>
- </fileset>
- </copy>
-
- <copy file="${basedir}/conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
- <copy file="${basedir}/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">
- <entry key="service.ma.conf_file"
-
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/${sql.config.file.basename}"/>
- </propertyfile>
-
- <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${service.home}/${deploy.root}/wsdd"/>
- <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${service.home}/${deploy.root}/wsdd"/>
-
- </target>
-
-
- <target name="copy-service-jar" depends="copy-dep-service-jars">
- <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- </target>
-
-
- <target name="delete-deploy-root">
- <delete dir="${service.home}/${deploy.root}"/>
- </target>
-
-
- <target name="tomcat-start"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Do you want me to start the application server
Tomcat for you?"
- addproperty="tomcat.start"
- validargs="y,n"
- defaultvalue="y" />
-
- <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}/${deploy.root}'>"/>
- <echo message=" </Context>"/>
- <echo></echo>
- <input message="Please do it now and press Enter when finished"/>
-
- <antcontrib:if>
- <equals arg1="${tomcat.start}" arg2="y" />
- <antcontrib:then>
-
- <psbase:tomcat-start tomcat-path="${tomcat.home}"/>
-
- <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
(${tomcat.home}/logs/catalina.out).</echo>
- <echo></echo>
- <input message="Please do it now and press Enter when finished"/>
-
- </antcontrib:then>
- <antcontrib:else>
-
- <echo>(Re)start the Tomcat.</echo>
-
- <echo></echo>
- <input message="Please do it now and press Enter when finished"/>
-
- </antcontrib:else>
- </antcontrib:if>
-
- </target>
-
-
- <target name="tomcat-shutdown"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Do you want me to shutdown the application
server Tomcat for you?"
- addproperty="tomcat.shutdown"
- validargs="y,n"
- defaultvalue="y" />
-
- <antcontrib:if>
- <equals arg1="${tomcat.shutdown}" arg2="y" />
- <antcontrib:then>
- <psbase:tomcat-shutdown tomcat-path="${tomcat.home}"/>
- </antcontrib:then>
- </antcontrib:if>
-
- </target>
-
-
- <target name="deploy-adminclient-introinfo">
-
- <echo></echo>
- <echo>perfSONAR service located in the directory</echo>
- <echo>${service.home}/${deploy.root}</echo>
- <echo>will be now installed in Tomcat.</echo>
- <echo></echo>
- <input message="Press Enter"/>
-
- </target>
-
-
- <path id="axis.classpath">
- <fileset dir="${basedir}/lib/repository">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <property name="adminService"
value="http://${target.server}:${target.port}/${deploy.root}/services/AdminService";
/>
- <property name="deployFile"
value="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
- <property name="undeployFile"
value="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
-
- <target name="deploy-adminclient"
- depends="deploy-adminclient-introinfo"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:deploy-adminclient admin-service="${adminService}"
- deploy-file="${deployFile}"/>
-
- </target>
-
-
- <target name="undeploy-adminclient-introinfo">
-
- <echo></echo>
- <echo>perfSONAR service located in the directory</echo>
- <echo>${service.home}/${deploy.root}</echo>
- <echo>will be now uninstalled in Tomcat.</echo>
- <echo></echo>
- <input message="Press Enter"/>
-
- </target>
-
-
- <target name="undeploy-adminclient"
- depends="undeploy-adminclient-introinfo"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:undeploy-adminclient admin-service="${adminService}"
- undeploy-file="${undeployFile}"/>
-
- </target>
-
-
- <target name="start">
- <property file="${basedir}/ant/const.properties"/>
- <antcall target="deploy-adminclient" />
- </target>
-
-
- <target name="stop">
- <property file="${basedir}/ant/const.properties"/>
- <antcall target="undeploy-adminclient" />
- </target>
-
-
- 
- 
-
- 
-
- 
-
-
- 
- 
-
-
- <target name="deploy"
- xmlns:antcontrib="antlib:net.sf.antcontrib">
-
- <property file="${basedir}/ant/const.properties"/>
-
- <antcall target="copy-service-jar"/>
- <antcall target="tomcat-start"/>
-
- <antcontrib:if>
- <equals arg1="${component.ma.xmldb.db_status}" arg2="on" />
- <antcontrib:then>
- <antcontrib:if>
- <equals arg1="${component.ma.xmldb.type}" arg2="webapp" />
- <antcontrib:then>
- <antcontrib:trycatch property="errormessage">
- <antcontrib:try>
- <antcall target="exist-adduser"/>
- </antcontrib:try>
- <antcontrib:catch>
- <echo>The script can not create new user
${component.ma.xmldb.db_username}.</echo>
- <echo>Such user could have been already created or there
is a problem with eXist.</echo>
- <echo>---------- Detailed error message:</echo>
- <echo>${errormessage}</echo>
- <echo>----------------------------------</echo>
- </antcontrib:catch>
- </antcontrib:trycatch>
- <antcall target="exist-init"/>
- </antcontrib:then>
- </antcontrib:if>
- </antcontrib:then>
- </antcontrib:if>
-
- <antcall target="deploy-adminclient" />
-
- </target>
-
-
- <target name="undeploy">
-
- <property file="${basedir}/ant/const.properties"/>
-
- <antcall target="undeploy-adminclient" />
- <antcall target="delete-deploy-root"/>
- <antcall target="tomcat-shutdown"/>
-
- </target>
-
-
-</project>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/ant/build.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/build.xml 2012-12-04 15:07:28 UTC (rev
6054)
+++ trunk/perfsonar-java-sql-ma/ant/build.xml 2012-12-05 07:50:02 UTC (rev
6055)
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="geant2_java-sql-ma"
- basedir="..">
-
-
- <property file="${basedir}/ant/const.properties.template"/>
-
-
- <taskdef resource="net/sf/antcontrib/antlib.xml"
- uri="antlib:net.sf.antcontrib">
- <classpath>
- <pathelement location="${antcontrib.jar}"/>
- </classpath>
- </taskdef>
-
- <taskdef resource="org/perfsonar/base/ant/antlib.xml"
- classpath="${antpsbase.jar}"
- uri="psbase:/base.perfsonar.org"/>
-
-
-
- <import file="libs-download-targets.xml"/>
- <import file="compile-targets.xml"/>
- <import file="pre-install-targets.xml"/>
- <import file="configure-targets.xml"/>
- <import file="axis-deploy-targets.xml"/>
- <import file="test-targets.xml"/>
- <import file="release-targets.xml"/>
- <import file="webapp-package-targets.xml"/>
-
-
-</project>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/ant/compile-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/compile-targets.xml 2012-12-04 15:07:28
UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/compile-targets.xml 2012-12-05 07:50:02
UTC (rev 6055)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="compile-targets"
- basedir="..">
-
-
- <target name="compile"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <property name="conf.file" value="${basedir}/ant/const.properties"/>
- <available file="${conf.file}" property="conf.file.present"/>
- <antcontrib:if>
- <isset property="conf.file.present"/>
- <antcontrib:then>
- <psbase:compile srcdir="src" dstdir="${build}"
libdir="lib/repository"/>
- </antcontrib:then>
- <antcontrib:else>
- <psbase:template-use template-file="ant/const.properties.template"
- dest-file="ant/const.properties"/>
- <property file="${basedir}/ant/const.properties"/>
- <psbase:compile srcdir="src" dstdir="${build}"
libdir="lib/repository"/>
- </antcontrib:else>
- </antcontrib:if>
-
- </target>
-
-
- <target name="jar"
- depends="compile"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:jar jarfile="${jarfilename}-${version}.jar"
- dstdir="${build}"
- classdir="${build}"/>
-
- </target>
-
-
-</project>

Deleted: trunk/perfsonar-java-sql-ma/ant/configure-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/configure-targets.xml 2012-12-04
15:07:28 UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/configure-targets.xml 2012-12-05
07:50:02 UTC (rev 6055)
@@ -1,231 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="configure-targets"
- basedir="..">
-
-
- <import file="exist-targets.xml"/>
-
-
- 
- 
-
-
- <target name="get-sql-metaconfig-file"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <property name="sql.default.config.file"
- value="${basedir}/conf/sql-database_TEST.xml"/>
- <psbase:input2 message="Enter the path of metadata configuration file"
- addproperty="sql.config.file"
- defaultvalue="${sql.default.config.file}"/>
-
- <tstamp>
- <format property="current.time" pattern="yyyyMMddHHmmss"/>
- </tstamp>
-
- <available file="${sql.config.file}" property="sql.config.file.present"/>
- <antcontrib:if>
- <isset property="sql.config.file.present"/>
- <antcontrib:then>
- <antcontrib:if>
- <antcontrib:equals arg1="${sql.config.file}"
arg2="${sql.default.config.file}" />
- <antcontrib:then>
- <copy file="${sql.config.file}"
- tofile="${sql.config.file}.${current.time}.old"
- overwrite="true"
- failonerror="false"/>
- </antcontrib:then>
- </antcontrib:if>
- </antcontrib:then>
- <antcontrib:else>
- <fail>!!!!!! ERROR: Provided metadata config file does not
exist.</fail>
- </antcontrib:else>
- </antcontrib:if>
-
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="service.ma.conf_file" value="${sql.config.file}"/>
- </propertyfile>
-
- </target>
-
-
- 
-
-
- <target name="exist-configure"
- xmlns:antcontrib="antlib:net.sf.antcontrib">
-
- <property file="conf/service.properties" />
-
- <antcontrib:if>
- <equals arg1="${component.ma.xmldb.db_status}" arg2="on" />
- <antcontrib:then>
- <antcontrib:if>
- <equals arg1="${component.ma.xmldb.type}" arg2="stand-alone" />
- <antcontrib:then>
- <antcall target="exist-init"/>
- </antcontrib:then>
- </antcontrib:if>
- </antcontrib:then>
- </antcontrib:if>
-
- </target>
-
-
- 
- 
-
-
- <target name="accessing-relational-database-setup-dynamic">
-
- <subant target="ibatis-jdbc-config">
- <fileset dir="ant" includes="*/ibatis-jdbc-config-targets.xml"/>
- </subant>
-
- </target>
-
-
- <target name="accessing-relational-database-setup"
- depends="accessing-relational-database-setup-dynamic">
-
- <echo></echo>
- <echo>If you want to change provided jdbc connection parameters
manually,</echo>
- <echo>because of some reasons,</echo>
- <echo>you can do this in configuration files
(ibatis-SqlMapConfig-*.xml)</echo>
- <echo>in ${basedir}/conf directory.</echo>
- <echo>After such change, when the service is already deployed, you
must</echo>
- <echo>redeploy the service (undeploy and deploy again).</echo>
- <echo></echo>
-
- <input message="Press Enter to continue"/>
-
- </target>
-
-
- 
-
-
- <target name="store-fuctionality"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Do you want the service to accept messages with
measurement data and store them?"
- addproperty="functionality.store"
- validargs="y,n"
- defaultvalue="n"/>
-
- <antcontrib:if>
- <equals arg1="${functionality.store}" arg2="y" />
- <antcontrib:then>
-
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="service.ma.xmldb.db_store" value="on"/>
- </propertyfile>
-
- </antcontrib:then>
- </antcontrib:if>
-
- </target>
-
-
- 
-
-
- <target name="register-fuctionality"
- xmlns:psbase="psbase:/base.perfsonar.org">
- <psbase:register-fuctionality
dest-config-file="conf/service.properties"/>
- </target>
-
-
- <target name="ma-register-fuctionality"
- depends="register-fuctionality"
- xmlns:antcontrib="antlib:net.sf.antcontrib">
-
- <antcontrib:if>
- <equals arg1="${functionality.register}" arg2="y" />
- <antcontrib:then>
-
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="service.r.service_type"
value="MA"/>
- <entry key="component.registrator.scheduler_component"
value="ma_scheduler"/>
- </propertyfile>
-
- <replace file="${basedir}/conf/components.properties"
-
token="#ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler"
-
value="ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler"/>
-
- <replace file="${basedir}/conf/components.properties"
-
token="#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"
-
value="registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
-
- </antcontrib:then>
- </antcontrib:if>
-
- </target>
-
-
- 
-
-
- <target name="set-service-properties">
- <propertyfile file="${basedir}/conf/service.properties">
-
- <entry key="service.sax_parser.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
- <entry key="service.log.log4j.config"
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
-
- 
- <entry key="service.r.service_type" value="ma"/>
- <entry key="service.r.service_name" value="${service.name}"/>
- <entry key="service.r.service_version" value="${version}"/>
-
- </propertyfile>
- </target>
-
-
- 
- 
-
-
- <target name="configure"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <property file="${basedir}/ant/const.properties"/>
-
- <psbase:template-use template-file="conf/components.properties.template"
- dest-file="conf/components.properties"/>
- <antcall target="get-sql-metaconfig-file"/>
-
- <property file="const.properties"/>
- <psbase:set-log4j-config template-file="conf/log4j.properties.template"
- dest-file="conf/log4j.properties"
- service-home="${service.home}"
- deploy-root="${deploy.root}"/>
-
- <antcall target="exist-configure"/>
- <antcall target="accessing-relational-database-setup"/>
- <antcall target="store-fuctionality"/>
- <antcall target="ma-register-fuctionality"/>
-
- <antcall target="set-service-properties"/>
-
- <psbase:set-service-descr-email-organization
dest-config-file="conf/service.properties"/>
-
- </target>
-
-
-</project>

Deleted: trunk/perfsonar-java-sql-ma/ant/const.properties.template
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/const.properties.template 2012-12-04
15:07:28 UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/const.properties.template 2012-12-05
07:50:02 UTC (rev 6055)
@@ -1,29 +0,0 @@
-
-# $Id$
-# project: perfSONAR
-# author: romradz
-
-
-build=build
-
-target.server=127.0.0.1
-
-service.name=geant2-java-sql-ma
-
-jarfilename=perfsonar-sql-ma
-version=2.1
-
-exist.war.file=exist-1.1.1-newcore.war
-exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.1.1
-
-wsdd.file.deploy=service-deploy.wsdd
-wsdd.file.undeploy=service-undeploy.wsdd
-wsdd.webservice.name=MeasurementArchiveService
-
-antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080416.jar
-
-api.location=doc/api
-api.title=perfSONAR
-api.windowtitle=perfSONAR
-api.bottom=perfSONAR

Deleted: trunk/perfsonar-java-sql-ma/ant/exist-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/exist-targets.xml 2012-12-04 15:07:28
UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/exist-targets.xml 2012-12-05 07:50:02
UTC (rev 6055)
@@ -1,214 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="exist-targets"
- basedir="..">
-
-
- <property file="${basedir}/conf/service.properties"/>
-
- <path id="exist.classpath">
- <fileset dir="${basedir}/lib/repository">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
-
- <typedef resource="org/exist/ant/antlib.xml" uri="http://exist-db.org/ant";>
- <classpath refid="exist.classpath"/>
- </typedef>
-
-
-
- <target name="exist-resources-list"
- xmlns:psbase="psbase:/base.perfsonar.org">
- <psbase:exist-resources-list uri="${component.ma.xmldb.db_uri.xmlrpc}"/>
- </target>
-
-
- <target name="exist-resource-present"
- xmlns:xdb="http://exist-db.org/ant";>
-
- <basename property="xmlresource" file="${service.ma.conf_file}"/>
- <condition property="resource.present">
- <xdb:exist uri="${component.ma.xmldb.db_uri.xmlrpc}"
- resource="${xmlresource}"/>
- </condition>
-
- </target>
-
-
- <target name="exist-collection-remove"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <basename property="collection"
file="${component.ma.xmldb.db_uri.xmlrpc}" />
- <basename property="resource" file="${service.ma.conf_file}"/>
-
- <psbase:exist-collection-remove uri="${component.ma.xmldb.db_uri.xmlrpc}"
- resource="${resource}"
- collection="${collection}"
- user="${component.ma.xmldb.db_username}"
-
password="${component.ma.xmldb.db_password}"/>
-
- </target>
-
-
- <target name="exist-resource-remove"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Enter the name of resource to remove"
- addproperty="resource"
- defaultvalue=""/>
- <psbase:exist-resource-remove uri="${component.ma.xmldb.db_uri.xmlrpc}"
- resource="${resource}"
- user="${component.ma.xmldb.db_username}"
-
password="${component.ma.xmldb.db_password}"/>
- </target>
-
-
- <target name="exist-resource-store"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:exist-resource-store uri="${component.ma.xmldb.db_uri.xmlrpc}"
- resource="${service.ma.conf_file}"
- user="${component.ma.xmldb.db_username}"
-
password="${component.ma.xmldb.db_password}"/>
-
- </target>
-
-
- <target name="exist-resource-extract"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <basename property="xmlresource" file="${service.ma.conf_file}"/>
- <psbase:exist-resource-extract uri="${component.ma.xmldb.db_uri.xmlrpc}"
- resource="${xmlresource}"
- user="${component.ma.xmldb.db_username}"
-
password="${component.ma.xmldb.db_password}"
- dest-file="conf/dump_${xmlresource}"/>
-
- </target>
-
-
- <target name="getdbroot">
-
- <dirname property="dir1" file="/${component.ma.xmldb.db_uri.xmlrpc}"/>
- <basename property="base1" file="${dir1}"/>
-
- <dirname property="dir2" file="${dir1}"/>
- <basename property="base2" file="${dir2}"/>
-
- <dirname property="dir3" file="${dir2}"/>
- <basename property="base3" file="${dir3}"/>
-
- <dirname property="dir4" file="${dir3}"/>
- <basename property="base4" file="${dir4}"/>
-
- <property name="dbroot"
value="xmldb:exist://${base4}/${base3}/${base2}/${base1}"/>
-
- </target>
-
-
- <target name="exist-collection-create"
- depends="getdbroot"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <basename property="ma-collection"
file="${component.ma.xmldb.db_uri.xmlrpc}" />
- <psbase:exist-collection-create uri="${dbroot}"
- collection="${ma-collection}"
- user="${component.ma.xmldb.db_username}"
-
password="${component.ma.xmldb.db_password}"/>
- </target>
-
-
- <target name="exist-init"
- depends="exist-resource-present"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Do you want me to initialize eXist xml database
(eXist database will store the metadata configuration file)?"
- addproperty="exist.init"
- validargs="y,n"
- defaultvalue="y" />
-
- <antcontrib:if>
- <equals arg1="${exist.init}" arg2="y" />
- <antcontrib:then>
- <antcontrib:if>
- <isset property="resource.present"/>
- <antcontrib:then>
- <antcall target="exist-resource-extract"/>
- <antcall target="exist-collection-remove"/>
- <antcall target="exist-collection-create"/>
- <antcall target="exist-resource-store"/>
- </antcontrib:then>
- <antcontrib:else>
- <antcall target="exist-collection-create"/>
- <antcall target="exist-resource-store"/>
- </antcontrib:else>
- </antcontrib:if>
- </antcontrib:then>
- </antcontrib:if>
-
- </target>
-
-
- <target name="exist-adduser"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Do you want me to add new user
${component.ma.xmldb.db_username} (provided in the pre-install step) in eXist
database (if a user only for this service already exists, because it is not
the first run of the installation, answer 'n')?"
- addproperty="exist.adduser"
- validargs="y,n"
- defaultvalue="y" />
-
- <antcontrib:if>
- <equals arg1="${exist.adduser}" arg2="y" />
- <antcontrib:then>
- <psbase:exist-xquery
uri="xmldb:exist://${target.server}:${target.port}/${exist.contextname}/xmlrpc/db"
- user="admin"
-
password="${component.ma.xmldb.db_adminpassword}"
-
query="xmldb:create-user('${component.ma.xmldb.db_username}',
'${component.ma.xmldb.db_password}', 'dba', '/db')" />
- </antcontrib:then>
- </antcontrib:if>
-
- </target>
-
-
- <target name="exist-password-update"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Enter eXist admin password?"
- addproperty="adminpass"
- defaultvalue=""/>
- <psbase:input2 message="Enter eXist username?"
- addproperty="username"
- defaultvalue=""/>
- <psbase:input2 message="Enter new password for ${username}?"
- addproperty="password"
- defaultvalue=""/>
- <psbase:input2 message="Enter the URL of eXist?"
- addproperty="url"
-
defaultvalue="xmldb:exist://${target.server}:${target.port}/${exist.contextname}/xmlrpc/db"/>
-
- <psbase:exist-xquery uri="${url}"
- user="admin"
- password="${adminpass}"
- query="xmldb:change-user('${username}',
'${password}', 'dba', '/')" />
-
- </target>
-
-
-</project>

Deleted:
trunk/perfsonar-java-sql-ma/ant/ibatis-discards-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/ant/ibatis-discards-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-04 15:07:28 UTC (rev 6054)
+++
trunk/perfsonar-java-sql-ma/ant/ibatis-discards-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-05 07:50:02 UTC (rev 6055)
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="discards-ibatis-jdbc-config-targets">
-
-
- <import file="../ibatis-jdbc-config-targets.xml"/>
-
-
- <target name="metric-question"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <echo></echo>
- <psbase:input2 message="Do you want to use data of discards metric which
are or will be stored in your relational database?"
- addproperty="_metric.decision"
- validargs="y,n"
- defaultvalue="y"/>
-
- <condition property="metric.decision">
- <equals arg1="y" arg2="${_metric.decision}"/>
- </condition>
-
- </target>
-
-
- <target name="jdbc-config-message">
-
- <echo></echo>
- <echo>Provide correct jdbc connection parameters</echo>
- <echo>for relational database where data of discards metric</echo>
- <echo>are stored.</echo>
- <echo></echo>
-
- </target>
-
-
- <target name="ibatis-jdbc-config"
- depends="metric-question"
- if="metric.decision">
-
- <antcall target="_ibatis-jdbc-config"/>
-
- </target>
-
-
- <target name="_ibatis-jdbc-config"
- depends="jdbc-config-message, get-ibatis-jdbc-config">
-
- <delete file="../../conf/ibatis-SqlMapConfig-discards.xml"/>
- <copy file="../../conf/ibatis-SqlMapConfig-discards.template.xml"
tofile="../../conf/ibatis-SqlMapConfig-discards.xml"/>
-
- <replace file="../../conf/ibatis-SqlMapConfig-discards.xml"
token="_DRIVER_" value="${rel.db.name}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-discards.xml"
token="_URL_" value="${rel.db.url}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-discards.xml"
token="_USERNAME_" value="${rel.db.username}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-discards.xml"
token="_PASSWORD_" value="${rel.db.password}"/>
-
- </target>
-
-
-</project>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/ant/ibatis-errors-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/ant/ibatis-errors-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-04 15:07:28 UTC (rev 6054)
+++
trunk/perfsonar-java-sql-ma/ant/ibatis-errors-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-05 07:50:02 UTC (rev 6055)
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="errors-ibatis-jdbc-config-targets">
-
-
- <import file="../ibatis-jdbc-config-targets.xml"/>
-
-
- <target name="metric-question"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <echo></echo>
- <psbase:input2 message="Do you want to use data of errors metric which
are or will be stored in your relational database?"
- addproperty="_metric.decision"
- validargs="y,n"
- defaultvalue="y"/>
-
- <condition property="metric.decision">
- <equals arg1="y" arg2="${_metric.decision}"/>
- </condition>
-
- </target>
-
-
- <target name="jdbc-config-message">
-
- <echo></echo>
- <echo>Provide correct jdbc connection parameters</echo>
- <echo>for relational database where data of errors metric</echo>
- <echo>are stored.</echo>
- <echo></echo>
-
- </target>
-
-
- <target name="ibatis-jdbc-config"
- depends="metric-question"
- if="metric.decision">
-
- <antcall target="_ibatis-jdbc-config"/>
-
- </target>
-
-
- <target name="_ibatis-jdbc-config"
- depends="jdbc-config-message, get-ibatis-jdbc-config">
-
- <delete file="../../conf/ibatis-SqlMapConfig-errors.xml"/>
- <copy file="../../conf/ibatis-SqlMapConfig-errors.template.xml"
tofile="../../conf/ibatis-SqlMapConfig-errors.xml"/>
-
- <replace file="../../conf/ibatis-SqlMapConfig-errors.xml"
token="_DRIVER_" value="${rel.db.name}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-errors.xml"
token="_URL_" value="${rel.db.url}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-errors.xml"
token="_USERNAME_" value="${rel.db.username}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-errors.xml"
token="_PASSWORD_" value="${rel.db.password}"/>
-
- </target>
-
-
-</project>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/ant/ibatis-jdbc-config-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/ibatis-jdbc-config-targets.xml
2012-12-04 15:07:28 UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/ibatis-jdbc-config-targets.xml
2012-12-05 07:50:02 UTC (rev 6055)
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="ibatis-jdbc-config-targets">
-
-
- <target name="get-ibatis-jdbc-config"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- 
-
- <psbase:input2 message="Enter the name of databse you are going to use?"
- addproperty="_rel.db.name"
- validargs="mysql,postgresql"
- defaultvalue="mysql"/>
-
- <condition property="_rel.db.mysql">
- <equals arg1="mysql" arg2="${_rel.db.name}"/>
- </condition>
- <condition property="rel.db.name" value="com.mysql.jdbc.Driver">
- <isset property="_rel.db.mysql"/>
- </condition>
-
- <condition property="_rel.db.postgresql">
- <equals arg1="postgresql" arg2="${_rel.db.name}"/>
- </condition>
- <condition property="rel.db.name" value="org.postgresql.Driver">
- <isset property="_rel.db.postgresql"/>
- </condition>
-
- 
-
- <condition property="rel.db.default.url"
value="jdbc:mysql://127.0.0.1/perfsonar_ma">
- <isset property="_rel.db.mysql"/>
- </condition>
- <condition property="rel.db.default.url"
value="jdbc:postgresql://127.0.0.1/perfsonar_ma">
- <isset property="_rel.db.postgresql"/>
- </condition>
-
- <psbase:input2 message="Enter database jdbc address URL?"
- addproperty="rel.db.url"
- defaultvalue="${rel.db.default.url}"/>
-
- 
-
- <psbase:input2 message="Enter database user name?"
- addproperty="rel.db.username"
- defaultvalue="perfsonar_ma"/>
-
- 
-
- <psbase:input2 message="Enter the password of user name
${rel.db.username}?"
- addproperty="rel.db.password"
- defaultvalue="testpass"/>
-
- </target>
-
-
-</project>
-
-
-

Deleted:
trunk/perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-04 15:07:28 UTC (rev 6054)
+++
trunk/perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-05 07:50:02 UTC (rev 6055)
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="l2pathstatus-domain-ibatis-jdbc-config-targets">
-
-
- <import file="../ibatis-jdbc-config-targets.xml"/>
-
-
- <target name="metric-question"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <echo></echo>
- <psbase:input2 message="Do you want to use data of L2 path status metric
in domain scope which are or will be stored in your relational database?"
- addproperty="_metric.decision"
- validargs="y,n"
- defaultvalue="y"/>
-
- <condition property="metric.decision">
- <equals arg1="y" arg2="${_metric.decision}"/>
- </condition>
-
- </target>
-
-
- <target name="jdbc-config-message">
-
- <echo></echo>
- <echo>Provide correct jdbc connection parameters</echo>
- <echo>for relational database where data of L2 path status metric -
domain scope</echo>
- <echo>are stored.</echo>
- <echo></echo>
-
- </target>
-
-
- <target name="ibatis-jdbc-config"
- depends="metric-question"
- if="metric.decision">
-
- <antcall target="_ibatis-jdbc-config"/>
-
- </target>
-
-
- <target name="_ibatis-jdbc-config"
- depends="jdbc-config-message, get-ibatis-jdbc-config">
-
- <delete file="../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"/>
- <copy
file="../../conf/ibatis-SqlMapConfig-L2-status-domain.template.xml"
tofile="../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"/>
-
- <replace file="../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"
token="_DRIVER_" value="${rel.db.name}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"
token="_URL_" value="${rel.db.url}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"
token="_USERNAME_" value="${rel.db.username}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"
token="_PASSWORD_" value="${rel.db.password}"/>
-
- </target>
-
-
-</project>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-04 15:07:28 UTC (rev 6054)
+++
trunk/perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-05 07:50:02 UTC (rev 6055)
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="l2pathstatus-interdomain-ibatis-jdbc-config-targets">
-
-
- <import file="../ibatis-jdbc-config-targets.xml"/>
-
-
- <target name="metric-question"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <echo></echo>
- <psbase:input2 message="Do you want to use data of L2 path status metric
in interdomain scope which are or will be stored in your relational database?"
- addproperty="_metric.decision"
- validargs="y,n"
- defaultvalue="y"/>
-
- <condition property="metric.decision">
- <equals arg1="y" arg2="${_metric.decision}"/>
- </condition>
-
- </target>
-
-
- <target name="jdbc-config-message">
-
- <echo></echo>
- <echo>Provide correct jdbc connection parameters</echo>
- <echo>for relational database where data of L2 path status metric -
interdomain scope</echo>
- <echo>are stored.</echo>
- <echo></echo>
-
- </target>
-
-
- <target name="ibatis-jdbc-config"
- depends="metric-question"
- if="metric.decision">
-
- <antcall target="_ibatis-jdbc-config"/>
-
- </target>
-
-
- <target name="_ibatis-jdbc-config"
- depends="jdbc-config-message, get-ibatis-jdbc-config">
-
- <delete file="../../conf/ibatis-SqlMapConfig-L2-status-interdomain.xml"/>
- <copy
file="../../conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml"
tofile="../../conf/ibatis-SqlMapConfig-L2-status-interdomain.xml"/>
-
- <replace file="../../conf/ibatis-SqlMapConfig-L2-status-interdomain.xml"
token="_DRIVER_" value="${rel.db.name}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-L2-status-interdomain.xml"
token="_URL_" value="${rel.db.url}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-L2-status-interdomain.xml"
token="_USERNAME_" value="${rel.db.username}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-L2-status-interdomain.xml"
token="_PASSWORD_" value="${rel.db.password}"/>
-
- </target>
-
-
-</project>
\ No newline at end of file

Deleted:
trunk/perfsonar-java-sql-ma/ant/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
---
trunk/perfsonar-java-sql-ma/ant/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-04 15:07:28 UTC (rev 6054)
+++
trunk/perfsonar-java-sql-ma/ant/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
2012-12-05 07:50:02 UTC (rev 6055)
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="utilization-ibatis-jdbc-config-targets">
-
-
- <import file="../ibatis-jdbc-config-targets.xml"/>
-
-
- <target name="metric-question"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <echo></echo>
- <psbase:input2 message="Do you want to use data of utilization metric
which are or will be stored in your relational database?"
- addproperty="_metric.decision"
- validargs="y,n"
- defaultvalue="y"/>
-
- <condition property="metric.decision">
- <equals arg1="y" arg2="${_metric.decision}"/>
- </condition>
-
- </target>
-
-
- <target name="jdbc-config-message">
-
- <echo></echo>
- <echo>Provide correct jdbc connection parameters</echo>
- <echo>for relational database where data of utilization metric</echo>
- <echo>are stored.</echo>
- <echo></echo>
-
- </target>
-
-
- <target name="ibatis-jdbc-config"
- depends="metric-question"
- if="metric.decision">
-
- <antcall target="_ibatis-jdbc-config"/>
-
- </target>
-
-
- <target name="_ibatis-jdbc-config"
- depends="jdbc-config-message, get-ibatis-jdbc-config">
-
- <delete file="../../conf/ibatis-SqlMapConfig-utilization.xml"/>
- <copy file="../../conf/ibatis-SqlMapConfig-utilization.template.xml"
tofile="../../conf/ibatis-SqlMapConfig-utilization.xml"/>
-
- <replace file="../../conf/ibatis-SqlMapConfig-utilization.xml"
token="_DRIVER_" value="${rel.db.name}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-utilization.xml"
token="_URL_" value="${rel.db.url}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-utilization.xml"
token="_USERNAME_" value="${rel.db.username}"/>
- <replace file="../../conf/ibatis-SqlMapConfig-utilization.xml"
token="_PASSWORD_" value="${rel.db.password}"/>
-
- </target>
-
-
-</project>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/libs-download-targets.xml 2012-12-04
15:07:28 UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/libs-download-targets.xml 2012-12-05
07:50:02 UTC (rev 6055)
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="libs-download-targets"
- basedir="..">
-
-
- <property name="maven.jar"
value="${basedir}/lib/misc/maven-artifact-ant-2.0.4-dep.jar"/>
-
-
- <target name="init-urnmaven">
-
- <path id="maven.classpath">
- <pathelement location="${maven.jar}" />
- </path>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="urn:maven-artifact-ant">
- <classpath refid="maven.classpath"/>
- </typedef>
-
- </target>
-
-
- <target name="init-lib-dependencies"
- depends="init-urnmaven"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:init-lib-dependencies
- localRepositoryPath="lib/repository"
-
remoteRepositoryUri1="http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/";
- remoteRepositoryUri2="http://www.ibiblio.org/maven2"/>
-
- </target>
-
-
- <target name="service-lib-dependencies"
- depends="init-lib-dependencies"
- xmlns:artifact="urn:maven-artifact-ant"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:lib-dependencies/>
-
- <artifact:dependencies>
-
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20090210"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.3c"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.1"/>
- <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20090210"/>
-
- <dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="com.ibatis" artifactId="ibatis-sqlmap"
version="2.1.7.597"/>
- <dependency groupId="mysql" artifactId="mysql-connector-java"
version="5.0.3"/>
- <dependency groupId="postgresql" artifactId="postgresql"
version="8.1-407.jdbc3"/>
-
- <localRepository refid="local.repository"/>
- <remoteRepository refid="remote.repository"/>
-
- </artifact:dependencies>
- </target>
-
-
- 
- 
-
-
- <target name="lib"
- depends="service-lib-dependencies">
- </target>
-
-
-</project>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/ant/pre-install-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/pre-install-targets.xml 2012-12-04
15:07:28 UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/pre-install-targets.xml 2012-12-05
07:50:02 UTC (rev 6055)
@@ -1,403 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="pre-install-targets"
- basedir="..">
-
-
-
- 
- 
-
-
- <target name="exist-install"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Do you want me to install eXist xml database as
a web application in your Tomcat instance?"
- addproperty="exist.war.install"
- validargs="y,n"
- defaultvalue="y" />
- <antcontrib:if>
- <equals arg1="${exist.war.install}" arg2="y" />
- <antcontrib:then>
- <antcall target="exist-war-install"/>
- </antcontrib:then>
- <antcontrib:else>
- <psbase:input2 message="Do you want me to install eXist xml
database as a stand-alone application?"
- addproperty="exist.jar.install"
- validargs="y,n"
- defaultvalue="y" />
- <antcontrib:if>
- <equals arg1="${exist.jar.install}" arg2="y" />
- <antcontrib:then>
- <antcall target="exist-jar-install"/>
- </antcontrib:then>
- <antcontrib:else>
- <psbase:input2 message="Do you want me just to use already
installed eXist xml database (web application or stand-alone)?"
- addproperty="exist.setup"
- validargs="y,n"
- defaultvalue="y" />
- <antcontrib:if>
- <equals arg1="${exist.setup}" arg2="y" />
- <antcontrib:then>
- <antcall target="exist-simple-setup"/>
- </antcontrib:then>
- <antcontrib:else>
- <echo>WARNING: You didn't configure xml database.
This service requires to do it !!!</echo>
- <echo></echo>
- </antcontrib:else>
- </antcontrib:if>
- </antcontrib:else>
- </antcontrib:if>
- </antcontrib:else>
- </antcontrib:if>
-
- </target>
-
-
- <target name="exist-war-install">
-
- <antcall target="exist-war-download"/>
- <antcall target="exist-main-properties"/>
- <antcall target="exist-tomcat-context"/>
-
- <propertyfile file="${basedir}/ant/const.properties">
- <entry key="exist.contextname" value="exist"/>
- </propertyfile>
-
- <property file="${basedir}/ant/const.properties" />
-
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/sqlmaconfig"/>
- 
- <entry key="component.ma.xmldb.db_uri.xmlrpc"
value="xmldb:exist://localhost:${target.port}/exist/xmlrpc/db/sqlmaconfig"/>
- <entry key="component.ma.xmldb.type" value="webapp"/>
- </propertyfile>
-
- <antcall target="exist-add-new-user"/>
-
- </target>
-
-
- <target name="exist-war-download"
- xmlns:antcontrib="antlib:net.sf.antcontrib"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Do you want me to download eXist web application
package?"
- addproperty="exist.war.automat.download"
- validargs="y,n"
- defaultvalue="y" />
- <property file="${basedir}/ant/const.properties"/>
-
- <antcontrib:if>
- <equals arg1="${exist.war.automat.download}" arg2="y" />
- <antcontrib:then>
- 
-
- <dirname property="_exist.war.install.location" file="${basedir}"/>
- <psbase:input2 message="Enter the path of directory where eXist
installation file will be located"
- addproperty="exist.war.install.location"
- defaultvalue="${_exist.war.install.location}" />
-
- <propertyfile file="${basedir}/ant/const.properties">
- <entry key="exist.home" value="${exist.war.install.location}"/>
- </propertyfile>
-
- <echo message="Downloading eXist installation file (please be
patient, this can take some time) ..."/>
- <get src="${exist.war.download.url}"
- dest="${exist.war.install.location}/${exist.war.file}"
- verbose="true"
- usetimestamp="true"/>
- </antcontrib:then>
- <antcontrib:else>
- 
-
- <echo>Go to to http://prdownloads.sourceforge.net/exist/</echo>
- <echo>and download ${exist.war.file} file.</echo>
- <echo></echo>
- <input message="Please do it now and press Enter when finished"/>
-
- <dirname property="_exist.war.install.location" file="${basedir}"/>
- <psbase:input2 message="Enter the path of directory where
downloaded eXist war file is located"
- addproperty="exist.war.install.location"
- defaultvalue="${_exist.war.install.location}" />
-
- <propertyfile file="${basedir}/ant/const.properties">
- <entry key="exist.home" value="${exist.war.install.location}"/>
- </propertyfile>
-
- </antcontrib:else>
- </antcontrib:if>
-
- </target>
-
-
- <target name="exist-tomcat-context">
-
- <property file="${basedir}/ant/const.properties"/>
-
- <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='/exist'"/>
- <echo message=" docBase='${exist.home}/${exist.war.file}'>"/>
- <echo message=" </Context>"/>
- <echo></echo>
- <input message="Please do it now and press Enter when finished"/>
-
- </target>
-
-
- <target name="exist-add-new-user"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:input2 message="Enter the eXist user name"
- addproperty="_exist.username"/>
- <psbase:input2 message="Enter the pasword for eXist user name
${_exist.username}"
- addproperty="_exist.password"/>
- <psbase:input2 message="Enter the password for admin eXist user"
- addproperty="_exist.adminpassword"
- defaultvalue=""/>
-
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="component.ma.xmldb.db_username"
value="${_exist.username}"/>
- <entry key="component.ma.xmldb.db_password"
value="${_exist.password}"/>
- <entry key="component.ma.xmldb.db_adminpassword"
value="${_exist.adminpassword}"/>
- </propertyfile>
-
- </target>
-
-
- <target name="exist-jar-install"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <echo>Visit the web site http://prdownloads.sourceforge.net/exist</echo>
- <echo>and download the file eXist-xxx.jar. </echo>
- <echo></echo>
- <echo>Install the application executing the following command:</echo>
- <echo></echo>
- <echo> java -jar eXist-1.0.jar</echo>
- <echo></echo>
- <echo>By dafault eXist is available on the port 8080.</echo>
- <echo>To change this number open the file bin/startup.sh</echo>
- <echo>and replace the line:</echo>
- <echo></echo>
- <echo> OPTIONS="-Dexist.home=$EXIST_HOME"</echo>
- <echo></echo>
- <echo>with the line:</echo>
- <echo></echo>
- <echo> OPTIONS="-Dexist.home=$EXIST_HOME -Djetty.port=8585"</echo>
- <echo></echo>
- <echo>(port number 8585 is only an example).</echo>
- <echo></echo>
- <echo>Once you have installed run the application executing</echo>
- <echo>the script startup.sh .</echo>
- <echo></echo>
- <input message="Please do it now and press Enter when finished"/>
-
- <property name="exist.default.home" value="/usr/local/eXist"/>
- <psbase:input2 message="Enter the path of eXist?"
- addproperty="_exist.home"
- defaultvalue="${exist.default.home}" />
-
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="component.ma.xmldb.type" value="stand-alone"/>
- </propertyfile>
-
- <propertyfile file="${basedir}/ant/const.properties">
- <entry key="exist.home" value="${_exist.home}"/>
- </propertyfile>
-
- <antcall target="exist-main-properties"/>
- <antcall target="exist-guiclient-add-new-user"/>
- <antcall target="exist-details"/>
-
- <property file="${basedir}/ant/const.properties" />
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://${exist.hostname}:${exist.port}/${exist.contextname}/xmlrpc/db/sqlmaconfig"/>
- 
- <entry key="component.ma.xmldb.db_uri.xmlrpc"
value="xmldb:exist://${exist.hostname}:${exist.port}/${exist.contextname}/xmlrpc/db/sqlmaconfig"/>
- </propertyfile>
-
- </target>
-
-
- <target name="exist-main-properties">
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="component.ma.xmldb.db_status" value="on"/>
- <entry key="component.ma.xmldb.db_access" value="xmlrpc"/>
- 
- </propertyfile>
- </target>
-
-
- <target name="exist-guiclient-add-new-user">
- <property file="${basedir}/ant/const.properties" />
-
- <echo>Add new user in your xml database eXist.</echo>
- <echo>You can do it using client application which can be found</echo>
- <echo>in eXist installation (${exist.home}/bin/client.sh).</echo>
- <echo></echo>
- <echo>Example use:</echo>
- <echo> client.sh -s
-ouri=xmldb:exist://localhost:8585/exist/xmlrpc</echo>
- <echo> exist:/db>adduser pSservice</echo>
- <echo> password: </echo>
- <echo> re-enter password:</echo>
- <echo> home collection [none]:</echo>
- <echo> enter groups: dba</echo>
- <echo></echo>
- <echo>(user name, hostname and port number 8585 are only examples)</echo>
- <echo></echo>
- <input message="Please do it now and and make sure the xml database is
running. Press Enter when finished."/>
- </target>
-
-
- <target name="exist-details"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <echo></echo>
- <echo>Now, provide some information which will be used to initialize the
xml database eXist.</echo>
- <echo></echo>
-
- <property name="exist.default.hostname" value="localhost"/>
- <psbase:input2 message="Enter the host name of xml database eXist"
- addproperty="_exist.hostname"
- defaultvalue="${exist.default.hostname}" />
-
- <property name="exist.default.contextname" value="exist"/>
- <psbase:input2 message="Enter the context name of xml database eXist
used in URL (example of such URL: http://localhost:8080/[exist-context-name])"
- addproperty="_exist.contextname"
- defaultvalue="${exist.default.contextname}" />
-
- <property name="exist.default.port" value="8080"/>
- <psbase:input2 message="Enter the port number of xml database eXist"
- addproperty="_exist.port"
- defaultvalue="${exist.default.port}" />
- <psbase:input2 message="Enter the eXist user name you have created"
- addproperty="_exist.username"
- defaultvalue=""/>
- <psbase:input2 message="Enter the pasword for eXist user name
${_exist.username}"
- addproperty="_exist.password"
- defaultvalue=""/>
-
- <propertyfile file="${basedir}/ant/const.properties">
- <entry key="exist.hostname" value="${_exist.hostname}"/>
- <entry key="exist.port" value="${_exist.port}"/>
- <entry key="exist.contextname" value="${_exist.contextname}"/>
- </propertyfile>
-
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="component.ma.xmldb.db_username"
value="${_exist.username}"/>
- <entry key="component.ma.xmldb.db_password"
value="${_exist.password}"/>
- </propertyfile>
-
- </target>
-
-
- <target name="exist-simple-setup"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <antcall target="exist-main-properties"/>
-
- <property name="exist.default.hostname" value="localhost"/>
- <psbase:input2 message="Enter the host name of xml database eXist"
- addproperty="_exist.hostname"
- defaultvalue="${exist.default.hostname}" />
-
- <psbase:input2 message="Enter the context name of xml database eXist
used in URL (example of such URL: http://localhost:8080/[exist-context-name])"
- addproperty="_exist.contextname"
- defaultvalue="exist" />
-
- <property name="exist.default.port" value="8080"/>
- <psbase:input2 message="Enter the port number of xml database eXist"
- addproperty="_exist.port"
- defaultvalue="${exist.default.port}" />
-
- <propertyfile file="${basedir}/ant/const.properties">
- <entry key="exist.hostname" value="${_exist.hostname}"/>
- <entry key="exist.port" value="${_exist.port}"/>
- <entry key="exist.contextname" value="${_exist.contextname}"/>
- </propertyfile>
-
- <propertyfile file="${basedir}/conf/service.properties">
- <entry key="component.ma.xmldb.type" value="webapp"/>
- <entry key="component.ma.xmldb.db_uri"
value="xmldb:exist://${_exist.hostname}:${_exist.port}/${_exist.contextname}/xmlrpc/db/sqlmaconfig"/>
- 
- <entry key="component.ma.xmldb.db_uri.xmlrpc"
value="xmldb:exist://${_exist.hostname}:${_exist.port}/${_exist.contextname}/xmlrpc/db/sqlmaconfig"/>
- </propertyfile>
-
- <antcall target="exist-add-new-user"/>
-
- </target>
-
-
- 
- 
-
-
- <target name="relational-database-setup-info">
-
- <echo>This service requires access to the relational database</echo>
- <echo>(mySQL or postgeSQL but others can be used as well).</echo>
- <echo>Make sure that you have one or install it from scratch.</echo>
- <echo></echo>
- <input message="Please do it now and press Enter when finished"/>
-
- <echo>In order to maintain measurement data (utilization|L2 path
status|errors|discards)</echo>
- <echo>please, prepare your relational database.</echo>
- <echo>In case of mySQL use simple script file
mysql-sqlma-dbsetup.sql</echo>
- <echo>that you can find in conf directory (${basedir}/conf)</echo>
- <echo>of perfSONAR SQL MA installation package.</echo>
- <echo>In case of postgreSQL use psql-sqlma-dbsetup.sql. </echo>
- <echo>(Warning: remember to change the password for perfsonar_ma
user!)</echo>
- <echo></echo>
- <input message="Please do it now and press Enter when finished"/>
-
- </target>
-
-
- 
- 
-
-
- <target name="pre-install"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:template-use template-file="ant/const.properties.template"
- dest-file="ant/const.properties"/>
- <psbase:template-use template-file="conf/service.properties.template"
- dest-file="conf/service.properties"/>
-
- <property file="${basedir}/ant/const.properties"/> 
-
- <psbase:get-service-name
default-service-name="${service.name}-${version}"
- dest-config-file="ant/const.properties"/>
- <psbase:get-service-home dest-config-file="ant/const.properties"/>
- <psbase:get-tomcat dest-config-file="ant/const.properties"
-
tomcat-download-url="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=tomcat&version=6.0.7";
- tomcat-name="apache-tomcat-6.0.7"/>
- <psbase:get-server-port dest-config-file="ant/const.properties"/>
-
- <antcall target="exist-install"/>
-
- <antcall target="relational-database-setup-info"/>
-
- </target>
-
-
-</project>

Deleted: trunk/perfsonar-java-sql-ma/ant/release-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/release-targets.xml 2012-12-04 15:07:28
UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/release-targets.xml 2012-12-05 07:50:02
UTC (rev 6055)
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="release-targets"
- basedir="..">
-
-
- <target name="release-init"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:template-use template-file="ant/const.properties.template"
- dest-file="ant/const.properties"/>
- <property file="${basedir}/ant/const.properties"/>
-
- </target>
-
-
- <target name="release"
- depends="release-init,jar">
-
- <delete dir="tmp"/>
- <mkdir dir="tmp/${service.name}-${version}"/>
- <copy todir="tmp/${service.name}-${version}">
- <fileset dir="${basedir}"/>
- </copy>
-
- <delete dir="tmp/${service.name}-${version}/tmp"/>
- <delete dir="tmp/${service.name}-${version}/build/org"/>
- <delete dir="tmp/${service.name}-${version}/bin"/>
-
- <delete
file="tmp/${service.name}-${version}/conf/components.properties"/>
- <delete file="tmp/${service.name}-${version}/conf/service.properties"/>
- <delete file="tmp/${service.name}-${version}/conf/log4j.properties"/>
- <delete file="tmp/${service.name}-${version}/ant/const.properties"/>
-
- <delete>
- <fileset dir="tmp/${service.name}-${version}/conf"
includes="**/*.old"/>
- <fileset dir="tmp/${service.name}-${version}/samples/requests"
includes="**/response*.xml"/>
- </delete>
-
- <tar destfile="${service.name}-${version}.tar"
- basedir="tmp/"
- longfile="gnu"
- excludes=".svn/**"/>
-
- <delete dir="tmp"/>
-
- <gzip zipfile="${service.name}-${version}.tar.gz"
- src="${service.name}-${version}.tar"/>
-
- <delete file="${service.name}-${version}.tar"/>
-
- </target>
-
-
-</project>

Deleted: trunk/perfsonar-java-sql-ma/ant/test-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/test-targets.xml 2012-12-04 15:07:28
UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/test-targets.xml 2012-12-05 07:50:02
UTC (rev 6055)
@@ -1,474 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="test-targets"
- basedir="..">
-
-
- <path id="classpath">
- <fileset dir="${basedir}/lib/repository">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
-
- <target name="init-test">
- <property file="${basedir}/ant/const.properties"/>
- <property name="ma.local"
-
value="http://${target.server}:${target.port}/${deploy.root}/services/${wsdd.webservice.name}"/>
- </target>
-
-
- <target name="echo-test"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg value="${basedir}/samples/requests/EchoRequest.xml"/>
- <arg value="${basedir}/samples/requests/response-1.xml"/>
- </java>
- </target>
-
-
- <target name="echo-xmldb-access-test"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/EchoRequest-xmldb-access-test.xml"/>
- <arg value="${basedir}/samples/requests/response-1-xmldb-access.xml"/>
- </java>
- </target>
-
-
- <target name="echo-xmldb-content-test"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/EchoRequest-xmldb-content-test.xml"/>
- <arg value="${basedir}/samples/requests/response-1-xmldb-content.xml"/>
- </java>
- </target>
-
-
- <target name="echo-random-fetch-test"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/EchoRequest-random-fetch-test.xml"/>
- <arg value="${basedir}/samples/requests/response-1-random-fetch.xml"/>
- </java>
- </target>
-
-
- <target name="echo-self-test"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg value="${basedir}/samples/requests/EchoRequest-self-test.xml"/>
- <arg value="${basedir}/samples/requests/response-1-self-test.xml"/>
- </java>
- </target>
-
-
- <target name="lookup-info-test"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg value="${basedir}/samples/requests/LookupInfoRequest.xml"/>
- <arg value="${basedir}/samples/requests/response-2.xml"/>
- </java>
- </target>
-
-
- 
-
- <target name="util-metadata-key-fetch-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MetadataKeyRequest-Utilization-1.xml"/>
- <arg value="${basedir}/samples/requests/response-3.xml"/>
- </java>
- </target>
-
-
- <target name="util-metadata-key-fetch-test-2"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MetadataKeyRequest-Utilization-2.xml"/>
- <arg value="${basedir}/samples/requests/response-all-metadata.xml"/>
- </java>
- </target>
-
-
- <target name="util-data-fetch-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-Utilization-1.xml"/>
- <arg value="${basedir}/samples/requests/response-4.xml"/>
- </java>
- </target>
-
-
- <target name="util-data-fetch-test-2"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-Utilization-2.xml"/>
- <arg value="${basedir}/samples/requests/response-5.xml"/>
- </java>
- </target>
-
-
- <target name="util-data-fetch-test-3"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-Utilization-3.xml"/>
- <arg value="${basedir}/samples/requests/response-6.xml"/>
- </java>
- </target>
-
-
- <target name="util-data-store-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-Utilization-1.xml"/>
- <arg value="${basedir}/samples/requests/response-7.xml"/>
- </java>
- </target>
-
-
- 
-
- <target name="errors-metadata-key-fetch-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MetadataKeyRequest-Errors-1.xml"/>
- <arg value="${basedir}/samples/requests/response-8.xml"/>
- </java>
- </target>
-
-
- <target name="errors-data-fetch-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-Errors-1.xml"/>
- <arg value="${basedir}/samples/requests/response-9.xml"/>
- </java>
- </target>
-
-
- <target name="errors-data-store-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-Errors-1.xml"/>
- <arg value="${basedir}/samples/requests/response-10.xml"/>
- </java>
- </target>
-
-
- 
-
- <target name="discards-metadata-key-fetch-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MetadataKeyRequest-Discards-1.xml"/>
- <arg value="${basedir}/samples/requests/response-11.xml"/>
- </java>
- </target>
-
-
- <target name="discards-data-fetch-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-Discards-1.xml"/>
- <arg value="${basedir}/samples/requests/response-12.xml"/>
- </java>
- </target>
-
-
- <target name="discards-data-store-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-Discards-1.xml"/>
- <arg value="${basedir}/samples/requests/response-13.xml"/>
- </java>
- </target>
-
-
- 
-
- <target name="L2status-metadata-key-fetch-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MetadataKeyRequest-L2Status-1.xml"/>
- <arg value="${basedir}/samples/requests/response-14.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-metadata-key-fetch-test-2"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MetadataKeyRequest-L2Status-2.xml"/>
- <arg value="${basedir}/samples/requests/response-15.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-metadata-key-fetch-test-3"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MetadataKeyRequest-L2Status-3.xml"/>
- <arg value="${basedir}/samples/requests/response-16.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-fetch-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-1.xml"/>
- <arg value="${basedir}/samples/requests/response-17.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-fetch-test-2"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-2.xml"/>
- <arg value="${basedir}/samples/requests/response-18.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-fetch-test-3"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-3.xml"/>
- <arg value="${basedir}/samples/requests/response-19.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-fetch-test-4"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-4.xml"/>
- <arg value="${basedir}/samples/requests/response-20.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-fetch-test-5"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-5.xml"/>
- <arg value="${basedir}/samples/requests/response-21.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-fetch-test-6"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/SetupDataRequest-L2Status-6.xml"/>
- <arg value="${basedir}/samples/requests/response-22.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-store-test-1"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-1.xml"/>
- <arg value="${basedir}/samples/requests/response-23-1.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-store-test-2"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-2.xml"/>
- <arg value="${basedir}/samples/requests/response-23-2.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-store-test-3"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-3.xml"/>
- <arg value="${basedir}/samples/requests/response-23-3.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-store-test-4"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-4.xml"/>
- <arg value="${basedir}/samples/requests/response-23-4.xml"/>
- </java>
- </target>
-
-
- <target name="L2status-data-store-test-5"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/MeasurementArchiveStoreRequest-L2Status-5.xml"/>
- <arg value="${basedir}/samples/requests/response-23-5.xml"/>
- </java>
- </target>
-
-
-
- 
-
- <target name="metadata-config-replace-test"
- depends="init-test">
- <java classname="org.perfsonar.client.testHarness.SOAPClient"
- classpathref="classpath"
- fork="true">
- <arg value="${ma.local}"/>
- <arg
value="${basedir}/samples/requests/CompleteMetadataStoreRequest.xml"/>
- <arg value="${basedir}/samples/requests/response-24.xml"/>
- </java>
- </target>
-
-
- 
- 
-
-
- <target name="test">
-
- <antcall target="echo-test"/>
- <antcall target="lookup-info-test"/>
-
- <antcall target="util-metadata-key-fetch-test-1"/>
- <antcall target="util-data-fetch-test-1"/>
- <antcall target="util-data-fetch-test-2"/>
- <antcall target="util-data-fetch-test-3"/>
-
- <antcall target="errors-metadata-key-fetch-test-1"/>
- <antcall target="errors-data-fetch-test-1"/>
-
- <antcall target="discards-metadata-key-fetch-test-1"/>
- <antcall target="discards-data-fetch-test-1"/>
-
- <antcall target="L2status-metadata-key-fetch-test-1"/>
- <antcall target="L2status-metadata-key-fetch-test-2"/>
- <antcall target="L2status-metadata-key-fetch-test-3"/>
- <antcall target="L2status-data-fetch-test-1"/>
- <antcall target="L2status-data-fetch-test-2"/>
- <antcall target="L2status-data-fetch-test-3"/>
- <antcall target="L2status-data-fetch-test-4"/>
- <antcall target="L2status-data-fetch-test-5"/>
- <antcall target="L2status-data-fetch-test-6"/>
-
- </target>
-
-
-</project>

Deleted: trunk/perfsonar-java-sql-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/ant/webapp-package-targets.xml 2012-12-04
15:07:28 UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/ant/webapp-package-targets.xml 2012-12-05
07:50:02 UTC (rev 6055)
@@ -1,203 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="webapp-package-targets"
- basedir="..">
-
-
-
- <property name="tmpdir" value="tmp" />
-
-
- 
- 
-
-
- <target name="war-package-create"
- depends="webapp-package-directory-prepare">
- <zip destfile="${service.name}.war"
- basedir="${tmpdir}/"
- excludes=".svn/**" />
- <delete dir="${tmpdir}"/>
- </target>
-
-
- <target name="webapp-package-create"
- xmlns:psbase="psbase:/base.perfsonar.org"
- depends="webapp-package-directory-prepare">
- <move todir="${tmpdir}-webapps/webapps/${service.name}">
- <fileset dir="${tmpdir}"/>
- </move>
- </target>
-
-
- <target name="webapp-package-directory-prepare"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <psbase:webapp-package-directory-init-phase-1 tmpdir="${tmpdir}"/>
- <antcall target="webapp-package-directory-init-phase-2" />
- <psbase:webapp-package-directory-init-phase-3 tmpdir="${tmpdir}"
-
service.name="${service.name}"
- version="${version}"
-
wsdd.file.deploy="${wsdd.file.deploy}"
-
wsdd.file.undeploy="${wsdd.file.undeploy}"/>
-
- 
- <antcall target="webapp-package-directory-extension-init-phase" />
-
- </target>
-
-
-
- 
- 
- 
-
-
- <target name="webapp-package-directory-init-phase-2">
-
- 
-
- 
- <copy file="${basedir}/conf/service.properties.template-2"
tofile="${basedir}/conf/service.properties"/>
- <copy file="${basedir}/conf/components.properties.template"
tofile="${basedir}/conf/components.properties"/>
- <copy file="${basedir}/conf/log4j.properties.template"
tofile="${basedir}/conf/log4j.properties"/>
-
- 
- <property name="service.ma.conf_file"
value="${basedir}/conf/sql-database_TEST.xml" />
-
- 
- <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090210/perfsonar-base-1.0.20090210.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20090210/nmwg-1.0.20090210.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${tmpdir}/WEB-INF/lib"/>
-
- 
- <copy file="${basedir}/conf/eventType-map.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
- <copy file="${basedir}/conf/eventType-rules.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
- <copy file="${service.ma.conf_file}"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
-
- </target>
-
-
- <target name="webapp-package-directory-extension-init-phase">
-
- 
-
- <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
- message="${line.separator}# Group=Internal${line.separator}"
- append="true" />
- <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
- message="# Description=The path to the metadata configuration
file, including the file's name.${line.separator}"
- append="true" />
- <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
-
message="service.ma.conf_file=/opt/perfsonar/services/${service.name}/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml${line.separator}"
- append="true" />
-
- 
- <antcall target="ibatis-files-prepare"/>
-
- </target>
-
-
- 
-
- <property name="db.driver" value="com.mysql.jdbc.Driver" />
- <property name="db.url"
value="jdbc:mysql://127.0.0.1/perfsonar_ma" />
- <property name="db.username" value="perfsonar_ma" />
- <property name="db.userpassword" value="testpass" />
-
- <target name="ibatis-files-prepare">
-
- 
- <copy file="${basedir}/conf/ibatis-utilization.xml"
todir="${tmpdir}/WEB-INF/classes"/>
- <copy
file="${basedir}/conf/ibatis-SqlMapConfig-utilization.template.xml"
tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"
token="_DRIVER_" value="${db.driver}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"
token="_URL_" value="${db.url}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"
token="_USERNAME_" value="${db.username}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"
token="_PASSWORD_" value="${db.userpassword}"/>
-
- 
- <copy file="${basedir}/conf/ibatis-errors.xml"
todir="${tmpdir}/WEB-INF/classes"/>
- <copy file="${basedir}/conf/ibatis-SqlMapConfig-errors.template.xml"

tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml"/>
- <replace file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml"
token="_DRIVER_" value="${db.driver}"/>
- <replace file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml"
token="_URL_" value="${db.url}"/>
- <replace file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml"
token="_USERNAME_" value="${db.username}"/>
- <replace file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml"
token="_PASSWORD_" value="${db.userpassword}"/>
-
- 
- <copy file="${basedir}/conf/ibatis-discards.xml"
todir="${tmpdir}/WEB-INF/classes"/>
- <copy file="${basedir}/conf/ibatis-SqlMapConfig-discards.template.xml"

tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"
token="_DRIVER_" value="${db.driver}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"
token="_URL_" value="${db.url}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"
token="_USERNAME_" value="${db.username}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"
token="_PASSWORD_" value="${db.userpassword}"/>
-
- 
- <copy file="${basedir}/conf/ibatis-L2-status-domain.xml"
todir="${tmpdir}/WEB-INF/classes"/>
- <copy
file="${basedir}/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml"

tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"
token="_DRIVER_" value="${db.driver}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"
token="_URL_" value="${db.url}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"
token="_USERNAME_" value="${db.username}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"
token="_PASSWORD_" value="${db.userpassword}"/>
-
- 
- <copy file="${basedir}/conf/ibatis-L2-status-interdomain.xml"
todir="${tmpdir}/WEB-INF/classes"/>
- <copy
file="${basedir}/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml"

tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"
token="_DRIVER_" value="${db.driver}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"
token="_URL_" value="${db.url}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"
token="_USERNAME_" value="${db.username}"/>
- <replace
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"
token="_PASSWORD_" value="${db.userpassword}"/>
-
- 
- 
-
- 
- 
-
- 
- 
-
- </target>
-
-
-
-</project>
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/contrib/war-creator-script/create-war.sh
===================================================================
--- trunk/perfsonar-java-sql-ma/contrib/war-creator-script/create-war.sh
2012-12-04 15:07:28 UTC (rev 6054)
+++ trunk/perfsonar-java-sql-ma/contrib/war-creator-script/create-war.sh
2012-12-05 07:50:02 UTC (rev 6055)
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-service_name='geant2-java-sql-ma'
-
-
-mvn package
-mkdir tmp-war
-cp -R ./build/${service_name}.war ./tmp-war/
-cd tmp-war
-unzip ${service_name}.war
-rm -f ${service_name}.war
-mkdir ./WEB-INF/log
-cp -R ../samples ./WEB-INF/
-cp -R ../doc ./WEB-INF/
-find . -name "*" | awk ' $0 !~ /\.svn/ {print $0}' | zip ${service_name}.war
-@
-mv ${service_name}.war ../build/${service_name}-new.war
-cd ..
-rm -fr tmp-war
\ No newline at end of file

Deleted: trunk/perfsonar-java-sql-ma/lib/misc/ant-contrib-1.0b3.jar
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-sql-ma/lib/misc/maven-artifact-ant-2.0.4-dep.jar
===================================================================
(Binary files differ)

Deleted:
trunk/perfsonar-java-sql-ma/lib/misc/perfsonar-base-ant-1.0.20080416.jar
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar_base/ant/build.xml
===================================================================
--- trunk/perfsonar_base/ant/build.xml 2012-12-04 15:07:28 UTC (rev 6054)
+++ trunk/perfsonar_base/ant/build.xml 2012-12-05 07:50:02 UTC (rev 6055)
@@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<project name="perfsonar-base"
- basedir="..">
-
-
- <property file="${basedir}/ant/const.properties"/>
- <typedef
file="${basedir}/${src}/main/java/org/perfsonar/base/ant/antlib.xml"
- uri="psbase:/base.perfsonar.org"/>
-
-
- <target name="compile"
- xmlns:psbase="psbase:/base.perfsonar.org">
- <psbase:compile srcdir="${src}"
- dstdir="${build}"
- libdir="${replib}"/>
- </target>
-
-
- <target name="ant-jar"
- xmlns:psbase="psbase:/base.perfsonar.org">
-
- <delete dir="${basedir}/${build}"/>
- <mkdir dir="${basedir}/${build}/org/perfsonar/base/ant"/>
- <copy
file="${basedir}/${src}/main/java/org/perfsonar/base/ant/antlib.xml"
- todir="${basedir}/${build}/org/perfsonar/base/ant"/>
- <psbase:jar jarfile="${jarfilename}-ant-${version}.jar"
- dstdir="${build}"
- classdir="${build}/"/>
- </target>
-
-
- <target name="class-jar"
- depends="compile"
- xmlns:psbase="psbase:/base.perfsonar.org">
- <psbase:jar jarfile="${jarfilename}-${version}.jar"
- dstdir="${build}"
- classdir="${build}"/>
- </target>
-
-
- <target name="class-ac-jar"
- depends="compile"
- xmlns:psbase="psbase:/base.perfsonar.org">
- <jar
destfile="${basedir}/${build}/${jarfilename}-ac_authn-${version}.jar"
- basedir="${build}"
- includes="org/perfsonar/base/exceptions/**
org/perfsonar/base/auxiliary/components/authn/**
org/perfsonar/client/base/authn/**"
- excludes="org/perfsonar/client/base/authn/AuthNSAMLData.class
org/perfsonar/client/base/authn/WSSAuthNSAMLData.class
org/perfsonar/client/base/authn/edugain/**
org/perfsonar/client/base/authn/saslca/**">
- </jar>
- </target>
-
-
- <property name="maven.jar"
value="${basedir}/lib/misc/maven-artifact-ant-2.0.4-dep.jar"/>
-
- <target name="init-urnmaven">
- <path id="maven.classpath">
- <pathelement location="${maven.jar}" />
- </path>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="urn:maven-artifact-ant">
- <classpath refid="maven.classpath"/>
- </typedef>
- </target>
-
-
- <target name="init-lib-dependencies"
- depends="init-urnmaven"
- xmlns:psbase="psbase:/base.perfsonar.org">
- <psbase:init-lib-dependencies
- localRepositoryPath="lib/repository"
-
remoteRepositoryUri1="http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/";
- remoteRepositoryUri2="http://www.ibiblio.org/maven2";
-
remoteRepositoryUri3="http://shibboleth.internet2.edu/downloads/maven2/"/>
- </target>
-
-
- <target name="lib"
- depends="init-lib-dependencies"
- xmlns:artifact="urn:maven-artifact-ant"
- xmlns:psbase="psbase:/base.perfsonar.org">
- <psbase:lib-dependencies/>
-
- <artifact:dependencies>
- <dependency groupId="nmwg" artifactId="nmwg" version="1.0.20090210"/>
- <localRepository refid="local.repository"/>
- <remoteRepository refid="remote.repository"/>
- </artifact:dependencies>
-
- </target>
-
-
-</project>
\ No newline at end of file

Deleted: trunk/perfsonar_base/ant/const.properties
===================================================================
--- trunk/perfsonar_base/ant/const.properties 2012-12-04 15:07:28 UTC (rev
6054)
+++ trunk/perfsonar_base/ant/const.properties 2012-12-05 07:50:02 UTC (rev
6055)
@@ -1,16 +0,0 @@
-# $Id$
-# project: perfSONAR
-# date: 2007/06/13
-# author: romradz
-
-
-# directory containing java sources
-src=src
-# directory containing class files
-build=build
-# path of library (jar) repository
-replib=lib/repository
-# name of jar file to be created
-jarfilename=perfsonar-base
-# version of the product (will be included in the final name of jar file)
-version=1.0.20090311

Deleted: trunk/perfsonar_base/lib/misc/ant-contrib-1.0b3.jar
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar_base/lib/misc/maven-artifact-ant-2.0.4-dep.jar
===================================================================
(Binary files differ)

[pS-dev] [GEANT/SA2/ps-java-services] r6055 - in trunk: perfsonar-java-sql-ma/ant perfsonar-java-sql-ma/ant/ibatis-discards-jdbc-config perfsonar-java-sql-ma/ant/ibatis-errors-jdbc-config perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-domain-jdbc-config perfsonar-java-sql-ma/ant/ibatis-l2pathstatus-interdomain-jdbc-config perfsonar-java-sql-ma/ant/ibatis-utilization-jdbc-config perfsonar-java-sql-ma/contrib/war-creator-script perfsonar-java-sql-ma/lib/misc perfsonar_base/ant perfsonar_base/lib/misc, svn-noreply, 12/05/2012

List archive