Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4575 - in branches/GEANT2-JAVA-SQL-MA-STABLE: doc packaging/deb packaging/rpm

Subject: perfsonar development work

List archive

perfsonar: r4575 - in branches/GEANT2-JAVA-SQL-MA-STABLE: doc packaging/deb packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4575 - in branches/GEANT2-JAVA-SQL-MA-STABLE: doc packaging/deb packaging/rpm
  • Date: Wed, 1 Oct 2008 10:09:39 -0400
Author: roman
Date: 2008-10-01 10:09:39 -0400 (Wed, 01 Oct 2008)
New Revision: 4575

Modified:
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/conffiles
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/install
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/postinst
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/postrm
branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
Log:
merged with the trunk (-r 4530:4574)



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-10-01
13:59:48 UTC (rev 4574)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/doc/ChangeLog.txt 2008-10-01
14:09:39 UTC (rev 4575)
@@ -1,6 +1,6 @@
Relational Database MA

-2008-09-22 Version 2.1
+2008-10-01 Version 2.1

- New: ibatisConfig parameter can be moved from store requests to
eventType-map configuration file
- New: Available as deb package
@@ -11,6 +11,7 @@
- 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: new service path /usr/lib/perfsonar/services/geant2-java-sql-ma/
- 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

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2008-10-01
13:59:48 UTC (rev 4574)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/changelog 2008-10-01
14:09:39 UTC (rev 4575)
@@ -9,6 +9,7 @@
* 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: new service path /usr/lib/perfsonar/services/geant2-java-sql-ma/
* 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
@@ -18,7 +19,7 @@
* Change: obsolete authRealm removed from metadata configuration file
* Fixed Bug #508: error in the SQL setup file

- -- Roman Lapacz
<>
Thu, 22 Sep 2008 12:00:00 +0200
+ -- Roman Lapacz
<>
Wed, 01 Oct 2008 12:00:00 +0200

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


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/conffiles
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/conffiles 2008-10-01
13:59:48 UTC (rev 4574)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/conffiles 2008-10-01
14:09:39 UTC (rev 4575)
@@ -1,29 +1,29 @@
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/components.properties
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/eventType-map.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/eventType-rules.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/objects.config
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/wizard.properties
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/wizardproperties.dtd
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-utilization.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-discards.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-errors.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-L2-status-domain.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-L2-status-interdomain.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-clmp-bwctl.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-clmp-bwctl.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-clmp-owamp.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-clmp-owamp.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-clmp-ping.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-clmp-ping.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/web.xml
-/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/server-config.wsdd
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/components.properties
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/eventType-map.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/eventType-rules.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.properties
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/objects.config
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/service.properties
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/servlet.properties
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/sql-database_TEST.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/wizard.properties
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/wizardproperties.dtd
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-utilization.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-discards.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-errors.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-L2-status-domain.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-L2-status-interdomain.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-clmp-bwctl.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-clmp-bwctl.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-clmp-owamp.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-clmp-owamp.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-SqlMapConfig-clmp-ping.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/ibatis-clmp-ping.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/web.xml
+/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/server-config.wsdd

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/install
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/install 2008-10-01
13:59:48 UTC (rev 4574)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/install 2008-10-01
14:09:39 UTC (rev 4575)
@@ -1,6 +1,6 @@
-build/geant2-java-sql-ma/* /opt/perfsonar/services/geant2-java-sql-ma
-doc /opt/perfsonar/services/geant2-java-sql-ma/WEB-INF
-samples /opt/perfsonar/services/geant2-java-sql-ma/WEB-INF
+build/geant2-java-sql-ma/* /usr/lib/perfsonar/services/geant2-java-sql-ma
+doc /usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF
+samples /usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF




Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/postinst
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/postinst 2008-10-01
13:59:48 UTC (rev 4574)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/postinst 2008-10-01
14:09:39 UTC (rev 4575)
@@ -18,34 +18,38 @@
# the debian-policy package


+SERVICENAME="geant2-java-sql-ma"
+SERVICEPATH="/usr/lib/perfsonar/services"
+
+
case "$1" in
configure)
- if [ -h /var/lib/tomcat5.5/webapps/geant2-java-sql-ma ]
+ if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
then
- rm /var/lib/tomcat5.5/webapps/geant2-java-sql-ma
+ rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- ln -s /opt/perfsonar/services/geant2-java-sql-ma
/var/lib/tomcat5.5/webapps/geant2-java-sql-ma || true
+ ln -s $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME
|| true

- if [ -h /etc/geant2-java-sql-ma ]
+ if [ -h /etc/$SERVICENAME ]
then
- rm /etc/geant2-java-sql-ma
+ rm /etc/$SERVICENAME
fi
- ln -s
/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf
/etc/geant2-java-sql-ma || true
+ ln -s $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true

- if [ -h /var/log/geant2-java-sql-ma ]
+ if [ -h /var/log/$SERVICENAME ]
then
- rm /var/log/geant2-java-sql-ma
+ rm /var/log/$SERVICENAME
fi
- ln -s /var/log/tomcat5.5 /var/log/geant2-java-sql-ma || true
+ ln -s /var/log/tomcat5.5 /var/log/$SERVICENAME || true

- if [ -h /usr/share/doc/geant2-java-sql-ma/spec ]
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
- rm /usr/share/doc/geant2-java-sql-ma/spec
+ rm /usr/share/doc/$SERVICENAME/spec
fi
- ln -s /opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/doc
/usr/share/doc/geant2-java-sql-ma/spec || true
+ ln -s $SERVICEPATH/$SERVICENAME/WEB-INF/doc
/usr/share/doc/$SERVICENAME/spec || true


- chown -R tomcat55
/opt/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/*
+ chown -R tomcat55
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/*
/etc/init.d/tomcat5.5 restart
;;


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/postrm
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/postrm 2008-10-01
13:59:48 UTC (rev 4574)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/deb/postrm 2008-10-01
14:09:39 UTC (rev 4575)
@@ -19,23 +19,26 @@
# the debian-policy package


+SERVICENAME="geant2-java-sql-ma"
+
+
case "$1" in
purge)
- if [ -h /var/lib/tomcat5.5/webapps/geant2-java-sql-ma ]
+ if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
then
- rm /var/lib/tomcat5.5/webapps/geant2-java-sql-ma
+ rm /var/lib/tomcat5.5/webapps/$SERVICENAME
fi
- if [ -h /etc/geant2-java-sql-ma ]
+ if [ -h /etc/$SERVICENAME ]
then
- rm /etc/geant2-java-sql-ma
+ rm /etc/$SERVICENAME
fi
- if [ -h /var/log/geant2-java-sql-ma ]
+ if [ -h /var/log/$SERVICENAME ]
then
- rm /var/log/geant2-java-sql-ma
+ rm /var/log/$SERVICENAME
fi
- if [ -h /usr/share/doc/geant2-java-sql-ma/spec ]
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
then
- rm /usr/share/doc/geant2-java-sql-ma/spec
+ rm /usr/share/doc/$SERVICENAME/spec
fi
;;


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-10-01 13:59:48 UTC (rev 4574)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/packaging/rpm/geant2-java-sql-ma.specs
2008-10-01 14:09:39 UTC (rev 4575)
@@ -1,5 +1,5 @@

-%define prefix /opt/perfsonar/services/%{name}
+%define prefix /usr/lib/perfsonar/services/%{name}

Name: geant2-java-sql-ma
Version: 2.1
@@ -112,7 +112,7 @@


%changelog
-* Tue Sep 22 2008 Roman Lapacz
<>
2.1-1
+* Wed Oct 01 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
@@ -122,6 +122,7 @@
- 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: new service path /usr/lib/perfsonar/services/geant2-java-sql-ma/
- 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


  • perfsonar: r4575 - in branches/GEANT2-JAVA-SQL-MA-STABLE: doc packaging/deb packaging/rpm, svnlog, 10/01/2008

Archive powered by MHonArc 2.6.16.

Top of Page