perfsonar development work

Author: nordunet.behrmann
Date: 2012-07-04 13:35:28 +0100 (Wed, 04 Jul 2012)
New Revision: 5939

Added:
   trunk/perfsonar-java-sql-ma/packaging/deb/geant2-java-sql-ma.xml
Modified:
   trunk/perfsonar-java-sql-ma/packaging/deb/control
   trunk/perfsonar-java-sql-ma/packaging/deb/install
   trunk/perfsonar-java-sql-ma/packaging/deb/postinst
Log:
perfsonar-java-sql-ma: Package for Tomcat 6 on Debian/Ubuntu

Updates the Debian packages such that the webapp is installed in Tomcat 6 
rather than Tomcat 5.5. Tomcat 5.5
is no longer supported on current releases of Debian and Ubuntu.

Modified: trunk/perfsonar-java-sql-ma/packaging/deb/control
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/deb/control   2012-07-04 12:35:27 
UTC (rev 5938)
+++ trunk/perfsonar-java-sql-ma/packaging/deb/control   2012-07-04 12:35:28 
UTC (rev 5939)
@@ -2,11 +2,11 @@
 Section: web
 Priority: extra
 Maintainer: Piotr Pikusa 
<>
-Build-Depends: debhelper (>= 5), maven2
+Build-Depends: debhelper (>= 5), maven | maven2
 Standards-Version: 3.7.2
 
 Package: perfsonar-java-sql-ma
 Architecture: all
-Depends: mysql-server, exist, java6-runtime, tomcat5.5
+Depends: mysql-server, perfsonar-exist, java6-runtime, tomcat6
 Description: perfSONAR Relational Database Service
 

Added: trunk/perfsonar-java-sql-ma/packaging/deb/geant2-java-sql-ma.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/deb/geant2-java-sql-ma.xml          
                  (rev 0)
+++ trunk/perfsonar-java-sql-ma/packaging/deb/geant2-java-sql-ma.xml    
2012-07-04 12:35:28 UTC (rev 5939)
@@ -0,0 +1 @@
+<Context path="/geant2-java-sql-ma" 
docBase="/usr/lib/perfsonar/services/geant2-java-sql-ma"/>

Modified: trunk/perfsonar-java-sql-ma/packaging/deb/install
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/deb/install   2012-07-04 12:35:27 
UTC (rev 5938)
+++ trunk/perfsonar-java-sql-ma/packaging/deb/install   2012-07-04 12:35:28 
UTC (rev 5939)
@@ -1,6 +1,7 @@
 build/geant2-java-sql-ma/* /usr/lib/perfsonar/services/geant2-java-sql-ma
-doc /usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF
+doc/* /usr/share/doc/perfsonar-java-sql-ma/spec/
 samples /usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF
+debian/geant2-java-sql-ma.xml /etc/tomcat6/Catalina/localhost/
 
 
 

Modified: trunk/perfsonar-java-sql-ma/packaging/deb/postinst
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/deb/postinst  2012-07-04 12:35:27 
UTC (rev 5938)
+++ trunk/perfsonar-java-sql-ma/packaging/deb/postinst  2012-07-04 12:35:28 
UTC (rev 5939)
@@ -24,12 +24,6 @@
 
 case "$1" in
     configure)
-    if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
-    then
-        rm /var/lib/tomcat5.5/webapps/$SERVICENAME
-    fi
-    ln -sf $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME 
|| true
-
     if [ -h /etc/$SERVICENAME ]
     then
         rm /etc/$SERVICENAME
@@ -43,16 +37,11 @@
     mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
     ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME || 
true
 
-    if [ -h /usr/share/doc/$SERVICENAME/spec ]
-    then
-        rm /usr/share/doc/$SERVICENAME/spec
-    fi
-    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc 
/usr/share/doc/$SERVICENAME/spec || true
+    ln -sf /usr/share/doc/$SERVICENAME/spec 
$SERVICEPATH/$SERVICENAME/WEB-INF/doc || true
 
+    chown -R tomcat6 $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
+    chown tomcat6 $SERVICEPATH/$SERVICENAME/WEB-INF/log
 
-    chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
-    chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
-
     #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/usr/share/tomcat5.5/common/endorsed/
     #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
     #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/usr/share/tomcat5.5/common/endorsed/
@@ -60,7 +49,7 @@
     #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/usr/share/tomcat5.5/common/endorsed/
 
 
-    /etc/init.d/tomcat5.5 restart
+    service tomcat6 restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)