Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r5103 - branches/new-structure-with-base2/ps-mdm-ls/ant

Subject: perfsonar development work

List archive

perfsonar: r5103 - branches/new-structure-with-base2/ps-mdm-ls/ant


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r5103 - branches/new-structure-with-base2/ps-mdm-ls/ant
  • Date: Thu, 23 Apr 2009 05:48:17 -0400
Author: mac
Date: 2009-04-23 05:48:17 -0400 (Thu, 23 Apr 2009)
New Revision: 5103

Modified:
branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
Log:
modified



Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml 2009-04-23
09:19:25 UTC (rev 5102)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml 2009-04-23
09:48:17 UTC (rev 5103)
@@ -1,71 +1,142 @@
-<!-- $Id: build.xml 4897 2009-01-21 14:13:05Z rodriguez $ -->
-<project name="perfsonar" basedir=".." default="info">
+<?xml version="1.0"?>

- <target name="info">
- <echo>Possible options:</echo>
- <echo>ant create.war</echo>
- <echo>ant axis2.server.deploy</echo>
- <echo>ant create.base2</echo>
+<!--
+
+ <description>
+
+ $Id$
+ project: perfSONAR
+ date: 2009/02/18
+ author: romradz
+
+ </description>
+
+-->
+
+<project name="ps-mdm-ls" basedir="..">
+
+
+
+ <!-- ======================= download.lib =================== -->
+
+
+ <taskdef resource="net/sf/antcontrib/antlib.xml"
+ uri="antlib:net.sf.antcontrib">
+ <classpath>
+ <pathelement location="lib/ant-contrib-1.0b3.jar"/>
+ </classpath>
+ </taskdef>
+
+ <property name="maven.jar"
value="${basedir}/lib/maven-artifact-ant-2.0.4-dep.jar"/>
+
+
+ <macrodef name="init-lib-dependencies-macro"
+ xmlns:artifact="urn:maven-artifact-ant">
+ <attribute name="localRepositoryPath"/>
+ <attribute name="remoteRepositoryUri1"/>
+ <attribute name="remoteRepositoryUri2"/>
+ <sequential>
+ <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>
+ <artifact:localRepository id="local.repository"
+
location="${basedir}/@{localRepositoryPath}"
+ layout="default"/>
+ <artifact:remoteRepository id="remote.repository"
+ url="@{remoteRepositoryUri1}"/>
+ <artifact:remoteRepository id="remote.repository.2"
+ url="@{remoteRepositoryUri2}"/>
+ </sequential>
+ </macrodef>
+
+
+ <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>
-

- <property name="build.dir" value="build"/>
- <property name="basejar.name" value="perfsonar-base-2.0"/>
- <property name="jar.name" value="geant-xmlls-2.0"/>
- <property name="axis.dir" value="resources/axis2-1.4.1" />
- <property name="temp" value="${build.dir}/temp" />

+ <target name="init-lib-dependencies"
+ depends="init-urnmaven">
+ <init-lib-dependencies-macro
+ localRepositoryPath="lib/repository"
+
remoteRepositoryUri1="http://anonsvn.internet2.edu/svn/perfsonar/trunk/jar-repository/";
+ remoteRepositoryUri2="http://www.ibiblio.org/maven2"/>
+ </target>


- <!-- ======================= create.service =================== -->
+ <target name="lib"
+ depends="init-lib-dependencies"
+ xmlns:artifact="urn:maven-artifact-ant">

+ <artifact:dependencies>
+ <dependency groupId="perfsonar" artifactId="ps-mdm-base2"
version="0.0.1"/>
+ <dependency groupId="commons-digester"
artifactId="commons-digester" version="2.0"/>
+ <dependency groupId="org.apache.axis2" artifactId="axis2-jaxws"
version="1.4.1"/>
+ <localRepository refid="local.repository"/>
+ <remoteRepository refid="remote.repository"/>
+ </artifact:dependencies>

+ </target>
+
+
+ <!-- ======================= create.library =================== -->
+
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+
+ <property name="jar.name" value="ps-mdm-ls"/>
+ <property name="jar.version" value="4.0"/>
+
+ <property name="config.file.name" value="configuration.xml" />
+
+
<path id="service.classpath">
- <fileset dir="${axis.dir}/lib">
+ <fileset dir="${lib.dir}">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${basedir}/lib">
- <include name="**/*.jar"/>
- </fileset>
<pathelement location="${build.dir}/classes" />
</path>


<target name="clean">
- <delete dir="${build.dir}"/>
+ <delete dir="${build.dir}/classes"/>
</target>


<target name="compile"
depends="clean">
- <mkdir dir="${build.dir}"/>
<mkdir dir="${build.dir}/classes"/>
<javac debug="on"
fork="true"
destdir="${build.dir}/classes"
srcdir="${basedir}/src"
- classpathref="service.classpath">
+ classpathref="service.classpath"
+ source="1.5"
+ target="1.5">
</javac>
</target>


- <target name="create.base2"
- depends="compile">
- <jar destfile="${build.dir}/${basejar.name}.jar">
- <fileset excludes="**/PerfsonarService.class"
dir="${build.dir}/classes"/>
- </jar>
- </target>
-
-
<target name="create.service"
- depends="create.base2">
+ depends="compile">
<copy toDir="${build.dir}/classes" failonerror="false">
<fileset dir="${basedir}/conf/axis2">
<include name="**/*.xml"/>
</fileset>
</copy>
<jar destfile="${build.dir}/${jar.name}.aar">
- <fileset includes="**/PerfsonarService.class **/*.xml"
dir="${build.dir}/classes"/>
+ <fileset includes="**/Axis2PerfsonarServiceConnPoint.class **/*.xml"
dir="${build.dir}/classes"/>
</jar>
</target>

@@ -73,6 +144,11 @@
<!-- ======================= create.war =================== -->


+ <property name="axis.dir" value="${basedir}/resources/axis2-1.4.1"/>
+ <property name="temp" value="${build.dir}/temp" />
+ <property name="war.name" value="${jar.name}"/>
+
+
<target name="init">
<mkdir dir="${temp}" />
<copy toDir="${temp}">
@@ -82,11 +158,22 @@
<exclude name="**/log4j.properties"/>
</fileset>
</copy>
+ <copy toDir="${temp}/WEB-INF/lib" flatten="true">
+ <fileset dir="${lib.dir}/repository">
+ <include name="**/*.jar" />
+ </fileset>
+ </copy>
+ <copy toDir="${temp}/WEB-INF">
+ <fileset dir="${build.dir}">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
</target>


<target name="prepare.repo"
depends="init">
+
<copy toDir="${temp}/WEB-INF">
<fileset dir="${axis.dir}/repository">
<include name="**/**" />
@@ -94,9 +181,10 @@
</copy>

<copy file="${build.dir}/${jar.name}.aar"
todir="${temp}/WEB-INF/services" />
- <copy file="${basedir}/conf/configuration-ls.xml"
tofile="${temp}/WEB-INF/classes/perfsonar/conf/configuration.xml" />
+ <copy file="${basedir}/conf/${config.file.name}"
tofile="${temp}/WEB-INF/classes/perfsonar/conf/configuration.xml" />
<copy file="${basedir}/conf/configuration-rules.xml"
todir="${temp}/WEB-INF/classes/perfsonar/conf" />
<copy file="${basedir}/conf/log4j.properties"
todir="${temp}/WEB-INF/classes" />
+ <copy file="${basedir}/conf/log4j.xml"
todir="${temp}/WEB-INF/classes" />

<path id="services.archives">
<fileset dir="${temp}/WEB-INF/services">
@@ -121,166 +209,26 @@
<mkdir dir="${temp}/WEB-INF/conf" />
<copy file="${axis.dir}/conf/axis2.xml" toDir="${temp}/WEB-INF/conf" />

- <copy
file="${basedir}/lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
todir="${temp}/WEB-INF/lib"/>
- <!-- for auth -->
- <copy
file="${basedir}/lib/repository/opensaml/opensaml1/1.1/opensaml1-1.1.jar"

todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/bouncycastle/bcprov-jdk15/124/bcprov-jdk15-124.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/xml-security/xmlsec/1.3.0/xmlsec-1.3.0.jar"

todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/edugain/edugain/0.7alpha/edugain-0.7alpha.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-authr/0.5/perfsonar-authr-0.5.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/sasl-ca/sasl-ca/1.0/sasl-ca-1.0.jar"

todir="${temp}/WEB-INF/lib"/>
- <copy file="${basedir}/lib/repository/codec/codec/1.0/codec-1.0.jar"

todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/org.slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/opensaml/opensaml/2.0-TP2-jdk-1.5/opensaml-2.0-TP2-jdk-1.5.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/xmltooling/xmltooling/1.0-TP2-jdk-1.5/xmltooling-1.0-TP2-jdk-1.5.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/wss4j/wss4j/1.5.1/wss4j-1.5.1.jar"

todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/org.apache.rampart/rampart-core/1.4/rampart-core-1.4.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"

todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/xerces/xerces-xml-apis/2.8.0/xerces-xml-apis-2.8.0.jar"
todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"

todir="${temp}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/xalan/xalan-serializer/2.7.0/xalan-serializer-2.7.0.jar"
todir="${temp}/WEB-INF/lib"/>
-
- <copy file="${basedir}/${build.dir}/${basejar.name}.jar"
todir="${temp}/WEB-INF/lib"/>
-
</target>


<target name="create.war"
depends="create.service,init,prepare.repo">
- <war destfile="${build.dir}/axis2.war"
webxml="${axis.dir}/webapp/WEB-INF/web.xml">
- <lib dir="${axis.dir}/lib">
- <include name="**" />
- <exclude name="**servlet**" />
- <exclude name="ant*.jar" />
- <exclude name="axis2-adb-codegen*.jar"/>
- <exclude name="axis2-codegen*.jar"/>
- <exclude name="jibx-bind*.jar"/>
- </lib>
+ <war destfile="${build.dir}/${war.name}.war"
webxml="${axis.dir}/webapp/WEB-INF/web.xml">
<webinf dir="${temp}/WEB-INF" />
<fileset dir="${temp}">
- <include name="${axis.dir}/webapp/axis2-web/**" />
+ <include name="axis2-web/**" />
</fileset>
</war>
<delete dir="${temp}" />
</target>


- <!-- ======================= use of built-in Axis2 service container
=================== -->
+ <!-- ======================= testing =================== -->


- <target name="axis2.server.undeploy">
+ <!-- http://localhost:8080/ps-mdm-ls/services/MeasurementArchiveService
-->

- <delete file="${axis.dir}/lib/${basejar.name}.jar"
failonerror="false"/>
- <delete file="${axis.dir}/repository/services/${jar.name}.aar"
failonerror="false"/>

- <delete file="${axis.dir}/lib/commons-digester-1.7.jar"
failonerror="false"/>
- <delete file="${axis.dir}/lib/commons-collections-3.2.jar"
failonerror="false"/>
- <delete file="${axis.dir}/lib/commons-beanutils-1.7.0.jar"
failonerror="false"/>

- <!-- for auth -->
- <delete file="${axis.dir}/lib/opensaml1-1.1.jar"

failonerror="false"/>
- <delete file="${axis.dir}/lib/bcprov-jdk15-124.jar"

failonerror="false"/>
- <delete file="${axis.dir}/lib/xmlsec-1.3.0.jar"

failonerror="false"/>
- <delete file="${axis.dir}/lib/edugain-0.7alpha.jar"

failonerror="false"/>
- <delete file="${axis.dir}/lib/perfsonar-authr-0.5.jar"

failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/sasl-ca/sasl-ca/1.0/sasl-ca-1.0.jar"
failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/codec/codec/1.0/codec-1.0.jar"

failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/org.slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/opensaml/opensaml/2.0-TP2-jdk-1.5/opensaml-2.0-TP2-jdk-1.5.jar"
failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/xmltooling/xmltooling/1.0-TP2-jdk-1.5/xmltooling-1.0-TP2-jdk-1.5.jar"
failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/wss4j/wss4j/1.5.1/wss4j-1.5.1.jar"

failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/org.apache.rampart/rampart-core/1.4/rampart-core-1.4.jar"
failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"
failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/xerces/xerces-xml-apis/2.8.0/xerces-xml-apis-2.8.0.jar"
failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"

failonerror="false"/>
- <delete
file="${axis.dir}/lib/repository/xalan/xalan-serializer/2.7.0/xalan-serializer-2.7.0.jar"
failonerror="false"/>
-
- <delete file="${axis.dir}/log4j.xml"
failonerror="false"/>
-
- <delete dir="${build.dir}/perfsonar"/>
-
- </target>
-
-
- <target name="axis2.server.deploy"
- depends="create.service, axis2.server.undeploy">
-
- <copy file="${build.dir}/${basejar.name}.jar"
todir="${axis.dir}/lib"/>
- <copy file="${build.dir}/${jar.name}.aar"
todir="${axis.dir}/repository/services"/>
-
- <copy
file="${basedir}/lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
todir="${axis.dir}/lib"/>
-
- <!-- for auth -->
- <copy
file="${basedir}/lib/repository/opensaml/opensaml1/1.1/opensaml1-1.1.jar"

todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/bouncycastle/bcprov-jdk15/124/bcprov-jdk15-124.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/xml-security/xmlsec/1.3.0/xmlsec-1.3.0.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/edugain/edugain/0.7alpha/edugain-0.7alpha.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-authr/0.5/perfsonar-authr-0.5.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/sasl-ca/sasl-ca/1.0/sasl-ca-1.0.jar"

todir="${axis.dir}/lib"/>
- <copy file="${basedir}/lib/repository/codec/codec/1.0/codec-1.0.jar"

todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/org.slf4j/slf4j-log4j12/1.0.1/slf4j-log4j12-1.0.1.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/opensaml/opensaml/2.0-TP2-jdk-1.5/opensaml-2.0-TP2-jdk-1.5.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/xmltooling/xmltooling/1.0-TP2-jdk-1.5/xmltooling-1.0-TP2-jdk-1.5.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/wss4j/wss4j/1.5.1/wss4j-1.5.1.jar"

todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/org.apache.rampart/rampart-core/1.4/rampart-core-1.4.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/xerces/xerces-xml-apis/2.8.0/xerces-xml-apis-2.8.0.jar"
todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"

todir="${axis.dir}/lib"/>
- <copy
file="${basedir}/lib/repository/xalan/xalan-serializer/2.7.0/xalan-serializer-2.7.0.jar"
todir="${axis.dir}/lib"/>
-
- <mkdir dir="${build.dir}/perfsonar" />
- <mkdir dir="${build.dir}/perfsonar/conf" />
- <copy file="${basedir}/conf/configuration-ls.xml"
tofile="${build.dir}/perfsonar/conf/configuration.xml"/>
- <copy file="${basedir}/conf/configuration-rules.xml"
todir="${build.dir}/perfsonar/conf"/>
- <!-- <copy file="${basedir}/conf/log4j.properties"
todir="${build.dir}/perfsonar/conf"/> -->
-
- <copy file="${basedir}/conf/log4j.xml" todir="${axis.dir}"/>
- <echo/>
- <echo>---------------------------------------------</echo>
- <echo/>
- <echo>!!! Make sure you have set: </echo>
- <echo> export CLASSPATH=${basedir}/build:$CLASSPATH</echo>
-
- </target>
-
-
- <!-- ======================= test client =================== -->
-
-
- <property name="target.server" value="localhost"/>
- <property name="target.port" value="8080"/>
- <property name="deploy.root" value="axis2"/>
- <property name="webservice.name" value="SimpleService"/>
-
- <property name="local.service"
-
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}";
/>
-
- <target name="run.client">
- <java classname="org.perfsonar.base2.client.TestClient"
- classpathref="service.classpath"
- fork="true">
- <arg value="${local.service}"/>
- <arg value="${basedir}/samples/requests/EchoRequest.xml"/>
- <arg value="${basedir}/samples/requests/EchoResponse.xml"/>
- </java>
- </target>
-
-
- <target name="test.digester"
- depends="compile">
- <copy file="${basedir}/conf/configuration-rules.xml"
todir="${basedir}/${build.dir}/classes/perfsonar/conf" />
- <copy file="${basedir}/conf/configuration-ls.xml"
tofile="${basedir}/${build.dir}/classes/perfsonar/conf/configuration.xml" />
- <copy file="${basedir}/conf/log4j.properties"
todir="${basedir}/${build.dir}/classes" />
-
- <java
classname="org.perfsonar.base2.service.configuration.ConfigurationManager"
- classpathref="service.classpath"
- fork="true">
- </java>
- </target>
-
-
-</project>
+</project>
\ No newline at end of file


  • perfsonar: r5103 - branches/new-structure-with-base2/ps-mdm-ls/ant, svnlog, 04/23/2009

Archive powered by MHonArc 2.6.16.

Top of Page