perfsonar development work

Author: gijs
Date: 2008-04-22 10:28:50 -0400 (Tue, 22 Apr 2008)
New Revision: 3773

Added:
   trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.rc
Removed:
   trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma-nfcapd.rc
Modified:
   trunk/surfnet_java-flowsa-ma/conf/log4j.properties
   trunk/surfnet_java-flowsa-ma/conf/service.properties
   trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs
Log:
fixes some wrong paths

Modified: trunk/surfnet_java-flowsa-ma/conf/log4j.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/log4j.properties  2008-04-22 14:21:32 
UTC (rev 3772)
+++ trunk/surfnet_java-flowsa-ma/conf/log4j.properties  2008-04-22 14:28:50 
UTC (rev 3773)
@@ -2,14 +2,14 @@
 log4j.threshhold=DEBUG
 
 log4j.appender.rootAppender.MaxBackupIndex=10
-log4j.appender.rootAppender.File=${catalina.home}/logs/perfsonar/root.log
+log4j.appender.rootAppender.File=${catalina.home}/logs/surfnet_java-flowsa-ma-root.log
 log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.rootAppender.MaxFileSize=500KB
 log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
 
 log4j.appender.FILE=org.apache.log4j.RollingFileAppender 
-log4j.appender.FILE.File=${catalina.home}/logs/perfsonar/normal.log 
+log4j.appender.FILE.File=${catalina.home}/logs/surfnet_java-flowsa-ma.log 
 log4j.appender.FILE.MaxFileSize=10MB 
 log4j.appender.FILE.MaxBackupIndex=10 
 log4j.appender.FILE.layout=org.apache.log4j.PatternLayout 

Modified: trunk/surfnet_java-flowsa-ma/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-04-22 
14:21:32 UTC (rev 3772)
+++ trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-04-22 
14:28:50 UTC (rev 3773)
@@ -102,7 +102,7 @@
 service.ma.flowsa.nfcapd.start-processes=false
 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.run=/var/run/surfnet_java-flowsa-ma
 service.ma.flowsa.nfcapd.user=perfsonar
 service.ma.flowsa.nfcapd.group=perfsonar
 

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

Copied: trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.rc (from 
rev 3770, 
trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma-nfcapd.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 14:21:32 UTC (rev 3772)
+++ trunk/surfnet_java-flowsa-ma/contrib/surfnet_java-flowsa-ma.specs   
2008-04-22 14:28:50 UTC (rev 3773)
@@ -38,7 +38,7 @@
 %{__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}%{_var}/run/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d
 
 # copy the service content to the tomcat webapps directory
@@ -47,21 +47,21 @@
 popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    %{__cp} contrib/%{name}-nfcapd.rc 
${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}-nfcapd
+    %{__cp} contrib/%{name}.rc ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}
 popd
 
 %post
 ## make symlink so service shows up in tomcat
 %{__ln_s} %{prefix} %{base}/tomcat/webapps/%{name}
 ## make symlink for easy access to conf
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/service.properties 
%{_sysconfdir}/%{name}/service.properties
+%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
 
 %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
+%{__rm} -rf %{_sysconfdir}/%{name}/*.properties
 
 
 
@@ -71,8 +71,8 @@
 
 %files
 %defattr(0644,root,perfsonar,0755)
-%attr(755,perfsonar,perfsonar) %{_var}/run/%{name}-nfcapd
-%attr(755,root,root) %{_sysconfdir}/init.d/%{name}-nfcapd
+%attr(755,perfsonar,perfsonar) %{_var}/run/%{name}
+%attr(755,root,root) %{_sysconfdir}/init.d/%{name}
 %attr(640,perfsonar,perfsonar) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
 %attr(750,perfsonar,perfsonar)%{_localstatedir}/lib/%{name}
 %{prefix}