perfsonar development work

Author: melis
Date: 2008-10-13 10:45:56 -0400 (Mon, 13 Oct 2008)
New Revision: 4615

Modified:
   trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
   trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles
   trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs
   trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
   trunk/geant2_java-sshtelnet-mp/packaging/deb/install
   trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst
   trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
   trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs
Log:
forgot to update the packaging configuration files

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2008-10-13 
14:42:43 UTC (rev 4614)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2008-10-13 
14:45:56 UTC (rev 4615)
@@ -1,3 +1,13 @@
+ps-mdm-sshtelnet-mp (1.3.4RC3) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.6b
+  * Changed LS registration rating to 90000ms
+  * Fixed paths for logging
+  * Fixed bug in self-test
+
+ -- Stijn Melis 
<>
  Mon, 13 Oct 2008 11:40:09 +0200
+
 ps-mdm-sshtelnet-mp (1.3.4RC2) unstable; urgency=low
 
   * ps-base version: 1.0.20080902

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles      2008-10-13 
14:42:43 UTC (rev 4614)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/conffiles      2008-10-13 
14:45:56 UTC (rev 4615)
@@ -1,9 +1,6 @@
 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/components.properties
 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/service.properties
 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/servlet.properties
 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/wizard.properties
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
 /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/web.xml

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs   2008-10-13 14:42:43 
UTC (rev 4614)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs   2008-10-13 14:45:56 
UTC (rev 4615)
@@ -1,2 +1,3 @@
 /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
 /etc/ps-mdm-sshtelnet-mp
+/var/lib/ps-mdm-sshtelnet-mp
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2008-10-13 14:42:43 
UTC (rev 4614)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2008-10-13 14:45:56 
UTC (rev 4615)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4RC2/doc/*
\ No newline at end of file
+ps-mdm-sshtelnet-mp-1.3.4RC3/doc/*
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/install
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2008-10-13 
14:42:43 UTC (rev 4614)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2008-10-13 
14:45:56 UTC (rev 4615)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4RC2/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
+ps-mdm-sshtelnet-mp-1.3.4RC3/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst       2008-10-13 
14:42:43 UTC (rev 4614)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst       2008-10-13 
14:45:56 UTC (rev 4615)
@@ -20,7 +20,7 @@
 
 case "$1" in
     configure)
-    ln -sf /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp 
/var/lib/tomcat5.5/webapps/ps-mdm-sshtelnet-mp
+       ln -sf /usr/lib/perfsonar/services/$SERVICE 
/var/lib/tomcat5.5/webapps/$SERVICE
     ln -sf 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
 /etc/ps-mdm-sshtelnet-mp || true
     chown tomcat55 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
     /etc/init.d/tomcat5.5 restart

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2008-10-13 14:42:43 
UTC (rev 4614)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2008-10-13 14:45:56 
UTC (rev 4615)
@@ -17,7 +17,7 @@
 
 build-stamp: configure-stamp 
        dh_testdir
-       ant -f ps-mdm-sshtelnet-mp-1.3.4RC2/ant/build.xml 
webapp-package-create
+       ant -f ps-mdm-sshtelnet-mp-1.3.4RC3/ant/build.xml 
webapp-package-create
 
        touch $@
 

Modified: 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs    
  2008-10-13 14:42:43 UTC (rev 4614)
+++ trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs    
  2008-10-13 14:45:56 UTC (rev 4615)
@@ -6,7 +6,7 @@
 Name: ps-mdm-sshtelnet-mp
 
 # Version of the microrelease
-Version: 1.3.4RC2
+Version: 1.3.4RC3
 License: GPL
 
 # Package version. Increment if you create a new package of same microrelease
@@ -91,7 +91,7 @@
 %{__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} /var/lib/tomcat5/webapps/%{name}
+%{__ln_sf} %{prefix} /var/lib/tomcat5/webapps/%{name}
 %{__ln_s} %{_var}/log/tomcat5 %{_var}/log/%{name}
 ## restart tomcat
 /sbin/service tomcat5 restart
@@ -134,6 +134,13 @@
 
 
 %changelog
+* Mon Oct 13 2008 Stijn Melis 
<>
 1.3.4RC3
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.6b
+- Changed LS registration rating to 90000ms
+- Fixed paths for logging
+- Fixed bug in self-test
+
 * Tue Sep 30 2008 Stijn Melis 
<>
 1.3.4RC2
 - ps-base version: 1.0.20080902
 - web-admin version: 0.9.6b