Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3298 - trunk/geant2_java-rrd-ma/ant

Subject: perfsonar development work

List archive

perfsonar: r3298 - trunk/geant2_java-rrd-ma/ant


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3298 - trunk/geant2_java-rrd-ma/ant
  • Date: Mon, 4 Feb 2008 07:18:39 -0500
Author: roman
Date: 2008-02-04 07:18:38 -0500 (Mon, 04 Feb 2008)
New Revision: 3298

Modified:
trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
trunk/geant2_java-rrd-ma/ant/const.properties.template
trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
Log:

web admin stuff (downloading libraries and deploying a service with web admin
functionality) moved to the base




Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml 2008-02-04
12:07:40 UTC (rev 3297)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml 2008-02-04
12:18:38 UTC (rev 3298)
@@ -45,25 +45,9 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <!-- this will be taken to the base ant stuff-->
- <copy
file="${basedir}/lib/repository/commons-io/commons-io/1.2/commons-io-1.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-
- <copy file="${basedir}/conf/axis-1.4/main.css"
todir="${service.home}/${deploy.root}" failonerror="false" />
- <copy file="${basedir}/conf/axis-1.4/default.css"
todir="${service.home}/${deploy.root}" failonerror="false" />
- <copy file="${basedir}/conf/axis-1.4/perfsonar_logo.gif"
todir="${service.home}/${deploy.root}" failonerror="false" />
- <copy file="${basedir}/conf/axis-1.4/partners.gif"
todir="${service.home}/${deploy.root}" failonerror="false"/>
-
- <copy file="${basedir}/conf/servlet.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"
failonerror="false" />
- <copy file="${basedir}/conf/wizard.properties"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"
failonerror="false" />
- <copy file="${basedir}/conf/wizardproperties.dtd"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"
failonerror="false"/>
- <!-- end of this base section -->
-
-
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080131/perfsonar-base-1.0.20080131.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.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"/>

@@ -300,25 +284,9 @@

<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>

- <!-- this will be taken to the base ant stuff-->
- <copy
file="${basedir}/lib/repository/commons-io/commons-io/1.2/commons-io-1.2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
-
- <copy file="${basedir}/conf/axis-1.4/main.css"
todir="${tmpdir}"/>
- <copy file="${basedir}/conf/axis-1.4/default.css"
todir="${tmpdir}"/>
- <copy file="${basedir}/conf/axis-1.4/perfsonar_logo.gif"
todir="${tmpdir}"/>
- <copy file="${basedir}/conf/axis-1.4/partners.gif"
todir="${tmpdir}"/>
-
- <copy file="${basedir}/conf/servlet.properties"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
- <copy file="${basedir}/conf/wizard.properties"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
- <copy file="${basedir}/conf/wizardproperties.dtd"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
- <!-- end of this base section -->
-
-
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080131/perfsonar-base-1.0.20080131.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
todir="${tmpdir}/WEB-INF/lib"/>

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


Modified: trunk/geant2_java-rrd-ma/ant/const.properties.template
===================================================================
--- trunk/geant2_java-rrd-ma/ant/const.properties.template 2008-02-04
12:07:40 UTC (rev 3297)
+++ trunk/geant2_java-rrd-ma/ant/const.properties.template 2008-02-04
12:18:38 UTC (rev 3298)
@@ -21,7 +21,7 @@
wsdd.webservice.name=MeasurementArchiveService

antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20070927.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080204.jar

#rrdjtool native library
lib_name=libjrrd.so

Modified: trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml 2008-02-04
12:07:40 UTC (rev 3297)
+++ trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml 2008-02-04
12:18:38 UTC (rev 3298)
@@ -54,17 +54,12 @@

<artifact:dependencies>

- <dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080131"/>
- <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>
+ <dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080131"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.5b"/>
+ <dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>

- <!-- this will be taken to the base ant stuff-->
- <dependency groupId="commons-io" artifactId="commons-io"
version="1.2"/>
- <dependency groupId="commons-codec" artifactId="commons-codec"
version="1.3"/>
- <dependency groupId="commons-fileupload"
artifactId="commons-fileupload" version="1.2"/>
- <dependency groupId="perfsonar"
artifactId="perfsonar-web-admin" version="0.5b"/>

-
<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>



  • perfsonar: r3298 - trunk/geant2_java-rrd-ma/ant, svnlog, 02/04/2008

Archive powered by MHonArc 2.6.16.

Top of Page