[jspwiki] 23/24: Deploy to tomcat8 instead of tomcat6
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Nov 16 18:23:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jspwiki.
commit 8033e2f5482046bb0906ea6ba5755d8792bc3659
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Sep 8 12:15:23 2014 +0000
Deploy to tomcat8 instead of tomcat6
---
debian/README.Debian | 2 +-
debian/changelog | 3 ++-
debian/control | 4 ++--
debian/jspwiki.links | 4 ++--
debian/jspwiki.postinst | 6 +++---
debian/jspwiki.properties | 2 +-
debian/rules | 2 +-
debian/tomcat.policy | 14 +++++++-------
8 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 4ddd17f..233ec44 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -16,7 +16,7 @@ and page templates.
/etc/jspwiki contains all configuration files.
-/etc/tomcat6/policy.d/05jspwiki.policy is a symbolic link to
+/etc/tomcat8/policy.d/05jspwiki.policy is a symbolic link to
/etc/jspwiki/tomcat.policy
For more information see README.gz and http://www.jspwiki.org
diff --git a/debian/changelog b/debian/changelog
index 2152966..1d8b661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
jspwiki (2.8.0-6) UNRELEASED; urgency=medium
* Team upload.
+ * Deploy to tomcat8 instead of tomcat6
* Build with the default JDK instead of GCJ and removed the dependency
on libgnujaf-java
* Fixed the broken links to jstl.jar and standard.jar
* Use the Debian packages providing ecs, commons-logging and nekohtml instead
of the prebuilt jars in the source package
- * Don't mark the symlink /etc/tomcat6/policy.d/05jspwiki.policy as a conffile
+ * Don't mark the symlink /etc/tomcat8/policy.d/05jspwiki.policy as a conffile
* Compress the JavaScript files with the YUI compressor packaged in Debian
* Switch to the source format 3.0 (quilt)
* Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index 6bc27b2..1a656a5 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends-Indep: libcommons-codec-java,
libnekohtml-java,
liboro-java,
liboscache-java,
- tomcat6,
+ tomcat8,
unzip,
yui-compressor,
wget
@@ -47,7 +47,7 @@ Depends: libcommons-codec-java,
libnekohtml-java,
liboro-java,
liboscache-java,
- tomcat6,
+ tomcat8,
${misc:Depends}
Suggests: rcs
Description: WikiWikiWeb clone written in Java
diff --git a/debian/jspwiki.links b/debian/jspwiki.links
index 30b1c12..e7ed41f 100644
--- a/debian/jspwiki.links
+++ b/debian/jspwiki.links
@@ -1,8 +1,8 @@
etc/jspwiki/jspwiki.properties usr/share/jspwiki/WEB-INF/jspwiki.properties
etc/jspwiki/jspwiki.tld usr/share/jspwiki/WEB-INF/jspwiki.tld
etc/jspwiki/web.xml usr/share/jspwiki/WEB-INF/web.xml
-etc/jspwiki/jspwiki.xml etc/tomcat6/Catalina/localhost/JSPWiki.xml
-etc/jspwiki/tomcat.policy etc/tomcat6/policy.d/05jspwiki.policy
+etc/jspwiki/jspwiki.xml etc/tomcat8/Catalina/localhost/JSPWiki.xml
+etc/jspwiki/tomcat.policy etc/tomcat8/policy.d/05jspwiki.policy
usr/share/java/log4j-1.2.jar usr/share/jspwiki/WEB-INF/lib/log4j-1.2.jar
usr/share/java/commons-codec.jar usr/share/jspwiki/WEB-INF/lib/commons-codec.jar
usr/share/java/commons-fileupload.jar usr/share/jspwiki/WEB-INF/lib/commons-fileupload.jar
diff --git a/debian/jspwiki.postinst b/debian/jspwiki.postinst
index d269bfd..2132ee0 100644
--- a/debian/jspwiki.postinst
+++ b/debian/jspwiki.postinst
@@ -4,14 +4,14 @@ set -e
. /usr/share/debconf/confmodule
-# retrieve the tomcat6 user
-db_get tomcat6/username && TOMCAT6_USER="$RET" || TOMCAT6_USER="tomcat6"
+# retrieve the tomcat8 user
+db_get tomcat8/username && TOMCAT_USER="$RET" || TOMCAT_USER="tomcat8"
cd /var/lib/jspwiki
if [[ ! -f default/Main.txt ]];
then
tar --extract --gunzip --keep-old-files --file /usr/share/doc/jspwiki/examples/wikipages.tar.gz || true
- chown -R $TOMCAT6_USER default
+ chown -R $TOMCAT_USER default
fi
set +e
diff --git a/debian/jspwiki.properties b/debian/jspwiki.properties
index 5f51151..340b4da 100644
--- a/debian/jspwiki.properties
+++ b/debian/jspwiki.properties
@@ -792,7 +792,7 @@ mail.smtp.host = @mail.smtp.host@
log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
log4j.appender.FileLog.MaxFileSize = 10MB
log4j.appender.FileLog.MaxBackupIndex = 14
-log4j.appender.FileLog.File = /var/log/tomcat6/jspwiki.log
+log4j.appender.FileLog.File = /var/log/tomcat8/jspwiki.log
log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
diff --git a/debian/rules b/debian/rules
index d80e5b3..7bbd825 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ install: build
binary-indep: build install
dh_testdir
dh_testroot
- dh_installdirs -p jspwiki etc/jspwiki etc/tomcat6/policy.d var/lib/jspwiki var/lib/tomcat6/webapps usr/share/doc/jspwiki/examples usr/share
+ dh_installdirs -p jspwiki etc/jspwiki etc/tomcat8/policy.d var/lib/jspwiki var/lib/tomcat8/webapps usr/share/doc/jspwiki/examples usr/share
dh_install -p jspwiki
cp -r build/JSPWiki debian/jspwiki/usr/share/jspwiki
rm -f debian/jspwiki/usr/share/jspwiki/WEB-INF/jspwiki.properties
diff --git a/debian/tomcat.policy b/debian/tomcat.policy
index a7f4406..8e255a3 100644
--- a/debian/tomcat.policy
+++ b/debian/tomcat.policy
@@ -1,15 +1,15 @@
-grant codeBase "file:/var/lib/tomcat6/webapps/JSPWiki/-" {
- permission java.io.FilePermission "/var/lib/tomcat6/temp/-", "read,write";
+grant codeBase "file:/var/lib/tomcat8/webapps/JSPWiki/-" {
+ permission java.io.FilePermission "/var/lib/tomcat8/temp/-", "read,write";
permission java.util.PropertyPermission "java.io.tmpdir", "read";
permission java.util.PropertyPermission "user.dir", "read";
permission java.util.PropertyPermission "jspwiki.propertyfile.cascade.1", "read";
permission java.util.PropertyPermission "java.runtime.version", "read";
permission java.io.FilePermission "/etc/jspwiki/-", "read";
- permission java.io.FilePermission "/var/log/tomcat6/-", "read,write";
+ permission java.io.FilePermission "/var/log/tomcat8/-", "read,write";
permission java.io.FilePermission "/var/lib/jspwiki", "read,write";
permission java.io.FilePermission "/var/lib/jspwiki/-", "read,write";
permission java.io.FilePermission "/usr/share/jspwiki/-", "read";
- permission java.io.FilePermission "/var/lib/tomcat6/webapps/JSPWiki/-", "read";
+ permission java.io.FilePermission "/var/lib/tomcat8/webapps/JSPWiki/-", "read";
permission java.security.SecurityPermission "getProperty.login.configuration.provider", "read,write";
permission javax.security.auth.AuthPermission "*";
permission javax.management.MBeanServerPermission "*";
@@ -17,17 +17,17 @@ grant codeBase "file:/var/lib/tomcat6/webapps/JSPWiki/-" {
permission javax.management.MBeanTrustPermission "*";
};
grant codeBase "file:/usr/share/jspwiki/-" {
- permission java.io.FilePermission "/var/lib/tomcat6/temp/-", "read,write";
+ permission java.io.FilePermission "/var/lib/tomcat8/temp/-", "read,write";
permission java.util.PropertyPermission "java.io.tmpdir", "read";
permission java.util.PropertyPermission "user.dir", "read";
permission java.util.PropertyPermission "jspwiki.propertyfile.cascade.1", "read";
permission java.util.PropertyPermission "java.runtime.version", "read";
permission java.io.FilePermission "/etc/jspwiki/-", "read";
- permission java.io.FilePermission "/var/log/tomcat6/-", "read,write";
+ permission java.io.FilePermission "/var/log/tomcat8/-", "read,write";
permission java.io.FilePermission "/var/lib/jspwiki", "read,write";
permission java.io.FilePermission "/var/lib/jspwiki/-", "read,write";
permission java.io.FilePermission "/usr/share/jspwiki/-", "read";
- permission java.io.FilePermission "/var/lib/tomcat6/webapps/JSPWiki/-", "read";
+ permission java.io.FilePermission "/var/lib/tomcat8/webapps/JSPWiki/-", "read";
permission java.security.SecurityPermission "getProperty.login.configuration.provider", "read,write";
permission javax.security.auth.AuthPermission "*";
permission javax.management.MBeanServerPermission "*";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jspwiki.git
More information about the pkg-java-commits
mailing list