perfsonar development work

Author: mac
Date: 2008-10-23 07:32:48 -0400 (Thu, 23 Oct 2008)
New Revision: 4661

Modified:
   trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs
Log:
updated



Modified: trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs
===================================================================
--- trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs     
2008-10-23 11:25:25 UTC (rev 4660)
+++ trunk/packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs     
2008-10-23 11:32:48 UTC (rev 4661)
@@ -1,6 +1,5 @@
+%define prefix /usr/lib/perfsonar/services/%{name}
 
-%define prefix /var/lib/tomcat5/webapps/%{name}
-
 Name: geant2-java-xml-ls
 Version: 1.3
 License: Modified BSD
@@ -47,8 +46,9 @@
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/run/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/log
 
-
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}
      %{__cp} -a  %{name}-%{version}/* ${RPM_BUILD_ROOT}%{prefix}
@@ -70,8 +70,11 @@
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config 
%{_sysconfdir}/%{name}
 %{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
-#%{__ln_s} %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{name}
-%{__ln_s} %{_var}/log/tomcat5 %{_var}/log/%{name}
+%{__ln_s} %{prefix}/WEB-INF/log %{_var}/log/%{name}
+%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+
+
+
 ## restart tomcat
 /sbin/service tomcat5 restart
 
@@ -83,9 +86,8 @@
 %{__rm} -rf %{_sysconfdir}/%{name}/objects.config
 #%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
 %{__rm} -rf %{_var}/log/%{name}
+%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}
 
-
-
 %postun
 ## restart tomcat
 /sbin/service tomcat5 restart
@@ -98,6 +100,8 @@
 
 %files
 %defattr(0644,root,tomcat,0755)
+%attr(755,tomcat,tomcat) %{_var}/run/%{name}
+%attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.properties
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/objects.config
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
@@ -108,10 +112,12 @@
 /usr/share/doc/%{name}/schema
 
 
-
 %changelog
 
-* Thu Oct 1 2008 Maciej Glowiak 
<>
 1.3-1
+* Mon Oct 20 2008 Maciej Glowiak 
<>
 1.3-1
+- New: WebAdmin wizard script improvements
+- New: Support for OWAMP
+- New: Support for more eventTypes
 - New: XQuery supports 'escaped' parameter, rejects other
 - New: XQuery return eventType
 - New: LSDiscovery for hLS
@@ -121,10 +127,10 @@
 - New: Self test implemented
 - New: Packaging (DEB+RPM)
 - New: Authentication
-- Change: nmwg-jar-ver=1.0.20080911
+- Change: nmwg-jar=nmwg-1.0.20081015.jar
 - Change: ps-antxml-ver=1.0.20080204
-- Change: ps-jar-ver=1.0.200807911
-- Change: ps-webadmin=0.8.3b
+- Change: ps-jar-ver=1.0.20080924
+- Change: ps-webadmin=0.9.8b