You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/03/26 23:57:07 UTC

svn commit: r1582107 - in /tomee/tomee/trunk/tomee/tomee-deb: ./ src/main/groovy/org/apache/tomee/deb/ src/main/resources/control/ src/main/resources/init/

Author: tveronezi
Date: Wed Mar 26 22:57:06 2014
New Revision: 1582107

URL: http://svn.apache.org/r1582107
Log:
-a debian package for every type of tomee 
-the debian package should be named as tomee-${classifier} otherwise "apt-get" wouldn't be able to update it to a eventual newer version of the app

Modified:
    tomee/tomee/trunk/tomee/tomee-deb/pom.xml
    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/control.template
    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/control/prerm.sh
    tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh
    tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee.sh

Modified: tomee/tomee/trunk/tomee/tomee-deb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/pom.xml?rev=1582107&r1=1582106&r2=1582107&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/pom.xml Wed Mar 26 22:57:06 2014
@@ -63,6 +63,38 @@
       <artifactId>commons-codec</artifactId>
       <version>${commons.codec}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>apache-tomee</artifactId>
+      <version>${project.version}</version>
+      <classifier>plus</classifier>
+      <type>zip</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>apache-tomee</artifactId>
+      <version>${project.version}</version>
+      <classifier>jaxrs</classifier>
+      <type>zip</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>apache-tomee</artifactId>
+      <version>${project.version}</version>
+      <classifier>webprofile</classifier>
+      <type>zip</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>apache-tomee</artifactId>
+      <version>${project.version}</version>
+      <classifier>plume</classifier>
+      <type>zip</type>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -86,7 +118,34 @@
                   <classifier>plus</classifier>
                   <type>zip</type>
                   <outputDirectory>${distribution.workdir}</outputDirectory>
-                  <destFileName>tomee.zip</destFileName>
+                  <destFileName>tomee-plus.zip</destFileName>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>apache-tomee</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>jaxrs</classifier>
+                  <type>zip</type>
+                  <outputDirectory>${distribution.workdir}</outputDirectory>
+                  <destFileName>tomee-jaxrs.zip</destFileName>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>apache-tomee</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>webprofile</classifier>
+                  <type>zip</type>
+                  <outputDirectory>${distribution.workdir}</outputDirectory>
+                  <destFileName>tomee-webprofile.zip</destFileName>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>apache-tomee</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>plume</classifier>
+                  <type>zip</type>
+                  <outputDirectory>${distribution.workdir}</outputDirectory>
+                  <destFileName>tomee-plume.zip</destFileName>
                 </artifactItem>
               </artifactItems>
             </configuration>
@@ -122,7 +181,11 @@
                 <buildDir>${project.build.directory}</buildDir>
               </properties>
               <source>
-                new org.apache.tomee.deb.PackageBuilder(properties: properties).createPackage()
+                def builder = new org.apache.tomee.deb.PackageBuilder(properties: properties)
+                builder.createPackage('plus', 'tomee-plus.zip')
+                builder.createPackage('jaxrs', 'tomee-jaxrs.zip')
+                builder.createPackage('webprofile', 'tomee-webprofile.zip')
+                builder.createPackage('plume', 'tomee-plume.zip')
               </source>
             </configuration>
           </execution>
@@ -142,8 +205,24 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>${project.build.directory}/apache-tomee-${project.version}.deb</file>
+                  <file>${project.build.directory}/apache-tomee-plus-${project.version}.deb</file>
+                  <type>deb</type>
+                  <classifier>plus</classifier>
+                </artifact>
+                <artifact>
+                  <file>${project.build.directory}/apache-tomee-jaxrs-${project.version}.deb</file>
+                  <type>deb</type>
+                  <classifier>jaxrs</classifier>
+                </artifact>
+                <artifact>
+                  <file>${project.build.directory}/apache-tomee-webprofile-${project.version}.deb</file>
+                  <type>deb</type>
+                  <classifier>webprofile</classifier>
+                </artifact>
+                <artifact>
+                  <file>${project.build.directory}/apache-tomee-plume-${project.version}.deb</file>
                   <type>deb</type>
+                  <classifier>plume</classifier>
                 </artifact>
               </artifacts>
             </configuration>

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=1582107&r1=1582106&r2=1582107&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 Wed Mar 26 22:57:06 2014
@@ -27,8 +27,9 @@ class PackageBuilder {
     def ant = new AntBuilder()
     def properties
 
-    String unzip(String tarPath) {
-        def outputDir = new File(new File(tarPath).parent, 'exploded')
+    String unzip(String classifier, String tarPath) {
+        def outputDir = new File(new File(tarPath).parent, "exploded-${classifier}")
+        ant.delete(includeemptydirs: true, dir: outputDir.absolutePath) // remove old files
         outputDir.mkdirs()
         ant.unzip(
                 src: tarPath,
@@ -81,7 +82,7 @@ class PackageBuilder {
         }
     }
 
-    String createControlDir(String dataDirPath) {
+    String createControlDir(String classifier, String dataDirPath) {
         def dataDir = new File(dataDirPath)
         def controlDir = new File(dataDir.parent, 'control')
         controlDir.mkdirs()
@@ -95,69 +96,72 @@ class PackageBuilder {
         }
         Double installedSize = dataDir.directorySize() / 1024
         writeTemplate(new File(controlDir, 'control'), '/control/control.template', [
+                classifier  : classifier,
                 tomeeVersion: properties.tomeeVersion,
                 inMB        : installedSize.longValue()
         ])
-        writeTemplate(new File(controlDir, 'postinst'), '/control/postinst.sh', [tomeeVersion: properties.tomeeVersion])
-        writeTemplate(new File(controlDir, 'prerm'), '/control/prerm.sh', [tomeeVersion: properties.tomeeVersion])
-        writeTemplate(new File(controlDir, 'postrm'), '/control/postrm.sh', [tomeeVersion: properties.tomeeVersion])
+        writeTemplate(new File(controlDir, 'postinst'), '/control/postinst.sh', [tomeeVersion: properties.tomeeVersion, classifier: classifier])
+        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 ->
-            new File(dataDir, "etc/tomee/${properties.tomeeVersion}").eachFile {
-                out.writeLine("/etc/tomee/${properties.tomeeVersion}/${it.name}")
+            new File(dataDir, "etc/tomee/${classifier}/${properties.tomeeVersion}").eachFile {
+                out.writeLine("/etc/tomee/${classifier}/${properties.tomeeVersion}/${it.name}")
             }
-            out.writeLine('/etc/init.d/tomee')
+            out.writeLine("/etc/init.d/tomee-${classifier}")
         }
         controlDir.absolutePath
     }
 
-    String createDataDir(String explodedPath) {
+    String createDataDir(String classifier, String explodedPath) {
         def exploded = new File(explodedPath)
-        def outputDir = new File(exploded.parent, 'output')
+        def outputDir = new File(exploded.parent, "output-${classifier}")
         def dataDir = new File(outputDir, 'data')
         dataDir.mkdirs()
-        def distributionTomeeDir = new File(dataDir, "usr/share/tomee/${properties.tomeeVersion}")
+        def distributionTomeeDir = new File(dataDir, "usr/share/tomee/${classifier}/${properties.tomeeVersion}")
         ant.move(todir: distributionTomeeDir.absolutePath) {
             fileset(dir: explodedPath) {
                 include(name: "**/*")
             }
         }
-        ant.move(todir: new File(dataDir, "etc/tomee/${properties.tomeeVersion}").absolutePath) {
+        ant.move(todir: new File(dataDir, "etc/tomee/${classifier}/${properties.tomeeVersion}").absolutePath) {
             fileset(dir: new File(distributionTomeeDir, 'conf')) {
                 include(name: "**/*")
             }
         }
         def initd = new File(dataDir, 'etc/init.d/')
         initd.mkdirs()
-        writeTemplate(new File(initd, 'tomee'), '/init/tomee.sh', [
+        writeTemplate(new File(initd, "tomee-${classifier}"), '/init/tomee.sh', [
+                classifier: classifier,
                 tomeeVersion: properties.tomeeVersion
         ])
-        ant.move(todir: new File(dataDir, "usr/share/doc/tomee/${properties.tomeeVersion}/").absolutePath) {
+        ant.move(todir: new File(dataDir, "usr/share/doc/tomee/${classifier}/${properties.tomeeVersion}/").absolutePath) {
             fileset(file: new File(distributionTomeeDir, 'LICENSE').absolutePath)
             fileset(file: new File(distributionTomeeDir, 'NOTICE').absolutePath)
             fileset(file: new File(distributionTomeeDir, 'RELEASE-NOTES').absolutePath)
             fileset(file: new File(distributionTomeeDir, 'RUNNING.txt').absolutePath)
         }
-        new File(dataDir, "var/log/tomee/${properties.tomeeVersion}").mkdirs()
-        new File(dataDir, "var/lib/tomee/${properties.tomeeVersion}/temp").mkdirs()
-        new File(dataDir, "var/lib/tomee/${properties.tomeeVersion}/work").mkdirs()
-        new File(dataDir, "var/lib/tomee/${properties.tomeeVersion}/webapps").mkdirs()
+        new File(dataDir, "var/log/tomee/${classifier}/${properties.tomeeVersion}").mkdirs()
+        new File(dataDir, "var/lib/tomee/${classifier}/${properties.tomeeVersion}/temp").mkdirs()
+        new File(dataDir, "var/lib/tomee/${classifier}/${properties.tomeeVersion}/work").mkdirs()
+        new File(dataDir, "var/lib/tomee/${classifier}/${properties.tomeeVersion}/webapps").mkdirs()
         new File(distributionTomeeDir, 'conf').delete() // add link from "/usr/lib/tomee/conf" to "/etc/tomee"
         new File(distributionTomeeDir, 'logs').delete() // add link from "/usr/lib/tomee/logs" to "/var/log/tomee"
         new File(distributionTomeeDir, 'temp').delete() // add link from "/usr/lib/tomee/temp" to "/var/lib/tomee/temp"
         new File(distributionTomeeDir, 'work').delete() // add link from "/usr/lib/tomee/work" to "/var/lib/tomee/work"
         writeTemplate(
-                new File(dataDir, "usr/share/doc/tomee/${properties.tomeeVersion}/copyright"),
+                new File(dataDir, "usr/share/doc/tomee/${classifier}/${properties.tomeeVersion}/copyright"),
                 '/copyright.template',
                 [formattedDate: new Date().toString()]
         )
         writeTemplate(new File(distributionTomeeDir, 'bin/setenv.sh'), '/init/setenv.sh', [
+                classifier: classifier,
                 tomeeVersion: properties.tomeeVersion
         ])
         exploded.delete()
         dataDir.absolutePath
     }
 
-    private File createTarGz(String path) {
+    private File createTarGz(String classifier, String path) {
         def dataDir = new File(path)
         def tarFile = new File(dataDir.parent, "${dataDir.name}.tar")
         def gzFile = new File(tarFile.parent, "${tarFile.name}.gz")
@@ -169,14 +173,14 @@ class PackageBuilder {
                     exclude(name: "**/postinst")
                     exclude(name: "**/prerm")
                     exclude(name: "**/postrm")
-                    exclude(name: "**/init.d/tomee")
+                    exclude(name: "**/init.d/tomee-${classifier}")
                 }
                 tarfileset(dir: dataDir.absolutePath, username: 'root', group: 'root', filemode: '755', prefix: './') {
                     include(name: "**/*.sh")
                     include(name: "**/postinst")
                     include(name: "**/prerm")
                     include(name: "**/postrm")
-                    include(name: "**/init.d/tomee")
+                    include(name: "**/init.d/tomee-${classifier}")
                 }
             }
             gzip(src: tarFile, destfile: gzFile)
@@ -200,13 +204,13 @@ class PackageBuilder {
         output.closeArchiveEntry()
     }
 
-    File compressFiles(String... paths) {
-        def packageName = "apache-tomee-${properties.tomeeVersion}.deb"
+    File compressFiles(String classifier, String... paths) {
+        def packageName = "apache-tomee-${classifier}-${properties.tomeeVersion}.deb"
         def ar = new File(new File(paths[0]).parent, packageName)
         def output = new ArArchiveOutputStream(new FileOutputStream(ar))
         arDebianBinary(output)
         paths.collect({
-            createTarGz(it)
+            createTarGz(classifier, it)
         }).each {
             arItem(output, it)
         }
@@ -214,12 +218,12 @@ class PackageBuilder {
         ar
     }
 
-    void createPackage() {
-        def filePath = new File(properties.workDir as String, 'tomee.zip').absolutePath
-        def explodedPath = unzip(filePath)
-        def dataDir = createDataDir(explodedPath)
-        def controlDir = createControlDir(dataDir)
-        def deb = compressFiles(controlDir, dataDir)
+    void createPackage(String classifier, String fileName) {
+        def filePath = new File(properties.workDir as String, fileName).absolutePath
+        def explodedPath = unzip(classifier, filePath)
+        def dataDir = createDataDir(classifier, explodedPath)
+        def controlDir = createControlDir(classifier, dataDir)
+        def deb = compressFiles(classifier, controlDir, dataDir)
         deb.renameTo(new File(properties.buildDir as String, deb.name))
     }
 }

Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/control.template
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/control.template?rev=1582107&r1=1582106&r2=1582107&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/control.template (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/control.template Wed Mar 26 22:57:06 2014
@@ -1,4 +1,4 @@
-Package: tomee-${tomeeVersion}
+Package: tomee-${classifier}
 Provides: tomee
 Version: ${tomeeVersion}
 Section: java
@@ -7,7 +7,7 @@ Homepage: http://tomee.apache.org/
 Architecture: all
 Installed-Size: ${inMB}
 Maintainer: devlist <de...@tomee.apache.org>
-Description: Apache TomEE
+Description: Apache TomEE (${classifier})
  Apache TomEE, pronounced "Tommy", is an all-Apache Java EE 6 Web Profile
  certified stack where Tomcat is top dog. Apache TomEE is assembled from a
  vanilla Apache Tomcat zip file. We start with Tomcat, add our jars and zip

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=1582107&r1=1582106&r2=1582107&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 Wed Mar 26 22:57:06 2014
@@ -1,20 +1,23 @@
 #!/bin/sh
 
-ln -sf /etc/tomee/${tomeeVersion} /usr/share/tomee/${tomeeVersion}/conf
-ln -sf /var/log/tomee/${tomeeVersion} /usr/share/tomee/${tomeeVersion}/logs
-ln -sf /var/lib/tomee/${tomeeVersion}/temp /usr/share/tomee/${tomeeVersion}/temp
-ln -sf /var/lib/tomee/${tomeeVersion}/work /usr/share/tomee/${tomeeVersion}/work
-ln -sf /var/lib/tomee/${tomeeVersion}/webapps /usr/share/tomee/${tomeeVersion}/webapps
+ln -sf /etc/tomee/${classifier}/${tomeeVersion} /usr/share/tomee/${classifier}/${tomeeVersion}/conf
+ln -sf /var/log/tomee/${classifier}/${tomeeVersion} /usr/share/tomee/${classifier}/${tomeeVersion}/logs
+ln -sf /var/lib/tomee/${classifier}/${tomeeVersion}/temp /usr/share/tomee/${classifier}/${tomeeVersion}/temp
+ln -sf /var/lib/tomee/${classifier}/${tomeeVersion}/work /usr/share/tomee/${classifier}/${tomeeVersion}/work
+ln -sf /var/lib/tomee/${classifier}/${tomeeVersion}/webapps /usr/share/tomee/${classifier}/${tomeeVersion}/webapps
+
+ln -sf /etc/init.d/tomee-${classifier} /etc/init.d/tomee
 
 groupadd apachetomee
 useradd apachetomee -g apachetomee
 
-chown -R root:apachetomee /var/log/tomee/${tomeeVersion}
-chown -R root:apachetomee /var/lib/tomee/${tomeeVersion}
-chown -R root:apachetomee /etc/tomee/${tomeeVersion}
-chmod -R g+w /var/log/tomee/${tomeeVersion}
-chmod -R g+w /var/lib/tomee/${tomeeVersion}
-chmod -R o-rwx /etc/tomee/${tomeeVersion}
+chown -R root:apachetomee /var/log/tomee/${classifier}/${tomeeVersion}
+chown -R root:apachetomee /var/lib/tomee/${classifier}/${tomeeVersion}
+chown -R root:apachetomee /etc/tomee/${classifier}/${tomeeVersion}
+chmod -R g+w /var/log/tomee/${classifier}/${tomeeVersion}
+chmod -R g+w /var/lib/tomee/${classifier}/${tomeeVersion}
+chmod -R o-rwx /etc/tomee/${classifier}/${tomeeVersion}
+chmod -R g+w /etc/tomee/${classifier}/${tomeeVersion}
 
-update-rc.d tomee defaults
-echo "Reboot your machine or run 'service tomee start' to start the Apache TomEE server (version: ${tomeeVersion})"
\ No newline at end of file
+update-rc.d tomee-${classifier} defaults
+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=1582107&r1=1582106&r2=1582107&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 Wed Mar 26 22:57:06 2014
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-update-rc.d -f tomee remove
\ No newline at end of file
+update-rc.d -f tomee-${classifier} remove
\ No newline at end of file

Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh?rev=1582107&r1=1582106&r2=1582107&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh Wed Mar 26 22:57:06 2014
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-CATALINA_HOME=/usr/share/tomee/${tomeeVersion}
+CATALINA_HOME=/usr/share/tomee/${classifier}/${tomeeVersion}
 su - apachetomee -c "\$CATALINA_HOME/bin/shutdown.sh -force"
 
-rm -f /usr/share/tomee/${tomeeVersion}/conf
-rm -f /usr/share/tomee/${tomeeVersion}/logs
-rm -f /usr/share/tomee/${tomeeVersion}/temp
-rm -f /usr/share/tomee/${tomeeVersion}/work
-rm -f /usr/share/tomee/${tomeeVersion}/webapps
+rm -f /usr/share/tomee/${classifier}/${tomeeVersion}/conf
+rm -f /usr/share/tomee/${classifier}/${tomeeVersion}/logs
+rm -f /usr/share/tomee/${classifier}/${tomeeVersion}/temp
+rm -f /usr/share/tomee/${classifier}/${tomeeVersion}/work
+rm -f /usr/share/tomee/${classifier}/${tomeeVersion}/webapps
 
-rm -Rf /var/lib/tomee/${tomeeVersion}/*
-rm -Rf /var/log/tomee/${tomeeVersion}/*
+rm -Rf /var/lib/tomee/${classifier}/${tomeeVersion}/*
+rm -Rf /var/log/tomee/${classifier}/${tomeeVersion}/*

Modified: tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh?rev=1582107&r1=1582106&r2=1582107&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh Wed Mar 26 22:57:06 2014
@@ -1,2 +1,2 @@
 #!/bin/sh
-export CATALINA_PID=/usr/share/tomee/${tomeeVersion}/temp/tomee.pid
\ No newline at end of file
+export CATALINA_PID=/usr/share/tomee/${classifier}/${tomeeVersion}/temp/tomee.pid
\ 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=1582107&r1=1582106&r2=1582107&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 Wed Mar 26 22:57:06 2014
@@ -1,28 +1,34 @@
 #!/bin/bash
 ### BEGIN INIT INFO
-# Provides:          tomee
-# Short-Description: Apache TomEE ${tomeeVersion}
+# Provides:          tomee-${classifier}
+# Required-Start:    \$local_fs \$remote_fs \$network
+# Required-Stop:     \$local_fs \$remote_fs \$network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Apache TomEE ${classifier} ${tomeeVersion}
 # Description:       Manages the Apache TomEE server.
 ### END INIT INFO
-CATALINA_HOME=/usr/share/tomee/${tomeeVersion}
+TOMEE_VERSION=${tomeeVersion}
+TOMEE_CLASSIFIER=${classifier}
+CATALINA_HOME=/usr/share/tomee
 TOMCAT_USER=apachetomee
-
 RETVAL=0
+
 start(){
-   echo "Starting TomEE ${properties.tomeeVersion}: "
-   su - \$TOMCAT_USER -c "\$CATALINA_HOME/bin/catalina.sh start"
+   echo "Starting TomEE (\$TOMEE_CLASSIFIER \$TOMEE_VERSION): "
+   su - \$TOMCAT_USER -c "\$CATALINA_HOME/\$TOMEE_CLASSIFIER/\$TOMEE_VERSION/bin/catalina.sh start"
    RETVAL=\$?
    return \$RETVAL
 }
 
 stop(){
-   echo "Shutting down TomEE ${properties.tomeeVersion}: "
-   su - \$TOMCAT_USER -c "\$CATALINA_HOME/bin/shutdown.sh -force"
+   echo "Shutting down TomEE (\$TOMEE_CLASSIFIER \$TOMEE_VERSION): "
+   su - \$TOMCAT_USER -c "\$CATALINA_HOME/\$TOMEE_CLASSIFIER/\$TOMEE_VERSION/bin/shutdown.sh -force"
    RETVAL=\$?
    return \$RETVAL
 }
 
-case "\$1" in
+case \$1 in
    start)
       start
       ;;