Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4805 - in trunk/geant2-java-sql-ma: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm

Subject: perfsonar development work

List archive

perfsonar: r4805 - in trunk/geant2-java-sql-ma: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4805 - in trunk/geant2-java-sql-ma: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm
  • Date: Wed, 17 Dec 2008 05:30:26 -0500
Author: roman
Date: 2008-12-17 05:30:25 -0500 (Wed, 17 Dec 2008)
New Revision: 4805

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/axis-1.4/index.jsp
trunk/geant2-java-sql-ma/conf/service.properties
trunk/geant2-java-sql-ma/doc/ChangeLog.txt
trunk/geant2-java-sql-ma/packaging/deb/changelog
trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
trunk/geant2-java-sql-ma/pom.xml
Log:
- use of web admin lib ver. 0.9.3c
- presenting the date on web admin page updated


Modified: trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml 2008-12-16
21:45:41 UTC (rev 4804)
+++ trunk/geant2-java-sql-ma/ant/axis-deploy-targets.xml 2008-12-17
10:30:25 UTC (rev 4805)
@@ -46,7 +46,7 @@
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-web-admin/0.9.2c/perfsonar-web-admin-0.9.2c.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"/>

@@ -289,7 +289,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-web-admin/0.9.2c/perfsonar-web-admin-0.9.2c.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 2008-12-16
21:45:41 UTC (rev 4804)
+++ trunk/geant2-java-sql-ma/ant/libs-download-targets.xml 2008-12-17
10:30:25 UTC (rev 4805)
@@ -55,7 +55,7 @@
<artifact:dependencies>

<dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080902"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.2c"/>
+ <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 2008-12-16
21:45:41 UTC (rev 4804)
+++ trunk/geant2-java-sql-ma/ant/webapp-package-targets.xml 2008-12-17
10:30:25 UTC (rev 4805)
@@ -81,7 +81,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-web-admin/0.9.2c/perfsonar-web-admin-0.9.2c.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"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2-java-sql-ma/conf/axis-1.4/index.jsp
===================================================================
--- trunk/geant2-java-sql-ma/conf/axis-1.4/index.jsp 2008-12-16 21:45:41
UTC (rev 4804)
+++ trunk/geant2-java-sql-ma/conf/axis-1.4/index.jsp 2008-12-17 10:30:25
UTC (rev 4805)
@@ -53,9 +53,6 @@
</head>
<body>
<%
- java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("EEE
MMM dd HH:mm:ss zzz yyyy");
- java.util.Date now= new java.util.Date();
- java.util.Date date= dateFormat.parse(now.toString());
String confPath = "WEB-INF/classes/perfsonar/conf/";
String ServicePropertiesPath = confPath+ "service.properties";
ServletContext sc = getServletContext();

Modified: trunk/geant2-java-sql-ma/conf/service.properties
===================================================================
--- trunk/geant2-java-sql-ma/conf/service.properties 2008-12-16 21:45:41
UTC (rev 4804)
+++ trunk/geant2-java-sql-ma/conf/service.properties 2008-12-17 10:30:25
UTC (rev 4805)
@@ -104,7 +104,7 @@

# Group=LS
# Description=The version number of the service.
-service.r.service_version=2.0
+service.r.service_version=2.1

# Group=LS
# Description=The email address of the person who manages the service.

Modified: trunk/geant2-java-sql-ma/doc/ChangeLog.txt
===================================================================
--- trunk/geant2-java-sql-ma/doc/ChangeLog.txt 2008-12-16 21:45:41 UTC (rev
4804)
+++ trunk/geant2-java-sql-ma/doc/ChangeLog.txt 2008-12-17 10:30:25 UTC (rev
4805)
@@ -15,7 +15,7 @@
- Change: default value of service.r.access_point property update to service
URL
- Change: eventType Path.Status used by default in metadata configuration
file
- Change: ibatisConfig parameter in L2 CompleteMetadataStoreRequest in link
metadata is optional
-- Change: use of web admin library v0.9.2c
+- Change: use of web admin library v0.9.3c
- Change: one database table is now used for domain and interdomain links
- Change: eXist default port is 8180
- Change: use of pSbase v1.0.20080902

Modified: trunk/geant2-java-sql-ma/packaging/deb/changelog
===================================================================
--- trunk/geant2-java-sql-ma/packaging/deb/changelog 2008-12-16 21:45:41
UTC (rev 4804)
+++ trunk/geant2-java-sql-ma/packaging/deb/changelog 2008-12-17 10:30:25
UTC (rev 4805)
@@ -14,7 +14,7 @@
* Change: eXist default port is 8180
* Change: format of log messages changed
* Change: use of pSbase v1.0.20080902
- * Change: use of web admin library v0.9.2c
+ * Change: use of web admin library v0.9.3c
* Change: one database table is now used for domain and interdomain links
* Change: obsolete authRealm removed from metadata configuration file
* Fixed Bug #508: error in the SQL setup file

Modified: trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
2008-12-16 21:45:41 UTC (rev 4804)
+++ trunk/geant2-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
2008-12-17 10:30:25 UTC (rev 4805)
@@ -131,7 +131,7 @@
- Change: eXist default port is 8180
- Change: format of log messages changed
- Change: use of pSbase v1.0.20080902
-- Change: use of web admin library v0.9.2c
+- Change: use of web admin library v0.9.3c
- Change: one database table is now used for domain and interdomain links
- Change: obsolete authRealm removed from metadata configuration file
- Fixed Bug #508: error in the SQL setup file

Modified: trunk/geant2-java-sql-ma/pom.xml
===================================================================
--- trunk/geant2-java-sql-ma/pom.xml 2008-12-16 21:45:41 UTC (rev 4804)
+++ trunk/geant2-java-sql-ma/pom.xml 2008-12-17 10:30:25 UTC (rev 4805)
@@ -133,7 +133,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.2c</version>
+ <version>0.9.3c</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>


  • perfsonar: r4805 - in trunk/geant2-java-sql-ma: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm, svnlog, 12/17/2008

Archive powered by MHonArc 2.6.16.

Top of Page