Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4940 - in trunk/geant2-java-sql-ma: . ant conf

Subject: perfsonar development work

List archive

perfsonar: r4940 - in trunk/geant2-java-sql-ma: . ant conf


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4940 - in trunk/geant2-java-sql-ma: . ant conf
  • Date: Tue, 3 Feb 2009 09:21:06 -0500
Author: roman
Date: 2009-02-03 09:21:05 -0500 (Tue, 03 Feb 2009)
New Revision: 4940

Modified:
trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml
trunk/geant2-java-sql-ma/conf/service.properties
trunk/geant2-java-sql-ma/conf/wizard.properties
trunk/geant2-java-sql-ma/pom.xml
Log:
use of new version of the base (v.1.0.20090203)



Modified: trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml 2009-02-03
13:50:48 UTC (rev 4939)
+++ trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml 2009-02-03
14:21:05 UTC (rev 4940)
@@ -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.20080902/perfsonar-base-1.0.20080902.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.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.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.20080902/perfsonar-base-1.0.20080902.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.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.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2-java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/libs-download-targets.xml 2009-02-03
13:50:48 UTC (rev 4939)
+++ trunk/geant2-java-sql-ma/ant/libs-download-targets.xml 2009-02-03
14:21:05 UTC (rev 4940)
@@ -54,7 +54,7 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080902"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20090203"/>
<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.20080630"/>

Modified: trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml 2009-02-03
13:50:48 UTC (rev 4939)
+++ trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml 2009-02-03
14:21:05 UTC (rev 4940)
@@ -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.20080902/perfsonar-base-1.0.20080902.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20090203/perfsonar-base-1.0.20090203.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.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2-java-sql-ma/conf/service.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/service.properties 2009-02-03 13:50:48
UTC (rev 4939)
+++ trunk/geant2-java-sql-ma/conf/service.properties 2009-02-03 14:21:05
UTC (rev 4940)
@@ -87,7 +87,7 @@
service.r.service_type=ma

# Group=LS
-# Description=The URL address of the LS service.
+# Description=The URL address of the LS service (more LS addresses can be
separated by commas).
service.r.ls_url=http://somewhere

# Group=LS
@@ -115,8 +115,8 @@
service.r.service_description=perfSONAR service

# Group=LS
-# Description=The time (miliseconds) between register requests to the LS
service (default value is 43200000 ms; 12 hours).
-component.registrator.interval=43200000
+# Description=The time (seconds) between register requests to the LS service
(default value is 43200 secs; 12 hours).
+component.registrator.interval=43200

# Group=LS
# Description=The name of the scheduler component (the implementation of
this component must also be declared in the components.properties file).

Modified: trunk/geant2-java-sql-ma/conf/wizard.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/wizard.properties 2009-02-03 13:50:48
UTC (rev 4939)
+++ trunk/geant2-java-sql-ma/conf/wizard.properties 2009-02-03 14:21:05
UTC (rev 4940)
@@ -135,15 +135,15 @@

<property>
<entry key="service.r.ls_url" required="true">http://somewhere</entry>
- <Comment>Enter the LS URL:</Comment>
+ <Comment>Enter the LS URL (more LS addresses can be separated by
commas):</Comment>
<ProposedValue>http://somewhere</ProposedValue>
<Group order="5">LS</Group>
</property>

<property>
- <entry key="component.registrator.interval">43200000</entry>
- <Comment>Set the registration interval (milliseconds):</Comment>
- <ProposedValue>43200000</ProposedValue>
+ <entry key="component.registrator.interval">43200</entry>
+ <Comment>Set the registration interval (seconds):</Comment>
+ <ProposedValue>43200</ProposedValue>
<Group order="6">LS</Group>
</property>


Modified: trunk/geant2-java-sql-ma/pom.xml
===================================================================
--- trunk/geant2-java-sql-ma/pom.xml 2009-02-03 13:50:48 UTC (rev 4939)
+++ trunk/geant2-java-sql-ma/pom.xml 2009-02-03 14:21:05 UTC (rev 4940)
@@ -128,7 +128,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20080902</version>
+ <version>1.0.20090203</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>


  • perfsonar: r4940 - in trunk/geant2-java-sql-ma: . ant conf, svnlog, 02/03/2009

Archive powered by MHonArc 2.6.16.

Top of Page