[jetty9] 67/99: Reuse and patch the configuration files from the upstream distribution
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Fri Oct 9 21:20:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository jetty9.
commit 4e5614618f27a328b234084a11f62b03d6961f51
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 11 15:47:49 2014 +0200
Reuse and patch the configuration files from the upstream distribution
---
debian/changelog | 3 ++-
debian/jetty-extra.conf | 11 --------
debian/jetty-shared-webapps.xml | 42 -------------------------------
debian/jetty.conf | 4 ---
debian/jetty8.install | 6 +++--
debian/jetty8.links | 2 ++
debian/patches/adjust-configuration.patch | 12 +++++++++
debian/patches/series | 1 +
8 files changed, 21 insertions(+), 60 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 467dbe3..d1e5441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,11 +20,12 @@ jetty8 (8.1.15-1) UNRELEASED; urgency=medium
- Updated the Homepage field
* debian/rules: Install the upstream changelog
* debian/watch: Watch the tags from the Git repository
- * debian/jetty-shared-webapps.xml: Updated the path of the webapps directory
* debian/jetty8.init: Added the missing JETTY_CONF variable
* debian/jetty8.init: Paths relative to JETTY_HOME are now recognized
in /etc/jetty8/jetty.conf
* Install the missing Jasper dependencies in /usr/share/jetty8/lib/jsp
+ * Reuse and patch the configuration files from the upstream distribution
+ instead of installing Debian specific files (Closes: #728380)
* Switch to debhelper level 9
-- Emmanuel Bourg <ebourg at apache.org> Wed, 30 Jul 2014 16:01:22 +0200
diff --git a/debian/jetty-extra.conf b/debian/jetty-extra.conf
deleted file mode 100644
index 5d47d78..0000000
--- a/debian/jetty-extra.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# list of jetty configuration and property files
-# Replace jetty.conf with this file to use the extra features
-/etc/jetty/jetty-logging.xml
-/etc/jetty/jetty-jmx.xml
-/etc/jetty/jetty.xml
-/etc/jetty/jetty-shared-webapps.xml
-/etc/jetty/jetty-plus.xml
-/etc/jetty/jetty-ajp.xml
-/etc/jetty/jetty-ssl.xml
-/etc/jetty/jetty-sslengine.xml
-/etc/jetty/jetty-stats.xml
diff --git a/debian/jetty-shared-webapps.xml b/debian/jetty-shared-webapps.xml
deleted file mode 100644
index 0c1fee8..0000000
--- a/debian/jetty-shared-webapps.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server to use webapps located in -->
-<!-- /usr/share/jetty8/webapps -->
-<!-- -->
-<!-- Documentation of this file format can be found at: -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
-<!-- -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- Configure the webapp deployer. -->
- <!-- A webapp deployer will deploy standard webapps discovered -->
- <!-- in a directory at startup, without the need for additional -->
- <!-- configuration files. It does not support hot deploy or -->
- <!-- non standard contexts (see ContextDeployer above). -->
- <!-- -->
- <!-- This deployer is configured to deploy webapps from the -->
- <!-- /usr/share/jetty8/webapps directory -->
- <!-- -->
- <!-- Normally only one type of deployer need be used. -->
- <!-- -->
- <!-- =========================================================== -->
- <Call name="addLifeCycle">
- <Arg>
- <New class="org.eclipse.jetty.deploy.WebAppDeployer">
- <Set name="contexts"><Ref id="Contexts"/></Set>
- <Set name="webAppDir">/usr/share/jetty8/webapps</Set>
- <Set name="parentLoaderPriority">false</Set>
- <Set name="extract">true</Set>
- <Set name="allowDuplicates">false</Set>
- <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
- </New>
- </Arg>
- </Call>
-
-</Configure>
diff --git a/debian/jetty.conf b/debian/jetty.conf
deleted file mode 100644
index 2b15091..0000000
--- a/debian/jetty.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# list of jetty configuration and property files
-/etc/jetty8/jetty-logging.xml
-/etc/jetty8/jetty.xml
-/etc/jetty8/jetty-shared-webapps.xml
diff --git a/debian/jetty8.install b/debian/jetty8.install
index ded2a2d..d532ec9 100644
--- a/debian/jetty8.install
+++ b/debian/jetty8.install
@@ -1,20 +1,22 @@
jetty-ajp/src/main/config/etc/* etc/jetty8
jetty-annotations/src/main/config/etc/* etc/jetty8
+jetty-deploy/src/main/config/etc/* etc/jetty8
jetty-jmx/src/main/config/etc/* etc/jetty8
jetty-monitor/src/main/config/etc/* etc/jetty8
jetty-overlay-deployer/src/main/config/etc/* etc/jetty8
jetty-plus/src/main/config/etc/* etc/jetty8
jetty-policy/src/main/config/etc/* etc/jetty8
+jetty-policy/src/main/config/lib/policy/* etc/jetty8/policy
jetty-rewrite/src/main/config/etc/* etc/jetty8
jetty-security/src/main/config/etc/* etc/jetty8
jetty-server/src/main/config/etc/* etc/jetty8
jetty-util/src/main/config/etc/* etc/jetty8
jetty-webapp/src/main/config/etc/* etc/jetty8
-debian/jetty-shared-webapps.xml etc/jetty8
-debian/jetty.conf etc/jetty8
debian/root-webapp/* var/lib/jetty8/webapps/root
test-jetty-webapp/src/main/webapp/jetty_banner.gif var/lib/jetty8/webapps/root
+jetty-distribution/src/main/resources/start.ini etc/jetty8
+jetty-distribution/src/main/resources/etc/* etc/jetty8
jetty-distribution/src/main/resources/contexts etc/jetty8
jetty-distribution/src/main/resources/resources usr/share/jetty8
jetty-start/target/classes/org/eclipse/jetty/start/start.config etc/jetty8
diff --git a/debian/jetty8.links b/debian/jetty8.links
index 3b519fe..8fc2a0a 100644
--- a/debian/jetty8.links
+++ b/debian/jetty8.links
@@ -2,4 +2,6 @@ var/lib/jetty8/webapps usr/share/jetty8/webapps
var/log/jetty8 usr/share/jetty8/logs
etc/jetty8 usr/share/jetty8/etc
etc/jetty8/contexts usr/share/jetty8/contexts
+etc/jetty8/start.ini usr/share/jetty8/start.ini
+etc/jetty8/policy usr/share/jetty8/lib/policy
usr/share/doc/libjetty8-java/api usr/share/jetty8/javadoc
diff --git a/debian/patches/adjust-configuration.patch b/debian/patches/adjust-configuration.patch
new file mode 100644
index 0000000..8267bed
--- /dev/null
+++ b/debian/patches/adjust-configuration.patch
@@ -0,0 +1,12 @@
+Description: Adjust the configuration of the default distribution
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jetty-distribution/src/main/resources/start.ini
++++ b/jetty-distribution/src/main/resources/start.ini
+@@ -64,5 +64,5 @@
+ #etc/jetty-overlay.xml
+ etc/jetty-webapps.xml
+ etc/jetty-contexts.xml
+-etc/jetty-testrealm.xml
++#etc/jetty-testrealm.xml
+ #===========================================================
diff --git a/debian/patches/series b/debian/patches/series
index 98e6f0c..e92cb49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disable-osgi-tests.patch
maven-bundle-plugin-version.patch
disable-modules.patch
aggregate-doc.patch
+adjust-configuration.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git
More information about the pkg-java-commits
mailing list