Author: nthykier-guest
Date: 2010-02-06 11:02:57 +0000 (Sat, 06 Feb 2010)
New Revision: 11505
Removed:
trunk/jetty5/.classpath
trunk/jetty5/.project
trunk/jetty5/debian/README.Debian
trunk/jetty5/debian/adminRealm.properties
trunk/jetty5/debian/ant-jetty-nonfree.properties
trunk/jetty5/debian/jetty-extra.install
trunk/jetty5/debian/jetty.default
trunk/jetty5/debian/jetty.dirs
trunk/jetty5/debian/jetty.init
trunk/jetty5/debian/jetty.install
trunk/jetty5/debian/jetty.links
trunk/jetty5/debian/jetty.postinst
trunk/jetty5/debian/jetty.postrm
trunk/jetty5/debian/jetty.preinst
trunk/jetty5/debian/jetty.prerm
trunk/jetty5/debian/jetty.xml
trunk/jetty5/debian/start.config
Modified:
trunk/jetty5/debian/changelog
trunk/jetty5/debian/control
trunk/jetty5/debian/patches/build-javadoc-src-encoding.patch
trunk/jetty5/debian/patches/remove-import-from-sun.patch
trunk/jetty5/debian/patches/sunjsse-disable.patch
trunk/jetty5/debian/rules
trunk/jetty5/debian/watch
Log:
Removed irrelevant files and renamed source to jetty5.
Deleted: trunk/jetty5/.classpath
===================================================================
--- trunk/jetty5/.classpath 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/.classpath 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="webapps/template/src"/>
- <classpathentry kind="src" path="extra/j2ee/gensrc"/>
- <classpathentry kind="src" path="extra/j2ee/src"/>
- <classpathentry kind="src" path="test/src"/>
- <classpathentry kind="src" path="demo/src"/>
- <classpathentry kind="src" path="extra/ftp/src"/>
- <classpathentry kind="src" path="extra/ftp/test/src"/>
- <classpathentry kind="src" path="extra/plus/src"/>
- <classpathentry kind="src" path="extra/loadbalancer/src"/>
- <classpathentry kind="src" path="extra/plus/demo/src"/>
- <classpathentry kind="lib" path="ext/commons-el.jar"/>
- <classpathentry kind="lib" path="ext/xercesImpl.jar"/>
- <classpathentry kind="lib" path="extra/ext/jts1_0.jar"/>
- <classpathentry kind="lib" path="extra/ext/jotm.jar"/>
- <classpathentry kind="lib" path="ext/xml-apis.jar"/>
- <classpathentry kind="lib" path="extra/ext/jta-spec1_0_1.jar"/>
- <classpathentry kind="lib" path="extra/ext/hsqldb.jar"/>
- <classpathentry kind="lib" path="extra/ext/commons-cli.jar"/>
- <classpathentry kind="lib" path="extra/ext/jonas_timer.jar"/>
- <classpathentry kind="lib" path="extra/ext/carol.jar"/>
- <classpathentry kind="lib" path="extra/ext/jotm_jrmp_stubs.jar"/>
- <classpathentry kind="lib" path="extra/ext/activation.jar"/>
- <classpathentry sourcepath="ext/jasper-src.jar" kind="lib"
path="ext/jasper-runtime.jar"/>
- <classpathentry kind="lib" path="ext/mx4j-jmx.jar"/>
- <classpathentry kind="lib" path="extra/ext/objectweb-datasource.jar"/>
- <classpathentry kind="lib" path="ext/commons-logging.jar"/>
- <classpathentry kind="lib" path="extra/ext/xapool.jar"/>
- <classpathentry kind="lib" path="ext/ant.jar"/>
- <classpathentry sourcepath="ext/jasper-src.jar" kind="lib"
path="ext/jasper-compiler.jar"/>
- <classpathentry kind="lib" path="extra/ext/jotm_iiop_stubs.jar"/>
- <classpathentry kind="lib" path="extra/ext/mail.jar"/>
- <classpathentry kind="lib" path="ext/mx4j-tools.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
- <classpathentry kind="lib" path="extra/ext/log4j.jar"/>
- <classpathentry kind="var" path="JBOSS/lib/jboss-common.jar"/>
- <classpathentry kind="var" path="JBOSS/lib/jboss-jmx.jar"/>
- <classpathentry kind="var" path="JBOSS/lib/jboss-system.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jboss.jar"/>
- <classpathentry kind="var"
path="JBOSS/server/all/lib/jboss-common-jdbc-wrapper.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jbossha.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jboss-iiop.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jboss-j2ee.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jboss-jaas.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jboss-jsr77.jar"/>
- <classpathentry kind="var"
path="JBOSS/server/all/lib/jboss-management.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jbossmq.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jbosssx.jar"/>
- <classpathentry kind="var"
path="JBOSS/server/all/lib/jboss-transaction.jar"/>
- <classpathentry kind="var" path="JBOSS/server/all/lib/jgroups.jar"/>
- <classpathentry kind="var" path="JBOSS"/>
- <classpathentry kind="output" path="classes"/>
-</classpath>
Deleted: trunk/jetty5/.project
===================================================================
--- trunk/jetty5/.project 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/.project 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Jetty_5</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
- <linkedResources>
- <link>
- <name>jboss-ha</name>
- <type>2</type>
-
<location>JBOSS_HOME/server/all/deploy/jbossha-httpsession.sar</location>
- </link>
- </linkedResources>
-</projectDescription>
Deleted: trunk/jetty5/debian/README.Debian
===================================================================
--- trunk/jetty5/debian/README.Debian 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/README.Debian 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,6 +0,0 @@
-jetty for Debian
-----------------
-
-Jetty's extras are available in the jetty-extra package.
-
- -- Philipp Meier <me...@meisterbohne.de>, Thu Jan 15 13:59:34 CET 2004
Deleted: trunk/jetty5/debian/adminRealm.properties
===================================================================
--- trunk/jetty5/debian/adminRealm.properties 2010-02-06 02:32:29 UTC (rev
11504)
+++ trunk/jetty5/debian/adminRealm.properties 2010-02-06 11:02:57 UTC (rev
11505)
@@ -1,14 +0,0 @@
-#
-# This file defines users passwords and roles for a HashUserRealm
-#
-# The format is
-# <username>: <password>[,<rolename> ...]
-#
-# Passwords may be clear text, obfuscated or checksummed. The class
-# org.mortbay.util.Password should be used to generate obfuscated
-# passwords or password checksums
-#
-# If DIGEST Authentication is used, the password must be in a recoverable
-# format, either plain text or OBF:.
-#
-admin: admin,server-administrator
Deleted: trunk/jetty5/debian/ant-jetty-nonfree.properties
===================================================================
--- trunk/jetty5/debian/ant-jetty-nonfree.properties 2010-02-06 02:32:29 UTC
(rev 11504)
+++ trunk/jetty5/debian/ant-jetty-nonfree.properties 2010-02-06 11:02:57 UTC
(rev 11505)
@@ -1,21 +0,0 @@
-# compilation settings
-javac.debug=on
-javac.optimize=on
-build.javadoc=gjdoc
-build.compiler=jikes
-javadoc.encoding=ISO-8859-1
-
-# temp files
-ext=../../debian/ext
-jetty.ext=../../debian/ext
-classes=../../debian/build/classes
-test.classes=../../debian/build/test-classes
-jetty.webapp.classes=../../debian/build/jetty-webapp-classes
-tmp.src=../../debian/build/tmp-src
-
-# dist
-etc=../../debian/tmp/etc/jetty
-lib=../../debian/build/lib
-start.jar=../../debian/jetty/usr/share/jetty/lib/start.jar
-stop.jar=../../debian/jetty/usr/share/jetty/lib/stop.jar
-javadoc=../../debian/tmp/usr/share/doc/jetty/api
Modified: trunk/jetty5/debian/changelog
===================================================================
--- trunk/jetty5/debian/changelog 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/changelog 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,3 +1,10 @@
+jetty5 (5.1.14-2) UNRELEASED; urgency=low
+
+ * Renamed source package to jetty5.
+ * Removed README.Debian - no longer relevant.
+
+ -- Niels Thykier <ni...@thykier.net> Tue, 02 Feb 2010 17:25:48 +0100
+
jetty (5.1.14-1) unstable; urgency=low
* New upstream release.
Modified: trunk/jetty5/debian/control
===================================================================
--- trunk/jetty5/debian/control 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/control 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,9 +1,9 @@
-Source: jetty
-Section: contrib/web
+Source: jetty5
+Section: web
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Philipp Meier <me...@fnogol.de>, Michael Koch <konque...@gmx.de>
-Build-Depends: debhelper (>= 4.9.5), cdbs (>> 0.4.5.3)
+Uploaders: Niels Thykier <ni...@thykier.net>
+Build-Depends: debhelper (>= 4.9.5), cdbs (>> 0.4.5.3), default-jdk
Build-Depends-Indep: java-gcj-compat-dev, ant, junit, libmx4j-java,
liblog4j1.2-java, libservlet2.4-java, libcommons-logging-java, libgnumail-java
Standards-Version: 3.7.2
Deleted: trunk/jetty5/debian/jetty-extra.install
===================================================================
--- trunk/jetty5/debian/jetty-extra.install 2010-02-06 02:32:29 UTC (rev
11504)
+++ trunk/jetty5/debian/jetty-extra.install 2010-02-06 11:02:57 UTC (rev
11505)
@@ -1 +0,0 @@
-extra/lib/* usr/share/jetty/lib/
Deleted: trunk/jetty5/debian/jetty.default
===================================================================
--- trunk/jetty5/debian/jetty.default 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.default 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,4 +0,0 @@
-# Defaults for jetty see /etc/init.d/jetty for more
-#JETTY_TMP=/var/cache/jetty
-#JAVA_OPTIONS="-Xmx256m -Djava.awt.headless=true \
-# -Djava.io.tmpdir=$JETTY_TMP -Djava.library.path=/usr/lib"
Deleted: trunk/jetty5/debian/jetty.dirs
===================================================================
--- trunk/jetty5/debian/jetty.dirs 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.dirs 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,9 +0,0 @@
-etc/jetty
-usr/share/jetty
-usr/share/jetty/lib
-usr/share/jetty/ext
-usr/share/jetty/webapps
-usr/share/jetty/cgi-bin
-usr/share/java/webapps
-var/log/jetty/
-var/cache/jetty
Deleted: trunk/jetty5/debian/jetty.init
===================================================================
--- trunk/jetty5/debian/jetty.init 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.init 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,229 +0,0 @@
-#!/bin/sh -e
-#
-# /etc/init.d/jetty -- startup script for jetty 4.2.11
-#
-# Written by Philipp Meier <me...@meisterbohne.de>
-#
-### BEGIN INIT INFO
-# Provides: jetty
-# Required-Start: $syslog $network
-# Required-Stop: $syslog $network
-# Should-Start: $local_fs
-# Should-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start Jetty
-# Description: Start Jetty HTTP server and servlet container.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-NAME=jetty
-DESC="Jetty servlet engine"
-JETTY_HOME=/usr/share/$NAME
-START_JAR="$JETTY_HOME/lib/start.jar"
-
-# The following variables can be overwritten in /etc/default/jetty
-
-# Whether to start jetty (as a daemon) or not
-NO_START=0
-
-# Run Jetty as this user ID (default: jetty)
-# Set this to an empty string to prevent Jetty from starting automatically
-JETTY_USER=jetty
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
-# defined in /etc/default/jetty)
-JDK_DIRS="
- /usr/lib/jvm/java-6-sun \
- /usr/lib/jvm/java-1.5.0-sun \
- /usr/lib/jvm/java-gcj \
- /usr/lib/j2sdk1.6-sun \
- /usr/lib/j2sdk1.5-sun \
- /usr/lib/j2sdk1.4-sun \
- /usr/lib/j2sdk1.4 \
- /usr/lib/j2se/1.4 \
- /usr/lib/j2sdk1.3 \
- /usr/lib/j2se/1.3 \
- /usr/lib/kaffe/ \
- "
-
-# Timeout in seconds for the shutdown of all webapps
-JETTY_SHUTDOWN=30
-
-# Jetty uses a directory to store temporary files like unpacked webapps
-JETTY_TMP=/var/cache/jetty
-
-# Jetty uses a config file to setup it's boot classpath
-START_CONFIG=/etc/jetty/start.config
-
-# End of variables that can be overwritten in /etc/default/jetty
-
-# overwrite settings from default file
-if [ -f /etc/default/jetty ]; then
- . /etc/default/jetty
-fi
-
-# Check whether jetty is still installed (it might not be if this package was
-# removed and not purged)
-if [ -r "$START_JAR" ]; then
- HAVE_JETTY=1
-else
- exit 0
-fi
-
-# Check whether startup has been disabled
-if [ "$NO_START" != "0" -a "$1" != "stop" ]; then
- [ "$VERBOSE" != "no" ] && echo "Not starting jetty - edit
/etc/default/jetty and change NO_START to be 0 (or comment it out).";
- exit 0;
-fi
-
-if [ -z "$JETTY_USER" ]; then
- echo "Not starting/stopping $DESC as configured (JETTY_USER is"
- echo "empty in /etc/default/jetty)."
- exit 0
-fi
-
-# Look for the right JVM to use
-for jdir in $JDK_DIRS; do
- if [ -d "$jdir" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME="$jdir"
- fi
-done
-export JAVA_HOME
-
-export JAVA="$JAVA_HOME/bin/java"
-
-# Set java.awt.headless=true if JAVA_OPTIONS is not set so the
-# Xalan XSL transformer can work without X11 display on JDK 1.4+
-if [ -z "$JAVA_OPTIONS" ]; then
- JAVA_OPTIONS="-Xmx256m \
- -Djava.awt.headless=true \
- -Djava.io.tmpdir=\"$JETTY_TMP\" \
- -Djava.library.path=/usr/lib"
-fi
-export JAVA_OPTIONS
-
-# Define other required variables
-PIDFILE="/var/run/$NAME.pid"
-LOGDIR="/var/log/jetty"
-WEBAPPDIR="$JETTY_HOME/webapps"
-
-##################################################
-# Check for JAVA_HOME
-##################################################
-if [ -z "$JAVA_HOME" ]; then
- echo "Could not start $DESC because no Java Development Kit"
- echo "(JDK) was found. Please download and install JDK 1.3 or higher and
set"
- echo "JAVA_HOME in /etc/default/jetty to the JDK's installation directory."
- exit 0
-
-fi
-
-ARGUMENTS="$JAVA_OPTIONS -DSTART=$START_CONFIG -Djetty.home=$JETTY_HOME -jar
$START_JAR /etc/jetty/jetty.xml"
-
-##################################################
-# Do the action
-##################################################
-case "$1" in
- start)
- if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
- --user "$JETTY_USER" --startas "$JAVA" > /dev/null;
then
-
-
-
- # Look for rotatelogs/rotatelogs2
- if [ -x /usr/sbin/rotatelogs ]; then
- ROTATELOGS=/usr/sbin/rotatelogs
- else
- ROTATELOGS=/usr/sbin/rotatelogs2
- fi
-
- if [ -f $PIDFILE ]
- then
- echo "$PIDFILE exists, but jetty was not running.
Ignoring $PIDFILE"
- fi
-
- echo -n "Starting $DESC: "
- if [ \! -e "$LOGDIR/out.log" ]; then
- touch "$LOGDIR/out.log"
- chown jetty.adm "$LOGDIR/out.log"
- fi
- su -p -s /bin/sh "$JETTY_USER" \
- -c "$ROTATELOGS \"$LOGDIR/out.log\" 86400" \
- < "$LOGDIR/out.log" &
- su -p -s /bin/sh "$JETTY_USER" \
- -c "$JAVA $ARGUMENTS >> $LOGDIR/out.log 2>&1 & \
- echo \$!" > "$PIDFILE"
- echo "$NAME."
- else
- echo "(already running)."
- exit 1
- fi
- ;;
-
- stop)
- echo -n "Stopping $DESC: "
-
- if start-stop-daemon --quiet --test --start --pidfile "$PIDFILE" \
- --user "$JETTY_USER" --startas "$JAVA" > /dev/null; then
- if [ -x "$PIDFILE" ]; then
- echo "(not running but $PIDFILE exists)."
- else
- echo "(not running)."
- fi
- else
- start-stop-daemon --quiet --stop \
- --pidfile "$PIDFILE" --user "$JETTY_USER" \
- --startas "$JAVA" > /dev/null
- while ! start-stop-daemon --quiet --test --start \
- --pidfile "$PIDFILE" --user "$JETTY_USER" \
- --startas "$JAVA" > /dev/null; do
- sleep 1
- echo -n "."
- JETTY_SHUTDOWN=`expr $JETTY_SHUTDOWN - 1` || true
- if [ $JETTY_SHUTDOWN -ge 0 ]; then
- start-stop-daemon --oknodo --quiet --stop \
- --pidfile "$PIDFILE" --user
"$JETTY_USER" \
- --startas "$JAVA"
- else
- echo -n " (killing) "
- start-stop-daemon --stop --signal 9 --oknodo \
- --quiet --pidfile "$PIDFILE" \
- --user "$JETTY_USER"
- fi
- done
- rm -f "$PIDFILE"
- echo "$NAME."
- fi
- ;;
-
- restart|force-reload)
- $0 stop $*
- sleep 1
- $0 start $*
- ;;
-
- check)
- echo "Checking arguments to Jetty: "
- echo
- echo "PIDFILE = $PIDFILE"
- echo "JAVA_OPTIONS = $JAVA_OPTIONS"
- echo "JAVA = $JAVA"
- echo "JETTY_USER = $JETTY_USER"
- echo "ARGUMENTS = $ARGUMENTS"
-
- if [ -f $PIDFILE ]
- then
- echo "Jetty running pid="`cat $PIDFILE`
- exit 0
- fi
- exit 1
- ;;
-
- *)
- echo "Usage: /etc/init.d/jetty
{start|stop|restart|force-reload|check}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Deleted: trunk/jetty5/debian/jetty.install
===================================================================
--- trunk/jetty5/debian/jetty.install 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.install 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,13 +0,0 @@
-start.jar usr/share/jetty/lib
-stop.jar usr/share/jetty/lib
-lib/org.mortbay* usr/share/jetty/lib
-classes/org/mortbay/jetty/servlet/webdefault.xml etc/jetty
-debian/tmp/usr/share/jetty/lib/*
-debian/jetty.xml etc/jetty
-debian/start.config etc/jetty
-debian/adminRealm.properties etc/jetty
-demo/webapps/jetty/* usr/share/jetty/webapps/root
-README.TXT usr/share/doc/jetty
-VERSION.TXT usr/share/doc/jetty
-javadoc/* usr/share/doc/jetty/api
-etc/dtd usr/share/doc/jetty
Deleted: trunk/jetty5/debian/jetty.links
===================================================================
--- trunk/jetty5/debian/jetty.links 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.links 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,2 +0,0 @@
-usr/share/jetty/lib/org.mortbay.jetty.jar usr/share/java/jetty-5.0.0.jar
-usr/share/java/jetty-5.0.0.jar usr/share/java/jetty.jar
Deleted: trunk/jetty5/debian/jetty.postinst
===================================================================
--- trunk/jetty5/debian/jetty.postinst 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.postinst 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
- configure)
- if ! id jetty > /dev/null 2>&1 ; then
- adduser --system --home /usr/share/jetty --no-create-home \
- --ingroup nogroup --disabled-password --shell /bin/false \
- jetty
- fi
- chown jetty:adm /var/cache/jetty /var/log/jetty
- chmod 750 /var/log/jetty
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
Deleted: trunk/jetty5/debian/jetty.postrm
===================================================================
--- trunk/jetty5/debian/jetty.postrm 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.postrm 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,22 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-# Remove cached files
-rm -rf /var/cache/jetty/*
-
-case "$1" in
- purge)
- userdel jetty || true
- rm -rf /var/log/jetty
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- # Nothing to do here
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
Deleted: trunk/jetty5/debian/jetty.preinst
===================================================================
--- trunk/jetty5/debian/jetty.preinst 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.preinst 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,42 +0,0 @@
-#! /bin/sh
-# preinst script for jetty
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- upgrade)
-
- ;;
-
- install|upgrade)
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: trunk/jetty5/debian/jetty.prerm
===================================================================
--- trunk/jetty5/debian/jetty.prerm 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.prerm 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,39 +0,0 @@
-#! /bin/sh
-# prerm script for jetty
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- remove|upgrade|deconfigure)
-# install-info --quiet --remove /usr/info/jetty.info.gz
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: trunk/jetty5/debian/jetty.xml
===================================================================
--- trunk/jetty5/debian/jetty.xml 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/jetty.xml 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,222 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN"
"http://jetty.mortbay.org/configure_1_2.dtd";>
-
-
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server -->
-<!-- =============================================================== -->
-<Configure class="org.mortbay.jetty.Server">
-
- <Call class="org.apache.commons.logging.LogFactory" name="getFactory">
- <Call name="getInstance">
- <Arg/>
- <Call name="reset"/>
- <Call name="add">
- <Arg>
- <New class="org.mortbay.log.OutputStreamLogSink">
- <Set name="filename">/var/log/jetty/jetty_yyyy_mm_dd.log</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">true</Set>
- <Set name="logLabels">true</Set>
- <Set name="logStackSize">true</Set>
- <Set name="logStackTrace">false</Set>
- <Set name="logOneLine">false</Set>
- <Set name="suppressStack">false</Set>
- <Set name="logTimeZone">GMT</Set>
- </New>
- </Arg>
- </Call>
- </Call>
- </Call>
-
-
-
- <!-- =============================================================== -->
- <!-- Configure the Request Listeners -->
- <!-- =============================================================== -->
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add and configure a HTTP listener to port 8280 -->
- <!-- The default port can be changed using: java -Djetty.port=80 -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addListener">
- <Arg>
- <New class="org.mortbay.http.SocketListener">
- <Set name="Port"><SystemProperty name="jetty.port"
default="8280"/></Set>
- <Set name="MinThreads">10</Set>
- <Set name="MaxThreads">100</Set>
- <Set name="MaxIdleTimeMs">30000</Set>
- <Set name="LowResourcePersistTimeMs">5000</Set>
- <Set name="ConfidentialPort">8443</Set>
- <Set name="IntegralPort">8443</Set>
- </New>
- </Arg>
- </Call>
-
-
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add a HTTPS SSL listener on port 8443 -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- UNCOMMENT TO ACTIVATE
- <Call name="addListener">
- <Arg>
- <New class="org.mortbay.http.SunJsseListener">
- <Set name="Port">8443</Set>
- <Set name="MinThreads">5</Set>
- <Set name="MaxThreads">100</Set>
- <Set name="MaxIdleTimeMs">30000</Set>
- <Set name="LowResourcePersistTimeMs">2000</Set>
- <Set name="Keystore">/etc/demokeystore</Set>
- <Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
- <Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
- </New>
- </Arg>
- </Call>
- -->
-
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add a AJP13 listener on port 8209 -->
- <!-- This protocol can be used with mod_jk in apache, IIS etc. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- UNCOMMENT TO ACTIVATE
- <Call name="addListener">
- <Arg>
- <New class="org.mortbay.http.ajp.AJP13Listener">
- <Set name="Host">127.0.0.1</Set>
- <Set name="Port">8209</Set>
- <Set name="MinThreads">5</Set>
- <Set name="MaxThreads">20</Set>
- <Set name="MaxIdleTimeMs">0</Set>
- <Set name="confidentialPort">443</Set>
- </New>
- </Arg>
- </Call>
- -->
-
-
- <!-- =============================================================== -->
- <!-- Configure the Contexts -->
- <!-- =============================================================== -->
-
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add a all web application within the webapps directory. -->
- <!-- + No virtual host specified -->
- <!-- + Look in the webapps directory relative to jetty.home or . -->
- <!-- + Use the webdefault.xml resource for the defaults descriptor -->
- <!-- + Upack the war file -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Set name="rootWebApp">root</Set>
- <Call name="addWebApplications">
- <Arg></Arg>
- <Arg><SystemProperty name="jetty.home"
default="/usr/share/jetty"/>/webapps/</Arg>
- <Arg>/etc/jetty/webdefault.xml</Arg>
- <Arg type="boolean">true</Arg>
- </Call>
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add a all web application within the debian webapps directory. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- UNCOMMENT TO ACTIVATE
- <Call name="addWebApplications">
- <Arg></Arg>
- <Arg>/usr/share/java/webapps/</Arg>
- <Arg>/etc/jetty/webdefault.xml</Arg>
- <Arg type="boolean">false</Arg>
- </Call>
- -->
-
- <Call name="addRealm">
- <Arg>
- <New class="org.mortbay.http.HashUserRealm">
- <Arg>Jetty Admin Realm</Arg>
- <Arg>/etc/jetty/adminRealm.properties</Arg>
- </New>
- </Arg>
- </Call>
-
- <Call name="addContext">
- <Arg>/admin</Arg>
- <Set name="realmName">Jetty Admin Realm</Set>
- <Set name="authenticator"><New
class="org.mortbay.http.BasicAuthenticator"/></Set>
-
- <Call name="addHandler">
- <Arg><New class="org.mortbay.http.handler.SecurityHandler"/></Arg>
- </Call>
- <Call name="addSecurityConstraint">
- <Arg>/</Arg>
- <Arg><New class="org.mortbay.http.SecurityConstraint">
- <Arg>Admin</Arg>
- <Arg>server-administrator</Arg>
- </New></Arg>
- </Call>
-
- <Call name="addServlet">
- <Arg>Debug</Arg>
- <Arg>/Debug/*</Arg>
- <Arg>org.mortbay.servlet.Debug</Arg>
- </Call>
- <Call name="addServlet">
- <Arg>Admin</Arg>
- <Arg>/</Arg>
- <Arg>org.mortbay.servlet.AdminServlet</Arg>
- </Call>
- <Call name="setAttribute">
- <Arg>org.mortbay.http.HttpServer</Arg>
- <Arg><Call name="getHttpServer"/></Arg>
- </Call>
- </Call>
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Build the javadoc context. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addContext">
- <Arg>/javadoc/*</Arg>
- <Set name="ResourceBase">/usr/share/doc/jetty/api/</Set>
- <Call name="addHandler">
- <Arg><New class="org.mortbay.http.handler.ResourceHandler"/></Arg>
- </Call>
- </Call>
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Build the cgi-bin context. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addContext">
- <Arg>/cgi-bin/*</Arg>
- <Set name="ResourceBase">/usr/lib/cgi-bin/</Set>
- <Call name="addServlet">
- <Arg>Common Gateway Interface</Arg>
- <Arg>/</Arg>
- <Arg>org.mortbay.servlet.CGI</Arg>
- <!-- Set initParams for CGI -->
- <Put name="Path">/bin:/usr/bin:/usr/local/bin</Put>
- <!-- <Put name="commandPrefix">perl</Put> -->
- </Call>
- </Call>
-
- <!-- =============================================================== -->
- <!-- Configure the Request Log -->
- <!-- =============================================================== -->
- <Set name="RequestLog">
- <New class="org.mortbay.http.NCSARequestLog">
- <Arg>/var/log/jetty/request_yyyy_mm_dd.log</Arg>
- <Set name="retainDays">90</Set>
- <Set name="append">true</Set>
- <Set name="extended">false</Set>
- <Set name="buffered">false</Set>
- <Set name="LogTimeZone">GMT</Set>
- </New>
- </Set>
-
- <!-- =============================================================== -->
- <!-- Configure the Other Server Options -->
- <!-- =============================================================== -->
- <Set name="requestsPerGC">2000</Set>
- <Set name="statsOn">false</Set>
-
-</Configure>
-
-
Modified: trunk/jetty5/debian/patches/build-javadoc-src-encoding.patch
===================================================================
--- trunk/jetty5/debian/patches/build-javadoc-src-encoding.patch
2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/patches/build-javadoc-src-encoding.patch
2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,5 +1,5 @@
---- build.xml.orig 2005-04-07 12:53:50.000000000 +0200
-+++ build.xml 2005-06-30 16:33:27.089524800 +0200
+--- a/build.xml 2005-04-07 12:53:50.000000000 +0200
++++ b/build.xml 2005-06-30 16:33:27.089524800 +0200
@@ -372,6 +373,7 @@
public="true"
windowtitle="${ant.project.name} ${RELEASE.MAJOR.MINOR} API"
Modified: trunk/jetty5/debian/patches/remove-import-from-sun.patch
===================================================================
--- trunk/jetty5/debian/patches/remove-import-from-sun.patch 2010-02-06
02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/patches/remove-import-from-sun.patch 2010-02-06
11:02:57 UTC (rev 11505)
@@ -1,5 +1,5 @@
---- x 2005-12-13 15:25:19.726692025 +0100
-+++ src/org/mortbay/servlet/PostFileFilter.java 2005-12-13
15:25:07.438317184 +0100
+--- a/src/org/mortbay/servlet/PostFileFilter.java 2005-12-13
15:25:19.726692025 +0100
++++ b/src/org/mortbay/servlet/PostFileFilter.java 2005-12-13
15:25:07.438317184 +0100
@@ -30,7 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: trunk/jetty5/debian/patches/sunjsse-disable.patch
===================================================================
--- trunk/jetty5/debian/patches/sunjsse-disable.patch 2010-02-06 02:32:29 UTC
(rev 11504)
+++ trunk/jetty5/debian/patches/sunjsse-disable.patch 2010-02-06 11:02:57 UTC
(rev 11505)
@@ -1,5 +1,5 @@
---- build.xml.orig 2005-08-27 12:24:26.717664274 +0200
-+++ build.xml 2005-08-27 12:24:11.106455215 +0200
+--- a/build.xml 2005-08-27 12:24:26.717664274 +0200
++++ b/build.xml 2005-08-27 12:24:11.106455215 +0200
@@ -87,6 +87,12 @@
/>
<echo message="JMX available=${jmx.available}" level="info"/>
Modified: trunk/jetty5/debian/rules
===================================================================
--- trunk/jetty5/debian/rules 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/rules 2010-02-06 11:02:57 UTC (rev 11505)
@@ -5,7 +5,8 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
+#ANT_HOME := /usr/share/ant
DEB_JARS := mx4j log4j-1.2 log4j junit commons-logging gnumail
-DEB_ANT_INSTALL_TARGET := webapps extra javadoc
+DEB_ANT_INSTALL_TARGET :=
+DEB_ANT_BUILD_TARGET := prepare jetty.jar
\ No newline at end of file
Deleted: trunk/jetty5/debian/start.config
===================================================================
--- trunk/jetty5/debian/start.config 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/start.config 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,86 +0,0 @@
-# This file controls what file are to be put on classpath or command line.
-#
-# Format is as follows:
-# Each line contains entry for one JAR file.
-# Format of line:
-#
-# SUBJECT [ [!] CONDITION [AND|OR] ]*
-#
-# where SUBJECT:
-# ends with ".class" is the Main class to run.
-# ends with ".xml" is a configuration file for the command line
-# ends with "/" is a directory from which add all jar and zip files from.
-# ends with "/*" is a directory from which add all unconsidered jar and zip
files from.
-# Containing = are used to assign system properties.
-# all other subjects are treated as files to be added to the classpath.
-#
-# Subjects may include system properties with $(propertyname) syntax.
-#
-# Files starting with "/" are considered absolute, all others are relative to
-# the home directory.
-#
-# CONDITION is one of:
-# always
-# never
-# available classname
-# java OPERATOR version
-# nargs OPERATOR number
-# OPERATOR := one of "<",">","<=",">=","==","!="
-#
-# CONTITIONS can be combined with AND OR or !, with AND being the assume
-# operator for a list of CONDITIONS.
-# Classpath operations are evaluated on the fly, so once a class or jar is
-# added to the classpath, subsequent available conditions will see that class.
-#
-
-$(jetty.class.path) always
-
-org.apache.commons.logging.LogFactory=org.mortbay.log.Factory AND ! property
org.apache.commons.logging.LogFactory ! property org.apache.commons.logging.Log
-
-# Try different settings of jetty.home until the jetty.jar is found.
-jetty.home=/usr/share/jetty
-
-# Debian jars home
-java.lib.home=/usr/share/java always
-tomcat.lib.home=/usr/share/tomcat5.5/common/lib/ always
-
-# Do not validate xml files by default.
-# Disabled because servlet-2.3.jar references an XSD which is not longer
-# hostet by IBM. This should generally make the startup faster.
-property=org.mortbay.xml.XmlParser.NotValidating=true
-
-# The main class to run
-org.mortbay.jetty.Server.class
-
-# The default configuration files
-#/etc/admin.xml nargs == 0
-/etc/jetty/jetty.xml nargs == 0
-
-# Set the jetty classpath
-# Always use the >1.2 version because version matching does not work with kaffe
-$(jetty.home)/lib/org.mortbay.jetty.jar
-#$(jetty.home)/lib/org.mortbay.jetty.jar java >= 1.4
-#$(jetty.home)/extra/lib/org.mortbay.jetty-jdk1.2.jar java < 1.4 AND java >=
1.2
-$(jetty.home)/lib/org.mortbay.jmx.jar
-$(java.lib.home)/servlet-api-2.4.jar
-$(java.lib.home)/jsp-api-2.0.jar
-
-# Always use xercesImpl from debian if it is present
-$(java.lib.home)/xercesImpl.jar ! available
org.apache.xerces.jaxp.DocumentBuilderImpl.class
-
-# Add the XML support jars if needed.
-$(java.lib.home)/xmlParserAPIs.jar ! available
org.w3c.dom.DOMError
-$(java.lib.home)/xml-apis.jar ! available
org.w3c.dom.Document
-
-# Set the classpath for the supporting cast
-$(java.lib.home)/commons-logging.jar ! available
org.apache.commons.logging.LogFactory
-$(java.lib.home)/commons-el.jar ! available
org.apache.commons.el.ExpressionEvaluatorImpl
-$(java.lib.home)/jmxri.jar ! available
javax.management.MBeanServer
-$(tomcat.lib.home)/jasper-runtime.jar ! available
org.apache.jasper.Constants
-$(tomcat.lib.home)/jasper-compiler.jar ! available
org.apache.jasper.JspCompilationContext
-$(java.lib.home)/ant-1.6.jar ! available
org.apache.tools.ant.BuildException
-$(java.home)/lib/tools.jar ! available
com.sun.tools.javac.Main
-$(java.home)/../lib/tools.jar ! available
com.sun.tools.javac.Main
-
-# Add anything in ext we have not yet considered.
-$(jetty.home)/ext/*
Modified: trunk/jetty5/debian/watch
===================================================================
--- trunk/jetty5/debian/watch 2010-02-06 02:32:29 UTC (rev 11504)
+++ trunk/jetty5/debian/watch 2010-02-06 11:02:57 UTC (rev 11505)
@@ -1,2 +1,2 @@
version=3
-ftp://ftp.mortbay.org/pub/jetty-5/jetty-(.*)\.tgz debian uupdate
+http://dist.codehaus.org/jetty/jetty-5.1.x/ jetty-(.*)\.tgz debian uupdate
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
