Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4436 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant

Subject: perfsonar development work

List archive

perfsonar: r4436 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4436 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant
  • Date: Tue, 2 Sep 2008 09:03:52 -0400
Author: roman
Date: 2008-09-02 09:03:52 -0400 (Tue, 02 Sep 2008)
New Revision: 4436

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
Log:
merged with the trunk (-r 4425:4435)



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-02 12:59:13 UTC (rev 4435)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-02 13:03:52 UTC (rev 4436)
@@ -45,7 +45,7 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080901/perfsonar-base-1.0.20080901.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.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.20080630/nmwg-1.0.20080630.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
@@ -288,7 +288,7 @@

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

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080901/perfsonar-base-1.0.20080901.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.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.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-09-02 12:59:13 UTC (rev 4435)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-09-02 13:03:52 UTC (rev 4436)
@@ -54,7 +54,7 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080901"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080902"/>
<dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.1b"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.1"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-09-02 12:59:13 UTC (rev 4435)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-09-02 13:03:52 UTC (rev 4436)
@@ -80,7 +80,7 @@

<!-- copy jar files -->
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080901/perfsonar-base-1.0.20080901.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.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.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-09-02 12:59:13 UTC (rev
4435)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-09-02 13:03:52 UTC (rev
4436)
@@ -128,7 +128,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20080901</version>
+ <version>1.0.20080902</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>


  • perfsonar: r4436 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant, svnlog, 09/02/2008

Archive powered by MHonArc 2.6.16.

Top of Page