You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomee.apache.org by Thiago Veronezi <th...@veronezi.org> on 2014/04/10 14:21:01 UTC
Re: Debian Package
Hi Daniel,
Thanks for the changelog tip. It works like a charm! :)
Regarding the dependencies on other packages: I'm still trying to get our
package done. Once we have something good enough, I will try to use the
libraries from other packages like tomcat and activemq. I will need to ping
the package maintainers and try sync updates with them.
Just for fun, these are the current lintian results...
tveronezi@debianboto:~/dev/ws/tomee/trunk/tomee/tomee-deb$ lintian
./target/apache-tomee-plus-1.6.1-SNAPSHOT.deb
E: tomee-plus: non-etc-file-marked-as-conffile
var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/openejb.conf
E: tomee-plus: non-etc-file-marked-as-conffile
var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/server.xml
E: tomee-plus: non-etc-file-marked-as-conffile
var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/tomcat-users.xml
E: tomee-plus: non-etc-file-marked-as-conffile
var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/conf.d/cxf-rs.properties
E: tomee-plus: non-etc-file-marked-as-conffile
var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/conf.d/cxf.properties
E: tomee-plus: non-etc-file-marked-as-conffile
var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/conf.d/hsql.properties
E: tomee-plus: no-copyright-file
W: tomee-plus: extra-license-file
usr/share/doc/tomee-plus-1.6.1-SNAPSHOT/LICENSE
E: tomee-plus: init.d-script-does-not-implement-required-option
etc/init.d/tomee-plus force-reload
W: tomee-plus: codeless-jar
usr/share/tomee-plus-1.6.1-SNAPSHOT/lib/tomcat-i18n-es.jar
W: tomee-plus: codeless-jar
usr/share/tomee-plus-1.6.1-SNAPSHOT/lib/tomcat-i18n-fr.jar
W: tomee-plus: codeless-jar
usr/share/tomee-plus-1.6.1-SNAPSHOT/lib/tomcat-i18n-ja.jar
W: tomee-plus: codeless-jar
usr/share/tomee-plus-1.6.1-SNAPSHOT/lib/tomee-webapp-1.6.1-SNAPSHOT.jar
[]s,
Thiago.
On Sun, Mar 30, 2014 at 11:56 AM, dsh <da...@gmail.com> wrote:
> Hi Thiago,
>
> I suppose that is the constraint you have to deal with if you depend on
> others. Usually on Linux (or even commonly on Unix type of systems) it is
> uncommon, that every app ships it's own Java, app server or more generally
> it's own runtime env. That's why I did ask whether it's a self contained
> package or not.
>
> Additionally in cloud envirnments it might add additional constraints if
> each app comes with it's own runtime env. On the other that might even have
> some advantages in cloude environments. Probably something to be researched
> and/or discussed.
>
> Cheers
> Daniel
>
>
> On Sun, Mar 30, 2014 at 4:54 PM, Thiago Veronezi <thiago@veronezi.org
> >wrote:
>
> > Hi Daniel,
> >
> > For now it is self contained, but I guess I would get one big REJECT if I
> > submit it. One of the current violations is exactly that: packages
> > shouldn't duplicate binaries. I was thinking about adding a dependency on
> > libtomcat7 (or maybe tomcat7-common), but this would also add a
> dependency
> > on how fast they publish their tomcat packages.
> >
> > For example, this developer is publishing tomcat7_7.0.52-1~bpo70+1 (
> > https://lists.debian.org/debian-java/2014/03/msg00006.html) but apt
> still
> > shows "7.0.28"...
> >
> >
> >
> **********************************************************************************************
> > tveronezi@debianboto:~/dev$ apt-cache show tomcat7
> > Package: tomcat7
> > Version: 7.0.28-4
> > Installed-Size: 351
> > Maintainer: Debian Java Maintainers <
> > pkg-java-maintainers@lists.alioth.debian.org>
> > Architecture: all
> > Depends: tomcat7-common (>= 7.0.28-4), ucf, adduser, debconf (>= 0.5) |
> > debconf-2.0
> > Recommends: authbind
> > Suggests: tomcat7-docs (>= 7.0.28-4), tomcat7-admin (>= 7.0.28-4),
> > tomcat7-examples (>= 7.0.28-4), tomcat7-user (>= 7.0.28-4), libtcnative-1
> > Description-en: Servlet and JSP engine
> > Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
> > specifications from Sun Microsystems, and provides a "pure Java" HTTP
> web
> > server environment for Java code to run.
> > .
> > This package contains only the startup scripts for the system-wide
> daemon.
> > No documentation or web applications are included here, please install
> > the tomcat7-docs and tomcat7-examples packages if you want them.
> > Install the authbind package if you need to use Tomcat on ports 1-1023.
> > Install tomcat7-user instead of this package if you don't want Tomcat to
> > start as a service.
> > Homepage: http://tomcat.apache.org
> > Description-md5: 71d2a54f759941814ab4cf7873094b26
> > Section: java
> > Priority: optional
> > Filename: pool/main/t/tomcat7/tomcat7_7.0.28-4_all.deb
> > Size: 49298
> > MD5sum: bbad096f79e933c8c32096fd7113a9e4
> > SHA1: 913ccac2120fdb43551c53fc7d549cb36414eb00
> > SHA256: 454a462370e2d7c912d0688ade03c9dd29f0bb63f74a1d9c1e1dceef67126d33
> >
> >
> **********************************************************************************************
> >
> > ... and our server depends on 7.0.53.
> >
> > Anyway, I wouldn't change what tomcat installs. I would simply add links
> to
> > the tomcat jars instead of including them myself. This way, one could
> have
> > tomcat and tomee installed in the same box.
> >
> > We could also depend on the activemq packages (libactivemq-java provides
> > the version 5.6.0), but it will add still more constraints. I need to
> check
> > the rules for that. It would be nicer to depend on others packages, but I
> > guess it is simpler to package them ourselves... or maybe to start
> > contributing to those packages too. :)
> >
> > If nothing works out, I would do what dropbox and google (for Chrome) do.
> > They have their own deb files. After installing it, the users can update
> > the packages by using apt-get. I don't know how that works, but I have a
> > feeling that they include their own debian repositories references in the
> > localhost. That would add another issue: where to put our binaries? I
> dont
> > think the ASF has is own debian repository.
> >
> > []s,
> > Thiago.
> >
> >
> > On Sun, Mar 30, 2014 at 9:26 AM, dsh <da...@gmail.com> wrote:
> >
> > > Hi Thiago,
> > >
> > > yea I as well would like to recommend using debuild - especially if the
> > > package should be pushed upstreams and become an "official" Debian
> > package.
> > > I could try to ask colleagues how they usually build their DEB packages
> > if
> > > using JIRA, Git or Bugzilla to pull the changelog information.
> > >
> > > Are you re-using the already existing Tomcat packages for Debian? Or is
> > the
> > > TomEE package a self-contained package that as well includes Tomcat.
> > Maybe
> > > if that is possible it would make sense to rely on the already existing
> > > Tomcat Packages [1] and just have a tomcat$version-tomee or
> tomee-tomcat
> > > (if multiple tomcat versions are supported) package instead. That way
> you
> > > wouldn't have to care about stuff like which user runs the underlying
> > > Tomcat instance etc..
> > >
> > > Others are following the same strategy btw - for instance jenkins.
> > >
> > > [1] https://packages.debian.org/search?keywords=tomcat
> > >
> > > Cheers
> > > Daniel
> > >
> > >
> > > On Sun, Mar 30, 2014 at 3:06 PM, Thiago Veronezi <thiago@veronezi.org
> > > >wrote:
> > >
> > > > Hi Daniel,
> > > >
> > > > I know that jira has a rest api; I would like to link it to our
> build.
> > > This
> > > > way we wouldn't have to maintain to changelogs: the tomee jira and
> the
> > > > debian/changelog file. I didnt touch it yet because I'm trying to
> > address
> > > > the rest of the violations that the current build has.
> > > > https://ftp-master.debian.org/REJECT-FAQ.html
> > > >
> > > > I start to think that the maven build will not help us. The debian
> > > > developers expect to build the packages from the source codes with a
> > > simple
> > > > debuild command. I will learn debuild first. I hope it can use the
> > maven
> > > > builds too.
> > > >
> > > > []s,
> > > > Thiago.
> > > >
> > > >
> > > >
> > > >
> > > > On Fri, Mar 28, 2014 at 6:25 PM, dsh <da...@gmail.com>
> wrote:
> > > >
> > > > > Hi,
> > > > >
> > > > > can you describe a little more what's the issue with the changelog
> > > file?
> > > > Is
> > > > > it just that you don't know how to create it or rather that you
> don't
> > > > know
> > > > > how to create it automatically while building the DEB package? I
> > think
> > > > > adding that information helps others to provide some support on
> this
> > > > > subject.
> > > > >
> > > > > Cheers
> > > > > Daniel
> > > > >
> > > > >
> > > > > On Tue, Mar 25, 2014 at 8:18 PM, Thiago Veronezi <
> > tveronezi@apache.org
> > > > > >wrote:
> > > > >
> > > > > > Great news! Our debian package is working. I just need to figure
> > out
> > > > how
> > > > > to
> > > > > > create this changelog file that lintian is complaining about.
> > > > > > In the mean time, any feedback is very welcome. You can test it
> by
> > > > > building
> > > > > > it locally...
> > > > > >
> > > > > > tveronezi@botodev:~/dev/ws/tomee/trunk/tomee/tomee-deb$ mvn
> clean
> > > > > install
> > > > > > tveronezi@botodev:~/dev/ws/tomee/trunk/tomee/tomee-deb$ sudo
> dpkg
> > -i
> > > > > > ./target/apache-tomee-1.6.1-SNAPSHOT.deb
> > > > > >
> > > > > > I have a question for you guys: how to make maven to install the
> > > debian
> > > > > > file in "
> > > > > >
> repository.apache.org/content/groups/snapshots/org/apache/openejb/
> > "?
> > > > > > My "maven-install-plugin" approach didn't work.
> > > > > >
> > > > > > []s,
> > > > > > Thiago.
> > > > > >
> > > > > > On Tue, Mar 25, 2014 at 3:01 PM, <tv...@apache.org> wrote:
> > > > > >
> > > > > > > Author: tveronezi
> > > > > > > Date: Tue Mar 25 19:01:36 2014
> > > > > > > New Revision: 1581465
> > > > > > >
> > > > > > > URL: http://svn.apache.org/r1581465
> > > > > > > Log:
> > > > > > > https://issues.apache.org/jira/browse/TOMEE-245
> > > > > > >
> > > > > > > The package is working, but it's not yet a valid debian
> package.
> > We
> > > > > still
> > > > > > > need to figure out how to create the changelog file.
> > > > > > >
> > > > > > > tveronezi@botodev:~/dev/ws/tomee/trunk/tomee/tomee-deb$
> lintian
> > > > > > > ./target/apache-tomee-1.6.1-SNAPSHOT.deb
> > > > > > > E: tomee: debian-changelog-file-missing
> > > > > > >
> > > > > > > Added:
> > > > > > >
> > > > > >
> > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh
> > > > > > >
> > > > > >
> > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template
> > > > > > >
> > > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh
> > > > > > > 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/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=1581465&r1=1581464&r2=1581465&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 Mar 25 19:01:36 2014
> > > > > > > @@ -43,15 +43,13 @@ class PackageBuilder {
> > > > > > > outputDir.delete()
> > > > > > > aux.renameTo(outputDir)
> > > > > > > ant.delete(includeemptydirs: true) {
> > > > > > > + fileset(dir: outputDir.absolutePath, includes:
> > > > '**/*.txt')
> > > > > > > fileset(dir: outputDir.absolutePath, includes:
> > > > '**/*.exe')
> > > > > > > fileset(dir: outputDir.absolutePath, includes:
> > > > '**/*.bat')
> > > > > > > fileset(dir: outputDir.absolutePath, includes:
> > > > > > > '**/*.original')
> > > > > > > fileset(dir: outputDir.absolutePath, includes:
> > > > '**/*.tmp')
> > > > > > > - fileset(dir: new File(outputDir,
> > > > 'webapps').absolutePath)
> > > > > {
> > > > > > > - include(name: '**/*')
> > > > > > > - exclude(name: '**/tomee/**')
> > > > > > > - }
> > > > > > > }
> > > > > > > + ant.delete(includeemptydirs: true, dir: new
> > > File(outputDir,
> > > > > > > 'webapps').absolutePath)
> > > > > > > outputDir.absolutePath
> > > > > > > }
> > > > > > >
> > > > > > > @@ -98,6 +96,15 @@ class PackageBuilder {
> > > > > > > new File(controlDir, 'prerm').withWriter {
> > BufferedWriter
> > > > out
> > > > > ->
> > > > > > >
> > > > > out.write(this.class.getResource('/control/prerm.sh').text)
> > > > > > > }
> > > > > > > + new File(controlDir, 'postrm').withWriter {
> > BufferedWriter
> > > > out
> > > > > > ->
> > > > > > > +
> > > > > out.write(this.class.getResource('/control/postrm.sh').text)
> > > > > > > + }
> > > > > > > + new File(controlDir, 'conffiles').withWriter {
> > > > BufferedWriter
> > > > > > out
> > > > > > > ->
> > > > > > > + new File(dataDir, 'etc/tomee').eachFile {
> > > > > > > + out.writeLine("/etc/tomee/${it.name}")
> > > > > > > + }
> > > > > > > + out.writeLine('/etc/init.d/tomee')
> > > > > > > + }
> > > > > > > controlDir.absolutePath
> > > > > > > }
> > > > > > >
> > > > > > > @@ -106,7 +113,7 @@ class PackageBuilder {
> > > > > > > def outputDir = new File(exploded.parent, 'output')
> > > > > > > def dataDir = new File(outputDir, 'data')
> > > > > > > dataDir.mkdirs()
> > > > > > > - def distributionTomeeDir = new File(dataDir,
> > 'opt/tomee')
> > > > > > > + def distributionTomeeDir = new File(dataDir,
> > > > > 'usr/share/tomee')
> > > > > > > ant.move(todir: distributionTomeeDir.absolutePath) {
> > > > > > > fileset(dir: explodedPath) {
> > > > > > > include(name: "**/*")
> > > > > > > @@ -122,10 +129,6 @@ class PackageBuilder {
> > > > > > > new File(initd, 'tomee').withWriter { BufferedWriter
> out
> > > ->
> > > > > > >
> > > out.write(this.class.getResource('/init/tomee.sh').text)
> > > > > > > }
> > > > > > > - ant.move(
> > > > > > > - todir: new File(dataDir,
> > > > > 'var/lib/tomee').absolutePath,
> > > > > > > - file: new File(distributionTomeeDir,
> > > > > > > 'webapps').absolutePath
> > > > > > > - )
> > > > > > > ant.move(todir: new File(dataDir,
> > > > > > > 'usr/share/doc/tomee/').absolutePath) {
> > > > > > > fileset(file: new File(distributionTomeeDir,
> > > > > > > 'LICENSE').absolutePath)
> > > > > > > fileset(file: new File(distributionTomeeDir,
> > > > > > > 'NOTICE').absolutePath)
> > > > > > > @@ -133,13 +136,24 @@ class PackageBuilder {
> > > > > > > fileset(file: new File(distributionTomeeDir,
> > > > > > > 'RUNNING.txt').absolutePath)
> > > > > > > }
> > > > > > > new File(dataDir, 'var/log/tomee').mkdirs()
> > > > > > > - new File(dataDir, 'var/tmp/tomee/temp').mkdirs()
> > > > > > > - new File(dataDir, 'var/tmp/tomee/work').mkdirs()
> > > > > > > + new File(dataDir, 'var/lib/tomee/temp').mkdirs()
> > > > > > > + new File(dataDir, 'var/lib/tomee/work').mkdirs()
> > > > > > > + new File(dataDir, 'var/lib/tomee/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/tmp/tomee/temp"
> > > > > > > - new File(distributionTomeeDir, 'work').delete() // add
> > > link
> > > > > from
> > > > > > > "/usr/lib/tomee/work" to "/var/tmp/tomee/work"
> > > > > > > - new File(distributionTomeeDir, 'webapps').delete() //
> > add
> > > > link
> > > > > > > from "/usr/lib/tomee/webapps" to "/var/lib/tomee/webapps"
> > > > > > > + 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"
> > > > > > > + new File(dataDir,
> > > > 'usr/share/doc/tomee/copyright').withWriter
> > > > > {
> > > > > > > BufferedWriter out ->
> > > > > > > + def template = new
> > > > GStringTemplateEngine().createTemplate(
> > > > > > > +
> > this.class.getResource('/copyright.template')
> > > > > > > + ).make([
> > > > > > > + formattedDate: new Date().toString()
> > > > > > > + ])
> > > > > > > + out.write(template.toString())
> > > > > > > + }
> > > > > > > + new File(distributionTomeeDir,
> > > 'bin/setenv.sh').withWriter {
> > > > > > > BufferedWriter out ->
> > > > > > > +
> > > > out.write(this.class.getResource('/init/setenv.sh').text)
> > > > > > > + }
> > > > > > > exploded.delete()
> > > > > > > dataDir.absolutePath
> > > > > > > }
> > > > > > > @@ -155,12 +169,14 @@ class PackageBuilder {
> > > > > > > exclude(name: "**/*.sh")
> > > > > > > exclude(name: "**/postinst")
> > > > > > > exclude(name: "**/prerm")
> > > > > > > + exclude(name: "**/postrm")
> > > > > > > exclude(name: "**/init.d/tomee")
> > > > > > > }
> > > > > > > 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")
> > > > > > > }
> > > > > > > }
> > > > > > >
> > > > > > > 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=1581465&r1=1581464&r2=1581465&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 Mar 25 19:01:36 2014
> > > > > > > @@ -1,19 +1,17 @@
> > > > > > > #!/bin/sh
> > > > > > >
> > > > > > > -ln -sf /etc/tomee /opt/tomee/conf
> > > > > > > -ln -sf /var/log/tomee /opt/tomee/logs
> > > > > > > -ln -sf /var/tmp/tomee/temp /opt/tomee/temp
> > > > > > > -ln -sf /var/tmp/tomee/work /opt/tomee/work
> > > > > > > -ln -sf /var/lib/tomee/webapps /opt/tomee/webapps
> > > > > > > +ln -sf /etc/tomee /usr/share/tomee/conf
> > > > > > > +ln -sf /var/log/tomee /usr/share/tomee/logs
> > > > > > > +ln -sf /var/lib/tomee/temp /usr/share/tomee/temp
> > > > > > > +ln -sf /var/lib/tomee/work /usr/share/tomee/work
> > > > > > > +ln -sf /var/lib/tomee/webapps /usr/share/tomee/webapps
> > > > > > >
> > > > > > > groupadd apachetomee
> > > > > > > useradd apachetomee -g apachetomee
> > > > > > >
> > > > > > > -chown -R apachetomee:apachetomee /opt/tomee/
> > > > > > > +chown -R apachetomee:apachetomee /usr/share/tomee
> > > > > > > chown -R apachetomee:apachetomee /var/log/tomee
> > > > > > > -chown -R apachetomee:apachetomee /var/tmp/tomee/temp
> > > > > > > -chown -R apachetomee:apachetomee /var/tmp/tomee/work
> > > > > > > -chown -R apachetomee:apachetomee /var/lib/tomee/webapps
> > > > > > > +chown -R apachetomee:apachetomee /var/lib/tomee
> > > > > > >
> > > > > > > update-rc.d tomee defaults
> > > > > > > echo "Reboot your machine or run 'service tomee start' to
> start
> > > the
> > > > > > > Apache TomEE server"
> > > > > > > \ No newline at end of file
> > > > > > >
> > > > > > > Added:
> > > > > > >
> > > >
> 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=1581465&view=auto
> > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
> ==============================================================================
> > > > > > > ---
> > > > > >
> > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh
> > > > > > > (added)
> > > > > > > +++
> > > > > >
> > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh
> > > > > > > Tue Mar 25 19:01:36 2014
> > > > > > > @@ -0,0 +1,3 @@
> > > > > > > +#!/bin/sh
> > > > > > > +
> > > > > > > +update-rc.d -f tomee 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=1581465&r1=1581464&r2=1581465&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 Mar 25 19:01:36 2014
> > > > > > > @@ -1,15 +1,13 @@
> > > > > > > #!/bin/sh
> > > > > > >
> > > > > > > -kill -9 $(ps aux | grep org.apache.catalina.startup.Bootstrap
> |
> > > grep
> > > > > -v
> > > > > > > grep | awk '{print $2}')
> > > > > > > +CATALINA_HOME=/usr/share/tomee
> > > > > > > +su - apachetomee -c "$CATALINA_HOME/bin/shutdown.sh -force"
> > > > > > >
> > > > > > > -rm -f /opt/tomee/conf
> > > > > > > -rm -f /opt/tomee/logs
> > > > > > > -rm -f /opt/tomee/temp
> > > > > > > -rm -f /opt/tomee/work
> > > > > > > -rm -f /opt/tomee/webapps
> > > > > > > +rm -f /usr/share/tomee/conf
> > > > > > > +rm -f /usr/share/tomee/logs
> > > > > > > +rm -f /usr/share/tomee/temp
> > > > > > > +rm -f /usr/share/tomee/work
> > > > > > > +rm -f /usr/share/tomee/webapps
> > > > > > >
> > > > > > > -rm -Rf /var/tmp/tomee/work/*
> > > > > > > -rm -Rf /var/tmp/tomee/temp/*
> > > > > > > +rm -Rf /var/lib/tomee/*
> > > > > > > rm -Rf /var/log/tomee/*
> > > > > > > -
> > > > > > > -update-rc.d -f tomee remove
> > > > > > > \ No newline at end of file
> > > > > > >
> > > > > > > Added:
> > > > > > >
> > > >
> tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template
> > > > > > > URL:
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
> http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template?rev=1581465&view=auto
> > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
> ==============================================================================
> > > > > > > ---
> > > > > > >
> > > >
> tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template
> > > > > > > (added)
> > > > > > > +++
> > > > > > >
> > > >
> tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template
> > > > > > Tue
> > > > > > > Mar 25 19:01:36 2014
> > > > > > > @@ -0,0 +1,16 @@
> > > > > > > +This package was debianized by the Apache TomEE dev Team <
> > > > > > > dev@tomee.apache.org> on
> > > > > > > +${formattedDate}
> > > > > > > +
> > > > > > > +Upstream Authors:
> > > > > > > +
> > > > > > > + Thiago Veronezi <tv...@apache.org>
> > > > > > > +
> > > > > > > +Copyright:
> > > > > > > +
> > > > > > > + Copyright (C) 1999-2014 The Apache Software Foundation
> > > > > > > +
> > > > > > > +License:
> > > > > > > +
> > > > > > > + * (if not otherwise specified):
> > > > > > > +
> > > > > > > + /usr/share/common-licenses/Apache-2'
> > > > > > >
> > > > > > > Added:
> > > > > >
> 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=1581465&view=auto
> > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
> ==============================================================================
> > > > > > > ---
> > > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh
> > > > > > > (added)
> > > > > > > +++
> > > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh
> > > > > > > Tue Mar 25 19:01:36 2014
> > > > > > > @@ -0,0 +1,2 @@
> > > > > > > +#!/bin/sh
> > > > > > > +export CATALINA_PID=/tmp/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=1581465&r1=1581464&r2=1581465&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
> > > > > > > Mar 25 19:01:36 2014
> > > > > > > @@ -4,20 +4,20 @@
> > > > > > > # Short-Description: Apache TomEE
> > > > > > > # Description: Manages the Apache TomEE server.
> > > > > > > ### END INIT INFO
> > > > > > > -CATALINA_HOME=/opt/tomee
> > > > > > > +CATALINA_HOME=/usr/share/tomee
> > > > > > > TOMCAT_USER=apachetomee
> > > > > > >
> > > > > > > RETVAL=0
> > > > > > > start(){
> > > > > > > echo "Starting TomEE: "
> > > > > > > - su - $TOMCAT_USER -c "$CATALINA_HOME/bin/startup.sh"
> > > > > > > + su - $TOMCAT_USER -c "$CATALINA_HOME/bin/catalina.sh start"
> > > > > > > RETVAL=$?
> > > > > > > return $RETVAL
> > > > > > > }
> > > > > > >
> > > > > > > stop(){
> > > > > > > echo "Shutting down TomEE: "
> > > > > > > - su - $TOMCAT_USER -c "$CATALINA_HOME/bin/shutdown.sh"
> > > > > > > + su - $TOMCAT_USER -c "$CATALINA_HOME/bin/shutdown.sh
> -force"
> > > > > > > RETVAL=$?
> > > > > > > return $RETVAL
> > > > > > > }
> > > > > > > @@ -29,12 +29,12 @@ case "$1" in
> > > > > > > stop)
> > > > > > > stop
> > > > > > > ;;
> > > > > > > - force-reload)
> > > > > > > + restart)
> > > > > > > stop
> > > > > > > start
> > > > > > > ;;
> > > > > > > *)
> > > > > > > - echo $"Usage: $0 {start|stop|force-reload}"
> > > > > > > + echo $"Usage: $0 {start|stop|restart}"
> > > > > > > exit 1
> > > > > > > ;;
> > > > > > > esac
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
>
Re: Debian Package
Posted by Thiago Veronezi <th...@veronezi.org>.
Hi guys,
A new tentative of having a debian packages is ready. Please note that this
is only a trial. I plan to upload it to launchpad, then submit it to debian
(integration with existing debian packages). I don't want to overload "
people.apache.org". The goal of it is to be able to have fresh deb packages
with our standard "mvn install".
You guys can check it out by following these steps.
Include this line in your "/etc/apt/sources.list"...
deb http://people.apache.org/~tveronezi/deb-repo/ tomee main
Execute...
gpg --keyserver keyserver.ubuntu.com --recv-keys 9344B2AF
Execute...
gpg -a --export 9344B2AF | sudo apt-key add -
The last two steps import my gpg key, so apt-get won't complain about
non-authenticated repositories.
Execute...
sudo apt-get update
Install tomee with...
sudo apt-get install tomee-webprofile
or...
sudo apt-get install tomee-jaxrs
or...
sudo apt-get install tomee-plus
or...
sudo apt-get install tomee-plume
It will install tomee under "/var/lib/tomee-{classifier}"
[]s,
Thiago.
On Thu, Apr 10, 2014 at 8:21 AM, Thiago Veronezi <th...@veronezi.org>wrote:
> Hi Daniel,
>
> Thanks for the changelog tip. It works like a charm! :)
>
> Regarding the dependencies on other packages: I'm still trying to get our
> package done. Once we have something good enough, I will try to use the
> libraries from other packages like tomcat and activemq. I will need to ping
> the package maintainers and try sync updates with them.
>
> Just for fun, these are the current lintian results...
>
> tveronezi@debianboto:~/dev/ws/tomee/trunk/tomee/tomee-deb$ lintian
> ./target/apache-tomee-plus-1.6.1-SNAPSHOT.deb
> E: tomee-plus: non-etc-file-marked-as-conffile
> var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/openejb.conf
> E: tomee-plus: non-etc-file-marked-as-conffile
> var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/server.xml
> E: tomee-plus: non-etc-file-marked-as-conffile
> var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/tomcat-users.xml
> E: tomee-plus: non-etc-file-marked-as-conffile
> var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/conf.d/cxf-rs.properties
> E: tomee-plus: non-etc-file-marked-as-conffile
> var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/conf.d/cxf.properties
> E: tomee-plus: non-etc-file-marked-as-conffile
> var/lib/tomee-plus-1.6.1-SNAPSHOT/conf/conf.d/hsql.properties
> E: tomee-plus: no-copyright-file
> W: tomee-plus: extra-license-file
> usr/share/doc/tomee-plus-1.6.1-SNAPSHOT/LICENSE
> E: tomee-plus: init.d-script-does-not-implement-required-option
> etc/init.d/tomee-plus force-reload
> W: tomee-plus: codeless-jar
> usr/share/tomee-plus-1.6.1-SNAPSHOT/lib/tomcat-i18n-es.jar
> W: tomee-plus: codeless-jar
> usr/share/tomee-plus-1.6.1-SNAPSHOT/lib/tomcat-i18n-fr.jar
> W: tomee-plus: codeless-jar
> usr/share/tomee-plus-1.6.1-SNAPSHOT/lib/tomcat-i18n-ja.jar
> W: tomee-plus: codeless-jar
> usr/share/tomee-plus-1.6.1-SNAPSHOT/lib/tomee-webapp-1.6.1-SNAPSHOT.jar
>
> []s,
> Thiago.
>
>
>
>
> On Sun, Mar 30, 2014 at 11:56 AM, dsh <da...@gmail.com> wrote:
>
>> Hi Thiago,
>>
>> I suppose that is the constraint you have to deal with if you depend on
>> others. Usually on Linux (or even commonly on Unix type of systems) it is
>> uncommon, that every app ships it's own Java, app server or more generally
>> it's own runtime env. That's why I did ask whether it's a self contained
>> package or not.
>>
>> Additionally in cloud envirnments it might add additional constraints if
>> each app comes with it's own runtime env. On the other that might even
>> have
>> some advantages in cloude environments. Probably something to be
>> researched
>> and/or discussed.
>>
>> Cheers
>> Daniel
>>
>>
>> On Sun, Mar 30, 2014 at 4:54 PM, Thiago Veronezi <thiago@veronezi.org
>> >wrote:
>>
>> > Hi Daniel,
>> >
>> > For now it is self contained, but I guess I would get one big REJECT if
>> I
>> > submit it. One of the current violations is exactly that: packages
>> > shouldn't duplicate binaries. I was thinking about adding a dependency
>> on
>> > libtomcat7 (or maybe tomcat7-common), but this would also add a
>> dependency
>> > on how fast they publish their tomcat packages.
>> >
>> > For example, this developer is publishing tomcat7_7.0.52-1~bpo70+1 (
>> > https://lists.debian.org/debian-java/2014/03/msg00006.html) but apt
>> still
>> > shows "7.0.28"...
>> >
>> >
>> >
>> **********************************************************************************************
>> > tveronezi@debianboto:~/dev$ apt-cache show tomcat7
>> > Package: tomcat7
>> > Version: 7.0.28-4
>> > Installed-Size: 351
>> > Maintainer: Debian Java Maintainers <
>> > pkg-java-maintainers@lists.alioth.debian.org>
>> > Architecture: all
>> > Depends: tomcat7-common (>= 7.0.28-4), ucf, adduser, debconf (>= 0.5) |
>> > debconf-2.0
>> > Recommends: authbind
>> > Suggests: tomcat7-docs (>= 7.0.28-4), tomcat7-admin (>= 7.0.28-4),
>> > tomcat7-examples (>= 7.0.28-4), tomcat7-user (>= 7.0.28-4),
>> libtcnative-1
>> > Description-en: Servlet and JSP engine
>> > Apache Tomcat implements the Java Servlet and the JavaServer Pages
>> (JSP)
>> > specifications from Sun Microsystems, and provides a "pure Java" HTTP
>> web
>> > server environment for Java code to run.
>> > .
>> > This package contains only the startup scripts for the system-wide
>> daemon.
>> > No documentation or web applications are included here, please install
>> > the tomcat7-docs and tomcat7-examples packages if you want them.
>> > Install the authbind package if you need to use Tomcat on ports 1-1023.
>> > Install tomcat7-user instead of this package if you don't want Tomcat
>> to
>> > start as a service.
>> > Homepage: http://tomcat.apache.org
>> > Description-md5: 71d2a54f759941814ab4cf7873094b26
>> > Section: java
>> > Priority: optional
>> > Filename: pool/main/t/tomcat7/tomcat7_7.0.28-4_all.deb
>> > Size: 49298
>> > MD5sum: bbad096f79e933c8c32096fd7113a9e4
>> > SHA1: 913ccac2120fdb43551c53fc7d549cb36414eb00
>> > SHA256: 454a462370e2d7c912d0688ade03c9dd29f0bb63f74a1d9c1e1dceef67126d33
>> >
>> >
>> **********************************************************************************************
>> >
>> > ... and our server depends on 7.0.53.
>> >
>> > Anyway, I wouldn't change what tomcat installs. I would simply add
>> links to
>> > the tomcat jars instead of including them myself. This way, one could
>> have
>> > tomcat and tomee installed in the same box.
>> >
>> > We could also depend on the activemq packages (libactivemq-java provides
>> > the version 5.6.0), but it will add still more constraints. I need to
>> check
>> > the rules for that. It would be nicer to depend on others packages, but
>> I
>> > guess it is simpler to package them ourselves... or maybe to start
>> > contributing to those packages too. :)
>> >
>> > If nothing works out, I would do what dropbox and google (for Chrome)
>> do.
>> > They have their own deb files. After installing it, the users can update
>> > the packages by using apt-get. I don't know how that works, but I have a
>> > feeling that they include their own debian repositories references in
>> the
>> > localhost. That would add another issue: where to put our binaries? I
>> dont
>> > think the ASF has is own debian repository.
>> >
>> > []s,
>> > Thiago.
>> >
>> >
>> > On Sun, Mar 30, 2014 at 9:26 AM, dsh <da...@gmail.com> wrote:
>> >
>> > > Hi Thiago,
>> > >
>> > > yea I as well would like to recommend using debuild - especially if
>> the
>> > > package should be pushed upstreams and become an "official" Debian
>> > package.
>> > > I could try to ask colleagues how they usually build their DEB
>> packages
>> > if
>> > > using JIRA, Git or Bugzilla to pull the changelog information.
>> > >
>> > > Are you re-using the already existing Tomcat packages for Debian? Or
>> is
>> > the
>> > > TomEE package a self-contained package that as well includes Tomcat.
>> > Maybe
>> > > if that is possible it would make sense to rely on the already
>> existing
>> > > Tomcat Packages [1] and just have a tomcat$version-tomee or
>> tomee-tomcat
>> > > (if multiple tomcat versions are supported) package instead. That way
>> you
>> > > wouldn't have to care about stuff like which user runs the underlying
>> > > Tomcat instance etc..
>> > >
>> > > Others are following the same strategy btw - for instance jenkins.
>> > >
>> > > [1] https://packages.debian.org/search?keywords=tomcat
>> > >
>> > > Cheers
>> > > Daniel
>> > >
>> > >
>> > > On Sun, Mar 30, 2014 at 3:06 PM, Thiago Veronezi <thiago@veronezi.org
>> > > >wrote:
>> > >
>> > > > Hi Daniel,
>> > > >
>> > > > I know that jira has a rest api; I would like to link it to our
>> build.
>> > > This
>> > > > way we wouldn't have to maintain to changelogs: the tomee jira and
>> the
>> > > > debian/changelog file. I didnt touch it yet because I'm trying to
>> > address
>> > > > the rest of the violations that the current build has.
>> > > > https://ftp-master.debian.org/REJECT-FAQ.html
>> > > >
>> > > > I start to think that the maven build will not help us. The debian
>> > > > developers expect to build the packages from the source codes with a
>> > > simple
>> > > > debuild command. I will learn debuild first. I hope it can use the
>> > maven
>> > > > builds too.
>> > > >
>> > > > []s,
>> > > > Thiago.
>> > > >
>> > > >
>> > > >
>> > > >
>> > > > On Fri, Mar 28, 2014 at 6:25 PM, dsh <da...@gmail.com>
>> wrote:
>> > > >
>> > > > > Hi,
>> > > > >
>> > > > > can you describe a little more what's the issue with the changelog
>> > > file?
>> > > > Is
>> > > > > it just that you don't know how to create it or rather that you
>> don't
>> > > > know
>> > > > > how to create it automatically while building the DEB package? I
>> > think
>> > > > > adding that information helps others to provide some support on
>> this
>> > > > > subject.
>> > > > >
>> > > > > Cheers
>> > > > > Daniel
>> > > > >
>> > > > >
>> > > > > On Tue, Mar 25, 2014 at 8:18 PM, Thiago Veronezi <
>> > tveronezi@apache.org
>> > > > > >wrote:
>> > > > >
>> > > > > > Great news! Our debian package is working. I just need to figure
>> > out
>> > > > how
>> > > > > to
>> > > > > > create this changelog file that lintian is complaining about.
>> > > > > > In the mean time, any feedback is very welcome. You can test it
>> by
>> > > > > building
>> > > > > > it locally...
>> > > > > >
>> > > > > > tveronezi@botodev:~/dev/ws/tomee/trunk/tomee/tomee-deb$ mvn
>> clean
>> > > > > install
>> > > > > > tveronezi@botodev:~/dev/ws/tomee/trunk/tomee/tomee-deb$ sudo
>> dpkg
>> > -i
>> > > > > > ./target/apache-tomee-1.6.1-SNAPSHOT.deb
>> > > > > >
>> > > > > > I have a question for you guys: how to make maven to install the
>> > > debian
>> > > > > > file in "
>> > > > > >
>> repository.apache.org/content/groups/snapshots/org/apache/openejb/
>> > "?
>> > > > > > My "maven-install-plugin" approach didn't work.
>> > > > > >
>> > > > > > []s,
>> > > > > > Thiago.
>> > > > > >
>> > > > > > On Tue, Mar 25, 2014 at 3:01 PM, <tv...@apache.org> wrote:
>> > > > > >
>> > > > > > > Author: tveronezi
>> > > > > > > Date: Tue Mar 25 19:01:36 2014
>> > > > > > > New Revision: 1581465
>> > > > > > >
>> > > > > > > URL: http://svn.apache.org/r1581465
>> > > > > > > Log:
>> > > > > > > https://issues.apache.org/jira/browse/TOMEE-245
>> > > > > > >
>> > > > > > > The package is working, but it's not yet a valid debian
>> package.
>> > We
>> > > > > still
>> > > > > > > need to figure out how to create the changelog file.
>> > > > > > >
>> > > > > > > tveronezi@botodev:~/dev/ws/tomee/trunk/tomee/tomee-deb$
>> lintian
>> > > > > > > ./target/apache-tomee-1.6.1-SNAPSHOT.deb
>> > > > > > > E: tomee: debian-changelog-file-missing
>> > > > > > >
>> > > > > > > Added:
>> > > > > > >
>> > > > > >
>> > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh
>> > > > > > >
>> > > > > >
>> > >
>> tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template
>> > > > > > >
>> > > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh
>> > > > > > > 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/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=1581465&r1=1581464&r2=1581465&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 Mar 25 19:01:36 2014
>> > > > > > > @@ -43,15 +43,13 @@ class PackageBuilder {
>> > > > > > > outputDir.delete()
>> > > > > > > aux.renameTo(outputDir)
>> > > > > > > ant.delete(includeemptydirs: true) {
>> > > > > > > + fileset(dir: outputDir.absolutePath, includes:
>> > > > '**/*.txt')
>> > > > > > > fileset(dir: outputDir.absolutePath, includes:
>> > > > '**/*.exe')
>> > > > > > > fileset(dir: outputDir.absolutePath, includes:
>> > > > '**/*.bat')
>> > > > > > > fileset(dir: outputDir.absolutePath, includes:
>> > > > > > > '**/*.original')
>> > > > > > > fileset(dir: outputDir.absolutePath, includes:
>> > > > '**/*.tmp')
>> > > > > > > - fileset(dir: new File(outputDir,
>> > > > 'webapps').absolutePath)
>> > > > > {
>> > > > > > > - include(name: '**/*')
>> > > > > > > - exclude(name: '**/tomee/**')
>> > > > > > > - }
>> > > > > > > }
>> > > > > > > + ant.delete(includeemptydirs: true, dir: new
>> > > File(outputDir,
>> > > > > > > 'webapps').absolutePath)
>> > > > > > > outputDir.absolutePath
>> > > > > > > }
>> > > > > > >
>> > > > > > > @@ -98,6 +96,15 @@ class PackageBuilder {
>> > > > > > > new File(controlDir, 'prerm').withWriter {
>> > BufferedWriter
>> > > > out
>> > > > > ->
>> > > > > > >
>> > > > > out.write(this.class.getResource('/control/prerm.sh').text)
>> > > > > > > }
>> > > > > > > + new File(controlDir, 'postrm').withWriter {
>> > BufferedWriter
>> > > > out
>> > > > > > ->
>> > > > > > > +
>> > > > > out.write(this.class.getResource('/control/postrm.sh').text)
>> > > > > > > + }
>> > > > > > > + new File(controlDir, 'conffiles').withWriter {
>> > > > BufferedWriter
>> > > > > > out
>> > > > > > > ->
>> > > > > > > + new File(dataDir, 'etc/tomee').eachFile {
>> > > > > > > + out.writeLine("/etc/tomee/${it.name}")
>> > > > > > > + }
>> > > > > > > + out.writeLine('/etc/init.d/tomee')
>> > > > > > > + }
>> > > > > > > controlDir.absolutePath
>> > > > > > > }
>> > > > > > >
>> > > > > > > @@ -106,7 +113,7 @@ class PackageBuilder {
>> > > > > > > def outputDir = new File(exploded.parent, 'output')
>> > > > > > > def dataDir = new File(outputDir, 'data')
>> > > > > > > dataDir.mkdirs()
>> > > > > > > - def distributionTomeeDir = new File(dataDir,
>> > 'opt/tomee')
>> > > > > > > + def distributionTomeeDir = new File(dataDir,
>> > > > > 'usr/share/tomee')
>> > > > > > > ant.move(todir: distributionTomeeDir.absolutePath) {
>> > > > > > > fileset(dir: explodedPath) {
>> > > > > > > include(name: "**/*")
>> > > > > > > @@ -122,10 +129,6 @@ class PackageBuilder {
>> > > > > > > new File(initd, 'tomee').withWriter { BufferedWriter
>> out
>> > > ->
>> > > > > > >
>> > > out.write(this.class.getResource('/init/tomee.sh').text)
>> > > > > > > }
>> > > > > > > - ant.move(
>> > > > > > > - todir: new File(dataDir,
>> > > > > 'var/lib/tomee').absolutePath,
>> > > > > > > - file: new File(distributionTomeeDir,
>> > > > > > > 'webapps').absolutePath
>> > > > > > > - )
>> > > > > > > ant.move(todir: new File(dataDir,
>> > > > > > > 'usr/share/doc/tomee/').absolutePath) {
>> > > > > > > fileset(file: new File(distributionTomeeDir,
>> > > > > > > 'LICENSE').absolutePath)
>> > > > > > > fileset(file: new File(distributionTomeeDir,
>> > > > > > > 'NOTICE').absolutePath)
>> > > > > > > @@ -133,13 +136,24 @@ class PackageBuilder {
>> > > > > > > fileset(file: new File(distributionTomeeDir,
>> > > > > > > 'RUNNING.txt').absolutePath)
>> > > > > > > }
>> > > > > > > new File(dataDir, 'var/log/tomee').mkdirs()
>> > > > > > > - new File(dataDir, 'var/tmp/tomee/temp').mkdirs()
>> > > > > > > - new File(dataDir, 'var/tmp/tomee/work').mkdirs()
>> > > > > > > + new File(dataDir, 'var/lib/tomee/temp').mkdirs()
>> > > > > > > + new File(dataDir, 'var/lib/tomee/work').mkdirs()
>> > > > > > > + new File(dataDir, 'var/lib/tomee/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/tmp/tomee/temp"
>> > > > > > > - new File(distributionTomeeDir, 'work').delete() //
>> add
>> > > link
>> > > > > from
>> > > > > > > "/usr/lib/tomee/work" to "/var/tmp/tomee/work"
>> > > > > > > - new File(distributionTomeeDir, 'webapps').delete() //
>> > add
>> > > > link
>> > > > > > > from "/usr/lib/tomee/webapps" to "/var/lib/tomee/webapps"
>> > > > > > > + 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"
>> > > > > > > + new File(dataDir,
>> > > > 'usr/share/doc/tomee/copyright').withWriter
>> > > > > {
>> > > > > > > BufferedWriter out ->
>> > > > > > > + def template = new
>> > > > GStringTemplateEngine().createTemplate(
>> > > > > > > +
>> > this.class.getResource('/copyright.template')
>> > > > > > > + ).make([
>> > > > > > > + formattedDate: new Date().toString()
>> > > > > > > + ])
>> > > > > > > + out.write(template.toString())
>> > > > > > > + }
>> > > > > > > + new File(distributionTomeeDir,
>> > > 'bin/setenv.sh').withWriter {
>> > > > > > > BufferedWriter out ->
>> > > > > > > +
>> > > > out.write(this.class.getResource('/init/setenv.sh').text)
>> > > > > > > + }
>> > > > > > > exploded.delete()
>> > > > > > > dataDir.absolutePath
>> > > > > > > }
>> > > > > > > @@ -155,12 +169,14 @@ class PackageBuilder {
>> > > > > > > exclude(name: "**/*.sh")
>> > > > > > > exclude(name: "**/postinst")
>> > > > > > > exclude(name: "**/prerm")
>> > > > > > > + exclude(name: "**/postrm")
>> > > > > > > exclude(name: "**/init.d/tomee")
>> > > > > > > }
>> > > > > > > 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")
>> > > > > > > }
>> > > > > > > }
>> > > > > > >
>> > > > > > > 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=1581465&r1=1581464&r2=1581465&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 Mar 25 19:01:36 2014
>> > > > > > > @@ -1,19 +1,17 @@
>> > > > > > > #!/bin/sh
>> > > > > > >
>> > > > > > > -ln -sf /etc/tomee /opt/tomee/conf
>> > > > > > > -ln -sf /var/log/tomee /opt/tomee/logs
>> > > > > > > -ln -sf /var/tmp/tomee/temp /opt/tomee/temp
>> > > > > > > -ln -sf /var/tmp/tomee/work /opt/tomee/work
>> > > > > > > -ln -sf /var/lib/tomee/webapps /opt/tomee/webapps
>> > > > > > > +ln -sf /etc/tomee /usr/share/tomee/conf
>> > > > > > > +ln -sf /var/log/tomee /usr/share/tomee/logs
>> > > > > > > +ln -sf /var/lib/tomee/temp /usr/share/tomee/temp
>> > > > > > > +ln -sf /var/lib/tomee/work /usr/share/tomee/work
>> > > > > > > +ln -sf /var/lib/tomee/webapps /usr/share/tomee/webapps
>> > > > > > >
>> > > > > > > groupadd apachetomee
>> > > > > > > useradd apachetomee -g apachetomee
>> > > > > > >
>> > > > > > > -chown -R apachetomee:apachetomee /opt/tomee/
>> > > > > > > +chown -R apachetomee:apachetomee /usr/share/tomee
>> > > > > > > chown -R apachetomee:apachetomee /var/log/tomee
>> > > > > > > -chown -R apachetomee:apachetomee /var/tmp/tomee/temp
>> > > > > > > -chown -R apachetomee:apachetomee /var/tmp/tomee/work
>> > > > > > > -chown -R apachetomee:apachetomee /var/lib/tomee/webapps
>> > > > > > > +chown -R apachetomee:apachetomee /var/lib/tomee
>> > > > > > >
>> > > > > > > update-rc.d tomee defaults
>> > > > > > > echo "Reboot your machine or run 'service tomee start' to
>> start
>> > > the
>> > > > > > > Apache TomEE server"
>> > > > > > > \ No newline at end of file
>> > > > > > >
>> > > > > > > Added:
>> > > > > > >
>> > > >
>> 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=1581465&view=auto
>> > > > > > >
>> > > > > > >
>> > > > > >
>> > > > >
>> > > >
>> > >
>> >
>> ==============================================================================
>> > > > > > > ---
>> > > > > >
>> > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh
>> > > > > > > (added)
>> > > > > > > +++
>> > > > > >
>> > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/postrm.sh
>> > > > > > > Tue Mar 25 19:01:36 2014
>> > > > > > > @@ -0,0 +1,3 @@
>> > > > > > > +#!/bin/sh
>> > > > > > > +
>> > > > > > > +update-rc.d -f tomee 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=1581465&r1=1581464&r2=1581465&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 Mar 25 19:01:36 2014
>> > > > > > > @@ -1,15 +1,13 @@
>> > > > > > > #!/bin/sh
>> > > > > > >
>> > > > > > > -kill -9 $(ps aux | grep
>> org.apache.catalina.startup.Bootstrap |
>> > > grep
>> > > > > -v
>> > > > > > > grep | awk '{print $2}')
>> > > > > > > +CATALINA_HOME=/usr/share/tomee
>> > > > > > > +su - apachetomee -c "$CATALINA_HOME/bin/shutdown.sh -force"
>> > > > > > >
>> > > > > > > -rm -f /opt/tomee/conf
>> > > > > > > -rm -f /opt/tomee/logs
>> > > > > > > -rm -f /opt/tomee/temp
>> > > > > > > -rm -f /opt/tomee/work
>> > > > > > > -rm -f /opt/tomee/webapps
>> > > > > > > +rm -f /usr/share/tomee/conf
>> > > > > > > +rm -f /usr/share/tomee/logs
>> > > > > > > +rm -f /usr/share/tomee/temp
>> > > > > > > +rm -f /usr/share/tomee/work
>> > > > > > > +rm -f /usr/share/tomee/webapps
>> > > > > > >
>> > > > > > > -rm -Rf /var/tmp/tomee/work/*
>> > > > > > > -rm -Rf /var/tmp/tomee/temp/*
>> > > > > > > +rm -Rf /var/lib/tomee/*
>> > > > > > > rm -Rf /var/log/tomee/*
>> > > > > > > -
>> > > > > > > -update-rc.d -f tomee remove
>> > > > > > > \ No newline at end of file
>> > > > > > >
>> > > > > > > Added:
>> > > > > > >
>> > > >
>> tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template
>> > > > > > > URL:
>> > > > > > >
>> > > > > >
>> > > > >
>> > > >
>> > >
>> >
>> http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template?rev=1581465&view=auto
>> > > > > > >
>> > > > > > >
>> > > > > >
>> > > > >
>> > > >
>> > >
>> >
>> ==============================================================================
>> > > > > > > ---
>> > > > > > >
>> > > >
>> tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template
>> > > > > > > (added)
>> > > > > > > +++
>> > > > > > >
>> > > >
>> tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/copyright.template
>> > > > > > Tue
>> > > > > > > Mar 25 19:01:36 2014
>> > > > > > > @@ -0,0 +1,16 @@
>> > > > > > > +This package was debianized by the Apache TomEE dev Team <
>> > > > > > > dev@tomee.apache.org> on
>> > > > > > > +${formattedDate}
>> > > > > > > +
>> > > > > > > +Upstream Authors:
>> > > > > > > +
>> > > > > > > + Thiago Veronezi <tv...@apache.org>
>> > > > > > > +
>> > > > > > > +Copyright:
>> > > > > > > +
>> > > > > > > + Copyright (C) 1999-2014 The Apache Software Foundation
>> > > > > > > +
>> > > > > > > +License:
>> > > > > > > +
>> > > > > > > + * (if not otherwise specified):
>> > > > > > > +
>> > > > > > > + /usr/share/common-licenses/Apache-2'
>> > > > > > >
>> > > > > > > Added:
>> > > > > >
>> 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=1581465&view=auto
>> > > > > > >
>> > > > > > >
>> > > > > >
>> > > > >
>> > > >
>> > >
>> >
>> ==============================================================================
>> > > > > > > ---
>> > > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh
>> > > > > > > (added)
>> > > > > > > +++
>> > > > tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/init/setenv.sh
>> > > > > > > Tue Mar 25 19:01:36 2014
>> > > > > > > @@ -0,0 +1,2 @@
>> > > > > > > +#!/bin/sh
>> > > > > > > +export CATALINA_PID=/tmp/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=1581465&r1=1581464&r2=1581465&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
>> > > > > > > Mar 25 19:01:36 2014
>> > > > > > > @@ -4,20 +4,20 @@
>> > > > > > > # Short-Description: Apache TomEE
>> > > > > > > # Description: Manages the Apache TomEE server.
>> > > > > > > ### END INIT INFO
>> > > > > > > -CATALINA_HOME=/opt/tomee
>> > > > > > > +CATALINA_HOME=/usr/share/tomee
>> > > > > > > TOMCAT_USER=apachetomee
>> > > > > > >
>> > > > > > > RETVAL=0
>> > > > > > > start(){
>> > > > > > > echo "Starting TomEE: "
>> > > > > > > - su - $TOMCAT_USER -c "$CATALINA_HOME/bin/startup.sh"
>> > > > > > > + su - $TOMCAT_USER -c "$CATALINA_HOME/bin/catalina.sh
>> start"
>> > > > > > > RETVAL=$?
>> > > > > > > return $RETVAL
>> > > > > > > }
>> > > > > > >
>> > > > > > > stop(){
>> > > > > > > echo "Shutting down TomEE: "
>> > > > > > > - su - $TOMCAT_USER -c "$CATALINA_HOME/bin/shutdown.sh"
>> > > > > > > + su - $TOMCAT_USER -c "$CATALINA_HOME/bin/shutdown.sh
>> -force"
>> > > > > > > RETVAL=$?
>> > > > > > > return $RETVAL
>> > > > > > > }
>> > > > > > > @@ -29,12 +29,12 @@ case "$1" in
>> > > > > > > stop)
>> > > > > > > stop
>> > > > > > > ;;
>> > > > > > > - force-reload)
>> > > > > > > + restart)
>> > > > > > > stop
>> > > > > > > start
>> > > > > > > ;;
>> > > > > > > *)
>> > > > > > > - echo $"Usage: $0 {start|stop|force-reload}"
>> > > > > > > + echo $"Usage: $0 {start|stop|restart}"
>> > > > > > > exit 1
>> > > > > > > ;;
>> > > > > > > esac
>> > > > > > >
>> > > > > > >
>> > > > > > >
>> > > > > >
>> > > > >
>> > > >
>> > >
>> >
>>
>
>