Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4806 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm

Subject: perfsonar development work

List archive

perfsonar: r4806 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4806 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm
  • Date: Wed, 17 Dec 2008 05:37:18 -0500
Author: roman
Date: 2008-12-17 05:37:18 -0500 (Wed, 17 Dec 2008)
New Revision: 4806

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/conf/axis-1.4/index.jsp
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
Log:
merged with the trunk (-r 4771:4805)


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-12-17 10:30:25 UTC (rev 4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-12-17 10:37:18 UTC (rev 4806)
@@ -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: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-12-17 10:30:25 UTC (rev 4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-12-17 10:37:18 UTC (rev 4806)
@@ -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: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-12-17 10:30:25 UTC (rev 4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-12-17 10:37:18 UTC (rev 4806)
@@ -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: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-12-17
10:30:25 UTC (rev 4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-12-17
10:37:18 UTC (rev 4806)
@@ -6,6 +6,7 @@
<link rel="stylesheet" type="text/css" href="main.css"/>
<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
<script src="Service_Admin.js"></script>
+ <script src="liveclock.js"></script>

<style type="text/css">
<!--
@@ -52,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();
@@ -71,22 +69,29 @@
%>
<div class="adminPanel">
<div class="banner">
- <table border="0" align="left" cellpadding="0"
cellspacing="0">
- <tr>
- <td>
- <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
- </td>
- <td>
- <table>
- <tr><td
id="date"><%=date.toString()%></td></tr>
- <tr><td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td></tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
+ <table border="0" align="left" cellpadding="0" cellspacing="0">
+ <tr>
+ <td>
+ <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
+ </td>
+ <td>
+ <table>
+ <tr>
+ <td id="date">
+ <script type="text/javascript">
+ <!--
+ show_clock();
+ //-->
+ </script>
+ </td>
+ </tr>
+ <tr>
+ <td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td>
+ </tr>
+ </table>
+ </td>
</tr>
- </table>
+ </table>
</div>
<div class="mainWindow">
<div class="sidebar">

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-12-17
10:30:25 UTC (rev 4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-12-17
10:37:18 UTC (rev 4806)
@@ -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: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-12-17
10:30:25 UTC (rev 4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-12-17
10:37:18 UTC (rev 4806)
@@ -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: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2008-12-17
10:30:25 UTC (rev 4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2008-12-17
10:37:18 UTC (rev 4806)
@@ -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:
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2008-12-17 10:30:25 UTC (rev 4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2008-12-17 10:37:18 UTC (rev 4806)
@@ -67,12 +67,12 @@

%post
## make symlink for easy access to conf
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/log %{_var}/log/%{name}
-%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}

## restart tomcat
/sbin/service tomcat5 restart
@@ -81,11 +81,13 @@

%preun
## remove symlink
-%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
-%{__rm} -rf %{_sysconfdir}/%{name}/objects.config
-%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
-%{__rm} -rf %{_var}/log/%{name}
-%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}
+if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/service.properties ]; then
+ %{__rm} -rf %{_sysconfdir}/%{name}/*.properties || true
+ %{__rm} -rf %{_sysconfdir}/%{name}/objects.config || true
+ %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
+ %{__rm} -rf %{_var}/log/%{name} || true
+ %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+fi



@@ -129,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: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-12-17 10:30:25 UTC (rev
4805)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-12-17 10:37:18 UTC (rev
4806)
@@ -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: r4806 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . 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