perfsonar development work

Author: gijs
Date: 2008-05-22 08:13:09 -0400 (Thu, 22 May 2008)
New Revision: 3870

Modified:
   trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.init
   trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.specs
   
trunk/packaging/rpm/surfnet_java-flowsubscription-mp/surfnet_java-flowsubscription-mp.specs
Log:


Modified: 
trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.init
===================================================================
--- trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.init    
  2008-05-21 14:45:29 UTC (rev 3869)
+++ trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.init    
  2008-05-22 12:13:09 UTC (rev 3870)
@@ -18,7 +18,7 @@
 [ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions
 
 # pull in sysconfig settings
-[ -f /etc/sysconfig/flowsa-nfcapd ] && . /etc/sysconfig/flowsa-nfcapd
+[ -f /etc/sysconfig/surfnet_java-flowsa-ma ] && . 
/etc/sysconfig/surfnet_java-flowsa-ma
 
 
 if [[ ! -f $CONF ]]; then

Modified: 
trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.specs
===================================================================
--- trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.specs   
  2008-05-21 14:45:29 UTC (rev 3869)
+++ trunk/packaging/rpm/surfnet_java-flowsa-ma/surfnet_java-flowsa-ma.specs   
  2008-05-22 12:13:09 UTC (rev 3870)
@@ -4,13 +4,18 @@
 Version: 0.2
 License: GPL
 Release: 2
-Summary: PERFsonar flow selection and aggregation Measurement Archive
+Summary: perfSONAR flow selection and aggregation Measurement Archive
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Group: Network/Web service
 packager: Gijs Molenaar 
<>
 URL: http://www.perfsonar.org
-Requires: perfsonar-tomcat >= 6.0.16-5, nfdump >= 1.5.7-1
+Requires: tomcat5
+Requires: nfdump
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
 BuildArch: noarch
 BuildRequires: maven2
 
@@ -50,18 +55,25 @@
 popd
 
 %post
-## make symlink so service shows up in tomcat
 ## make symlink for easy access to conf
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
+/sbin/chkconfig --add %{name}
+/sbin/service tomcat5 restart
 
 %preun
-## stop service
-/etc/init.d/surfnet_java-flowsa-ma stop
-## remove symlink
-%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
+if [ "$1" = "0" ]; then
+    ## stop service
+    /sbin/service %{name} stop
+    /sbin/chkconfig --del %{name}
+    ## remove symlink
+    %{__rm} -rf %{_sysconfdir}/%{name}/*.properties
+fi
 
+%postun
+/sbin/service tomcat5 restart
 
 
+
 %clean
 # clean up the durt
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +87,7 @@
 %{prefix}
 %{_sysconfdir}/%{name}
 
+%changelog
 * Tue May 20 2008 Gijs Molenaar 
<>
 0.2-1
 - Changed to new filesystem layout
 

Modified: 
trunk/packaging/rpm/surfnet_java-flowsubscription-mp/surfnet_java-flowsubscription-mp.specs
===================================================================
--- 
trunk/packaging/rpm/surfnet_java-flowsubscription-mp/surfnet_java-flowsubscription-mp.specs
 2008-05-21 14:45:29 UTC (rev 3869)
+++ 
trunk/packaging/rpm/surfnet_java-flowsubscription-mp/surfnet_java-flowsubscription-mp.specs
 2008-05-22 12:13:09 UTC (rev 3870)
@@ -4,23 +4,28 @@
 Version: 0.1
 License: GPL
 Release: 1
-Summary: PERFsonar flow subscription Measurement Point
+Summary: perfSONAR flow subscription Measurement Point
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Group: Network/Web service
 packager: Gijs Molenaar 
<>
 URL: http://www.perfsonar.org
-Requires: perfsonar-tomcat >= 6.0.16-5, nfdump >= 1.5.7-1, zebedee
+Requires: tomcat5
+Requires: nfdump
+Requires: zebedee
 BuildArch: noarch
 BuildRequires: maven2
 
+
 %description
 TODO
 
+
 %prep
 %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
 %setup -q
 
+
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
     mvn package
@@ -35,19 +40,28 @@
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
-    %{__cp} -a  flowsama/* ${RPM_BUILD_ROOT}%{prefix}
+    %{__cp} -a  flowsubscription-mp/* ${RPM_BUILD_ROOT}%{prefix}
 popd
 
+
 %post
 ## make symlink for easy access to conf
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
+## restart tomcat
+/sbin/service tomcat5 restart
 
+
 %preun
 ## remove symlink
 %{__rm} -rf %{_sysconfdir}/%{name}/*.properties
 
 
+%postun
+## restart tomcat
+/sbin/service tomcat5 restart
 
+
+
 %clean
 # clean up the durt
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +73,7 @@
 %{_sysconfdir}/%{name}
 
 
+%changelog
 * Fri Apr 20 2008 Gijs Molenaar 
<>
 0.1-1
 - first release