perfsonar development work

Author: gijs
Date: 2008-04-04 10:46:47 -0400 (Fri, 04 Apr 2008)
New Revision: 3619

Added:
   tags/surfnet_java-flowsa-ma-0.1/contrib/perfsonar-flow-ma.specs
Modified:
   tags/surfnet_java-flowsa-ma-0.1/contrib/flow-ma.specs
   tags/surfnet_java-flowsa-ma-0.1/pom.xml
Log:
I know, a tag shouldn't be modified, but I forgot 2 small things for this tag,
changing version ID and adding one file... 



Modified: tags/surfnet_java-flowsa-ma-0.1/contrib/flow-ma.specs
===================================================================
--- tags/surfnet_java-flowsa-ma-0.1/contrib/flow-ma.specs       2008-04-04 
14:31:07 UTC (rev 3618)
+++ tags/surfnet_java-flowsa-ma-0.1/contrib/flow-ma.specs       2008-04-04 
14:46:47 UTC (rev 3619)
@@ -1,21 +1,22 @@
-# TODO: I'm not sure about the name yet. I hate het surfnet_java-flowsa-ma 
name, 
-# and i think it isn't a valid rpm pacakge name anyway. now i have a short 
and full name.
+# TODO: I'm not sure about the name yet. I hate het surfnet_java-flowsa-ma 
name for
+# usage in dir structure, and i think it isn't a valid rpm/deb package name.
 #
 %define shortname flowsa-ma
-%define fullname perfsonar-%{shortname}
+%define fullname surfnet_java-%{shortname}
 %define appdir %{_var}/lib/tomcat5/webapps
+%define user tomcat
+%define group tomcat
 
 Name: %{fullname}
-# TODO: to be replaced with SVN tag
-Version: 0.9.1
-# TODO: what license is it anyway
-License: PERFsonar licence?
+# TODO: is it possible to replace this with SVN tag?
+Version: TRUNK
+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
-packager: Gijs Molenaar 
<>
+packager: Gijs Molenaar 
<>
 URL: http://www.perfsonar.org
 # TODO: tomcat version number?
 Requires: tomcat5, nfdump
@@ -67,12 +68,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,tomcat,0755)
-#%attr(775,root,tomcat) %dir %{appdir}/%{shortname}
+%defattr(0644,root,%{group},0755)
 %{appdir}/%{shortname}
-%attr(755,tomcat,tomcat) %{_var}/run/flowsa-nfcapd
+%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,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
+%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
 

Added: tags/surfnet_java-flowsa-ma-0.1/contrib/perfsonar-flow-ma.specs

Modified: tags/surfnet_java-flowsa-ma-0.1/pom.xml
===================================================================
--- tags/surfnet_java-flowsa-ma-0.1/pom.xml     2008-04-04 14:31:07 UTC (rev 
3618)
+++ tags/surfnet_java-flowsa-ma-0.1/pom.xml     2008-04-04 14:46:47 UTC (rev 
3619)
@@ -4,7 +4,7 @@
   <artifactId>flowsa-ma</artifactId>
   <packaging>war</packaging>
   <name>Flowsa Measurement Archive</name>
-  <version>0.9.1</version>
+  <version>0.1</version>
   <description>Flow selection and aggregation Measurement Archive for
                perfSONAR. For more information see the 
wiki-page.</description>
   
<url>http://wiki.perfsonar.net/jra1-wiki/index.php/Flow_Selection_and_Aggregation_MA</url>
@@ -225,4 +225,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
\ No newline at end of file
+</project>