[jetty9] 96/99: Rename Jetty8 -> Jetty9
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Fri Oct 9 21:20:56 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 03ae8e17c2fff0e43cdd64e3be537ae98041aeb3
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Wed Aug 5 20:36:35 2015 +0200
Rename Jetty8 -> Jetty9
---
debian/README.Debian | 28 +++++++++---------
debian/changelog | 2 +-
debian/control | 34 +++++++++++-----------
debian/jetty8.dirs | 7 -----
debian/jetty8.install | 24 ---------------
debian/jetty8.links | 6 ----
debian/{jetty8.cron.daily => jetty9.cron.daily} | 2 +-
debian/{jetty8.default => jetty9.default} | 6 ++--
debian/jetty9.dirs | 7 +++++
debian/{jetty8.init => jetty9.init} | 30 +++++++++----------
debian/jetty9.install | 24 +++++++++++++++
debian/jetty9.links | 6 ++++
debian/{jetty8.postinst => jetty9.postinst} | 6 ++--
debian/{jetty8.postrm => jetty9.postrm} | 22 +++++++-------
debian/{jetty8.prerm => jetty9.prerm} | 0
debian/libjetty8-extra-java.links | 13 ---------
debian/libjetty8-extra-java.poms | 7 -----
debian/libjetty8-java-doc.install | 1 -
debian/libjetty8-java.dirs | 3 --
debian/libjetty8-java.links | 1 -
debian/libjetty8-java.poms | 26 -----------------
debian/libjetty9-extra-java.links | 13 +++++++++
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 | 1 +
debian/libjetty9-java.poms | 26 +++++++++++++++++
debian/root-webapp/index.html | 4 +--
debian/rules | 34 +++++++++++-----------
debian/watch | 2 +-
31 files changed, 176 insertions(+), 176 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 2eed0e8..2e93c58 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,37 +1,37 @@
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 libjetty8-java
-$ sudo apt-get install libjetty8-extra-java
-$ sudo apt-get install jetty8
+$ sudo apt-get install libjetty9-java
+$ sudo apt-get install libjetty9-extra-java
+$ sudo apt-get install jetty9
Starting:
-Edit /etc/default/jetty8
+Edit /etc/default/jetty9
Set:
NO_START=0
Then do:
-$ sudo service jetty8 start
+$ sudo service jetty9 start
Stopping:
-$ sudo service jetty8 stop
+$ sudo service jetty9 stop
--
diff --git a/debian/changelog b/debian/changelog
index af1bab5..9fc77bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jetty8 (9.2.13-1) UNRELEASED; urgency=medium
+jetty9 (9.2.13-1) UNRELEASED; urgency=medium
* New upstream release
diff --git a/debian/control b/debian/control
index d01388d..7dacd27 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>
@@ -23,14 +23,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: http://anonscm.debian.org/gitweb/?p=pkg-java/jetty8.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/jetty9.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=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
+Depends: ${misc:Depends}, libservlet3.1-java
+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,
@@ -39,31 +39,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
+Recommends: default-jdk-doc, libmail-java-doc, libservlet3.1-java-doc
+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: libasm3-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,
@@ -73,16 +73,16 @@ Description: Javadoc for the Jetty API
# 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 94ba08b..0000000
--- a/debian/jetty8.install
+++ /dev/null
@@ -1,24 +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-plus/src/main/config/etc/* etc/jetty8
-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/* 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
-
-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 b952bd6..0000000
--- a/debian/jetty8.links
+++ /dev/null
@@ -1,6 +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
-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 95%
rename from debian/jetty8.default
rename to debian/jetty9.default
index 5aa6ec8..9788021 100644
--- a/debian/jetty8.default
+++ b/debian/jetty9.default
@@ -40,12 +40,12 @@ VERBOSE=yes
#JSP_COMPILER=jikes
# 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 94%
rename from debian/jetty8.init
rename to debian/jetty9.init
index f63d073..b460a4f 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 8.1.1
#
# 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
-NAME=jetty8
+NAME=jetty9
DESC="Jetty servlet engine"
JETTY_HOME=/usr/share/$NAME
LOGDIR="/var/log/$NAME"
@@ -108,7 +108,7 @@ JETTY_PORT=8080
# Additional arguments to pass to Jetty
JETTY_ARGS=
-JETTY_STATE=/var/lib/jetty8/jetty.state
+JETTY_STATE=/var/lib/jetty9/jetty.state
# Extra options to pass to the JVM
# Set java.awt.headless=true if JAVA_OPTIONS is not set so the
@@ -145,10 +145,10 @@ find_jdks
JETTY_SHUTDOWN=30
# Jetty uses a directory to store temporary files like unpacked webapps
-JETTY_TMP=/var/cache/jetty8/data
+JETTY_TMP=/var/cache/jetty9/data
# Jetty uses a config file to setup its boot classpath
-JETTY_START_CONFIG=/etc/jetty8/start.config
+JETTY_START_CONFIG=/etc/jetty9/start.config
# End of variables that can be overwritten in /etc/default/jetty
@@ -166,13 +166,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/jetty8 and change NO_START to be 0 (or comment it out)."
+ [ "$VERBOSE" != "no" ] && log_failure_msg "Not starting jetty - edit /etc/default/jetty9 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/jetty8)."
+ log_failure_msg "(JETTY_USER is empty in /etc/default/jetty9)."
exit 0
fi
@@ -215,7 +215,7 @@ 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/jetty8 to the JDK's installation directory."
+ log_failure_msg "JAVA_HOME in /etc/default/jetty9 to the JDK's installation directory."
exit 0
fi
@@ -262,7 +262,7 @@ fi
#####################################################
if [ -z "$CONFIGS" ]
then
- CONFIGS="/etc/jetty8/jetty-logging.xml /etc/jetty8/jetty-started.xml"
+ CONFIGS="/etc/jetty9/jetty-logging.xml /etc/jetty9/jetty-started.xml"
fi
##################################################
diff --git a/debian/jetty9.install b/debian/jetty9.install
new file mode 100644
index 0000000..d28270e
--- /dev/null
+++ b/debian/jetty9.install
@@ -0,0 +1,24 @@
+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-plus/src/main/config/etc/* etc/jetty9
+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/* var/lib/jetty9/webapps/root
+test-jetty-webapp/src/main/webapp/jetty_banner.gif var/lib/jetty9/webapps/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..19edd58
--- /dev/null
+++ b/debian/jetty9.links
@@ -0,0 +1,6 @@
+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
+usr/share/doc/libjetty9-java/api usr/share/jetty9/javadoc
diff --git a/debian/jetty8.postinst b/debian/jetty9.postinst
similarity index 84%
rename from debian/jetty8.postinst
rename to debian/jetty9.postinst
index a2e6ab5..52ede00 100644
--- a/debian/jetty8.postinst
+++ b/debian/jetty9.postinst
@@ -7,12 +7,12 @@ JETTY_GROUP=jetty
case "$1" in
configure)
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 66%
rename from debian/jetty8.postrm
rename to debian/jetty9.postrm
index 100340a..1ee6c14 100644
--- a/debian/jetty8.postrm
+++ b/debian/jetty9.postrm
@@ -4,23 +4,23 @@ set -e
#DEBHELPER#
# Remove cached files
-rm -rf /var/cache/jetty8/*
+rm -rf /var/cache/jetty9/*
case "$1" in
remove)
# Remove ROOT webapp if not modified
- RWLOC="/var/lib/jetty8/webapps/root"
+ RWLOC="/var/lib/jetty9/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/jetty8/webapps/root \
- /var/lib/jetty8/webapps \
- /var/lib/jetty8 || true
+ /var/lib/jetty9/webapps/root \
+ /var/lib/jetty9/webapps \
+ /var/lib/jetty9 || true
fi
- if [ -d "/var/cache/jetty8" ] ; then
- rm -rf /var/cache/jetty8
+ if [ -d "/var/cache/jetty9" ] ; then
+ rm -rf /var/cache/jetty9
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/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 100%
rename from debian/jetty8.prerm
rename to debian/jetty9.prerm
diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links
deleted file mode 100644
index 52a6f60..0000000
--- a/debian/libjetty8-extra-java.links
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/share/tomcat7/lib/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/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-extra-java.poms b/debian/libjetty8-extra-java.poms
deleted file mode 100644
index 9abae3a..0000000
--- a/debian/libjetty8-extra-java.poms
+++ /dev/null
@@ -1,7 +0,0 @@
-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
-test-jetty-servlet/pom.xml --java-lib --usj-name=jetty8-test-servlet
diff --git a/debian/libjetty8-java-doc.install b/debian/libjetty8-java-doc.install
deleted file mode 100644
index cf64dc3..0000000
--- a/debian/libjetty8-java-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-target/site/api usr/share/doc/libjetty8-java
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 100644
index 5fc22b9..0000000
--- a/debian/libjetty8-java.links
+++ /dev/null
@@ -1 +0,0 @@
-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 37d629b..0000000
--- a/debian/libjetty8-java.poms
+++ /dev/null
@@ -1,26 +0,0 @@
-pom.xml --no-parent
-jetty-webapp/pom.xml --java-lib --usj-name=jetty8-webapp
-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-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-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-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/libjetty9-extra-java.links b/debian/libjetty9-extra-java.links
new file mode 100644
index 0000000..3e04a54
--- /dev/null
+++ b/debian/libjetty9-extra-java.links
@@ -0,0 +1,13 @@
+usr/share/tomcat7/lib/annotations-api.jar usr/share/jetty9/lib/annotations/javax.annotation.jar
+usr/share/java/asm3.jar usr/share/jetty9/lib/annotations/org.objectweb.asm.jar
+usr/share/java/asm3-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/tomcat7/lib/tomcat-util.jar usr/share/jetty9/lib/jsp/tomcat-util.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..53b095a
--- /dev/null
+++ b/debian/libjetty9-java-doc.install
@@ -0,0 +1 @@
+target/site/api usr/share/doc/libjetty9-java
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..dd2cdb0
--- /dev/null
+++ b/debian/libjetty9-java.links
@@ -0,0 +1 @@
+usr/share/java/servlet-api-3.1.jar usr/share/jetty9/lib/servlet-api-3.1.jar
diff --git a/debian/libjetty9-java.poms b/debian/libjetty9-java.poms
new file mode 100644
index 0000000..99227d3
--- /dev/null
+++ b/debian/libjetty9-java.poms
@@ -0,0 +1,26 @@
+pom.xml --no-parent
+jetty-webapp/pom.xml --java-lib --usj-name=jetty9-webapp
+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-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-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-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/rules b/debian/rules
index 86befe0..9a8561a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,41 +22,41 @@ 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/libjetty8-java::
- mh_installpoms -plibjetty8-java
+install/libjetty9-java::
+ mh_installpoms -plibjetty9-java
version=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/'); \
for lib in $(LIBJETTY_JARS); do \
- mh_installjar -plibjetty8-java --java-lib --usj-name=jetty8-$$lib \
+ mh_installjar -plibjetty9-java --java-lib --usj-name=jetty9-$$lib \
jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \
if [ $$lib = "start" ]; then \
continue; \
fi; \
jar=jetty-$$lib-$$version.jar; \
- jar8=jetty8-$$lib-$$version.jar; \
- dh_link -plibjetty8-java usr/share/java/$$jar8 usr/share/jetty8/lib/$$jar; \
+ jar9=jetty9-$$lib-$$version.jar; \
+ dh_link -plibjetty9-java usr/share/java/$$jar9 usr/share/jetty9/lib/$$jar; \
done; \
- dh_link -plibjetty8-java usr/share/java/jetty8-start-$$version.jar usr/share/jetty8/start.jar
+ dh_link -plibjetty9-java usr/share/java/jetty9-start-$$version.jar usr/share/jetty9/start.jar
-install/libjetty8-extra-java::
- mh_installpoms -plibjetty8-extra-java
+install/libjetty9-extra-java::
+ mh_installpoms -plibjetty9-extra-java
version=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/'); \
for lib in $(LIBJETTY_EXTRA_JARS); do \
- mh_installjar -plibjetty8-extra-java --java-lib --usj-name=jetty8-$$lib \
+ mh_installjar -plibjetty9-extra-java --java-lib --usj-name=jetty9-$$lib \
jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \
if [ $$lib = "monitor" ]; then \
continue; \
fi; \
jar=jetty-$$lib-$$version.jar; \
- jar8=jetty8-$$lib-$$version.jar; \
- dh_link -plibjetty8-extra-java usr/share/java/$$jar8 usr/share/jetty8/lib/$$jar; \
+ jar9=jetty9-$$lib-$$version.jar; \
+ dh_link -plibjetty9-extra-java usr/share/java/$$jar9 usr/share/jetty9/lib/$$jar; \
done; \
- dh_link -plibjetty8-extra-java usr/share/java/jetty8-monitor-$$version.jar usr/share/jetty8/lib/monitor/jetty-monitor.jar; \
+ dh_link -plibjetty9-extra-java usr/share/java/jetty9-monitor-$$version.jar usr/share/jetty9/lib/monitor/jetty-monitor.jar; \
# Add also test-jetty-servlet \
- mh_installjar -plibjetty8-extra-java --java-lib --usj-name=jetty8-test-servlet \
+ mh_installjar -plibjetty9-extra-java --java-lib --usj-name=jetty9-test-servlet \
test-jetty-servlet/pom.xml test-jetty-servlet/target/test-jetty-servlet-*.jar; \
- dh_link -plibjetty8-extra-java usr/share/java/jetty8-test-servlet-$$version.jar \
- usr/share/jetty8/lib/test-jetty-servlet-$$version.jar;
+ dh_link -plibjetty9-extra-java usr/share/java/jetty9-test-servlet-$$version.jar \
+ usr/share/jetty9/lib/test-jetty-servlet-$$version.jar;
-install/libjetty8-java-doc::
+install/libjetty9-java-doc::
mv target/site/apidocs target/site/api
- dh_install -p libjetty8-java-doc
+ dh_install -p libjetty9-java-doc
diff --git a/debian/watch b/debian/watch
index e591377..f7e80b3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/refs/ .*jetty-(8\.[\d\.]+).v.*.tar.gz
+http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/refs/ .*jetty-(9\.[\d\.]+).v.*.tar.gz
--
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