Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4441 - in trunk/geant2-java-rrd-ma: . ant conf

Subject: perfsonar development work

List archive

perfsonar: r4441 - in trunk/geant2-java-rrd-ma: . ant conf


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4441 - in trunk/geant2-java-rrd-ma: . ant conf
  • Date: Wed, 3 Sep 2008 05:41:35 -0400
Author: roman
Date: 2008-09-03 05:41:34 -0400 (Wed, 03 Sep 2008)
New Revision: 4441

Modified:
trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml
trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml
trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml
trunk/geant2-java-rrd-ma/conf/log4j.properties
trunk/geant2-java-rrd-ma/conf/log4j.syslog.properties
trunk/geant2-java-rrd-ma/conf/wizard.properties
trunk/geant2-java-rrd-ma/pom.xml
Log:
- new version of the base (1.0.20080902)
- new version of the web admin (0.9.1b)



Modified: trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml 2008-09-02
14:30:33 UTC (rev 4440)
+++ trunk/geant2-java-rrd-ma/ant/axis-deploy-targets.xml 2008-09-03
09:41:34 UTC (rev 4441)
@@ -46,8 +46,8 @@
depends="copy-dep-base-service-jars">

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.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-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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

@@ -246,8 +246,8 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.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"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.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-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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>


Modified: trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml 2008-09-02
14:30:33 UTC (rev 4440)
+++ trunk/geant2-java-rrd-ma/ant/libs-download-targets.xml 2008-09-03
09:41:34 UTC (rev 4441)
@@ -55,8 +55,8 @@
<artifact:dependencies>

<dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080721"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.8.3b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080902"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.1b"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>



Modified: trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml 2008-09-02
14:30:33 UTC (rev 4440)
+++ trunk/geant2-java-rrd-ma/ant/webapp-package-targets.xml 2008-09-03
09:41:34 UTC (rev 4441)
@@ -85,7 +85,7 @@
<copy file="${basedir}/${build}/${jarfilename}-${version}.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"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.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-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>

<!-- copy conf files -->

Modified: trunk/geant2-java-rrd-ma/conf/log4j.properties
===================================================================
--- trunk/geant2-java-rrd-ma/conf/log4j.properties 2008-09-02 14:30:33
UTC (rev 4440)
+++ trunk/geant2-java-rrd-ma/conf/log4j.properties 2008-09-03 09:41:34
UTC (rev 4441)
@@ -126,7 +126,7 @@
log4j.appender.warnAppender.MaxFileSize=500KB

# Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender


@@ -154,7 +154,7 @@
log4j.appender.errorAppender.MaxFileSize=500KB

# Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender


@@ -182,7 +182,7 @@
log4j.appender.fatalAppender.MaxFileSize=500KB

# Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender


@@ -210,7 +210,7 @@
log4j.appender.psRootAppender.MaxFileSize=500KB

# Group=All message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender



Modified: trunk/geant2-java-rrd-ma/conf/log4j.syslog.properties
===================================================================
--- trunk/geant2-java-rrd-ma/conf/log4j.syslog.properties 2008-09-02
14:30:33 UTC (rev 4440)
+++ trunk/geant2-java-rrd-ma/conf/log4j.syslog.properties 2008-09-03
09:41:34 UTC (rev 4441)
@@ -125,7 +125,7 @@
log4j.appender.warnAppender.MaxFileSize=500KB

# Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender


@@ -153,7 +153,7 @@
log4j.appender.errorAppender.MaxFileSize=500KB

# Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender


@@ -181,7 +181,7 @@
log4j.appender.fatalAppender.MaxFileSize=500KB

# Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender


@@ -209,7 +209,7 @@
log4j.appender.psRootAppender.MaxFileSize=500KB

# Group=All message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log
file.
log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender



Modified: trunk/geant2-java-rrd-ma/conf/wizard.properties
===================================================================
--- trunk/geant2-java-rrd-ma/conf/wizard.properties 2008-09-02 14:30:33
UTC (rev 4440)
+++ trunk/geant2-java-rrd-ma/conf/wizard.properties 2008-09-03 09:41:34
UTC (rev 4441)
@@ -29,7 +29,7 @@

<property>
<entry key="component.ma.xmldb.db_uri"
required="true">xmldb:exist://localhost:8180/exist/xmlrpc</entry>
- <Comment>Enter the location of the eXist database:</Comment>
+ <Comment>Enter the URI location of the eXist database:</Comment>
<ProposedValue>xmldb:exist://localhost:8180/exist/xmlrpc</ProposedValue>
<Group order="1">eXist</Group>
</property>
@@ -42,24 +42,26 @@
</property>

<property>
- <entry key="component.ma.xmldb.db_password" required="true"
password="true"></entry>
+ <entry key="component.ma.xmldb.db_password" required="true"
password="true">perfsonar</entry>
<Comment>Enter the password for the eXist user:</Comment>
- <ProposedValue></ProposedValue>
+ <ProposedValue>perfsonar</ProposedValue>
<Group order="3">eXist</Group>
</property>

<property>
- <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true"></entry>
- <Comment>Enter the eXist administration password:</Comment>
- <ProposedValue></ProposedValue>
- <Group order="4">eXist</Group>
+ <entry key="create_user" required="true">no</entry>
+ <Comment>Do you wish to create a user with this name?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="4" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

<property>
- <entry key="old_adminpassword" required="true"
password="true">perfsonar</entry>
- <Comment>Enter the old eXist administration password:</Comment>
- <ProposedValue>perfsonar</ProposedValue>
- <Group order="5">eXist</Group>
+ <entry key="old_adminpassword_1" required="true" password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="5" dependsOn="4">eXist</Group>
</property>

<property>
@@ -69,10 +71,39 @@
<Group order="6">eXist</Group>
</property>

+ <property>
+ <entry key="change_admin_pass" required="true">no</entry>
+ <Comment>Do you wish to change the exist Admin password?</Comment>
+ <ProposedValue>yes</ProposedValue>
+ <Group order="7" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
+ </property>

+ <property>
+ <entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="8" dependsOn="7">eXist</Group>
+ </property>

+ <property>
+ <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="7">eXist</Group>
+ </property>

+ <property>
+ <entry key="old_adminpassword" required="true" password="true" />
+ <Comment>Enter the old eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="99" dependsOn="7">eXist</Group>
+ </property>

+
+
+
<property>
<entry key="service.r.service_name" required="true">perfSONAR Java RRD
MA</entry>
<Comment>Enter the service name:</Comment>

Modified: trunk/geant2-java-rrd-ma/pom.xml
===================================================================
--- trunk/geant2-java-rrd-ma/pom.xml 2008-09-02 14:30:33 UTC (rev 4440)
+++ trunk/geant2-java-rrd-ma/pom.xml 2008-09-03 09:41:34 UTC (rev 4441)
@@ -139,12 +139,12 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20080721</version>
+ <version>1.0.20080902</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.8.3b</version>
+ <version>0.9.1b</version>
</dependency>
<dependency>
<groupId>rrdjtool</groupId>


  • perfsonar: r4441 - in trunk/geant2-java-rrd-ma: . ant conf, svnlog, 09/03/2008

Archive powered by MHonArc 2.6.16.

Top of Page