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/04/08 15:55:39 UTC
svn commit: r1585731 - 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/control/prerm.sh resources/init/tomee.sh
Author: tveronezi
Date: Tue Apr 8 13:55:39 2014
New Revision: 1585731
URL: http://svn.apache.org/r1585731
Log:
Changing installation dir from tomee/${classifier}/${properties.tomeeVersion} to tomee-${classifier}-${properties.tomeeVersion}. This way dpkg won complain when removing other versions of tomee.
Adding "-e" flag in the installation scripts.
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/control/prerm.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=1585731&r1=1585730&r2=1585731&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 Tue Apr 8 13:55:39 2014
@@ -118,8 +118,8 @@ class PackageBuilder {
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/${classifier}/${properties.tomeeVersion}").eachFile {
- out.writeLine("/etc/tomee/${classifier}/${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-${classifier}")
}
@@ -131,13 +131,13 @@ class PackageBuilder {
def outputDir = new File(exploded.parent, "output-${classifier}")
def dataDir = new File(outputDir, 'data')
dataDir.mkdirs()
- def distributionTomeeDir = new File(dataDir, "usr/share/tomee/${classifier}/${properties.tomeeVersion}")
+ def distributionTomeeDir = new File(dataDir, "usr/share/tomee-${classifier}-${properties.tomeeVersion}")
ant.move(todir: distributionTomeeDir.absolutePath) {
fileset(dir: explodedPath) {
include(name: "**/*")
}
}
- def homeConf = new File(dataDir, "etc/tomee/${classifier}/${properties.tomeeVersion}")
+ def homeConf = new File(dataDir, "etc/tomee-${classifier}-${properties.tomeeVersion}")
ant.move(todir: homeConf.absolutePath) {
fileset(dir: new File(distributionTomeeDir, 'conf')) {
include(name: "**/*")
@@ -149,29 +149,31 @@ class PackageBuilder {
classifier : classifier,
tomeeVersion: properties.tomeeVersion
])
- ant.move(todir: new File(dataDir, "usr/share/doc/tomee/${classifier}/${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/${classifier}/${properties.tomeeVersion}").mkdirs()
- def baseConfDir = new File(dataDir, "var/lib/tomee/${classifier}/${properties.tomeeVersion}/conf")
+ new File(dataDir, "var/log/tomee-${classifier}-${properties.tomeeVersion}").mkdirs()
+ def baseConfDir = new File(dataDir, "var/lib/tomee-${classifier}-${properties.tomeeVersion}/conf")
baseConfDir.mkdirs()
ant.copy(todir: baseConfDir.absolutePath) {
fileset(file: new File(homeConf, 'server.xml'))
+ fileset(file: new File(homeConf, 'tomcat-users.xml'))
}
- def baseBinDir = new File(dataDir, "var/lib/tomee/${classifier}/${properties.tomeeVersion}/bin")
+ def baseBinDir = new File(dataDir, "var/lib/tomee-${classifier}-${properties.tomeeVersion}/bin")
baseBinDir.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(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(dataDir, "var/lib/tomee-${classifier}-${properties.tomeeVersion}/apps").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/${classifier}/${properties.tomeeVersion}/copyright"),
+ new File(dataDir, "usr/share/doc/tomee-${classifier}-${properties.tomeeVersion}/copyright"),
'/copyright.template',
[formattedDate: new Date().toString()]
)
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=1585731&r1=1585730&r2=1585731&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 Tue Apr 8 13:55:39 2014
@@ -1,16 +1,16 @@
-#!/bin/sh
+#!/bin/sh -e
-ln -sf /etc/tomee/${classifier}/${tomeeVersion} /usr/share/tomee/${classifier}/${tomeeVersion}/conf
-ln -sf /var/log/tomee/${classifier}/${tomeeVersion} /var/lib/tomee/${classifier}/${tomeeVersion}/logs
+ln -sf /etc/tomee-${classifier}-${tomeeVersion} /usr/share/tomee-${classifier}-${tomeeVersion}/conf
+ln -sf /var/log/tomee-${classifier}-${tomeeVersion} /var/lib/tomee-${classifier}-${tomeeVersion}/logs
-groupadd apachetomee
-useradd --system apachetomee -g apachetomee
+groupadd apachetomee || true
+useradd --system apachetomee -g apachetomee || true
-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}
+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}
update-rc.d tomee-${classifier} defaults
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=1585731&r1=1585730&r2=1585731&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 Tue Apr 8 13:55:39 2014
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
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/control/prerm.sh
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.sh?rev=1585731&r1=1585730&r2=1585731&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 Tue Apr 8 13:55:39 2014
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/sh -e
-service tomee-${classifier} stop
+service tomee-${classifier} stop || true
-rm /usr/share/tomee/${classifier}/${tomeeVersion}/conf
-rm -Rf /var/lib/tomee/${classifier}/${tomeeVersion}/*
-rm -Rf /var/log/tomee/${classifier}/${tomeeVersion}/*
+rm /usr/share/tomee-${classifier}-${tomeeVersion}/conf
+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/tomee.sh
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/tomee.sh?rev=1585731&r1=1585730&r2=1585731&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 Tue Apr 8 13:55:39 2014
@@ -8,8 +8,8 @@
# Short-Description: Apache TomEE ${classifier} ${tomeeVersion}
# Description: Manages the Apache TomEE server.
### END INIT INFO
-TOMEE_HOME=/usr/share/tomee/${classifier}/${tomeeVersion}
-export CATALINA_BASE=/var/lib/tomee/${classifier}/${tomeeVersion}
+TOMEE_HOME=/usr/share/tomee-${classifier}-${tomeeVersion}
+export CATALINA_BASE=/var/lib/tomee-${classifier}-${tomeeVersion}
TOMEE_USER=apachetomee
start(){