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/09 14:37:45 UTC
svn commit: r1585955 - in /tomee/tomee/trunk/tomee/tomee-deb: pom.xml
src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
src/main/resources/control/postrm.sh src/main/resources/control/prerm.sh
Author: tveronezi
Date: Wed Apr 9 12:37:45 2014
New Revision: 1585955
URL: http://svn.apache.org/r1585955
Log:
Marking new configuration files:
- openejb.conf
- conf.d/cxf.properties
- conf.d/cxf-rs.properties
- conf.d/hsql.properties
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/postrm.sh
tomee/tomee/trunk/tomee/tomee-deb/src/main/resources/control/prerm.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=1585955&r1=1585954&r2=1585955&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/pom.xml Wed Apr 9 12:37:45 2014
@@ -14,221 +14,242 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tomee</artifactId>
- <groupId>org.apache.openejb</groupId>
- <version>1.6.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>tomee-deb</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: TomEE :: Debian Package Builder</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <commons.compress>1.8</commons.compress>
- <commons.io>2.4</commons.io>
- <commons.codec>1.9</commons.codec>
- <distribution.workdir>${project.build.directory}/work-dir</distribution.workdir>
- </properties>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <releases>
- <updatePolicy>daily</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>${commons.compress}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>copy-tomee-zip</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>apache-tomee</artifactId>
- <version>${project.version}</version>
- <classifier>plus</classifier>
- <type>zip</type>
- <outputDirectory>${distribution.workdir}</outputDirectory>
- <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>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <classpathScope>runtime</classpathScope>
- <scriptpath>
- <path>${project.basedir}/src/main/groovy</path>
- </scriptpath>
- <defaults>
- <testSectionsFile>${project.basedir}/sections.properties</testSectionsFile>
- <logOutputDirectory>${project.build.directory}/logs</logOutputDirectory>
- <backupLogs>true</backupLogs>
- </defaults>
- </configuration>
- <executions>
- <execution>
- <id>build-distribution</id>
- <phase>package</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <properties>
- <tomeeVersion>${project.version}</tomeeVersion>
- <workDir>${distribution.workdir}</workDir>
- <buildDir>${project.build.directory}</buildDir>
- </properties>
- <source>
- 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>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <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>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <parent>
+ <artifactId>tomee</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>1.6.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tomee-deb</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: TomEE :: Debian Package Builder</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <commons.compress>1.8</commons.compress>
+ <commons.io>2.4</commons.io>
+ <commons.codec>1.9</commons.codec>
+ <distribution.workdir>${project.build.directory}/work-dir</distribution.workdir>
+ </properties>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <releases>
+ <updatePolicy>daily</updatePolicy>
+ </releases>
+ <snapshots>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons.compress}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <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>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf</artifactId>
+ <version>${openejb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf-rs</artifactId>
+ <version>${openejb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-hsql</artifactId>
+ <version>${openejb.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>copy-tomee-zip</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${project.version}</version>
+ <classifier>plus</classifier>
+ <type>zip</type>
+ <outputDirectory>${distribution.workdir}</outputDirectory>
+ <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>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <classpathScope>runtime</classpathScope>
+ <scriptpath>
+ <path>${project.basedir}/src/main/groovy</path>
+ </scriptpath>
+ <defaults>
+ <testSectionsFile>${project.basedir}/sections.properties</testSectionsFile>
+ <logOutputDirectory>${project.build.directory}/logs</logOutputDirectory>
+ <backupLogs>true</backupLogs>
+ </defaults>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build-distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <properties>
+ <tomeeVersion>${project.version}</tomeeVersion>
+ <workDir>${distribution.workdir}</workDir>
+ <buildDir>${project.build.directory}</buildDir>
+ </properties>
+ <source>
+ 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>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <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>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
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=1585955&r1=1585954&r2=1585955&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 Apr 9 12:37:45 2014
@@ -122,6 +122,16 @@ class PackageBuilder {
out.writeLine("/etc/tomee-${classifier}-${properties.tomeeVersion}/${it.name}")
}
out.writeLine("/etc/init.d/tomee-${classifier}")
+ new File(dataDir, "var/lib/tomee-${classifier}-${properties.tomeeVersion}/conf").eachFile {
+ if(it.isFile()) {
+ out.writeLine("/var/lib/tomee-${classifier}-${properties.tomeeVersion}/conf/${it.name}")
+ }
+ }
+ new File(dataDir, "var/lib/tomee-${classifier}-${properties.tomeeVersion}/conf/conf.d").eachFile {
+ if(it.isFile()) {
+ out.writeLine("/var/lib/tomee-${classifier}-${properties.tomeeVersion}/conf/conf.d/${it.name}")
+ }
+ }
}
controlDir.absolutePath
}
@@ -162,8 +172,25 @@ class PackageBuilder {
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")
- baseBinDir.mkdirs()
+ new File(baseConfDir.absolutePath, 'openejb.conf').withWriter { BufferedWriter out ->
+ def data = this.class.getResource('/default.openejb.conf').text
+ out.write(data)
+ }
+ def baseConfDDir = new File(baseConfDir, 'conf.d')
+ baseConfDDir.mkdirs()
+ // Saving default configuration files
+ new File(baseConfDDir, 'cxf.properties').withWriter { BufferedWriter out ->
+ def data = this.class.getResource('/META-INF/org.apache.openejb.server.ServerService/cxf').text
+ out.write(data)
+ }
+ new File(baseConfDDir, 'cxf-rs.properties').withWriter { BufferedWriter out ->
+ def data = this.class.getResource('/META-INF/org.apache.openejb.server.ServerService/cxf-rs').text
+ out.write(data)
+ }
+ new File(baseConfDDir, 'hsql.properties').withWriter { BufferedWriter out ->
+ def data = this.class.getResource('/META-INF/org.apache.openejb.server.ServerService/hsql').text
+ out.write(data)
+ }
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()
@@ -177,6 +204,8 @@ class PackageBuilder {
'/copyright.template',
[formattedDate: new Date().toString()]
)
+ def baseBinDir = new File(dataDir, "var/lib/tomee-${classifier}-${properties.tomeeVersion}/bin")
+ baseBinDir.mkdirs()
writeTemplate(new File(baseBinDir, 'setenv.sh'), '/init/setenv.sh', [
classifier : classifier,
tomeeVersion: properties.tomeeVersion
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=1585955&r1=1585954&r2=1585955&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 Apr 9 12:37:45 2014
@@ -1,4 +1,4 @@
#!/bin/sh -e
+update-alternatives --remove tomee /etc/init.d/tomee-${classifier}
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=1585955&r1=1585954&r2=1585955&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 Apr 9 12:37:45 2014
@@ -2,6 +2,21 @@
service tomee-${classifier} stop || true
-rm /usr/share/tomee-${classifier}-${tomeeVersion}/conf
-rm -Rf /var/lib/tomee-${classifier}-${tomeeVersion}/*
+# removing link to /var/logs
+rm -f /var/lib/tomee-${classifier}-${tomeeVersion}/logs
+
+# removing non-configuration files
+rm -Rf /var/lib/tomee-${classifier}-${tomeeVersion}/apps
+rm -Rf /var/lib/tomee-${classifier}-${tomeeVersion}/bin
+rm -Rf /var/lib/tomee-${classifier}-${tomeeVersion}/temp
+rm -Rf /var/lib/tomee-${classifier}-${tomeeVersion}/webapps
+rm -Rf /var/lib/tomee-${classifier}-${tomeeVersion}/work
+
+# removing files created by tomcat
+rm -Rf /var/lib/tomee-${classifier}-${tomeeVersion}/conf/Catalina
+
+# removing link to /etc
+rm -f /usr/share/tomee-${classifier}-${tomeeVersion}/conf
+
+# removing logs
rm -Rf /var/log/tomee-${classifier}-${tomeeVersion}/*