perfsonar development work

Author: gijs
Date: 2008-04-08 09:07:27 -0400 (Tue, 08 Apr 2008)
New Revision: 3633

Modified:
   trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma.specs
   trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma_perfsonar.specs
Log:
bug fixes



Modified: trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma.specs
===================================================================
--- trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma.specs        2008-04-08 
12:56:52 UTC (rev 3632)
+++ trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma.specs        2008-04-08 
13:07:27 UTC (rev 3633)
@@ -4,29 +4,21 @@
 %define shortname flowsa-ma
 %define fullname surfnet_java-%{shortname}
 %define appdir %{_var}/lib/tomcat5/webapps
-%define user tomcat
-%define group tomcat
 
 Name: %{fullname}
 # TODO: is it possible to replace this with SVN tag?
-Version: TRUNK
+Version: 0.1
 License: GPL
 Release: 1
 Summary: PERFsonar flow selection and aggregation Measurement Archive
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-Group: Applications/System
+Group: Network/Web service
 packager: Gijs Molenaar 
<>
 URL: http://www.perfsonar.org
-# TODO: tomcat version number?
 Requires: tomcat5, nfdump
-#TODO: more req?
-
-# TODO: is it no arch?
 BuildArch: noarch
-# TODO: version number?
 BuildRequires: maven2
-# TODO: version number?
 BuildRequires: ant
 # TODO: more buildreq?
 
@@ -36,10 +28,15 @@
 
 Complicated Tomcat service that encapulates nfdump output in XML.
 
-#%prep
-#%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
-#%setup -q
+## I prefer to svn export from svn in the BUILD dir, so we don't need 
extract from tar.gz
+##%prep
+##%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
+##%setup -q
 
+%post
+%{__ln_s} 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/service.properties 
%{_sysconfdir}/flowsa-ma/service.properties
+
+
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
     # we use maven to build our project.
@@ -53,6 +50,7 @@
 # make the directory
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{appdir}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/flowsa-ma
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{appdir}/%{shortname}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/run/flowsa-nfcapd
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d
@@ -61,18 +59,22 @@
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
     %{__mv} %{shortname}-%{version}/* ${RPM_BUILD_ROOT}%{appdir}/%{shortname}
 popd
-%{__cp} contrib/fedora-flowsa.rc 
${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/flowsa-nfcapd
 
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}
+    %{__cp} contrib/fedora-flowsa.rc 
${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/flowsa-nfcapd
+popd
+
 %clean
 # clean up the durt
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,%{group},0755)
-%{appdir}/%{shortname}
-%attr(755,%{user},%{group}) %{_var}/run/flowsa-nfcapd
+%defattr(0644,root,tomcat,0755)
+%attr(755,tomcat,tomcat) %{_var}/run/flowsa-nfcapd
 %attr(755,root,root) %{_sysconfdir}/init.d/flowsa-nfcapd
 # we don't want our properties file overwritten
-%attr(640,%{user},%{group}) %config(noreplace) 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/service.properties
-%attr(640,%{user},%{group}) %config(noreplace) 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/servlet.properties
+%attr(640,tomcat,tomcat) %config(noreplace) 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/service.properties
+%attr(640,tomcat,tomcat) %config(noreplace) 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/servlet.properties
+%{appdir}/%{shortname}
+%{_sysconfdir}/flowsa-ma
 

Modified: trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma_perfsonar.specs
===================================================================
--- trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma_perfsonar.specs      
2008-04-08 12:56:52 UTC (rev 3632)
+++ trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma_perfsonar.specs      
2008-04-08 13:07:27 UTC (rev 3633)
@@ -4,12 +4,10 @@
 %define shortname flowsa-ma
 %define fullname surfnet_java-%{shortname}
 %define appdir /home/perfsonar/webapps
-%define user perfsonar
-%define group perfsonar
 
 Name: %{fullname}
 # TODO: is it possible to replace this with SVN tag?
-Version: TRUNK
+Version: 0.1
 License: GPL
 Release: 3perfsonar
 Summary: PERFsonar flow selection and aggregation Measurement Archive
@@ -31,14 +29,17 @@
 
 Complicated Tomcat service that encapulates nfdump output in XML.
 
+## I prefer to svn export from svn in the BUILD dir, so we don't need 
extract from tar.gz
 #%prep
 #%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
 #%setup -q
 
 %post
-ln -fns /home/perfsonar/webapps/%{shortname} 
/home/perfsonar/perfsonar-tomcat/webapps/%{shortname}
+%{__ln_s} /home/perfsonar/webapps/%{shortname} 
/home/perfsonar/perfsonar-tomcat/webapps/%{shortname}
+%{__ln_s} 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/service.properties 
%{_sysconfdir}/flowsa-ma/service.properties
 
 
+
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
     # we use maven to build our project.
@@ -52,6 +53,7 @@
 # make the directory
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{appdir}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/flowsa-ma
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{appdir}/%{shortname}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/run/flowsa-nfcapd
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d
@@ -60,18 +62,22 @@
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
     %{__mv} %{shortname}-%{version}/* ${RPM_BUILD_ROOT}%{appdir}/%{shortname}
 popd
-%{__cp} contrib/fedora-flowsa.rc 
${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/flowsa-nfcapd
 
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}
+    %{__cp} contrib/fedora-flowsa.rc 
${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/flowsa-nfcapd
+popd
+
+
 %clean
 # clean up the durt
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,%{group},0755)
+%defattr(0644,root,perfsonar,0755)
+%attr(755,perfsonar,perfsonar) %{_var}/run/flowsa-nfcapd
+%attr(755,root,root) %{_sysconfdir}/init.d/flowsa-nfcapd
+%attr(640,perfsonar,perfsonar) %config(noreplace) 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/service.properties
+%attr(640,perfsonar,perfsonar) %config(noreplace) 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/servlet.properties
 %{appdir}/%{shortname}
-%attr(755,%{user},%{group}) %{_var}/run/flowsa-nfcapd
-%attr(755,root,root) %{_sysconfdir}/init.d/flowsa-nfcapd
-# we don't want our properties file overwritten
-%attr(640,%{user},%{group}) %config(noreplace) 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/service.properties
-%attr(640,%{user},%{group}) %config(noreplace) 
%{appdir}/%{shortname}/WEB-INF/classes/perfsonar/conf/servlet.properties
+%{_sysconfdir}/flowsa-ma