perfsonar development work

Author: roman
Date: 2008-09-16 08:41:33 -0400 (Tue, 16 Sep 2008)
New Revision: 4491

Modified:
   trunk/geant2-java-rrd-ma/doc/ChangeLog.txt
   trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs
Log:
see rev. number 4490



Modified: trunk/geant2-java-rrd-ma/doc/ChangeLog.txt
===================================================================
--- trunk/geant2-java-rrd-ma/doc/ChangeLog.txt  2008-09-16 10:55:31 UTC (rev 
4490)
+++ trunk/geant2-java-rrd-ma/doc/ChangeLog.txt  2008-09-16 12:41:33 UTC (rev 
4491)
@@ -1,6 +1,6 @@
 RRD MA ChangeLog
 
-2008-07-23 Version 3.1
+2008-09-03 Version 3.1
 
 - New: available as deb package
 - New: EchoRequest message allows now checking: if eXist database is running 
and the count the content of metadata configuration file; access data from 
random RRD file. It is also possible to request a self-test including all 
above.
@@ -9,7 +9,8 @@
 - New: performance improvements for MetadataKeyRequest message which fetches 
all metadata elements
 - Change: eXist default port is 8180
 - Change: format of log messages changed
-- Change: use of pSbase v1.0.20080721
+- Change: use of pSbase v1.0.20080902
+- Change: use of web admin library v0.9.2b
 - Change: obsolete authRealm removed from metadata configuration file
 - Fixed Bug #405: request for ability to define which domain is the 
interface (solved via keyword)
 

Modified: trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs
===================================================================
--- trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs     
2008-09-16 10:55:31 UTC (rev 4490)
+++ trunk/geant2-java-rrd-ma/packaging/rpm/geant2-java-rrd-ma.specs     
2008-09-16 12:41:33 UTC (rev 4491)
@@ -1,4 +1,4 @@
-%define prefix /var/lib/tomcat5/webapps/%{name}
+%define prefix /opt/perfsonar/services/%{name}
 
 Name: geant2-java-rrd-ma
 Version: 3.1
@@ -43,14 +43,12 @@
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples
-%{__install} -d -m 755 
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/metadata_conf
-%{__install} -d -m 755 
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/requests
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/rrd
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd
+%{__install} -d -m 755 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/metadata_conf
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
@@ -61,16 +59,15 @@
     %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
 popd
 
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/samples
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples
-popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
     %{__cp} -a samples/requests/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
     %{__cp} -a samples/responses/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
+    %{__cp} -a samples/rrd/* ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd
+    %{__cp} -a samples/metadata_conf/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/metadata_conf
 popd
 
-rrdtool restore  
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/rrd/test.xml 
${RPM_BUILD_ROOT}/usr/share/doc/%{name}/samples/rrd/test.rrd -f || true
+rrdtool restore ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.xml 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.rrd -f || true
 
 
 
@@ -81,6 +78,8 @@
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.rng 
%{_sysconfdir}/%{name}
 %{__ln_s} %{_var}/log/tomcat5 %{_var}/log/%{name}
+%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+
 ## restart tomcat
 /sbin/service tomcat5 restart
 
@@ -91,7 +90,9 @@
 %{__rm} -rf %{_sysconfdir}/%{name}/*.properties
 %{__rm} -rf %{_sysconfdir}/%{name}/objects.config
 %{__rm} -rf %{_sysconfdir}/%{name}/*.xml
+%{__rm} -rf %{_sysconfdir}/%{name}/*.rng
 %{__rm} -rf %{_var}/log/%{name}
+%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}
 
 
 
@@ -116,10 +117,6 @@
 %{_sysconfdir}/%{name}
 /usr/share/doc/%{name}
 /usr/share/doc/%{name}/schema
-/usr/share/doc/%{name}/samples
-/usr/share/doc/%{name}/samples/metadata_conf
-/usr/share/doc/%{name}/samples/requests
-/usr/share/doc/%{name}/samples/rrd
 
 
 
@@ -131,8 +128,10 @@
 - New: performance improvements for MetadataKeyRequest message which fetches 
all metadata elements
 - Change: format of log messages changed
 - Change: use of pSbase v1.0.20080902
-- Change: use of web admin library v0.9.1b
+- Change: use of web admin library v0.9.2b
+- Change: eXist default port is 8180
 - Change: obsolete authRealm removed from metadata configuration file
+- Fixed Bug #405: request for ability to define which domain is the 
interface (solved via keyword)
 
 * Mon Mar 10 2008 Roman Lapacz 
<>
 3.0-1
 - New: support of ErrorResponse message type (use of perfsonar-base library 
version 1.0.20080310)