Author: tveronezi
Date: Tue Mar 12 21:39:41 2013
New Revision: 1455723
URL: http://svn.apache.org/r1455723
Log:
https://issues.apache.org/jira/browse/TOMEE-245
-file-in-etc-not-marked-as-conffile fixed
-still need to address the issues below (lintian
./target/apache-tomee-plus-1.6.0-SNAPSHOT.deb)...
E: tomee: debian-changelog-file-missing
W: tomee: codeless-jar usr/share/tomee/lib/tomcat-i18n-es.jar
W: tomee: codeless-jar usr/share/tomee/lib/tomcat-i18n-fr.jar
W: tomee: codeless-jar usr/share/tomee/lib/tomcat-i18n-ja.jar
W: tomee: codeless-jar usr/share/tomee/lib/tomee-webapp-1.6.0-SNAPSHOT.jar
Modified:
tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
Modified:
tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
URL:
http://svn.apache.org/viewvc/tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy?rev=1455723&r1=1455722&r2=1455723&view=diff
==============================================================================
---
tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
(original)
+++
tomee/sandbox/tomee-deb/src/main/groovy/org/apache/tomee/deb/PackageBuilder.groovy
Tue Mar 12 21:39:41 2013
@@ -108,6 +108,7 @@ class PackageBuilder {
} else if (subPath.startsWith('/conf')) {
root = './etc/tomee'
path = root + subPath.substring('/conf'.length())
+ dataholder.conffiles << path.substring(1)
} else if (subPath.startsWith('/logs')) {
root = './var/log/tomee'
@@ -185,7 +186,8 @@ class PackageBuilder {
Integer startIndex = exploded.path.length()
def dataholder = [
size: 0l,
- checksum: new StringBuilder()
+ checksum: new StringBuilder(),
+ conffiles: new ArrayList<String>()
]
items.each {
@@ -197,7 +199,8 @@ class PackageBuilder {
return [
tar: tar,
checksum: dataholder.checksum.toString(),
- size: dataholder.size
+ size: dataholder.size,
+ conffiles: dataholder.conffiles
]
}
@@ -240,6 +243,10 @@ Description: Apache TomEE
addTextEntry(output, 'control', text)
}
+ private void addConffilesEntry(TarArchiveOutputStream output, List<String>
conffiles) {
+ addTextEntry(output, 'conffiles', conffiles.join('\n') + '\n')
+ }
+
private static void addChecksum(TarArchiveOutputStream output, String
checksum) {
addTextEntry(output, 'md5sums', checksum)
}
@@ -251,6 +258,7 @@ Description: Apache TomEE
output.longFileMode = TarArchiveOutputStream.LONGFILE_POSIX
addControlEntry(output, (long) data.size)
+ addConffilesEntry(output, (List<String>) data.conffiles)
addChecksum(output, (String) data.checksum)
output.close()
