Author: ebourg-guest Date: 2014-09-08 12:15:23 +0000 (Mon, 08 Sep 2014) New Revision: 18375
Modified: trunk/jspwiki/debian/README.Debian trunk/jspwiki/debian/changelog trunk/jspwiki/debian/control trunk/jspwiki/debian/jspwiki.links trunk/jspwiki/debian/jspwiki.postinst trunk/jspwiki/debian/jspwiki.properties trunk/jspwiki/debian/rules trunk/jspwiki/debian/tomcat.policy Log: Deploy to tomcat8 instead of tomcat6 Modified: trunk/jspwiki/debian/README.Debian =================================================================== --- trunk/jspwiki/debian/README.Debian 2014-09-08 11:53:45 UTC (rev 18374) +++ trunk/jspwiki/debian/README.Debian 2014-09-08 12:15:23 UTC (rev 18375) @@ -16,7 +16,7 @@ /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 Modified: trunk/jspwiki/debian/changelog =================================================================== --- trunk/jspwiki/debian/changelog 2014-09-08 11:53:45 UTC (rev 18374) +++ trunk/jspwiki/debian/changelog 2014-09-08 12:15:23 UTC (rev 18375) @@ -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 Modified: trunk/jspwiki/debian/control =================================================================== --- trunk/jspwiki/debian/control 2014-09-08 11:53:45 UTC (rev 18374) +++ trunk/jspwiki/debian/control 2014-09-08 12:15:23 UTC (rev 18375) @@ -19,7 +19,7 @@ libnekohtml-java, liboro-java, liboscache-java, - tomcat6, + tomcat8, unzip, yui-compressor, wget @@ -47,7 +47,7 @@ libnekohtml-java, liboro-java, liboscache-java, - tomcat6, + tomcat8, ${misc:Depends} Suggests: rcs Description: WikiWikiWeb clone written in Java Modified: trunk/jspwiki/debian/jspwiki.links =================================================================== --- trunk/jspwiki/debian/jspwiki.links 2014-09-08 11:53:45 UTC (rev 18374) +++ trunk/jspwiki/debian/jspwiki.links 2014-09-08 12:15:23 UTC (rev 18375) @@ -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 Modified: trunk/jspwiki/debian/jspwiki.postinst =================================================================== --- trunk/jspwiki/debian/jspwiki.postinst 2014-09-08 11:53:45 UTC (rev 18374) +++ trunk/jspwiki/debian/jspwiki.postinst 2014-09-08 12:15:23 UTC (rev 18375) @@ -4,14 +4,14 @@ . /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 Modified: trunk/jspwiki/debian/jspwiki.properties =================================================================== --- trunk/jspwiki/debian/jspwiki.properties 2014-09-08 11:53:45 UTC (rev 18374) +++ trunk/jspwiki/debian/jspwiki.properties 2014-09-08 12:15:23 UTC (rev 18375) @@ -792,7 +792,7 @@ 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 Modified: trunk/jspwiki/debian/rules =================================================================== --- trunk/jspwiki/debian/rules 2014-09-08 11:53:45 UTC (rev 18374) +++ trunk/jspwiki/debian/rules 2014-09-08 12:15:23 UTC (rev 18375) @@ -54,7 +54,7 @@ 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 Modified: trunk/jspwiki/debian/tomcat.policy =================================================================== --- trunk/jspwiki/debian/tomcat.policy 2014-09-08 11:53:45 UTC (rev 18374) +++ trunk/jspwiki/debian/tomcat.policy 2014-09-08 12:15:23 UTC (rev 18375) @@ -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 @@ 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 "*"; _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
