[jetty9] 06/99: Install files to "jetty8" directories to allow installation alongside jetty6
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Fri Oct 9 21:20:45 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 b6efe4de6d2c4011997ae10cfedd8d7f501a202a
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sun Mar 4 12:37:22 2012 +0100
Install files to "jetty8" directories to allow installation alongside jetty6
---
debian/README.Debian | 28 +++++++--------
debian/changelog | 2 +-
debian/control | 22 ++++++------
debian/jetty-shared-webapps.xml | 2 +-
debian/jetty.conf | 6 ++--
debian/jetty.dirs | 7 ----
debian/jetty.install | 25 --------------
debian/jetty.links | 6 ----
debian/{jetty.cron.daily => jetty8.cron.daily} | 2 +-
debian/{jetty.default => jetty8.default} | 8 ++---
debian/jetty8.dirs | 7 ++++
debian/{jetty.init => jetty8.init} | 32 ++++++++---------
debian/jetty8.install | 25 ++++++++++++++
debian/jetty8.links | 5 +++
debian/{jetty.postinst => jetty8.postinst} | 6 ++--
debian/{jetty.postrm => jetty8.postrm} | 22 ++++++------
debian/libjetty-extra-java.dirs | 1 -
debian/libjetty-extra-java.links | 12 -------
debian/libjetty-extra-java.poms | 6 ----
debian/libjetty-java-doc.install | 1 -
debian/libjetty-java.dirs | 3 --
debian/libjetty-java.links | 1 -
debian/libjetty-java.poms | 40 ----------------------
debian/libjetty8-extra-java.dirs | 1 +
debian/libjetty8-extra-java.links | 12 +++++++
debian/libjetty8-extra-java.poms | 6 ++++
...va-doc.doc-base => libjetty8-java-doc.doc-base} | 4 +--
debian/libjetty8-java-doc.install | 1 +
debian/libjetty8-java.dirs | 3 ++
debian/libjetty8-java.links | 1 +
debian/libjetty8-java.poms | 40 ++++++++++++++++++++++
debian/rules | 22 ++++++------
32 files changed, 180 insertions(+), 179 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index adbd8fc..2eed0e8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,37 +1,37 @@
jetty for Debian
----------------
-This debian package installs Jetty 6 into /usr/share/jetty
+This debian package installs Jetty 8 into /usr/share/jetty8
and other directories under /var and /etc, which are linked to
-from the /usr/share/jetty directory.
+from the /usr/share/jetty8 directory.
-The configuration of the server is in /etc/jetty. The configuration
-files listed in /etc/jetty/jetty.conf are passed to the command
-line of Jetty when it is started by /etc/init.d/jetty
+The configuration of the server is in /etc/jetty8. The configuration
+files listed in /etc/jetty8/jetty.conf are passed to the command
+line of Jetty when it is started by /etc/init.d/jetty8
-Webapps can be deployed by placing them in /var/lib/jetty/webapps
-(linked from /usr/share/jetty/webapps)
+Webapps can be deployed by placing them in /var/lib/jetty8/webapps
+(linked from /usr/share/jetty8/webapps)
Additional contexts can be configured and (hot) deployed via the
-/etc/jetty/contexts directory (linked from /usr/share/jetty/contexts).
+/etc/jetty8/contexts directory (linked from /usr/share/jetty8/contexts).
Installing:
-$ sudo apt-get install libjetty-java
-$ sudo apt-get install libjetty-extra-java
-$ sudo apt-get install jetty
+$ sudo apt-get install libjetty8-java
+$ sudo apt-get install libjetty8-extra-java
+$ sudo apt-get install jetty8
Starting:
-Edit /etc/default/jetty
+Edit /etc/default/jetty8
Set:
NO_START=0
Then do:
-$ sudo service jetty start
+$ sudo service jetty8 start
Stopping:
-$ sudo service jetty stop
+$ sudo service jetty8 stop
--
diff --git a/debian/changelog b/debian/changelog
index 206c6ac..abe392a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jetty (8.1.1-1) UNRELEASED; urgency=low
+jetty8 (8.1.1-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index dd8b468..39e8906 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: jetty
+Source: jetty8
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -15,17 +15,17 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty
Homepage: http://jetty.mortbay.com/
-Package: libjetty-java
+Package: libjetty8-java
Architecture: all
Depends: ${misc:Depends}, libservlet3.0-java
-Suggests: jetty, libjetty-java-doc
+Suggests: jetty8, libjetty8-java-doc
Description: Java servlet engine and webserver -- core libraries
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
It is designed to be light weight, high performance, embeddable,
extensible and flexible, thus making it an ideal platform for serving
dynamic HTTP requests from any Java application.
-#Package: libjetty-java-doc
+#Package: libjetty8-java-doc
#Section: doc
#Architecture: all
#Depends: ${misc:Depends}
@@ -39,13 +39,13 @@ Description: Java servlet engine and webserver -- core libraries
# .
# This package contains the Javadoc for libjetty-java.
-Package: libjetty-extra-java
+Package: libjetty8-extra-java
Architecture: all
-Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}),
+Depends: ${misc:Depends}, libjetty8-java (>= ${source:Version}),
libtomcat7-java (>= 7.0.26), libasm3-java, libgnujaf-java,
libgnumail-java, libjakarta-taglibs-standard-java, libservlet3.0-java,
jstl1.1-java
-Suggests: jetty
+Suggests: jetty8
Description: Java servlet engine and webserver -- extra libraries
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
It is designed to be light weight, high performance, embeddable,
@@ -55,12 +55,12 @@ Description: Java servlet engine and webserver -- extra libraries
jetty-servlet-tester, jetty-ajp, jetty-java5-threadpool,
jetty-client, jetty-rewrite-handler, jetty-plus, jetty-annotations
-Package: jetty
+Package: jetty8
Architecture: all
-Depends: ${misc:Depends}, libjetty-java (>= ${source:Version}),
+Depends: ${misc:Depends}, libjetty8-java (>= ${source:Version}),
adduser, apache2-utils, default-jre-headless | java5-runtime-headless | java6-runtime-headless
-Suggests: libjetty-extra-java (>= ${source:Version}),
- libjetty-java-doc (>= ${source:Version})
+Suggests: libjetty8-extra-java (>= ${source:Version}),
+ libjetty8-java-doc (>= ${source:Version})
Description: Java servlet engine and webserver
Jetty is an Open Source HTTP Servlet Server written in 100% Java.
It is designed to be light weight, high performance, embeddable,
diff --git a/debian/jetty-shared-webapps.xml b/debian/jetty-shared-webapps.xml
index 1c09ada..9a8cc78 100644
--- a/debian/jetty-shared-webapps.xml
+++ b/debian/jetty-shared-webapps.xml
@@ -30,7 +30,7 @@
<Arg>
<New class="org.eclipse.jetty.deploy.WebAppDeployer">
<Set name="contexts"><Ref id="Contexts"/></Set>
- <Set name="webAppDir">/usr/share/jetty/webapps</Set>
+ <Set name="webAppDir">/usr/share/jetty8/webapps</Set>
<Set name="parentLoaderPriority">false</Set>
<Set name="extract">true</Set>
<Set name="allowDuplicates">false</Set>
diff --git a/debian/jetty.conf b/debian/jetty.conf
index c5eb802..2b15091 100644
--- a/debian/jetty.conf
+++ b/debian/jetty.conf
@@ -1,4 +1,4 @@
# list of jetty configuration and property files
-/etc/jetty/jetty-logging.xml
-/etc/jetty/jetty.xml
-/etc/jetty/jetty-shared-webapps.xml
+/etc/jetty8/jetty-logging.xml
+/etc/jetty8/jetty.xml
+/etc/jetty8/jetty-shared-webapps.xml
diff --git a/debian/jetty.dirs b/debian/jetty.dirs
deleted file mode 100644
index 27f1475..0000000
--- a/debian/jetty.dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/jetty
-etc/jetty/contexts
-usr/share/jetty
-usr/share/doc/jetty
-var/lib/jetty/webapps
-var/log/jetty
-var/cache/jetty
diff --git a/debian/jetty.install b/debian/jetty.install
deleted file mode 100644
index 2ddc0cc..0000000
--- a/debian/jetty.install
+++ /dev/null
@@ -1,25 +0,0 @@
-jetty-webapp/src/main/config/etc/* etc/jetty
-jetty-policy/src/main/config/etc/* etc/jetty
-jetty-security/src/main/config/etc/* etc/jetty
-jetty-server/src/main/config/etc/* etc/jetty
-jetty-ajp/src/main/config/etc/* etc/jetty
-jetty-annotations/src/main/config/etc/* etc/jetty
-jetty-monitor/src/main/config/etc/* etc/jetty
-jetty-overlay-deployer/src/main/config/etc/* etc/jetty
-jetty-rewrite/src/main/config/etc/* etc/jetty
-jetty-plus/src/main/config/etc/* etc/jetty
-jetty-util/src/main/config/etc/* etc/jetty
-jetty-jmx/src/main/config/etc/* etc/jetty
-debian/jetty-shared-webapps.xml etc/jetty
-debian/jetty.conf etc/jetty
-
-debian/root-webapp/* var/lib/jetty/webapps/root
-test-jetty-webapp/src/main/webapp/jetty_banner.gif var/lib/jetty/webapps/root
-jetty-distribution/src/main/resources/contexts etc/jetty
-jetty-distribution/src/main/resources/resources usr/share/jetty
-jetty-start/target/classes/org/eclipse/jetty/start/start.config etc/jetty
-
-LICENSE-CONTRIBUTOR/cla-* usr/share/doc/jetty/LICENSES
-LICENSE-CONTRIBUTOR/ccla-* usr/share/doc/jetty/LICENSES
-NOTICE.txt usr/share/doc/jetty/LICENSES
-debian/README.Debian usr/share/doc/jetty
diff --git a/debian/jetty.links b/debian/jetty.links
deleted file mode 100644
index 5010583..0000000
--- a/debian/jetty.links
+++ /dev/null
@@ -1,6 +0,0 @@
-var/lib/jetty/webapps usr/share/jetty/webapps
-var/log/jetty usr/share/jetty/logs
-etc/jetty usr/share/jetty/etc
-etc/jetty/contexts usr/share/jetty/contexts
-usr/share/doc/libjetty-java/api usr/share/jetty/javadoc
-
diff --git a/debian/jetty.cron.daily b/debian/jetty8.cron.daily
similarity index 97%
rename from debian/jetty.cron.daily
rename to debian/jetty8.cron.daily
index 6a90e45..2b2774a 100644
--- a/debian/jetty.cron.daily
+++ b/debian/jetty8.cron.daily
@@ -1,6 +1,6 @@
#!/bin/sh
-NAME=jetty
+NAME=jetty8
DEFAULT=/etc/default/$NAME
# The following variables can be overwritten in $DEFAULT
diff --git a/debian/jetty.default b/debian/jetty8.default
similarity index 91%
rename from debian/jetty.default
rename to debian/jetty8.default
index d517847..4bfef3d 100644
--- a/debian/jetty.default
+++ b/debian/jetty8.default
@@ -1,4 +1,4 @@
-# Defaults for jetty see /etc/init.d/jetty for more
+# Defaults for jetty see /etc/init.d/jetty8 for more
# change to 0 to allow Jetty to start
NO_START=1
@@ -39,10 +39,10 @@ VERBOSE=yes
#JSP_COMPILER=jikes
# Jetty uses a directory to store temporary files like unpacked webapps
-#JETTY_TMP=/var/cache/jetty
+#JETTY_TMP=/var/cache/jetty8
# Jetty uses a config file to setup its boot classpath
-#JETTY_START_CONFIG=/etc/jetty/start.config
+#JETTY_START_CONFIG=/etc/jetty8/start.config
-# Default for number of days to keep old log files in /var/log/jetty/
+# Default for number of days to keep old log files in /var/log/jetty8/
#LOGFILE_DAYS=14
diff --git a/debian/jetty8.dirs b/debian/jetty8.dirs
new file mode 100644
index 0000000..7c18e22
--- /dev/null
+++ b/debian/jetty8.dirs
@@ -0,0 +1,7 @@
+etc/jetty8
+etc/jetty8/contexts
+usr/share/jetty8
+usr/share/doc/jetty8
+var/lib/jetty8/webapps
+var/log/jetty8
+var/cache/jetty8
diff --git a/debian/jetty.init b/debian/jetty8.init
similarity index 93%
rename from debian/jetty.init
rename to debian/jetty8.init
index 55cf135..365b845 100644
--- a/debian/jetty.init
+++ b/debian/jetty8.init
@@ -1,6 +1,6 @@
#!/bin/sh -e
#
-# /etc/init.d/jetty -- startup script for jetty 6.1.18
+# /etc/init.d/jetty8 -- startup script for jetty 8.1.1
#
# Written by Philipp Meier <meier at meisterbohne.de>
# Modified for Jetty 6 by Ludovic Claude <ludovic.claude at laposte.net>
@@ -19,11 +19,11 @@
# Configuration files
#
-# /etc/default/jetty
+# /etc/default/jetty8
# If it exists, this is read at the start of script. It may perform any
# sequence of shell commands, like setting relevant environment variables.
#
-# /etc/jetty/jetty.conf
+# /etc/jetty8/jetty.conf
# If found, the file will be used as this script's configuration.
# Each line in the file may contain:
# - A comment denoted by the pound (#) sign as first non-blank character.
@@ -34,11 +34,11 @@
#
# The files will be checked for existence before being passed to jetty.
#
-# /etc/jetty/jetty.xml
+# /etc/jetty8/jetty.xml
# If found, used as this script's configuration file, but only if
-# /etc/jetty/jetty.conf was not present. See above.
+# /etc/jetty8/jetty.conf was not present. See above.
#
-# Configuration variables (to define in /etc/default/jetty)
+# Configuration variables (to define in /etc/default/jetty8)
#
# JAVA_HOME
# Home of Java installation.
@@ -62,14 +62,14 @@
# if set, then used as a username to run the server as
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-NAME=jetty
+NAME=jetty8
DESC="Jetty servlet engine"
JETTY_HOME=/usr/share/$NAME
-LOGDIR="/var/log/jetty"
+LOGDIR="/var/log/$NAME"
START_JAR="$JETTY_HOME/start.jar"
DEFAULT=/etc/default/$NAME
DAEMON=/usr/bin/jsvc
-JVM_TMP=/var/cache/jetty/tmp
+JVM_TMP=/var/cache/$NAME/tmp
if [ `id -u` -ne 0 ]; then
echo "You need root privileges to run this script"
@@ -135,10 +135,10 @@ JDK_DIRS="
JETTY_SHUTDOWN=30
# Jetty uses a directory to store temporary files like unpacked webapps
-JETTY_TMP=/var/cache/jetty/data
+JETTY_TMP=/var/cache/jetty8/data
# Jetty uses a config file to setup its boot classpath
-JETTY_START_CONFIG=/etc/jetty/start.config
+JETTY_START_CONFIG=/etc/jetty8/start.config
# End of variables that can be overwritten in /etc/default/jetty
@@ -158,13 +158,13 @@ fi
# Check whether startup has been disabled
if [ "$NO_START" != "0" -a "$1" != "stop" ]; then
- [ "$VERBOSE" != "no" ] && log_failure_msg "Not starting jetty - edit /etc/default/jetty and change NO_START to be 0 (or comment it out)."
+ [ "$VERBOSE" != "no" ] && log_failure_msg "Not starting jetty - edit /etc/default/jetty8 and change NO_START to be 0 (or comment it out)."
exit 0
fi
if [ -z "$JETTY_USER" ]; then
log_failure_msg "Not starting/stopping $DESC as configured"
- log_failure_msg "(JETTY_USER is empty in /etc/default/jetty)."
+ log_failure_msg "(JETTY_USER is empty in /etc/default/jetty8)."
exit 0
fi
@@ -206,11 +206,11 @@ JAVA_OPTIONS="$JAVA_OPTIONS -cp $START_CLASSPATH"
if [ -z "$JAVA_HOME" ]; then
log_failure_msg "Could not start $DESC because no Java Development Kit"
log_failure_msg "(JDK) was found. Please download and install JDK 1.4 or higher and set"
- log_failure_msg "JAVA_HOME in /etc/default/jetty to the JDK's installation directory."
+ log_failure_msg "JAVA_HOME in /etc/default/jetty8 to the JDK's installation directory."
exit 0
fi
-CONFIG_LINES=$(cat /etc/jetty/jetty.conf | grep -v "^[[:space:]]*#" | tr "\n" " ")
+CONFIG_LINES=$(cat /etc/jetty8/jetty.conf | grep -v "^[[:space:]]*#" | tr "\n" " ")
##################################################
# Get the list of config.xml files from jetty.conf
@@ -252,7 +252,7 @@ fi
#####################################################
if [ -z "$CONFIGS" ]
then
- CONFIGS="/etc/jetty/jetty-logging.xml /etc/jetty/jetty.xml"
+ CONFIGS="/etc/jetty8/jetty-logging.xml /etc/jetty8/jetty.xml"
fi
##################################################
diff --git a/debian/jetty8.install b/debian/jetty8.install
new file mode 100644
index 0000000..5d59ec3
--- /dev/null
+++ b/debian/jetty8.install
@@ -0,0 +1,25 @@
+jetty-webapp/src/main/config/etc/* etc/jetty8
+jetty-policy/src/main/config/etc/* etc/jetty8
+jetty-security/src/main/config/etc/* etc/jetty8
+jetty-server/src/main/config/etc/* etc/jetty8
+jetty-ajp/src/main/config/etc/* etc/jetty8
+jetty-annotations/src/main/config/etc/* etc/jetty8
+jetty-monitor/src/main/config/etc/* etc/jetty8
+jetty-overlay-deployer/src/main/config/etc/* etc/jetty8
+jetty-rewrite/src/main/config/etc/* etc/jetty8
+jetty-plus/src/main/config/etc/* etc/jetty8
+jetty-util/src/main/config/etc/* etc/jetty8
+jetty-jmx/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/contexts etc/jetty8
+jetty-distribution/src/main/resources/resources usr/share/jetty8
+jetty-start/target/classes/org/eclipse/jetty/start/start.config etc/jetty8
+
+LICENSE-CONTRIBUTOR/cla-* usr/share/doc/jetty8/LICENSES
+LICENSE-CONTRIBUTOR/ccla-* usr/share/doc/jetty8/LICENSES
+NOTICE.txt usr/share/doc/jetty8/LICENSES
+debian/README.Debian usr/share/doc/jetty8
diff --git a/debian/jetty8.links b/debian/jetty8.links
new file mode 100644
index 0000000..3b519fe
--- /dev/null
+++ b/debian/jetty8.links
@@ -0,0 +1,5 @@
+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
+usr/share/doc/libjetty8-java/api usr/share/jetty8/javadoc
diff --git a/debian/jetty.postinst b/debian/jetty8.postinst
similarity index 65%
rename from debian/jetty.postinst
rename to debian/jetty8.postinst
index 14fec6d..7bc7a76 100644
--- a/debian/jetty.postinst
+++ b/debian/jetty8.postinst
@@ -4,12 +4,12 @@ set -e
case "$1" in
configure)
if ! id jetty > /dev/null 2>&1 ; then
- adduser --system --home /usr/share/jetty --no-create-home \
+ adduser --system --home /usr/share/jetty8 --no-create-home \
--group --disabled-password --shell /bin/false \
jetty
fi
- chown -R jetty:adm /var/cache/jetty /var/log/jetty /var/lib/jetty
- chmod 750 /var/log/jetty
+ chown -R jetty:adm /var/cache/jetty8 /var/log/jetty8 /var/lib/jetty8
+ chmod 750 /var/log/jetty8
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/jetty.postrm b/debian/jetty8.postrm
similarity index 62%
rename from debian/jetty.postrm
rename to debian/jetty8.postrm
index 7cd6f2d..c969451 100644
--- a/debian/jetty.postrm
+++ b/debian/jetty8.postrm
@@ -4,23 +4,23 @@ set -e
#DEBHELPER#
# Remove cached files
-rm -rf /var/cache/jetty/*
+rm -rf /var/cache/jetty8/*
case "$1" in
remove)
# Remove ROOT webapp if not modified
- RWLOC="/var/lib/jetty/webapps/root"
+ RWLOC="/var/lib/jetty8/webapps/root"
RWFILES="$RWLOC/index.html $RWLOC/jetty_banner.gif"
if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
= "12471c4b3020defb7ebd30ef84c0f9dd" ] ; then
rm $RWFILES
rmdir --ignore-fail-on-non-empty \
- /var/lib/jetty/webapps/root \
- /var/lib/jetty/webapps \
- /var/lib/jetty || true
+ /var/lib/jetty8/webapps/root \
+ /var/lib/jetty8/webapps \
+ /var/lib/jetty8 || true
fi
- if [ -d "/var/cache/jetty" ] ; then
- rm -rf /var/cache/jetty
+ if [ -d "/var/cache/jetty8" ] ; then
+ rm -rf /var/cache/jetty8
fi
;;
@@ -28,11 +28,11 @@ case "$1" in
# Remove user/group and log files (don't remove everything under
# /var/lib/jetty because there might be user-installed webapps)
deluser jetty || true
- rm -rf /var/log/jetty
- if [ -d "/var/lib/jetty" ] ; then
- rmdir --ignore-fail-on-non-empty /var/lib/jetty || true
+ rm -rf /var/log/jetty8
+ if [ -d "/var/lib/jetty8" ] ; then
+ rmdir --ignore-fail-on-non-empty /var/lib/jetty8 || true
fi
- rmdir --ignore-fail-on-non-empty /etc/jetty/contexts /etc/jetty || true
+ rmdir --ignore-fail-on-non-empty /etc/jetty8/contexts /etc/jetty8 || true
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/libjetty-extra-java.dirs b/debian/libjetty-extra-java.dirs
deleted file mode 100644
index 61cf297..0000000
--- a/debian/libjetty-extra-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/jetty/lib/ext
diff --git a/debian/libjetty-extra-java.links b/debian/libjetty-extra-java.links
deleted file mode 100644
index aae25cc..0000000
--- a/debian/libjetty-extra-java.links
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/share/java/tomcat-annotations-api.jar usr/share/jetty/lib/annotations/javax.annotation.jar
-usr/share/java/asm3.jar usr/share/jetty/lib/annotations/org.objectweb.asm.jar
-usr/share/java/asm3-commons.jar usr/share/jetty/lib/annotations/org.objectweb.asm.commons.jar
-
-usr/share/java/activation.jar usr/share/jetty/lib/jndi/javax.activation.jar
-usr/share/java/gnumail.jar usr/share/jetty/lib/jndi/javax.mail.jar
-
-usr/share/java/tomcat-jsp-api-2.2.jar usr/share/jetty/lib/jsp/javax.servlet.jsp.jar
-usr/share/java/tomcat-jasper.jar usr/share/jetty/lib/jsp/org.apache.jasper.jar
-usr/share/java/jstl1.1.jar usr/share/jetty/lib/jsp/javax.servlet.jsp.jstl.jar
-usr/share/java/tomcat-el-api-2.2.jar usr/share/jetty/lib/jsp/javax.el.jar
-usr/share/java/standard.jar usr/share/jetty/lib/jsp/org.apache.taglibs.standard.jar
diff --git a/debian/libjetty-extra-java.poms b/debian/libjetty-extra-java.poms
deleted file mode 100644
index b0463df..0000000
--- a/debian/libjetty-extra-java.poms
+++ /dev/null
@@ -1,6 +0,0 @@
-jetty-ajp/pom.xml --java-lib --usj-name=jetty-ajp
-jetty-annotations/pom.xml --java-lib --usj-name=jetty-annotations
-jetty-client/pom.xml --java-lib --usj-name=jetty-client
-jetty-jndi/pom.xml --java-lib --usj-name=jetty-jndi
-jetty-monitor/pom.xml --java-lib --usj-name=jetty-monitor
-jetty-plus/pom.xml --java-lib --usj-name=jetty-plus
diff --git a/debian/libjetty-java-doc.install b/debian/libjetty-java-doc.install
deleted file mode 100644
index 1521394..0000000
--- a/debian/libjetty-java-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-api usr/share/doc/libjetty-java
diff --git a/debian/libjetty-java.dirs b/debian/libjetty-java.dirs
deleted file mode 100644
index f0b415c..0000000
--- a/debian/libjetty-java.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/jetty
-usr/share/jetty/lib
-usr/share/jetty/lib/ext
diff --git a/debian/libjetty-java.links b/debian/libjetty-java.links
deleted file mode 100644
index b766370..0000000
--- a/debian/libjetty-java.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/tomcat-servlet-api-3.0.jar usr/share/jetty/lib/servlet-api-3.0.jar
diff --git a/debian/libjetty-java.poms b/debian/libjetty-java.poms
deleted file mode 100644
index a497384..0000000
--- a/debian/libjetty-java.poms
+++ /dev/null
@@ -1,40 +0,0 @@
-pom.xml --no-parent
-jetty-webapp/pom.xml --java-lib --usj-name=jetty-webapp
-jetty-policy/pom.xml --java-lib --usj-name=jetty-policy
-jetty-jsp/pom.xml
-jetty-security/pom.xml --java-lib --usj-name=jetty-security
-jetty-server/pom.xml --java-lib --usj-name=jetty-server
-jetty-jndi/pom.xml --ignore-pom
-jetty-xml/pom.xml --java-lib --usj-name=jetty-xml
-jetty-aggregate/jetty-webapp/pom.xml
-jetty-aggregate/jetty-server/pom.xml
-jetty-aggregate/jetty-all/pom.xml
-jetty-aggregate/jetty-all-server/pom.xml
-jetty-aggregate/jetty-client/pom.xml
-jetty-aggregate/jetty-plus/pom.xml --ignore-pom
-jetty-aggregate/pom.xml
-jetty-aggregate/jetty-websocket/pom.xml --java-lib --usj-name=jetty-websocket
-jetty-aggregate/jetty-servlet/pom.xml --java-lib --usj-name=jetty-servlet
-jetty-ajp/pom.xml --ignore-pom
-jetty-continuation/pom.xml --java-lib --usj-name=jetty-continuation
-jetty-annotations/pom.xml --ignore-pom
-jetty-nosql/pom.xml --ignore-pom
-jetty-monitor/pom.xml --ignore-pom
-jetty-client/pom.xml --ignore-pom
-jetty-overlay-deployer/pom.xml --java-lib --usj-name=jetty-overlay-deployer
-jetty-rewrite/pom.xml --java-lib --usj-name=jetty-rewrite
-jetty-plus/pom.xml --ignore-pom
-jetty-deploy/pom.xml --java-lib --usj-name=jetty-deploy
-jetty-distribution/pom.xml
-jetty-http/pom.xml --java-lib --usj-name=jetty-http
-jetty-nested/pom.xml
-jetty-websocket/pom.xml
-jetty-start/pom.xml --java-lib --usj-name=jetty-start
-jetty-http-spi/pom.xml
-jetty-io/pom.xml --java-lib --usj-name=jetty-io
-jetty-util/pom.xml --java-lib --usj-name=jetty-util
-jetty-jaspi/pom.xml
-jetty-jmx/pom.xml --java-lib --usj-name=jetty-jmx
-jetty-servlets/pom.xml --java-lib --usj-name=jetty-servlets
-jetty-servlet/pom.xml --java-lib --usj-name=jetty-servlet
-
diff --git a/debian/libjetty8-extra-java.dirs b/debian/libjetty8-extra-java.dirs
new file mode 100644
index 0000000..726d83f
--- /dev/null
+++ b/debian/libjetty8-extra-java.dirs
@@ -0,0 +1 @@
+usr/share/jetty8/lib/ext
diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links
new file mode 100644
index 0000000..771ba66
--- /dev/null
+++ b/debian/libjetty8-extra-java.links
@@ -0,0 +1,12 @@
+usr/share/java/tomcat-annotations-api.jar usr/share/jetty8/lib/annotations/javax.annotation.jar
+usr/share/java/asm3.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.jar
+usr/share/java/asm3-commons.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar
+
+usr/share/java/activation.jar usr/share/jetty8/lib/jndi/javax.activation.jar
+usr/share/java/gnumail.jar usr/share/jetty8/lib/jndi/javax.mail.jar
+
+usr/share/java/tomcat-jsp-api-2.2.jar usr/share/jetty8/lib/jsp/javax.servlet.jsp.jar
+usr/share/java/tomcat-jasper.jar usr/share/jetty8/lib/jsp/org.apache.jasper.jar
+usr/share/java/jstl1.1.jar usr/share/jetty8/lib/jsp/javax.servlet.jsp.jstl.jar
+usr/share/java/tomcat-el-api-2.2.jar usr/share/jetty8/lib/jsp/javax.el.jar
+usr/share/java/standard.jar usr/share/jetty8/lib/jsp/org.apache.taglibs.standard.jar
diff --git a/debian/libjetty8-extra-java.poms b/debian/libjetty8-extra-java.poms
new file mode 100644
index 0000000..95e4f20
--- /dev/null
+++ b/debian/libjetty8-extra-java.poms
@@ -0,0 +1,6 @@
+jetty-ajp/pom.xml --java-lib --usj-name=jetty8-ajp
+jetty-annotations/pom.xml --java-lib --usj-name=jetty8-annotations
+jetty-client/pom.xml --java-lib --usj-name=jetty8-client
+jetty-jndi/pom.xml --java-lib --usj-name=jetty8-jndi
+jetty-monitor/pom.xml --java-lib --usj-name=jetty8-monitor
+jetty-plus/pom.xml --java-lib --usj-name=jetty8-plus
diff --git a/debian/libjetty-java-doc.doc-base b/debian/libjetty8-java-doc.doc-base
similarity index 63%
rename from debian/libjetty-java-doc.doc-base
rename to debian/libjetty8-java-doc.doc-base
index 5b5af3d..d0af4f4 100644
--- a/debian/libjetty-java-doc.doc-base
+++ b/debian/libjetty8-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by Jetty.
Section: Programming
Format: HTML
-Index: /usr/share/doc/libjetty-java/api/index.html
-Files: /usr/share/doc/libjetty-java/api/*
+Index: /usr/share/doc/libjetty8-java/api/index.html
+Files: /usr/share/doc/libjetty8-java/api/*
diff --git a/debian/libjetty8-java-doc.install b/debian/libjetty8-java-doc.install
new file mode 100644
index 0000000..81d9f37
--- /dev/null
+++ b/debian/libjetty8-java-doc.install
@@ -0,0 +1 @@
+api usr/share/doc/libjetty8-java
diff --git a/debian/libjetty8-java.dirs b/debian/libjetty8-java.dirs
new file mode 100644
index 0000000..5d8303c
--- /dev/null
+++ b/debian/libjetty8-java.dirs
@@ -0,0 +1,3 @@
+usr/share/jetty8
+usr/share/jetty8/lib
+usr/share/jetty8/lib/ext
diff --git a/debian/libjetty8-java.links b/debian/libjetty8-java.links
new file mode 100644
index 0000000..ec47b97
--- /dev/null
+++ b/debian/libjetty8-java.links
@@ -0,0 +1 @@
+usr/share/java/tomcat-servlet-api-3.0.jar usr/share/jetty8/lib/servlet-api-3.0.jar
diff --git a/debian/libjetty8-java.poms b/debian/libjetty8-java.poms
new file mode 100644
index 0000000..1120437
--- /dev/null
+++ b/debian/libjetty8-java.poms
@@ -0,0 +1,40 @@
+pom.xml --no-parent
+jetty-webapp/pom.xml --java-lib --usj-name=jetty8-webapp
+jetty-policy/pom.xml --java-lib --usj-name=jetty8-policy
+jetty-jsp/pom.xml
+jetty-security/pom.xml --java-lib --usj-name=jetty8-security
+jetty-server/pom.xml --java-lib --usj-name=jetty8-server
+jetty-jndi/pom.xml --ignore-pom
+jetty-xml/pom.xml --java-lib --usj-name=jetty8-xml
+jetty-aggregate/jetty-webapp/pom.xml
+jetty-aggregate/jetty-server/pom.xml
+jetty-aggregate/jetty-all/pom.xml
+jetty-aggregate/jetty-all-server/pom.xml
+jetty-aggregate/jetty-client/pom.xml
+jetty-aggregate/jetty-plus/pom.xml --ignore-pom
+jetty-aggregate/pom.xml
+jetty-aggregate/jetty-websocket/pom.xml --java-lib --usj-name=jetty8-websocket
+jetty-aggregate/jetty-servlet/pom.xml --java-lib --usj-name=jetty8-servlet
+jetty-ajp/pom.xml --ignore-pom
+jetty-continuation/pom.xml --java-lib --usj-name=jetty8-continuation
+jetty-annotations/pom.xml --ignore-pom
+jetty-nosql/pom.xml --ignore-pom
+jetty-monitor/pom.xml --ignore-pom
+jetty-client/pom.xml --ignore-pom
+jetty-overlay-deployer/pom.xml --java-lib --usj-name=jetty8-overlay-deployer
+jetty-rewrite/pom.xml --java-lib --usj-name=jetty8-rewrite
+jetty-plus/pom.xml --ignore-pom
+jetty-deploy/pom.xml --java-lib --usj-name=jetty8-deploy
+jetty-distribution/pom.xml
+jetty-http/pom.xml --java-lib --usj-name=jetty8-http
+jetty-nested/pom.xml
+jetty-websocket/pom.xml
+jetty-start/pom.xml --java-lib --usj-name=jetty8-start
+jetty-http-spi/pom.xml
+jetty-io/pom.xml --java-lib --usj-name=jetty8-io
+jetty-util/pom.xml --java-lib --usj-name=jetty8-util
+jetty-jaspi/pom.xml
+jetty-jmx/pom.xml --java-lib --usj-name=jetty8-jmx
+jetty-servlets/pom.xml --java-lib --usj-name=jetty8-servlets
+jetty-servlet/pom.xml --java-lib --usj-name=jetty8-servlet
+
diff --git a/debian/rules b/debian/rules
index cbcd8d8..6330bed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,33 +18,35 @@ LIBJETTY_EXTRA_JARS := ajp annotations client jndi monitor plus
# Some java sources contain UTF-8 characters, build fails with C locale
export LC_ALL=C.UTF-8
-install/libjetty-java:: libjetty-java-mh-install
- version=$(wildcard debian/libjetty-java/usr/share/maven-repo/org/eclipse/jetty/jetty-server/8*); \
+install/libjetty8-java:: libjetty8-java-mh-install
+ version=$(wildcard debian/libjetty8-java/usr/share/maven-repo/org/eclipse/jetty/jetty-server/8*); \
version=$$(basename $$version); \
for lib in $(LIBJETTY_JARS); do \
- mh_installjar -plibjetty-java --java-lib --usj-name=jetty-$$lib \
+ mh_installjar -plibjetty8-java --java-lib --usj-name=jetty8-$$lib \
jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \
if [ $$lib = "start" ]; then \
continue; \
fi; \
jar=jetty-$$lib-$$version.jar; \
- dh_link -plibjetty-java usr/share/java/$$jar usr/share/jetty/lib/$$jar; \
+ jar8=jetty8-$$lib-$$version.jar; \
+ dh_link -plibjetty8-java usr/share/java/$$jar8 usr/share/jetty8/lib/$$jar; \
done; \
- dh_link -plibjetty-java usr/share/java/jetty-start-$$version.jar usr/share/jetty/start.jar
+ dh_link -plibjetty8-java usr/share/java/jetty8-start-$$version.jar usr/share/jetty8/start.jar
-install/libjetty-extra-java:: libjetty-extra-java-mh-install
- version=$(wildcard debian/libjetty-extra-java/usr/share/maven-repo/org/eclipse/jetty/jetty-ajp/8*); \
+install/libjetty8-extra-java:: libjetty8-extra-java-mh-install
+ version=$(wildcard debian/libjetty8-extra-java/usr/share/maven-repo/org/eclipse/jetty/jetty-ajp/8*); \
version=$$(basename $$version); \
for lib in $(LIBJETTY_EXTRA_JARS); do \
- mh_installjar -plibjetty-extra-java --java-lib --usj-name=jetty-$$lib \
+ mh_installjar -plibjetty8-extra-java --java-lib --usj-name=jetty8-$$lib \
jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \
if [ $$lib = "monitor" ]; then \
continue; \
fi; \
jar=jetty-$$lib-$$version.jar; \
- dh_link -plibjetty-extra-java usr/share/java/$$jar usr/share/jetty/lib/$$jar; \
+ jar8=jetty8-$$lib-$$version.jar; \
+ dh_link -plibjetty8-extra-java usr/share/java/$$jar8 usr/share/jetty8/lib/$$jar; \
done; \
- dh_link -plibjetty-extra-java usr/share/java/jetty-monitor-$$version.jar usr/share/jetty/lib/monitor/jetty-monitor.jar
+ dh_link -plibjetty8-extra-java usr/share/java/jetty8-monitor-$$version.jar usr/share/jetty8/lib/monitor/jetty-monitor.jar
%-mh-install:
mh_install -p$(patsubst %-mh-install,%,$@)
--
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