perfsonar development work

Author: dante.delvaux
Date: 2012-06-05 20:32:07 +0100 (Tue, 05 Jun 2012)
New Revision: 5931

Modified:
   branches/perfsonar-java-xml-ls-1.6-stable/packaging/debian/changelog
   
branches/perfsonar-java-xml-ls-1.6-stable/packaging/debian/perfsonar-java-xml-ls.postinst
   
branches/perfsonar-java-xml-ls-1.6-stable/packaging/rhel5/perfsonar-java-xml-ls.specs
   
branches/perfsonar-java-xml-ls-1.6-stable/packaging/rhel6/perfsonar-java-xml-ls.specs
   
branches/perfsonar-java-xml-ls-1.6-stable/src/main/resources/perfsonar/conf/webAdminConfig.xml
Log:
Correcting a Debian package configuration issue when upgrading and marking 
v1.6 as a final release.

Modified: branches/perfsonar-java-xml-ls-1.6-stable/packaging/debian/changelog
===================================================================
--- branches/perfsonar-java-xml-ls-1.6-stable/packaging/debian/changelog      
  2012-05-25 10:20:48 UTC (rev 5930)
+++ branches/perfsonar-java-xml-ls-1.6-stable/packaging/debian/changelog      
  2012-06-05 19:32:07 UTC (rev 5931)
@@ -1,11 +1,11 @@
-perfsonar-java-xml-ls (1.6-0c) stable; urgency=low
+perfsonar-java-xml-ls (1.6-1) stable; urgency=low
   
   * New: Embedded eXist DB version 1.2.6
   * Change: dependency against tomcat6
   * Change: now distributed under the GÉANT Standard Open Source Software 
Outward Licence
   * Change: lighter default logging and separated into exist.log and 
perfsonar.log
   * Fixes: PSSERVICES-572, PSSERVICES-563, PSSERVICES-558, PSSERVICES-613
- -- Antoine Delvaux 
<>
  Wed, 23 May 2012 18:30:00 +0000
+ -- Antoine Delvaux 
<>
  Tue, 05 Jun 2012 16:30:00 +0000
 
 perfsonar-java-xml-ls (1.5-1) stable; urgency=low
   

Modified: 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/debian/perfsonar-java-xml-ls.postinst
===================================================================
--- 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/debian/perfsonar-java-xml-ls.postinst
   2012-05-25 10:20:48 UTC (rev 5930)
+++ 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/debian/perfsonar-java-xml-ls.postinst
   2012-06-05 19:32:07 UTC (rev 5931)
@@ -39,8 +39,8 @@
     if [ -f /etc/default/${TOMCAT} ]
     then
         # Increase memory allocated to Tomcat JVM, the default (128m is not 
enough for eXist to work properly, see eXist site notes)
-        grep "^JAVA_OPTS=\"-Djava.awt.headless=true -Xmx128m" 
/etc/default/${TOMCAT} > /dev/null
-        if [ $? -gt 0 ]
+        COUNT=`grep -c "^JAVA_OPTS=\"-Djava.awt.headless=true -Xmx128m" 
/etc/default/${TOMCAT}` || true
+        if [ $COUNT -gt 0 ]
             then
             echo "Increasing ${TOMCAT} default memory allocation to 512m"
             sed -i 's/JAVA_OPTS="-Djava.awt.headless=true 
-Xmx128m/JAVA_OPTS="-Djava.awt.headless=true -Xmx512m/' /etc/default/${TOMCAT}

Modified: 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/rhel5/perfsonar-java-xml-ls.specs
===================================================================
--- 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/rhel5/perfsonar-java-xml-ls.specs
       2012-05-25 10:20:48 UTC (rev 5930)
+++ 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/rhel5/perfsonar-java-xml-ls.specs
       2012-06-05 19:32:07 UTC (rev 5931)
@@ -7,7 +7,7 @@
 
 Name: perfsonar-java-xml-ls
 Version: 1.6
-Release: 0c.el5_8
+Release: 1.el5_8
 Summary: perfSONAR Lookup Service
 Vendor: GÉANT
 Group: Network/Web service
@@ -158,7 +158,7 @@
 
 
 %changelog
-* Thu May 23 2012 Antoine Delvaux 
<>
 1.6-0c
+* Tue Jun 05 2012 Antoine Delvaux 
<>
 1.6-1
  - New: Embedded eXist DB version 1.2.6
  - Change: now distributed under the GÉANT Standard Open Source Software 
Outward Licence
  - Change: lighter default logging (only errors and warnings) and separated 
into exist.log and perfsonar.log

Modified: 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/rhel6/perfsonar-java-xml-ls.specs
===================================================================
--- 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/rhel6/perfsonar-java-xml-ls.specs
       2012-05-25 10:20:48 UTC (rev 5930)
+++ 
branches/perfsonar-java-xml-ls-1.6-stable/packaging/rhel6/perfsonar-java-xml-ls.specs
       2012-06-05 19:32:07 UTC (rev 5931)
@@ -6,7 +6,7 @@
 
 Name: perfsonar-java-xml-ls
 Version: 1.6
-Release: 0c.el6_2
+Release: 1.el6_2
 Summary: perfSONAR Lookup Service
 Vendor: GÉANT
 Group: Network/Web service
@@ -152,7 +152,7 @@
 
 
 %changelog
-* Thu May 23 2012 Antoine Delvaux 
<>
 1.6-0c
+* Tue Jun 05 2012 Antoine Delvaux 
<>
 1.6-1
  - New: Ported to RHEL6 and Tomcat6
  - New: Embedded eXist DB version 1.2.6
  - Change: now distributed under the GÉANT Standard Open Source Software 
Outward Licence

Modified: 
branches/perfsonar-java-xml-ls-1.6-stable/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
--- 
branches/perfsonar-java-xml-ls-1.6-stable/src/main/resources/perfsonar/conf/webAdminConfig.xml
      2012-05-25 10:20:48 UTC (rev 5930)
+++ 
branches/perfsonar-java-xml-ls-1.6-stable/src/main/resources/perfsonar/conf/webAdminConfig.xml
      2012-06-05 19:32:07 UTC (rev 5931)
@@ -7,7 +7,7 @@
        <wa:serviceInformation>
                
<wa:accessPoint>http://localhost:%PORT%/perfsonar-java-xml-ls/services/LookupService</wa:accessPoint>
                <wa:serviceName>Lookup service</wa:serviceName>
-               <wa:version>1.6 beta</wa:version>
+               <wa:version>1.6</wa:version>
        </wa:serviceInformation>
        
        <!-- credential for WA -->