perfsonar development work

Author: gijs
Date: 2008-04-23 08:04:44 -0400 (Wed, 23 Apr 2008)
New Revision: 3780

Modified:
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
   trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.rc
   trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs
Log:
- Improved default config
- Improved startup scripts
- Small bugs solved

Modified: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml  2008-04-23 
11:55:19 UTC (rev 3779)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml  2008-04-23 
12:04:44 UTC (rev 3780)
@@ -12,8 +12,7 @@
                <init-param>
                        <param-name>ips</param-name>
                        <param-value>
-                               127.0.0.1 62.131.17.150 78.27.8.39 
192.87.102.*
-                               192.87.109.* 192.87.117.*
+                               127.0.0.1 62.131.17.150 78.27.8.39 
192.87.102.* 192.87.109.* 192.87.117.*
                        </param-value>
                        <description>
                                A space separated list of ips that are 
allowed to access

Modified: trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.rc
===================================================================
--- trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.rc      
2008-04-23 11:55:19 UTC (rev 3779)
+++ trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.rc      
2008-04-23 12:04:44 UTC (rev 3780)
@@ -1,25 +1,15 @@
 #!/bin/bash
-# Start/stop the perfsonar flowsa-ma nfcapd collectors.
 #
-# $Id$
-# $Revision$
+# chkconfig: 345 91 19
+# description: Startup/Shutdown nfcapd processing for the perfSONAR \
+#               flowsa-ma service
+#
+# $Id:surfnet_java-flowsa-ma.rc 3773 2008-04-22 14:28:50Z gijs $
+# $Revision:3773 $
 
-### BEGIN INIT INFO
-# Provides:          PERFsonar flow SA MA nfcapd
-# Short-Description: PERFsonar flow selection and aggregation MA nfcapd flow 
collector 
-# Description:       This script will start the necessary nfcapd processes 
for
-#                    the perfsonar flowsa-ma service. this script will get 
the
-#                    router config from the service.properties file of the
-#                    flow-sa-ma tomcat service, so you need to edit this file
-#                    first.
-### END INIT INFO
 
-### BEGIN SCRIPT CONFIG
-#
 ## where is the service.properties file located
 CONF=/etc/surfnet_java-flowsa-ma/service.properties
-#
-### END SCRIPT CONFIG
 
 # source function library
 [ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions

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-23 11:55:19 UTC (rev 3779)
+++ trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs   
2008-04-23 12:04:44 UTC (rev 3780)
@@ -79,3 +79,12 @@
 %{_sysconfdir}/%{name}
 
 
+* Wed Apr 23 2008 Gijs Molenaar 
<>
 0.2-1
+- Improved default config
+- Improved startup scripts
+- Anonymisation enabled
+- Small bugs solved
+
+* Fri Apr 11 2008 Gijs Molenaar 
<>
 0.1-1
+- first release
+