perfsonar development work

Author: gijs
Date: 2008-05-02 09:25:40 -0400 (Fri, 02 May 2008)
New Revision: 3808

Modified:
   trunk/packaging/deb/perfsonar-tomcat/debian/changelog
   trunk/packaging/deb/perfsonar-tomcat/debian/conffiles
   trunk/packaging/deb/perfsonar-tomcat/debian/control
   trunk/packaging/deb/perfsonar-tomcat/debian/files
   trunk/packaging/deb/perfsonar-tomcat/debian/init
   trunk/packaging/deb/perfsonar-tomcat/debian/install
   trunk/packaging/deb/perfsonar-tomcat/debian/postinst
   trunk/packaging/deb/perfsonar-tomcat/debian/postrm
Log:


Modified: trunk/packaging/deb/perfsonar-tomcat/debian/changelog
===================================================================
--- trunk/packaging/deb/perfsonar-tomcat/debian/changelog       2008-05-02 
13:24:53 UTC (rev 3807)
+++ trunk/packaging/deb/perfsonar-tomcat/debian/changelog       2008-05-02 
13:25:40 UTC (rev 3808)
@@ -1,3 +1,12 @@
+perfsonar-tomcat (6.0.16-2) unstable; urgency=low
+
+  * changed java dependecy to sun-java5-jre so this is correclty satisfied in
+    debian
+  * readded startpage to satisfy loukik
+  * swapped config location back to /opt/perfsonar/tomcat/conf
+
+ -- Gijs Molenaar 
<>
  Fri, 02 May 2008 13:50:21 +0200
+
 perfsonar-tomcat (6.0.16-1) unstable; urgency=low
 
   * Initial release
@@ -2,3 +11,2 @@
 
- -- Gijs Molenaar 
<>
  Thu, 24 Apr 2008 11:11:23 +0200
-
+ -- Gijs Molenaar 
<gijs@gijs-desktop>
  Fri, 02 May 2008 13:49:54 +0200

Modified: trunk/packaging/deb/perfsonar-tomcat/debian/conffiles
===================================================================
--- trunk/packaging/deb/perfsonar-tomcat/debian/conffiles       2008-05-02 
13:24:53 UTC (rev 3807)
+++ trunk/packaging/deb/perfsonar-tomcat/debian/conffiles       2008-05-02 
13:25:40 UTC (rev 3808)
@@ -1,7 +1,7 @@
-/etc/perfsonar-tomcat/catalina.policy
-/etc/perfsonar-tomcat/catalina.properties
-/etc/perfsonar-tomcat/context.xml
-/etc/perfsonar-tomcat/logging.properties
-/etc/perfsonar-tomcat/server.xml
-/etc/perfsonar-tomcat/tomcat-users.xml
-/etc/perfsonar-tomcat/web.xml
+/opt/perfsonar/tomcat/conf/catalina.policy
+/opt/perfsonar/tomcat/conf/catalina.properties
+/opt/perfsonar/tomcat/conf/context.xml
+/opt/perfsonar/tomcat/conf/logging.properties
+/opt/perfsonar/tomcat/conf/server.xml
+/opt/perfsonar/tomcat/conf/tomcat-users.xml
+/opt/perfsonar/tomcat/conf/web.xml

Modified: trunk/packaging/deb/perfsonar-tomcat/debian/control
===================================================================
--- trunk/packaging/deb/perfsonar-tomcat/debian/control 2008-05-02 13:24:53 
UTC (rev 3807)
+++ trunk/packaging/deb/perfsonar-tomcat/debian/control 2008-05-02 13:25:40 
UTC (rev 3808)
@@ -8,7 +8,7 @@
 
 Package: perfsonar-tomcat
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, jsvc, java5-runtime | 
java6-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, jsvc, java-virtual-machine
 Description: Servlet and JSP engine perfSONAR edition
  Apache Tomcat is the reference implementation for the Java Servlet
  and JavaServer Pages technologies. this is the perfSONAR version

Modified: trunk/packaging/deb/perfsonar-tomcat/debian/files
===================================================================
--- trunk/packaging/deb/perfsonar-tomcat/debian/files   2008-05-02 13:24:53 
UTC (rev 3807)
+++ trunk/packaging/deb/perfsonar-tomcat/debian/files   2008-05-02 13:25:40 
UTC (rev 3808)
@@ -1 +1 @@
-perfsonar-tomcat_6.0.16-1_all.deb web optional
+perfsonar-tomcat_6.0.16-2_all.deb web optional

Modified: trunk/packaging/deb/perfsonar-tomcat/debian/init
===================================================================
--- trunk/packaging/deb/perfsonar-tomcat/debian/init    2008-05-02 13:24:53 
UTC (rev 3807)
+++ trunk/packaging/deb/perfsonar-tomcat/debian/init    2008-05-02 13:25:40 
UTC (rev 3808)
@@ -54,12 +54,12 @@
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do
     if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
-       JAVA_HOME_TMP="$jdir"
-       # checks for a real JDK like environment, needed to check if 
-       # really the java-gcj-compat-dev package is installed
-       if [ -r "$jdir/bin/jdb" ]; then
-           JAVA_HOME="$JAVA_HOME_TMP"
-       fi
+         JAVA_HOME="$jdir"
+        #JAVA_HOME_TMP="$jdir"
+        # checks for a real JDK like environment, needed to check if 
+        # really the java-gcj-compat-dev package is installed
+        #if [ -r "$jdir/bin/jdb" ]; then
+       #    JAVA_HOME="$JAVA_HOME_TMP"
     fi
 done
 export JAVA_HOME

Modified: trunk/packaging/deb/perfsonar-tomcat/debian/install
===================================================================
--- trunk/packaging/deb/perfsonar-tomcat/debian/install 2008-05-02 13:24:53 
UTC (rev 3807)
+++ trunk/packaging/deb/perfsonar-tomcat/debian/install 2008-05-02 13:25:40 
UTC (rev 3808)
@@ -1,4 +1,5 @@
-conf/* /etc/perfsonar-tomcat
+conf/* /opt/perfsonar/tomcat/conf
 bin/*.jar /opt/perfsonar/tomcat/bin
 lib/* /opt/perfsonar/tomcat/lib
 webapps/manager /opt/perfsonar/tomcat/webapps
+webapps/ROOT /opt/perfsonar/tomcat/webapps

Modified: trunk/packaging/deb/perfsonar-tomcat/debian/postinst
===================================================================
--- trunk/packaging/deb/perfsonar-tomcat/debian/postinst        2008-05-02 
13:24:53 UTC (rev 3807)
+++ trunk/packaging/deb/perfsonar-tomcat/debian/postinst        2008-05-02 
13:25:40 UTC (rev 3808)
@@ -28,11 +28,11 @@
     fi
 
 
-    chown -R root:perfsonar $PREFIX/logs $PREFIX/temp /etc/perfsonar-tomcat/*
-    chmod 640 /etc/perfsonar-tomcat/*
+    chown -R root:perfsonar $PREFIX/logs $PREFIX/temp $PREFIX/conf/*
+    chmod 640 $PREFIX/conf/*
     chmod 770 $PREFIX/logs $PREFIX/temp
 
-    ln -sf /etc/perfsonar-tomcat/* $PREFIX/conf || true
+    ln -sf $PREFIX/conf/* /etc/perfsonar-tomcat || true
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/packaging/deb/perfsonar-tomcat/debian/postrm
===================================================================
--- trunk/packaging/deb/perfsonar-tomcat/debian/postrm  2008-05-02 13:24:53 
UTC (rev 3807)
+++ trunk/packaging/deb/perfsonar-tomcat/debian/postrm  2008-05-02 13:25:40 
UTC (rev 3808)
@@ -23,7 +23,7 @@
 case "$1" in
     purge)
     userdel perfsonar || true
-    rm $PREFIX/conf/*
+    rm /etc/perfsonar-tomcat/*
     rm -rf $PREFIX/temp/* $PREFIX/logs/* $PREFIX/work/*
     ;;