svn commit: r1582265 - in /tomee/tomee/trunk/tomee/tomee-deb/src/main: groovy/org/apache/tomee/deb/PackageBuilder.groovy resources/control/postinst.sh resources/control/postrm.sh resources/init/tomee.sh

[tv...@apache.org]

Author: tveronezi
Date: Thu Mar 27 11:23:57 2014
New Revision: 1582265

URL: http://svn.apache.org/r1582265
Log:
using update-alternatives

Modified:
    tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
    tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh
    tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh
    tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee.sh

Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy?rev=1582265&r1=1582264&r2=1582265&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy Thu Mar 27 11:23:57 2014
@@ -100,7 +100,25 @@ class PackageBuilder {
                 tomeeVersion: properties.tomeeVersion,
                 inMB        : installedSize.longValue()
         ])
-        writeTemplate(new File(controlDir, 'postinst'), '/control/postinst.sh', [tomeeVersion: properties.tomeeVersion, classifier: classifier])
+        def priority
+        switch (classifier) {
+            case 'plus':
+                priority = 4
+                break
+            case 'plume':
+                priority = 3
+                break
+            case 'jaxrs':
+                priority = 2
+                break
+            default:
+                priority = 1
+        }
+        writeTemplate(new File(controlDir, 'postinst'), '/control/postinst.sh', [
+                tomeeVersion: properties.tomeeVersion,
+                classifier  : classifier,
+                priority    : priority
+        ])
         writeTemplate(new File(controlDir, 'prerm'), '/control/prerm.sh', [tomeeVersion: properties.tomeeVersion, classifier: classifier])
         writeTemplate(new File(controlDir, 'postrm'), '/control/postrm.sh', [tomeeVersion: properties.tomeeVersion, classifier: classifier])
         new File(controlDir, 'conffiles').withWriter { BufferedWriter out ->

Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh?rev=1582265&r1=1582264&r2=1582265&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postinst.sh Thu Mar 27 11:23:57 2014
@@ -13,4 +13,7 @@ chmod -R g+w /var/log/tomee/${classifier
 chmod -R g+w /var/lib/tomee/${classifier}/${tomeeVersion}
 
 update-rc.d tomee-${classifier} defaults
+
+update-alternatives --install /etc/init.d/tomee tomee /etc/init.d/tomee-${classifier} ${priority}
+
 echo "Reboot your machine or run 'service tomee-${classifier} start' to start the Apache TomEE ${classifier} server (version: ${tomeeVersion})"
\ No newline at end of file

Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh?rev=1582265&r1=1582264&r2=1582265&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh Thu Mar 27 11:23:57 2014
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-update-rc.d -f tomee-${classifier} remove
\ No newline at end of file
+update-rc.d -f tomee-${classifier} remove
+update-alternatives --remove tomee /etc/init.d/tomee-${classifier}
\ No newline at end of file

Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee.sh
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee.sh?rev=1582265&r1=1582264&r2=1582265&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee.sh (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee.sh Thu Mar 27 11:23:57 2014
@@ -13,13 +13,13 @@ export CATALINA_BASE=/var/lib/tomee/${cl
 TOMEE_USER=apachetomee
 
 start(){
-   echo "Starting TomEE (\$TOMEE_CLASSIFIER \$TOMEE_VERSION): "
+   echo "Starting TomEE ${classifier} (version ${tomeeVersion}): "
    su - \$TOMEE_USER --preserve-environment -c "\$TOMEE_HOME/bin/catalina.sh start"
    return \$?
 }
 
 stop(){
-   echo "Shutting down TomEE (\$TOMEE_CLASSIFIER \$TOMEE_VERSION): "
+   echo "Shutting down TomEE ${classifier} (version ${tomeeVersion}): "
    su - \$TOMEE_USER --preserve-environment -c "\$TOMEE_HOME/bin/shutdown.sh -force"
    return \$?
 }
@@ -35,8 +35,11 @@ case \$1 in
       stop
       start
       ;;
+   version)
+      echo "TomEE ${classifier} (version ${tomeeVersion})"
+      ;;
    *)
-      echo \$"Usage: \$0 {start|stop|restart}"
+      echo \$"Usage: \$0 {start|stop|restart|version}"
       exit 1
       ;;
 esac