[jetty9] 111/135: Renamed jetty8 to jetty9
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 17 14:53:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jetty9.
commit 54ff7519dd9d3de20502e54f752aeeceea6d7520
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Sep 23 16:50:13 2014 +0200
Renamed jetty8 to jetty9
---
debian/README.Debian | 22 +++----
debian/control | 30 ++++-----
debian/jetty8.dirs | 7 ---
debian/jetty8.install | 27 --------
debian/jetty8.links | 7 ---
debian/{jetty8.cron.daily => jetty9.cron.daily} | 2 +-
debian/{jetty8.default => jetty9.default} | 8 +--
debian/jetty9.dirs | 7 +++
debian/{jetty8.init => jetty9.init} | 16 ++---
debian/jetty9.install | 27 ++++++++
debian/jetty9.links | 7 +++
debian/{jetty8.postinst => jetty9.postinst} | 14 ++---
debian/{jetty8.postrm => jetty9.postrm} | 20 +++---
debian/{jetty8.prerm => jetty9.prerm} | 8 +--
debian/libjetty8-extra-java.links | 22 -------
debian/libjetty8-java-doc.install | 1 -
debian/libjetty8-java.dirs | 3 -
debian/libjetty8-java.links | 25 --------
debian/libjetty8-java.poms | 72 ----------------------
debian/libjetty9-extra-java.links | 21 +++++++
debian/libjetty9-extra-java.poms | 7 +++
...va-doc.doc-base => libjetty9-java-doc.doc-base} | 6 +-
debian/libjetty9-java-doc.install | 1 +
debian/libjetty9-java.dirs | 3 +
debian/libjetty9-java.links | 25 ++++++++
debian/libjetty9-java.poms | 34 ++++++++++
debian/root-webapp/index.html | 4 +-
debian/source/lintian-overrides | 2 +-
28 files changed, 198 insertions(+), 230 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index e85e91a..456f659 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,26 +1,26 @@
-jetty for Debian
+Jetty for Debian
----------------
-This debian package installs Jetty 8 into /usr/share/jetty8
+This debian package installs Jetty 9 into /usr/share/jetty9
and other directories under /var and /etc, which are linked to
-from the /usr/share/jetty8 directory.
+from the /usr/share/jetty9 directory.
-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
+The configuration of the server is in /etc/jetty9. The configuration
+files listed in /etc/jetty9/jetty.conf are passed to the command
+line of Jetty when it is started by /etc/init.d/jetty9
-Webapps can be deployed by placing them in /var/lib/jetty8/webapps
-(linked from /usr/share/jetty8/webapps)
+Webapps can be deployed by placing them in /var/lib/jetty9/webapps
+(linked from /usr/share/jetty9/webapps)
Additional contexts can be configured and (hot) deployed via the
-/etc/jetty8/contexts directory (linked from /usr/share/jetty8/contexts).
+/etc/jetty9/contexts directory (linked from /usr/share/jetty9/contexts).
Installing:
-$ sudo apt-get install jetty8
+$ sudo apt-get install jetty9
Stopping:
-$ sudo service jetty8 stop
+$ sudo service jetty9 stop
--
diff --git a/debian/control b/debian/control
index 12e23ba..3cc4bab 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: jetty8
+Source: jetty9
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -25,14 +25,14 @@ Build-Depends: ant-optional,
maven-debian-helper,
maven-repo-helper
Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/jetty8.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jetty8.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/jetty9.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jetty9.git
Homepage: http://www.eclipse.org/jetty/
-Package: libjetty8-java
+Package: libjetty9-java
Architecture: all
Depends: ${misc:Depends}, libservlet3.0-java
-Suggests: jetty8, libjetty8-java-doc
+Suggests: jetty9, libjetty9-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,
@@ -41,31 +41,31 @@ Description: Java servlet engine and webserver -- core libraries
.
This package contains the core libraries
-Package: libjetty8-java-doc
+Package: libjetty9-java-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Recommends: default-jdk-doc, libmail-java-doc, libservlet3.0-java-doc
-Suggests: libjetty8-java
+Suggests: libjetty9-java
Description: Javadoc for the Jetty API
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.
.
- This package contains the Javadoc for libjetty8-java.
+ This package contains the Javadoc for libjetty9-java.
-Package: libjetty8-extra-java
+Package: libjetty9-extra-java
Architecture: all
Depends: libasm4-java,
libmail-java,
libjakarta-taglibs-standard-java,
- libjetty8-java (>= ${source:Version}),
+ libjetty9-java (>= ${source:Version}),
libjstl1.1-java,
libservlet3.0-java,
libtomcat7-java (>= 7.0.56-1~),
${misc:Depends}
-Suggests: jetty8
+Suggests: jetty9
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,
@@ -75,16 +75,16 @@ 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: jetty8
+Package: jetty9
Architecture: all
Depends: adduser,
apache2-utils,
default-jre-headless | java6-runtime-headless,
- libjetty8-java (>= ${source:Version}),
- libjetty8-extra-java (>= ${source:Version}),
+ libjetty9-java (>= ${source:Version}),
+ libjetty9-extra-java (>= ${source:Version}),
${misc:Depends}
Recommends: authbind
-Suggests: libjetty8-java-doc (>= ${source:Version})
+Suggests: libjetty9-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/jetty8.dirs b/debian/jetty8.dirs
deleted file mode 100644
index 7c18e22..0000000
--- a/debian/jetty8.dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-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/jetty8.install b/debian/jetty8.install
deleted file mode 100644
index 0853332..0000000
--- a/debian/jetty8.install
+++ /dev/null
@@ -1,27 +0,0 @@
-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/root-webapp/* usr/share/jetty8/default-root
-test-jetty-webapp/src/main/webapp/jetty_banner.gif usr/share/jetty8/default-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
-
-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
deleted file mode 100644
index 8fc2a0a..0000000
--- a/debian/jetty8.links
+++ /dev/null
@@ -1,7 +0,0 @@
-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/jetty8.cron.daily b/debian/jetty9.cron.daily
similarity index 97%
rename from debian/jetty8.cron.daily
rename to debian/jetty9.cron.daily
index 2b2774a..3544aa5 100644
--- a/debian/jetty8.cron.daily
+++ b/debian/jetty9.cron.daily
@@ -1,6 +1,6 @@
#!/bin/sh
-NAME=jetty8
+NAME=jetty9
DEFAULT=/etc/default/$NAME
# The following variables can be overwritten in $DEFAULT
diff --git a/debian/jetty8.default b/debian/jetty9.default
similarity index 91%
rename from debian/jetty8.default
rename to debian/jetty9.default
index 53bd3fd..5bea729 100644
--- a/debian/jetty8.default
+++ b/debian/jetty9.default
@@ -1,4 +1,4 @@
-# Defaults for jetty see /etc/init.d/jetty8 for more
+# Defaults for jetty see /etc/init.d/jetty9 for more
# change to 1 to prevent Jetty from starting
NO_START=0
@@ -34,12 +34,12 @@ VERBOSE=yes
#JAVA_HOME=
# Jetty uses a directory to store temporary files like unpacked webapps
-#JETTY_TMP=/var/cache/jetty8
+#JETTY_TMP=/var/cache/jetty9
# Jetty uses a config file to setup its boot classpath
-#JETTY_START_CONFIG=/etc/jetty8/start.config
+#JETTY_START_CONFIG=/etc/jetty9/start.config
-# Default for number of days to keep old log files in /var/log/jetty8/
+# Default for number of days to keep old log files in /var/log/jetty9/
#LOGFILE_DAYS=14
# If you run Jetty on port numbers that are all higher than 1023, then you
diff --git a/debian/jetty9.dirs b/debian/jetty9.dirs
new file mode 100644
index 0000000..80e9281
--- /dev/null
+++ b/debian/jetty9.dirs
@@ -0,0 +1,7 @@
+etc/jetty9
+etc/jetty9/contexts
+usr/share/jetty9
+usr/share/doc/jetty9
+var/lib/jetty9/webapps
+var/log/jetty9
+var/cache/jetty9
diff --git a/debian/jetty8.init b/debian/jetty9.init
similarity index 97%
rename from debian/jetty8.init
rename to debian/jetty9.init
index 6e8d0be..e80e79f 100644
--- a/debian/jetty8.init
+++ b/debian/jetty9.init
@@ -1,13 +1,13 @@
#!/bin/sh -e
#
-# /etc/init.d/jetty8 -- startup script for jetty 8.1.1
+# /etc/init.d/jetty9 -- startup script for Jetty 9
#
# Written by Philipp Meier <meier at meisterbohne.de>
# Modified for Jetty 6 by Ludovic Claude <ludovic.claude at laposte.net>
# Modified for Jetty 8 by Jakub Adam <jakub.adam at ktknet.cz>
#
### BEGIN INIT INFO
-# Provides: jetty8
+# Provides: jetty9
# Required-Start: $local_fs $remote_fs $network
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: $named
@@ -20,11 +20,11 @@
# Configuration files
#
-# /etc/default/jetty8
+# /etc/default/jetty9
# 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/jetty8/jetty.conf
+# /etc/jetty9/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.
@@ -35,11 +35,11 @@
#
# The files will be checked for existence before being passed to jetty.
#
-# /etc/jetty8/jetty.xml
+# /etc/jetty9/jetty.xml
# If found, used as this script's configuration file, but only if
-# /etc/jetty8/jetty.conf was not present. See above.
+# /etc/jetty9/jetty.conf was not present. See above.
#
-# Configuration variables (to define in /etc/default/jetty8)
+# Configuration variables (to define in /etc/default/jetty9)
#
# JAVA_HOME
# Home of Java installation.
@@ -63,7 +63,7 @@
# 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
-VERSION=8
+VERSION=9
NAME=jetty$VERSION
DESC="Jetty $VERSION Servlet Engine"
JETTY_HOME=/usr/share/$NAME
diff --git a/debian/jetty9.install b/debian/jetty9.install
new file mode 100644
index 0000000..d576530
--- /dev/null
+++ b/debian/jetty9.install
@@ -0,0 +1,27 @@
+jetty-ajp/src/main/config/etc/* etc/jetty9
+jetty-annotations/src/main/config/etc/* etc/jetty9
+jetty-deploy/src/main/config/etc/* etc/jetty9
+jetty-jmx/src/main/config/etc/* etc/jetty9
+jetty-monitor/src/main/config/etc/* etc/jetty9
+jetty-overlay-deployer/src/main/config/etc/* etc/jetty9
+jetty-plus/src/main/config/etc/* etc/jetty9
+jetty-policy/src/main/config/etc/* etc/jetty9
+jetty-policy/src/main/config/lib/policy/* etc/jetty9/policy
+jetty-rewrite/src/main/config/etc/* etc/jetty9
+jetty-security/src/main/config/etc/* etc/jetty9
+jetty-server/src/main/config/etc/* etc/jetty9
+jetty-util/src/main/config/etc/* etc/jetty9
+jetty-webapp/src/main/config/etc/* etc/jetty9
+
+debian/root-webapp/* usr/share/jetty9/default-root
+test-jetty-webapp/src/main/webapp/jetty_banner.gif usr/share/jetty9/default-root
+jetty-distribution/src/main/resources/start.ini etc/jetty9
+jetty-distribution/src/main/resources/etc/* etc/jetty9
+jetty-distribution/src/main/resources/contexts etc/jetty9
+jetty-distribution/src/main/resources/resources usr/share/jetty9
+jetty-start/target/classes/org/eclipse/jetty/start/start.config etc/jetty9
+
+LICENSE-CONTRIBUTOR/cla-* usr/share/doc/jetty9/LICENSES
+LICENSE-CONTRIBUTOR/ccla-* usr/share/doc/jetty9/LICENSES
+NOTICE.txt usr/share/doc/jetty9/LICENSES
+debian/README.Debian usr/share/doc/jetty9
diff --git a/debian/jetty9.links b/debian/jetty9.links
new file mode 100644
index 0000000..7c7d7a8
--- /dev/null
+++ b/debian/jetty9.links
@@ -0,0 +1,7 @@
+var/lib/jetty9/webapps usr/share/jetty9/webapps
+var/log/jetty9 usr/share/jetty9/logs
+etc/jetty9 usr/share/jetty9/etc
+etc/jetty9/contexts usr/share/jetty9/contexts
+etc/jetty9/start.ini usr/share/jetty9/start.ini
+etc/jetty9/policy usr/share/jetty9/lib/policy
+usr/share/doc/libjetty9-java/api usr/share/jetty9/javadoc
diff --git a/debian/jetty8.postinst b/debian/jetty9.postinst
similarity index 71%
rename from debian/jetty8.postinst
rename to debian/jetty9.postinst
index c994444..1612b8a 100644
--- a/debian/jetty8.postinst
+++ b/debian/jetty9.postinst
@@ -7,20 +7,20 @@ JETTY_GROUP=jetty
case "$1" in
configure)
# Install the default page if no root context exist
- if [ ! -f /var/lib/jetty8/webapps/root.war ]; then
- mkdir -p /var/lib/jetty8/webapps/root
- if [ -z "$(ls -A /var/lib/jetty8/webapps/root)" ]; then
- cp /usr/share/jetty8/default-root/* /var/lib/jetty8/webapps/root
+ if [ ! -f /var/lib/jetty9/webapps/root.war ]; then
+ mkdir -p /var/lib/jetty9/webapps/root
+ if [ -z "$(ls -A /var/lib/jetty9/webapps/root)" ]; then
+ cp /usr/share/jetty9/default-root/* /var/lib/jetty9/webapps/root
fi
fi
if ! id jetty > /dev/null 2>&1 ; then
- adduser --system --home /usr/share/jetty8 --no-create-home \
+ adduser --system --home /usr/share/jetty9 --no-create-home \
--group --disabled-password --shell /bin/false \
$JETTY_USER
fi
- chown -R jetty:adm /var/cache/jetty8 /var/log/jetty8 /var/lib/jetty8
- chmod 750 /var/log/jetty8
+ chown -R jetty:adm /var/cache/jetty9 /var/log/jetty9 /var/lib/jetty9
+ chmod 750 /var/log/jetty9
# Authorize user jetty to open privileged ports via authbind.
JETTY_UID="`id -u $JETTY_USER`"
diff --git a/debian/jetty8.postrm b/debian/jetty9.postrm
similarity index 61%
rename from debian/jetty8.postrm
rename to debian/jetty9.postrm
index 258b68e..32bea99 100644
--- a/debian/jetty8.postrm
+++ b/debian/jetty9.postrm
@@ -4,17 +4,17 @@ set -e
#DEBHELPER#
# Remove cached files
-rm -rf /var/cache/jetty8/*
+rm -rf /var/cache/jetty9/*
case "$1" in
remove)
rmdir --ignore-fail-on-non-empty \
- /var/lib/jetty8/webapps/root \
- /var/lib/jetty8/webapps \
- /var/lib/jetty8 || true
+ /var/lib/jetty9/webapps/root \
+ /var/lib/jetty9/webapps \
+ /var/lib/jetty9 || true
- if [ -d "/var/cache/jetty8" ] ; then
- rm -rf /var/cache/jetty8
+ if [ -d "/var/cache/jetty9" ] ; then
+ rm -rf /var/cache/jetty9
fi
;;
@@ -22,11 +22,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/jetty8
- if [ -d "/var/lib/jetty8" ] ; then
- rmdir --ignore-fail-on-non-empty /var/lib/jetty8 || true
+ rm -rf /var/log/jetty9
+ if [ -d "/var/lib/jetty9" ] ; then
+ rmdir --ignore-fail-on-non-empty /var/lib/jetty9 || true
fi
- rmdir --ignore-fail-on-non-empty /etc/jetty8/contexts /etc/jetty8 || true
+ rmdir --ignore-fail-on-non-empty /etc/jetty9/contexts /etc/jetty9 || true
# clean up /etc/authbind after conffiles have been removed
rmdir --ignore-fail-on-non-empty /etc/authbind/byuid /etc/authbind || true
diff --git a/debian/jetty8.prerm b/debian/jetty9.prerm
similarity index 54%
rename from debian/jetty8.prerm
rename to debian/jetty9.prerm
index bbbf6fc..4a609b9 100644
--- a/debian/jetty8.prerm
+++ b/debian/jetty9.prerm
@@ -11,13 +11,13 @@ case "$1" in
fi
# Remove the default page
- if cmp --silent /var/lib/jetty8/webapps/root/index.html /usr/share/jetty8/default-root/index.html
+ if cmp --silent /var/lib/jetty9/webapps/root/index.html /usr/share/jetty9/default-root/index.html
then
- rm /var/lib/jetty8/webapps/root/index.html
+ rm /var/lib/jetty9/webapps/root/index.html
fi
- if cmp --silent /var/lib/jetty8/webapps/root/jetty_banner.gif /usr/share/jetty8/default-root/jetty_banner.gif
+ if cmp --silent /var/lib/jetty9/webapps/root/jetty_banner.gif /usr/share/jetty9/default-root/jetty_banner.gif
then
- rm /var/lib/jetty8/webapps/root/jetty_banner.gif
+ rm /var/lib/jetty9/webapps/root/jetty_banner.gif
fi
;;
esac
diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links
deleted file mode 100755
index dd9eb3f..0000000
--- a/debian/libjetty8-extra-java.links
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/dh-exec
-
-usr/share/java/jetty8-ajp.jar usr/share/jetty8/lib/jetty-ajp-${VERSION}.jar
-usr/share/java/jetty8-annotations.jar usr/share/jetty8/lib/jetty-annotations-${VERSION}.jar
-usr/share/java/jetty8-client.jar usr/share/jetty8/lib/jetty-client-${VERSION}.jar
-usr/share/java/jetty8-monitor.jar usr/share/jetty8/lib/monitor/jetty-monitor-${VERSION}.jar
-usr/share/java/jetty8-plus.jar usr/share/jetty8/lib/jetty-plus-${VERSION}.jar
-usr/share/java/jetty8-test-servlet.jar usr/share/jetty8/lib/test-jetty-servlet-${VERSION}.jar
-
-usr/share/tomcat7/lib/annotations-api.jar usr/share/jetty8/lib/annotations/javax.annotation.jar
-usr/share/java/asm4.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.jar
-usr/share/java/asm4-commons.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar
-usr/share/java/javax.mail.jar usr/share/jetty8/lib/jndi/javax.mail.jar
-usr/share/java/jsp-api-2.2.jar usr/share/jetty8/lib/jsp/javax.servlet.jsp.jar
-usr/share/tomcat7/lib/jasper.jar usr/share/jetty8/lib/jsp/jasper.jar
-usr/share/tomcat7/lib/jasper-el.jar usr/share/jetty8/lib/jsp/jasper-el.jar
-usr/share/tomcat7/lib/tomcat-api.jar usr/share/jetty8/lib/jsp/tomcat-api.jar
-usr/share/java/tomcat-juli.jar usr/share/jetty8/lib/jsp/tomcat-juli.jar
-usr/share/tomcat7/lib/tomcat-util.jar usr/share/jetty8/lib/jsp/tomcat-util.jar
-usr/share/java/jstl1.1.jar usr/share/jetty8/lib/jsp/javax.servlet.jsp.jstl.jar
-usr/share/java/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-java-doc.install b/debian/libjetty8-java-doc.install
deleted file mode 100644
index 69c1bc4..0000000
--- a/debian/libjetty8-java-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-target/site/apidocs/* usr/share/doc/libjetty8-java/api
diff --git a/debian/libjetty8-java.dirs b/debian/libjetty8-java.dirs
deleted file mode 100644
index 5d8303c..0000000
--- a/debian/libjetty8-java.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/jetty8
-usr/share/jetty8/lib
-usr/share/jetty8/lib/ext
diff --git a/debian/libjetty8-java.links b/debian/libjetty8-java.links
deleted file mode 100755
index 2321173..0000000
--- a/debian/libjetty8-java.links
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/dh-exec
-
-usr/share/java/jetty8-start.jar usr/share/jetty8/start.jar
-
-usr/share/java/jetty8-continuation.jar usr/share/jetty8/lib/jetty-continuation-${VERSION}.jar
-usr/share/java/jetty8-deploy.jar usr/share/jetty8/lib/jetty-deploy-${VERSION}.jar
-usr/share/java/jetty8-http.jar usr/share/jetty8/lib/jetty-http-${VERSION}.jar
-usr/share/java/jetty8-io.jar usr/share/jetty8/lib/jetty-io-${VERSION}.jar
-usr/share/java/jetty8-jaspi.jar usr/share/jetty8/lib/jetty-jaspi-${VERSION}.jar
-usr/share/java/jetty8-jmx.jar usr/share/jetty8/lib/jetty-jmx-${VERSION}.jar
-usr/share/java/jetty8-jsp.jar usr/share/jetty8/lib/jetty-jsp-${VERSION}.jar
-usr/share/java/jetty8-nested.jar usr/share/jetty8/lib/jetty-nested-${VERSION}.jar
-usr/share/java/jetty8-overlay-deployer.jar usr/share/jetty8/lib/jetty-overlay-deployer-${VERSION}.jar
-usr/share/java/jetty8-policy.jar usr/share/jetty8/lib/jetty-policy-${VERSION}.jar
-usr/share/java/jetty8-rewrite.jar usr/share/jetty8/lib/jetty-rewrite-${VERSION}.jar
-usr/share/java/jetty8-security.jar usr/share/jetty8/lib/jetty-security-${VERSION}.jar
-usr/share/java/jetty8-server.jar usr/share/jetty8/lib/jetty-server-${VERSION}.jar
-usr/share/java/jetty8-servlet.jar usr/share/jetty8/lib/jetty-servlet-${VERSION}.jar
-usr/share/java/jetty8-servlets.jar usr/share/jetty8/lib/jetty-servlets-${VERSION}.jar
-usr/share/java/jetty8-util.jar usr/share/jetty8/lib/jetty-util-${VERSION}.jar
-usr/share/java/jetty8-webapp.jar usr/share/jetty8/lib/jetty-webapp-${VERSION}.jar
-usr/share/java/jetty8-websocket.jar usr/share/jetty8/lib/jetty-websocket-${VERSION}.jar
-usr/share/java/jetty8-xml.jar usr/share/jetty8/lib/jetty-xml-${VERSION}.jar
-
-usr/share/java/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
deleted file mode 100644
index 63afeb9..0000000
--- a/debian/libjetty8-java.poms
+++ /dev/null
@@ -1,72 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-# --ignore: ignore this POM and its artifact if any
-# --ignore-pom: don't install the POM. To use on POM files that are created
-# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
-# --no-parent: remove the <parent> tag from the POM
-# --package=<package>: an alternative package to use when installing this POM
-# and its artifact
-# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-# of the version for the package.
-# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-# during a clean operation with mh_cleanpom or mh_installpom
-# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install. [mh_install]
-# --java-lib: install the jar into /usr/share/java to comply with Debian
-# packaging guidelines
-# --usj-name=<name>: name to use when installing the library in /usr/share/java
-# --usj-version=<version>: version to use when installing the library in /usr/share/java
-# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar.
-# It will be installed with mh_install. [mh_install]
-# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
-# Empty by default. [mh_install]
-#
-pom.xml --no-parent
-jetty-aggregate/pom.xml --ignore
-jetty-continuation/pom.xml --java-lib --usj-name=jetty8-continuation
-jetty-deploy/pom.xml --java-lib --usj-name=jetty8-deploy
-jetty-http/pom.xml --java-lib --usj-name=jetty8-http
-jetty-io/pom.xml --java-lib --usj-name=jetty8-io
-jetty-jaspi/pom.xml --java-lib --usj-name=jetty8-jaspi
-jetty-jmx/pom.xml --java-lib --usj-name=jetty8-jmx
-jetty-jsp/pom.xml --java-lib --usj-name=jetty8-jsp
-jetty-nested/pom.xml --java-lib --usj-name=jetty8-nested
-jetty-overlay-deployer/pom.xml --java-lib --usj-name=jetty8-overlay-deployer
-jetty-policy/pom.xml --java-lib --usj-name=jetty8-policy
-jetty-rewrite/pom.xml --java-lib --usj-name=jetty8-rewrite
-jetty-security/pom.xml --java-lib --usj-name=jetty8-security
-jetty-server/pom.xml --java-lib --usj-name=jetty8-server
-jetty-servlet/pom.xml --java-lib --usj-name=jetty8-servlet
-jetty-servlets/pom.xml --java-lib --usj-name=jetty8-servlets
-jetty-start/pom.xml --java-lib --usj-name=jetty8-start
-jetty-util/pom.xml --java-lib --usj-name=jetty8-util
-jetty-webapp/pom.xml --java-lib --usj-name=jetty8-webapp
-jetty-websocket/pom.xml --java-lib --usj-name=jetty8-websocket
-jetty-xml/pom.xml --java-lib --usj-name=jetty8-xml
-
-# Extras
-jetty-ajp/pom.xml --java-lib --usj-name=jetty8-ajp --package=libjetty8-extra-java
-jetty-annotations/pom.xml --java-lib --usj-name=jetty8-annotations --package=libjetty8-extra-java
-jetty-client/pom.xml --java-lib --usj-name=jetty8-client --package=libjetty8-extra-java
-jetty-jndi/pom.xml --java-lib --usj-name=jetty8-jndi --package=libjetty8-extra-java
-jetty-monitor/pom.xml --java-lib --usj-name=jetty8-monitor --package=libjetty8-extra-java
-jetty-plus/pom.xml --java-lib --usj-name=jetty8-plus --package=libjetty8-extra-java
-test-jetty-servlet/pom.xml --java-lib --usj-name=jetty8-test-servlet --package=libjetty8-extra-java
-
-# Ignored
-jetty-distribution/pom.xml --ignore
-jetty-http-spi/pom.xml --ignore
-jetty-nosql/pom.xml --ignore
-jetty-osgi/pom.xml --ignore
-jetty-spdy/pom.xml --ignore
-test-continuation/pom.xml --ignore
-test-continuation-jetty6/pom.xml --ignore
-test-jetty-webapp/pom.xml --ignore
-test-jetty-nested/pom.xml --ignore
-example-jetty-embedded/pom.xml --ignore
-example-async-rest/pom.xml --ignore
-tests/pom.xml --ignore
diff --git a/debian/libjetty9-extra-java.links b/debian/libjetty9-extra-java.links
new file mode 100644
index 0000000..8ab5e9b
--- /dev/null
+++ b/debian/libjetty9-extra-java.links
@@ -0,0 +1,21 @@
+#!/usr/bin/dh-exec
+
+usr/share/java/jetty9-ajp.jar usr/share/jetty9/lib/jetty-ajp-${VERSION}.jar
+usr/share/java/jetty9-annotations.jar usr/share/jetty9/lib/jetty-annotations-${VERSION}.jar
+usr/share/java/jetty9-client.jar usr/share/jetty9/lib/jetty-client-${VERSION}.jar
+usr/share/java/jetty9-monitor.jar usr/share/jetty9/lib/monitor/jetty-monitor-${VERSION}.jar
+usr/share/java/jetty9-plus.jar usr/share/jetty9/lib/jetty-plus-${VERSION}.jar
+usr/share/java/jetty9-test-servlet.jar usr/share/jetty9/lib/test-jetty-servlet-${VERSION}.jar
+
+usr/share/tomcat7/lib/annotations-api.jar usr/share/jetty9/lib/annotations/javax.annotation.jar
+usr/share/java/asm4.jar usr/share/jetty9/lib/annotations/org.objectweb.asm.jar
+usr/share/java/asm4-commons.jar usr/share/jetty9/lib/annotations/org.objectweb.asm.commons.jar
+usr/share/java/javax.mail.jar usr/share/jetty9/lib/jndi/javax.mail.jar
+usr/share/java/jsp-api-2.2.jar usr/share/jetty9/lib/jsp/javax.servlet.jsp.jar
+usr/share/tomcat7/lib/jasper.jar usr/share/jetty9/lib/jsp/jasper.jar
+usr/share/tomcat7/lib/jasper-el.jar usr/share/jetty9/lib/jsp/jasper-el.jar
+usr/share/tomcat7/lib/tomcat-api.jar usr/share/jetty9/lib/jsp/tomcat-api.jar
+usr/share/java/tomcat-juli.jar usr/share/jetty9/lib/jsp/tomcat-juli.jar
+usr/share/java/jstl1.1.jar usr/share/jetty9/lib/jsp/javax.servlet.jsp.jstl.jar
+usr/share/java/el-api-2.2.jar usr/share/jetty9/lib/jsp/javax.el.jar
+usr/share/java/standard.jar usr/share/jetty9/lib/jsp/org.apache.taglibs.standard.jar
diff --git a/debian/libjetty9-extra-java.poms b/debian/libjetty9-extra-java.poms
new file mode 100644
index 0000000..d706f28
--- /dev/null
+++ b/debian/libjetty9-extra-java.poms
@@ -0,0 +1,7 @@
+jetty-ajp/pom.xml --java-lib --usj-name=jetty9-ajp
+jetty-annotations/pom.xml --java-lib --usj-name=jetty9-annotations
+jetty-client/pom.xml --java-lib --usj-name=jetty9-client
+jetty-jndi/pom.xml --java-lib --usj-name=jetty9-jndi
+jetty-monitor/pom.xml --java-lib --usj-name=jetty9-monitor
+jetty-plus/pom.xml --java-lib --usj-name=jetty9-plus
+test-jetty-servlet/pom.xml --java-lib --usj-name=jetty9-test-servlet
diff --git a/debian/libjetty8-java-doc.doc-base b/debian/libjetty9-java-doc.doc-base
similarity index 54%
rename from debian/libjetty8-java-doc.doc-base
rename to debian/libjetty9-java-doc.doc-base
index c9d8784..cd35803 100644
--- a/debian/libjetty8-java-doc.doc-base
+++ b/debian/libjetty9-java-doc.doc-base
@@ -1,9 +1,9 @@
-Document: libjetty8-java
+Document: libjetty9-java
Title: API Javadoc for jetty
Author: Mortbay Consulting
Abstract: This is the API Javadoc provided by Jetty.
Section: Programming
Format: HTML
-Index: /usr/share/doc/libjetty8-java/api/index.html
-Files: /usr/share/doc/libjetty8-java/api/*
+Index: /usr/share/doc/libjetty9-java/api/index.html
+Files: /usr/share/doc/libjetty9-java/api/*
diff --git a/debian/libjetty9-java-doc.install b/debian/libjetty9-java-doc.install
new file mode 100644
index 0000000..611927e
--- /dev/null
+++ b/debian/libjetty9-java-doc.install
@@ -0,0 +1 @@
+target/site/apidocs/* usr/share/doc/libjetty9-java/api
diff --git a/debian/libjetty9-java.dirs b/debian/libjetty9-java.dirs
new file mode 100644
index 0000000..e02a32d
--- /dev/null
+++ b/debian/libjetty9-java.dirs
@@ -0,0 +1,3 @@
+usr/share/jetty9
+usr/share/jetty9/lib
+usr/share/jetty9/lib/ext
diff --git a/debian/libjetty9-java.links b/debian/libjetty9-java.links
new file mode 100644
index 0000000..2efd2bd
--- /dev/null
+++ b/debian/libjetty9-java.links
@@ -0,0 +1,25 @@
+#!/usr/bin/dh-exec
+
+usr/share/java/jetty9-start.jar usr/share/jetty9/start.jar
+
+usr/share/java/jetty9-continuation.jar usr/share/jetty9/lib/jetty-continuation-${VERSION}.jar
+usr/share/java/jetty9-deploy.jar usr/share/jetty9/lib/jetty-deploy-${VERSION}.jar
+usr/share/java/jetty9-http.jar usr/share/jetty9/lib/jetty-http-${VERSION}.jar
+usr/share/java/jetty9-io.jar usr/share/jetty9/lib/jetty-io-${VERSION}.jar
+usr/share/java/jetty9-jaspi.jar usr/share/jetty9/lib/jetty-jaspi-${VERSION}.jar
+usr/share/java/jetty9-jmx.jar usr/share/jetty9/lib/jetty-jmx-${VERSION}.jar
+usr/share/java/jetty9-jsp.jar usr/share/jetty9/lib/jetty-jsp-${VERSION}.jar
+usr/share/java/jetty9-nested.jar usr/share/jetty9/lib/jetty-nested-${VERSION}.jar
+usr/share/java/jetty9-overlay-deployer.jar usr/share/jetty9/lib/jetty-overlay-deployer-${VERSION}.jar
+usr/share/java/jetty9-policy.jar usr/share/jetty9/lib/jetty-policy-${VERSION}.jar
+usr/share/java/jetty9-rewrite.jar usr/share/jetty9/lib/jetty-rewrite-${VERSION}.jar
+usr/share/java/jetty9-security.jar usr/share/jetty9/lib/jetty-security-${VERSION}.jar
+usr/share/java/jetty9-server.jar usr/share/jetty9/lib/jetty-server-${VERSION}.jar
+usr/share/java/jetty9-servlet.jar usr/share/jetty9/lib/jetty-servlet-${VERSION}.jar
+usr/share/java/jetty9-servlets.jar usr/share/jetty9/lib/jetty-servlets-${VERSION}.jar
+usr/share/java/jetty9-util.jar usr/share/jetty9/lib/jetty-util-${VERSION}.jar
+usr/share/java/jetty9-webapp.jar usr/share/jetty9/lib/jetty-webapp-${VERSION}.jar
+usr/share/java/jetty9-websocket.jar usr/share/jetty9/lib/jetty-websocket-${VERSION}.jar
+usr/share/java/jetty9-xml.jar usr/share/jetty9/lib/jetty-xml-${VERSION}.jar
+
+usr/share/java/servlet-api-3.0.jar usr/share/jetty9/lib/servlet-api-3.0.jar
diff --git a/debian/libjetty9-java.poms b/debian/libjetty9-java.poms
new file mode 100644
index 0000000..80692eb
--- /dev/null
+++ b/debian/libjetty9-java.poms
@@ -0,0 +1,34 @@
+pom.xml --no-parent
+jetty-webapp/pom.xml --java-lib --usj-name=jetty9-webapp
+jetty-policy/pom.xml --java-lib --usj-name=jetty9-policy
+jetty-jsp/pom.xml
+jetty-security/pom.xml --java-lib --usj-name=jetty9-security
+jetty-server/pom.xml --java-lib --usj-name=jetty9-server
+jetty-jndi/pom.xml --ignore-pom
+jetty-xml/pom.xml --java-lib --usj-name=jetty9-xml
+jetty-aggregate/pom.xml
+jetty-aggregate/jetty-websocket/pom.xml --java-lib --usj-name=jetty9-websocket
+jetty-aggregate/jetty-servlet/pom.xml --java-lib --usj-name=jetty9-servlet
+jetty-ajp/pom.xml --ignore-pom
+jetty-continuation/pom.xml --java-lib --usj-name=jetty9-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=jetty9-overlay-deployer
+jetty-rewrite/pom.xml --java-lib --usj-name=jetty9-rewrite
+jetty-plus/pom.xml --ignore-pom
+jetty-deploy/pom.xml --java-lib --usj-name=jetty9-deploy
+jetty-distribution/pom.xml
+jetty-http/pom.xml --java-lib --usj-name=jetty9-http
+jetty-nested/pom.xml
+jetty-websocket/pom.xml
+jetty-start/pom.xml --java-lib --usj-name=jetty9-start
+jetty-http-spi/pom.xml
+jetty-io/pom.xml --java-lib --usj-name=jetty9-io
+jetty-util/pom.xml --java-lib --usj-name=jetty9-util
+jetty-jaspi/pom.xml
+jetty-jmx/pom.xml --java-lib --usj-name=jetty9-jmx
+jetty-servlets/pom.xml --java-lib --usj-name=jetty9-servlets
+jetty-servlet/pom.xml --java-lib --usj-name=jetty9-servlet
+
diff --git a/debian/root-webapp/index.html b/debian/root-webapp/index.html
index 94c600c..22076aa 100644
--- a/debian/root-webapp/index.html
+++ b/debian/root-webapp/index.html
@@ -1,12 +1,12 @@
<HTML>
<HEAD>
- <TITLE>Welcome to Jetty 8 on Debian</TITLE>
+ <TITLE>Welcome to Jetty 9 on Debian</TITLE>
<META http-equiv="Pragma" content="no-cache">
<META http-equiv="Cache-Control" content="no-cache,no-store">
</HEAD>
<BODY>
<A HREF="http://jetty.mortbay.org"><IMG SRC="jetty_banner.gif"></A>
-<h1>Welcome to Jetty 8 on Debian</h1>
+<h1>Welcome to Jetty 9 on Debian</h1>
<P align="justify">
<b>Jetty</b> is a 100% Java HTTP Server and Servlet Container. This means
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index dc5b26f..78a1016 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1 +1 @@
-jetty8 source: dh-exec-subst-unknown-variable * VERSION
+jetty9 source: dh-exec-subst-unknown-variable * VERSION
--
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