perfsonar development work

Author: roman
Date: 2008-07-25 07:10:10 -0400 (Fri, 25 Jul 2008)
New Revision: 4298

Modified:
   trunk/packaging/rpm/geant2-java-sql-ma/geant2-java-sql-ma.specs
Log:
some small updates


Modified: trunk/packaging/rpm/geant2-java-sql-ma/geant2-java-sql-ma.specs
===================================================================
--- trunk/packaging/rpm/geant2-java-sql-ma/geant2-java-sql-ma.specs     
2008-07-25 10:27:50 UTC (rev 4297)
+++ trunk/packaging/rpm/geant2-java-sql-ma/geant2-java-sql-ma.specs     
2008-07-25 11:10:10 UTC (rev 4298)
@@ -41,18 +41,27 @@
 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}/usr/share/doc/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
 
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
     %{__cp} -a  %{name}/* ${RPM_BUILD_ROOT}%{prefix}
 popd
 
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
+    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
+popd
 
 
+
 %post
 ## make symlink for easy access to conf
 %{__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}
 ## restart tomcat
 /sbin/service tomcat5 restart
 
@@ -62,6 +71,8 @@
 ## remove symlink
 %{__rm} -rf %{_sysconfdir}/%{name}/*.properties
 %{__rm} -rf %{_sysconfdir}/%{name}/objects.config
+%{__rm} -rf %{_sysconfdir}/%{name}/*.xml
+%{__rm} -rf %{_var}/log/%{name}
 
 
 
@@ -79,13 +90,18 @@
 %defattr(0644,root,tomcat,0755)
 %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
+%attr(640,tomcat,tomcat) %config(noreplace) %{prefix}/WEB-INF/classes/*.xml
 %{prefix}
 %{_sysconfdir}/%{name}
+/usr/share/doc/%{name}
+/usr/share/doc/%{name}/schema
 
 
 
 %changelog
 * Tue Jul 17 2008 Roman Lapacz 
<>
 2.1-1
+- New: if 'timeValue' attribute in datum element of store request (only for 
link status data) is missing then the current time is used
 - New: support for CompleteMetadataStoreRequest message type which replaces 
metadata configuration content
 - New: CompleteMetadataStoreRequest switched off by default
 - New: EchoRequest message allows now checking: if eXist database is running 
and the count the content of metadata configuration file; access data from 
relational database. It is also possible to request a self-test including all 
above.