Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3768 - in branches/GEANT2-JAVA-SQL-MA-STABLE: ant conf

Subject: perfsonar development work

List archive

perfsonar: r3768 - in branches/GEANT2-JAVA-SQL-MA-STABLE: ant conf


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3768 - in branches/GEANT2-JAVA-SQL-MA-STABLE: ant conf
  • Date: Tue, 22 Apr 2008 08:06:57 -0400
Author: roman
Date: 2008-04-22 08:06:56 -0400 (Tue, 22 Apr 2008)
New Revision: 3768

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/const.properties.template
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/conf/log4j.properties.template
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties.template-2
Log:
Changes from the rev numbers range 3747:3767 merged.



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-04-22 12:02:04 UTC (rev 3767)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-04-22 12:06:56 UTC (rev 3768)
@@ -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.20080310/perfsonar-base-1.0.20080310.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.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.20080310/perfsonar-base-1.0.20080310.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/const.properties.template
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/const.properties.template
2008-04-22 12:02:04 UTC (rev 3767)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/const.properties.template
2008-04-22 12:06:56 UTC (rev 3768)
@@ -11,7 +11,7 @@
service.name=geant2-java-sql-ma

jarfilename=perfsonar-sql-ma
-version=2.0rc8
+version=2.0rc9

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

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-04-22 12:02:04 UTC (rev 3767)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-04-22 12:06:56 UTC (rev 3768)
@@ -54,7 +54,7 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080310"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080422"/>
<dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.3b"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.0rc2"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-04-22 12:02:04 UTC (rev 3767)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-04-22 12:06:56 UTC (rev 3768)
@@ -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.20080310/perfsonar-base-1.0.20080310.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080422/perfsonar-base-1.0.20080422.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties.template
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties.template
2008-04-22 12:02:04 UTC (rev 3767)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/log4j.properties.template
2008-04-22 12:06:56 UTC (rev 3768)
@@ -5,7 +5,9 @@



-# the path of a directory which contains log files
+
+# Group=Logging
+# Description=The location of the log directory.
logDir=_LOGPATH_



Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties.template-2
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties.template-2
2008-04-22 12:02:04 UTC (rev 3767)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties.template-2
2008-04-22 12:06:56 UTC (rev 3768)
@@ -79,7 +79,7 @@
service.r.access_point=http://somewhere

# Group=LS
-# Description=The name of the organisation who who is deploying the service.
+# Description=The name of the organisation who is deploying the service.
service.r.organization_name=X

# Group=LS


  • perfsonar: r3768 - in branches/GEANT2-JAVA-SQL-MA-STABLE: ant conf, svnlog, 04/22/2008

Archive powered by MHonArc 2.6.16.

Top of Page