perfsonar development work

Author: psnc.pikusa
Date: 2010-08-27 16:10:34 +0100 (Fri, 27 Aug 2010)
New Revision: 5741

Modified:
   trunk/perfsonar-java-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
Log:
Update to version rc4

Modified: trunk/perfsonar-java-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
===================================================================
--- trunk/perfsonar-java-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs       
2010-08-27 15:01:44 UTC (rev 5740)
+++ trunk/perfsonar-java-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs       
2010-08-27 15:10:34 UTC (rev 5741)
@@ -1,18 +1,46 @@
-%define prefix /usr/lib/perfsonar/services/%{name}
-%define perfix_no_name /usr/lib/perfsonar/services/
-%define oldname geant2-java-rrd-ma
+%define prefix /usr/lib/perfsonar/services/perfsonar-java-rrd-ma
+%define prefix_no_name /usr/lib/perfsonar/services/
+%define old_name geant2-java-rrd-ma
 
+%define webapps_path /var/lib/tomcat5/webapps
+%define prefix2 /usr/lib/perfsonar/services
+
+%define stop_tomcat()\
+if [ -n "`/sbin/service tomcat5 status|grep running`" ]; then\
+    /sbin/service tomcat5 stop\
+fi\
+while [ -n "`/sbin/service tomcat5 status|grep running`" ]; do\
+    sleep 1\
+done
+
+%define restart_tomcat()\
+/sbin/service tomcat5 restart
+
+%define is_post_upgrade $1 -gt 1
+
+%define deploy_webapp %{__ln_s} -f %{prefix} %{webapps_path}/%{name}
+
+%define wait_until_webapp_undeployed while [ -e %{webapps_path}/%{name} ]; 
do sleep 1; done
+
+%define if_upgrade_deploy_webapp()\
+if [ %{is_post_upgrade} ]; then\
+    (%{wait_until_webapp_undeployed}; %{deploy_webapp}) &\
+fi
+
+
 Name: perfsonar-java-rrd-ma
 Version: 3.3
 License: Modified BSD
-Release: rc2
+Release: rc3
 Summary: perfSONAR Round Robin Database
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Group: Network/Web service
 packager: Piotr Pikusa 
<>
 URL: http://www.perfsonar.org
-Requires: tomcat5-exist
+Requires: jre >= 1.6
+Requires: tomcat5
+Requires: exist
 Requires: rrdjtool
 BuildArch: noarch
 #BuildRequires: maven2
@@ -42,6 +70,7 @@
 # make the directory
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix_no_name}%{old_name}
 %{__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
@@ -57,7 +86,7 @@
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
-    %{__cp} -a  %{name} ${RPM_BUILD_ROOT}%{perfix_no_name}
+    %{__cp} -a  %{name} ${RPM_BUILD_ROOT}%{prefix_no_name}
 popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
@@ -72,37 +101,54 @@
     %{__cp} -a samples/metadata_configuration_files/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/metadata_configuration_files
 popd
 
-rrdtool restore ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.xml 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.rrd -f || true
+# redirector servlet
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build/geant2-java-rrd-ma 
+   %{__cp} -a * ${RPM_BUILD_ROOT}%{prefix_no_name}%{old_name}
+popd
 
 
+#rrdtool restore ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.xml
+#${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/rrd/test.rrd -f || true
 
+#make links to tomcat webapps
+#%{__ln_s} -f %{_var}/lib/tomcat5/webapps/%{name} %{prefix} 
+rm -rf /var/lib/tomcat5/webapps/%{old_name} || true
+
+%pre
+%{stop_tomcat}
+
+
 %post
+%{if_upgrade_deploy_webapp}
 ## make symlink for easy access to conf
 %{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
 %{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
-%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
-rm -rf /var/lib/tomcat5/webapps/%{oldname} || true
-rm -rf %{_sysconfdir}/%{oldname} || true
-rm -rf /usr/share/doc/%{oldname} || true
+%{__ln_s} -f %{prefix_no_name}%{old_name} 
%{_var}/lib/tomcat5/webapps/%{old_name}
 
+
+rm -rf %{_sysconfdir}/%{old_name} || true
+rm -rf /usr/share/doc/%{old_name} || true
+
 ## restart tomcat
-/sbin/service tomcat5 restart
+%{restart_tomcat}
 
 
 
 %preun
 ## remove symlink
-rm -rf %{_sysconfdir}/%{name}/*.xml || true
-rm -rf %{prefix}/WEB-INF/log ||true
-rm -rf /var/log/%{name} || true
-rm -rf /var/lib/tomcat5/webapps/%{name} || true
+#rm -rf %{_sysconfdir}/%{name}/*.xml || true
+#rm -rf %{prefix}/WEB-INF/log ||true
+#rm -rf /var/log/%{name} || true
+#rm -rf /var/lib/tomcat5/webapps/%{name} || true
+%{stop_tomcat}
 
 
 
 
 %postun
 ## restart tomcat
-/sbin/service tomcat5 restart
+#/sbin/service tomcat5 restart
+%{restart_tomcat}
 
 
 
@@ -113,6 +159,10 @@
 
 
 %files
+%{prefix}
+%{prefix_no_name}%{old_name}
+#%{webapps_path}/%{name}
+#%{webapps_path}/%{old_name}
 %defattr(0644,root,tomcat,0755)
 %attr(755,tomcat,tomcat) %{_var}/run/%{name}
 %attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
@@ -120,11 +170,20 @@
 %{_sysconfdir}/%{name}
 /usr/share/doc/%{name}
 /usr/share/doc/%{name}/schema
-%{prefix}
 
 
 
+
 %changelog
+* Thu Aug 05 2010 Piotr Pikusa 
<>
 3.3-3
+- Fixed: PSSERVICES-494
+- Fixed: PSSERVICES-501
+- Fixed: PSSERVICES-469
+- New: PSSERVICES-484 - Created a migration component to rewrite the 
psbase-1 configuration files (service.properties) to psbase-2 
(configuration.xml) - 
+- New: PSSERVICES-490 - Redirector copomponent - redirect request for old 
url (genat2-java-rrd-ma) to the new one (perfsonar-java-rrd-ma)
+- Change: Updated dependency of exist package. Change from "tomcat5.5-exist" 
to "exist" which contanis exist v1.2.6
+
+
 * Tue Mar 23 2010 Piotr Pikusa 
<>
 3.3-2
 - New: Web Admin v1.0 integrated with the service
 - Change: new configuration.xml