perfsonar development work

Author: gijs
Date: 2008-04-22 09:54:51 -0400 (Tue, 22 Apr 2008)
New Revision: 3770

Added:
   trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma-nfcapd.rc
Removed:
   trunk/surfnet_java-flowsa-ma/contrib/fedora-flowsa.rc
   trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma.specs
Modified:
   trunk/surfnet_java-flowsa-ma/conf/service.properties
   trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs
Log:
prepare for 0.2 release

Modified: trunk/surfnet_java-flowsa-ma/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-04-22 
12:09:13 UTC (rev 3769)
+++ trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-04-22 
13:54:51 UTC (rev 3770)
@@ -91,7 +91,7 @@
 # nfdump.source - location of nfcapd files
 # nfdump.location - the location of the nfdump executable (including nfdump 
filename)
 # nfdump.outputreader - fully qualified name of the class used for output 
reading (expects a class implementing NfdumpOutputReader)
-service.ma.flowsa.nfdump.source=/usr/local/var/nfdump/flows/
+service.ma.flowsa.nfdump.source=/var/lib/surfnet_java-flowsa-ma
 service.ma.flowsa.nfdump.location=/usr/bin/nfdump
 
service.ma.flowsa.nfdump.ouputreader=org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory
 
@@ -103,8 +103,8 @@
 service.ma.flowsa.nfcapd.interval=5
 service.ma.flowsa.nfcapd.location=/usr/bin/nfcapd
 service.ma.flowsa.nfcapd.run=/var/run/flowsa-nfcapd
-service.ma.flowsa.nfcapd.user=tomcat
-service.ma.flowsa.nfcapd.group=tomcat
+service.ma.flowsa.nfcapd.user=perfsonar
+service.ma.flowsa.nfcapd.group=perfsonar
 
 # === Logger properties === 
 service.log.log4j.config=/perfsonar/conf/log4j.properties
@@ -120,4 +120,5 @@
 #=== Authentication ===
 service.as.authn_active=off
 service.as.authn_for_msg_types=SetupDataRequest
-service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService
\ No newline at end of file
+service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService
+

Deleted: trunk/surfnet_java-flowsa-ma/contrib/fedora-flowsa.rc

Deleted: trunk/surfnet_java-flowsa-ma/contrib/flowsa-ma.specs

Copied: trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma-nfcapd.rc 
(from rev 3769, trunk/surfnet_java-flowsa-ma/contrib/fedora-flowsa.rc)

Modified: trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs
===================================================================
--- trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs   
2008-04-22 12:09:13 UTC (rev 3769)
+++ trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs   
2008-04-22 13:54:51 UTC (rev 3770)
@@ -2,7 +2,7 @@
 %define prefix %{base}/services/%{name}
 
 Name: surfnet_java-flowsa-ma
-Version: 0.1
+Version: 0.2
 License: GPL
 Release: 3
 Summary: PERFsonar flow selection and aggregation Measurement Archive
@@ -11,24 +11,23 @@
 Group: Network/Web service
 packager: Gijs Molenaar 
<>
 URL: http://www.perfsonar.org
-Requires: perfsonar-tomcat, nfdump
+Requires: perfsonar-tomcat >= 6.0.16-5, nfdump >= 1.5.7-1
 BuildArch: noarch
 BuildRequires: maven2
 
 %description
-PEFsonar flow selection and aggregation Measurement Archive
+The Flow Selection and Aggregation MA acts as a perfSONAR interface wrapper
+around the functionality of the flow capturing and processing tool, nfdump.
+This makes it possible to perform remote flow selection and aggregation 
requests
+on historic flow data stored on the MA. The MA is accompanied by a 
ready-to-use
+plugin for perfsonarUI that gives access to all available functionality. 
 
-Complicated Tomcat service that encapulates nfdump output in XML.
-
 %prep
 %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
 %setup -q
 
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    # we use maven to build our project.
-    # This will download the nessasary dependesies from the perfsonar repos.
-    # maybe this is fragile, but it works the most flexible.
     mvn package
 popd
 
@@ -38,6 +37,7 @@
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_localstatedir}/lib/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/run/%{name}-nfcapd
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d
 
@@ -47,7 +47,7 @@
 popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    %{__cp} contrib/fedora-flowsa.rc 
${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}-nfcapd
+    %{__cp} contrib/%{name}-nfcapd.rc 
${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}-nfcapd
 popd
 
 %post
@@ -57,6 +57,8 @@
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/service.properties 
%{_sysconfdir}/%{name}/service.properties
 
 %preun
+## stop service
+/etc/init.d/surfnet_java-flowsa-ma-nfcapd stop
 ## remove symlink
 %{__rm} -rf %{base}/tomcat/webapps/%{name}
 %{__rm} -rf %{_sysconfdir}/%{name}/service.properties
@@ -72,6 +74,8 @@
 %attr(755,perfsonar,perfsonar) %{_var}/run/%{name}-nfcapd
 %attr(755,root,root) %{_sysconfdir}/init.d/%{name}-nfcapd
 %attr(640,perfsonar,perfsonar) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
+%attr(750,perfsonar,perfsonar)%{_localstatedir}/lib/%{name}
 %{prefix}
 %{_sysconfdir}/%{name}
 
+