Author: tveronezi
Date: Sat Sep 8 17:47:11 2012
New Revision: 1382334
URL: http://svn.apache.org/viewvc?rev=1382334&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-245
Removed:
openejb/trunk/openejb/tomee/apache-tomee-deb-package/src/main/resources/
Modified:
openejb/trunk/openejb/tomee/apache-tomee-deb-package/src/main/java/org/apache/tomee/debian/PackageBuilder.java
openejb/trunk/openejb/tomee/apache-tomee-deb/pom.xml
openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/groovy/commands/BuildDeb.groovy
openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/resources/control
Modified:
openejb/trunk/openejb/tomee/apache-tomee-deb-package/src/main/java/org/apache/tomee/debian/PackageBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee-deb-package/src/main/java/org/apache/tomee/debian/PackageBuilder.java?rev=1382334&r1=1382333&r2=1382334&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/apache-tomee-deb-package/src/main/java/org/apache/tomee/debian/PackageBuilder.java
(original)
+++
openejb/trunk/openejb/tomee/apache-tomee-deb-package/src/main/java/org/apache/tomee/debian/PackageBuilder.java
Sat Sep 8 17:47:11 2012
@@ -44,13 +44,22 @@ import java.io.PrintWriter;
import java.util.Map;
public class PackageBuilder {
+ private final String user;
+ private final String group;
+
+ private long size = 0;
+
+ public PackageBuilder(String user, String group) {
+ this.user = user;
+ this.group = group;
+ }
private File uncompress(File gz) throws IOException, CompressorException {
final File output = new File(gz.getParent(),
FilenameUtils.getBaseName(gz.getName()));
output.delete();
final InputStream is = new FileInputStream(gz);
- CompressorInputStream in = new
CompressorStreamFactory().createCompressorInputStream("gz", is);
+ final CompressorInputStream in = new
CompressorStreamFactory().createCompressorInputStream("gz", is);
IOUtils.copy(in, new FileOutputStream(output));
in.close();
@@ -92,7 +101,7 @@ public class PackageBuilder {
newFile.mkdirs();
} else {
final OutputStream out = new FileOutputStream(newFile);
- IOUtils.copy(in, out);
+ this.size = this.size + IOUtils.copy(in, out);
out.close();
}
}
@@ -102,8 +111,8 @@ public class PackageBuilder {
}
private String getCheckSumLine(String name, File file) throws IOException {
- FileInputStream fis = new FileInputStream(file);
- String md5 = DigestUtils.md5Hex(fis);
+ final FileInputStream fis = new FileInputStream(file);
+ final String md5 = DigestUtils.md5Hex(fis);
fis.close();
return md5 + " " + name;
}
@@ -115,9 +124,8 @@ public class PackageBuilder {
final TarArchiveEntry entry = new TarArchiveEntry(file);
entry.setName(name);
- //TODO: remove hard-coded value
- entry.setUserName("tomee");
- entry.setGroupName("tomee");
+ entry.setUserName(this.user);
+ entry.setGroupName(this.group);
if (modeMappings != null && modeMappings.containsKey(name)) {
entry.setMode(modeMappings.get(name));
@@ -317,7 +325,7 @@ public class PackageBuilder {
final File deb = new File(sourceTarGz.getParent(), name + "-" +
version + ".deb");
try {
createDebPackage(
- isControl,
+ "Installed-Size: " + (this.size / 1024) + "\n" + isControl,
isPostinst,
isPrerm,
md5sums,
Modified: openejb/trunk/openejb/tomee/apache-tomee-deb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee-deb/pom.xml?rev=1382334&r1=1382333&r2=1382334&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomee-deb/pom.xml (original)
+++ openejb/trunk/openejb/tomee/apache-tomee-deb/pom.xml Sat Sep 8 17:47:11
2012
@@ -36,13 +36,11 @@
<artifactId>apache-tomee</artifactId>
<version>1.1.0-SNAPSHOT</version>
<type>pom</type>
- <scope>provided</scope>
</dependency>
<dependency> <!-- to be sure to have it -->
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee-deb-package</artifactId>
<version>1.1.0-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified:
openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/groovy/commands/BuildDeb.groovy
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/groovy/commands/BuildDeb.groovy?rev=1382334&r1=1382333&r2=1382334&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/groovy/commands/BuildDeb.groovy
(original)
+++
openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/groovy/commands/BuildDeb.groovy
Sat Sep 8 17:47:11 2012
@@ -72,18 +72,18 @@ class BuildDeb {
String name = require('name')
String version = require('version')
- final PackageBuilder builder = new PackageBuilder()
+ final PackageBuilder builder = new PackageBuilder("tomee", "tomee")
Map<String, String> dirMapping = new MapBuilder<String, String>(new
HashMap<String, String>())
.add("/bin", "/usr/tomee")
- .add("/conf", "/usr/tomee")
+ .add("/conf", "/etc/tomee")
.add("/endorsed", "/usr/tomee")
.add("/lib", "/usr/tomee")
- .add("/LICENSE", "/usr/tomee")
- .add("/NOTICE", "/usr/tomee")
- .add("/RELEASE-NOTES", "/usr/tomee")
- .add("/RUNNING.txt", "/usr/tomee")
- .add("/work", "/usr/tomee")
+ .add("/LICENSE", "/usr/share/doc/tomee")
+ .add("/NOTICE", "/usr/share/doc/tomee")
+ .add("/RELEASE-NOTES", "/usr/share/doc/tomee")
+ .add("/RUNNING.txt", "/usr/share/doc/tomee")
+ .add("/work", "/var/tomee")
.add("/logs", "/var/tomee")
.add("/webapps", "/var/tomee")
.add("/temp", "/tmp/tomee")
@@ -97,7 +97,9 @@ class BuildDeb {
final File gz = new File(new File(require('project.folder')), 'build/'
+ original.getName())
FileUtils.copyFile(original, gz)
- final String control = StringUtils.replace(getResource("control"),
"{0}", version)
+ String control = StringUtils.replace(getResource("control"), "{0}",
version)
+ control = StringUtils.replace(control, "{1}", name)
+
builder.createDebPackage(name, version, gz,
control,
getResource("postinst"),
@@ -106,9 +108,6 @@ class BuildDeb {
modeMapping
)
gz.delete()
-
-
-
}
}
Modified:
openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/resources/control
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/resources/control?rev=1382334&r1=1382333&r2=1382334&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/resources/control
(original)
+++ openejb/trunk/openejb/tomee/apache-tomee-deb/src/main/resources/control Sat
Sep 8 17:47:11 2012
@@ -1,4 +1,4 @@
-Package: tomee
+Package: {1}
Version: {0}
Section: web
Priority: optional
