Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4530 - 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: r4530 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4530 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm
  • Date: Mon, 22 Sep 2008 10:35:42 -0400
Author: roman
Date: 2008-09-22 10:35:41 -0400 (Mon, 22 Sep 2008)
New Revision: 4530

Added:
branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/liveclock.js
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/deb/control
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 4496:4528)



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-22 14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-22 14:35:41 UTC (rev 4530)
@@ -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.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.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.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.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-09-22 14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-09-22 14:35:41 UTC (rev 4530)
@@ -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.1b"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.6b"/>
<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-09-22 14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-09-22 14:35:41 UTC (rev 4530)
@@ -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.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.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-09-22
14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/index.jsp 2008-09-22
14:35:41 UTC (rev 4530)
@@ -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 language="javascript" src="liveclock.js"/>

<style type="text/css">
<!--
@@ -50,7 +51,7 @@
-->
</style>
</head>
- <body>
+ <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();
@@ -78,7 +79,21 @@
</td>
<td>
<table>
- <tr><td
id="date"><%=date.toString()%></td></tr>
+ <tr><td id="date">
+ <script
type="text/javascript">
+ <!--
+ // For Version 4+
browsers, write the appropriate HTML to the
+ // page for
the clock, otherwise, attempt to write a static
+ // date to the page.
+ if (ie4||ns6)
{
+ document.write('<span
id="LiveClockIE" style="width:'+mywidth+'px" ></span>'); }
+ else if (document.layers) { document.write('<ilayer
bgColor="'+myback_color+'" id="ClockPosNS" visibility="hide"><layer
width="'+mywidth+'" id="LiveClockNS"></layer></ilayer>'); }
+ else { old = "true"; show_clock(); }
+ show_clock();
+ //-->
+ </script>
+
+ </td></tr>
<tr><td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td></tr>
</table>
</td>

Copied: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/axis-1.4/liveclock.js (from
rev 4528, trunk/geant2-java-sql-ma/conf/axis-1.4/liveclock.js)

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-09-22
14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/conf/service.properties 2008-09-22
14:35:41 UTC (rev 4530)
@@ -92,7 +92,7 @@

# Group=LS
# Description=The URL address of the service configured by this
configuration file.
-service.r.access_point=http://somewhere
+service.r.access_point=http://somewhere:8180/geant2-java-sql-ma/services/MeasurementArchiveService

# Group=LS
# Description=The name of the organisation who is deploying the service.

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-09-22
14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-09-22
14:35:41 UTC (rev 4530)
@@ -1,6 +1,6 @@
Relational Database MA

-2008-08-25 Version 2.1
+2008-09-22 Version 2.1

- New: ibatisConfig parameter can be moved from store requests to
eventType-map configuration file
- New: Available as deb package
@@ -11,9 +11,10 @@
- New: CompleteMetadataStoreRequest switched off by default
- New: ISO time format supported in CompleteMetadataStoreRequest and
MeasurementArchiveStoreRequest messages
- New: parameter keyword introduced in metadata block to indicate
project/organisation name
+- 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.2b
+- Change: use of web admin library v0.9.6b
- 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-09-22
14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2008-09-22
14:35:41 UTC (rev 4530)
@@ -9,15 +9,16 @@
* New: EchoRequest message allows now checking: if eXist database is
running and the count the content of metadata configuration file; access data
from relational database. It is also possible to request a self-test
including all above.
* New: parameter keyword introduced in metadata block to indicate
project/organisation name
* New: MeasurementArchiveStoreRequest switched off by default
+ * Change: default value of service.r.access_point property update to
service URL
* 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.2b
+ * Change: use of web admin library v0.9.6b
* 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

- -- Roman Lapacz
<>
Thu, 02 Sep 2008 12:00:00 +0200
+ -- Roman Lapacz
<>
Thu, 22 Sep 2008 12:00:00 +0200

geant2-java-sql-ma (2.0-1) stable; urgency=low


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/control
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/control 2008-09-22
14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/control 2008-09-22
14:35:41 UTC (rev 4530)
@@ -7,6 +7,6 @@

Package: geant2-java-sql-ma
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5, tomcat5.5-exist
+Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5-exist
Description: perfSONAR Relational Database Service


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-09-22 14:27:50 UTC (rev 4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2008-09-22 14:35:41 UTC (rev 4530)
@@ -11,7 +11,6 @@
Group: Network/Web service
packager: Roman Lapacz
<>
URL: http://www.perfsonar.org
-Requires: tomcat5
Requires: tomcat5-exist
BuildArch: noarch
BuildRequires: maven2
@@ -113,7 +112,7 @@


%changelog
-* Tue Sep 02 2008 Roman Lapacz
<>
2.1-1
+* Tue Sep 22 2008 Roman Lapacz
<>
2.1-1
- New: ibatisConfig parameter can be moved from store requests to
eventType-map configuration file
- New: Available as deb package
- New: if 'timeValue' attribute in datum element of store request (only for
link status data) is missing then the current time is used
@@ -123,10 +122,11 @@
- New: EchoRequest message allows now checking: if eXist database is running
and the count the content of metadata configuration file; access data from
relational database. It is also possible to request a self-test including all
above.
- New: parameter keyword introduced in metadata block to indicate
project/organisation name
- New: MeasurementArchiveStoreRequest switched off by default
+- Change: default value of service.r.access_point property update to service
URL
- 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.2b
+- Change: use of web admin library v0.9.6b
- 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-09-22 14:27:50 UTC (rev
4529)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-09-22 14:35:41 UTC (rev
4530)
@@ -133,7 +133,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.1b</version>
+ <version>0.9.6b</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>


  • perfsonar: r4530 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant conf conf/axis-1.4 doc packaging/deb packaging/rpm, svnlog, 09/22/2008

Archive powered by MHonArc 2.6.16.

Top of Page