diff --git a/jetty-OSGi-MANIFEST.MF b/jetty-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..fa225ee
--- /dev/null
+++ b/jetty-OSGi-MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.0
+Created-By: 2.3 (IBM Corporation)
+Import-Package: javax.net.ssl,javax.security.cert,javax.servlet;versio
+ n="[2.4.0,2.5.0)",javax.servlet.http;version="[2.4.0,2.5.0)",javax.se
+ rvlet.resources;version="[2.4.0,2.5.0)",javax.xml.parsers,org.apache.
+ commons.logging;version="[1.0.0,2.0.0)",org.xml.sax,org.xml.sax.helpe
+ rs
+Bundle-ManifestVersion: 2
+Export-Package: org.mortbay.html;version="5.1.11",org.mortbay.http;ver
+ sion="5.1.11",org.mortbay.http.ajp;version="5.1.11",org.mortbay.http.
+ handler;version="5.1.11",org.mortbay.http.nio;version="5.1.11",org.mo
+ rtbay.jetty;version="5.1.11",org.mortbay.jetty.servlet;version="5.1.1
+ 1",org.mortbay.jetty.win32;version="5.1.11",org.mortbay.log;version="
+ 5.1.11",org.mortbay.servlet;version="5.1.11",org.mortbay.util;version
+ ="5.1.11",org.mortbay.xml;version="5.1.11"
+Bundle-Version: 5.1.11.v200706111724
+Bundle-SymbolicName: org.mortbay.jetty
+Bundle-Name: Jetty WebServer
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
+ 2SE-1.3
+Bundle-Localization: plugin
+Bundle-Vendor: Mort Bay Consulting, Pty. Ltd.
+
diff --git a/jetty-PostFileFilter.patch b/jetty-PostFileFilter.patch
new file mode 100644
index 0000000..43e336a
--- /dev/null
+++ b/jetty-PostFileFilter.patch
@@ -0,0 +1,11 @@
+--- src/org/mortbay/servlet/PostFileFilter.java.sav 2006-08-10 14:03:26.000000000 +0200
++++ src/org/mortbay/servlet/PostFileFilter.java 2006-08-10 14:04:24.000000000 +0200
+@@ -30,7 +30,7 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+
+-import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
++//import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
+
+ /* ------------------------------------------------------------ */
+ /** PostFileFilter.
diff --git a/jetty-TestRFC2616-libgcj-bad-date-parser.patch b/jetty-TestRFC2616-libgcj-bad-date-parser.patch
new file mode 100644
index 0000000..bf008db
--- /dev/null
+++ b/jetty-TestRFC2616-libgcj-bad-date-parser.patch
@@ -0,0 +1,11 @@
+--- test/src/org/mortbay/http/TestRFC2616.java~ 2006-04-05 17:24:44.000000000 -0700
++++ test/src/org/mortbay/http/TestRFC2616.java 2006-08-08 12:47:50.000000000 -0700
+@@ -296,7 +296,7 @@
+
+ fields.put("D1","Sun, 6 Nov 1994 08:49:37 GMT");
+ fields.put("D2","Sunday, 6-Nov-94 08:49:37 GMT");
+- fields.put("D3","Sun Nov 6 08:49:37 1994");
++ fields.put("D3","Sun Nov 6 08:49:37 1994");
+ Date d1 = new Date(fields.getDateField("D1"));
+ Date d2 = new Date(fields.getDateField("D2"));
+ Date d3 = new Date(fields.getDateField("D3"));
diff --git a/jetty-extra-j2ee-build_xml.patch b/jetty-extra-j2ee-build_xml.patch
new file mode 100644
index 0000000..fb89f8b
--- /dev/null
+++ b/jetty-extra-j2ee-build_xml.patch
@@ -0,0 +1,11 @@
+--- extra/j2ee/build.xml.sav 2006-06-20 19:17:28.000000000 +0200
++++ extra/j2ee/build.xml 2006-06-20 19:18:23.000000000 +0200
+@@ -66,7 +66,7 @@
+
+
+
+-
++
+
+
+
diff --git a/jetty-libgcj-bad-serialization.patch b/jetty-libgcj-bad-serialization.patch
new file mode 100644
index 0000000..bafec9f
--- /dev/null
+++ b/jetty-libgcj-bad-serialization.patch
@@ -0,0 +1,22 @@
+--- test/src/org/mortbay/jetty/TestServer.java~ 2005-08-13 10:12:14.000000000 -0700
++++ test/src/org/mortbay/jetty/TestServer.java 2006-08-08 11:24:55.000000000 -0700
+@@ -96,19 +96,6 @@
+
+
+
+- System.err.println("Serialize and deserialize server");
+-
+- ObjectInputStream oi = new ObjectInputStream(new FileInputStream(tmp));
+- server = (Server)oi.readObject();
+- oi.close();
+-
+-
+- System.err.println("start recovered server");
+- server.start();
+- assertTrue("restarted",server.isStarted());
+- server.stop();
+- assertTrue("restopped",!server.isStarted());
+- server.destroy();
+ }
+
+ /* ------------------------------------------------------------ */
diff --git a/jetty.init b/jetty.init
new file mode 100644
index 0000000..61d4738
--- /dev/null
+++ b/jetty.init
@@ -0,0 +1,159 @@
+#!/bin/sh
+#
+# jetty This shell script takes care of starting and stopping jetty
+#
+# chkconfig: - 80 20
+# description: The Jetty Webserver and Servlet Container
+# processname: jetty
+# pidfile: /var/run/jetty/jetty.pid
+# config: /etc/jetty/jetty.conf
+#
+#
+# Portions from tomcat4.init by:
+#
+# Gomez Henri
+# Keith Irwin
+# Nicolas Mailhot
+#
+#
+
+
+# Source function library.
+if [ -x /etc/rc.d/init.d/functions ]; then
+ . /etc/rc.d/init.d/functions
+fi
+
+[ -r /etc/java/java.conf ] && . /etc/java/java.conf
+export JAVA_HOME
+
+# Get Jetty5's config
+
+JETTY_CFG="/etc/jetty/jetty.conf"
+
+[ -r "$JETTY_CFG" ] && . "${JETTY_CFG}"
+
+# Path to the jetty launch script (direct don't use the wrapper)
+JETTY_SCRIPT=/usr/bin/djetty
+
+# if JETTY_USER is not set, use jetty
+if [ -z "$JETTY_USER" ]; then
+ JETTY_USER="jetty"
+fi
+
+# if JETTY_HOME is not set, use /usr/share/jetty
+if [ -z "$JETTY_HOME" ]; then
+ JETTY_HOME="/usr/share/jetty"
+fi
+
+if [ -z "$SHUTDOWN_WAIT" ]; then
+ SHUTDOWN_WAIT=10
+fi
+
+if [ -z "$JETTY_PID" ]; then
+ JETTY_PID=/var/run/jetty/jetty.pid
+fi
+
+
+RETVAL=0
+
+start() {
+ echo -n "Starting $JETTY_PROG: "
+
+ if [ -f /var/lock/subsys/jetty ] ; then
+ if [ -f $JETTY_PID ]; then
+ read kpid < $JETTY_PID
+ if checkpid $kpid 2>&1; then
+ echo "process already running"
+ return -1
+ else
+ echo "lock file found but no process running for pid $kpid, continuing"
+ fi
+ fi
+ fi
+
+# touch $JETTY_PID
+# chown $JETTY_USER:$JETTY_USER $JETTY_PID
+
+# [ -x ${JETTY_HOME}/ext ] &&
+# rebuild-jar-repository -s ${JETTY_HOME}/ext
+
+ if [ -x /etc/rc.d/init.d/functions ]; then
+ daemon --user $JETTY_USER $JETTY_SCRIPT start
+ else
+ su - $JETTY_USER -c "$JETTY_SCRIPT start"
+ fi
+
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/jetty
+ return $RETVAL
+}
+
+
+stop() {
+ echo -n "Stopping $JETTY_PROG: "
+
+ if [ -f /var/lock/subsys/jetty ] ; then
+ if [ -x /etc/rc.d/init.d/functions ]; then
+ daemon --user $JETTY_USER $JETTY_SCRIPT stop
+ else
+ su - $JETTY_USER -c "$JETTY_SCRIPT stop"
+ fi
+ RETVAL=$?
+
+ if [ $RETVAL = 0 ]; then
+ count=0;
+
+ if [ -f /var/run/jetty/jetty.pid ]; then
+
+ read kpid < $JETTY_PID
+ let kwait=$SHUTDOWN_WAIT
+
+ until [ `ps --pid $kpid 2> /dev/null | grep -c $kpid 2> /dev/null` -eq '0' ] || [ $count -gt $kwait ]
+ do
+ echo "waiting for processes to exit";
+ sleep 1
+ let count=$count+1;
+ done
+
+ if [ $count -gt $kwait ]; then
+ echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
+ kill -9 $kpid
+ fi
+ fi
+ rm -f /var/lock/subsys/jetty $JETTY_PID
+ fi
+ fi
+}
+
+
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ sleep 2
+ start
+ ;;
+ condrestart)
+ if [ -f $JETTY_PID ] ; then
+ stop
+ start
+ fi
+ ;;
+ *)
+ echo "Usage: $JETTY_PROG {start|stop|restart|condrestart}"
+ exit 1
+esac
+
+exit $RETVAL
+
+#
+#
+# end
diff --git a/jetty.logrotate b/jetty.logrotate
new file mode 100644
index 0000000..9d98d0b
--- /dev/null
+++ b/jetty.logrotate
@@ -0,0 +1,7 @@
+/var/log/jetty/jetty-console.log {
+ copytruncate
+ weekly
+ rotate 52
+ compress
+ missingok
+}
diff --git a/jetty.script b/jetty.script
new file mode 100644
index 0000000..8449675
--- /dev/null
+++ b/jetty.script
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Wrapper script for Jetty5, to be sure it will allways
+# be run with correct user profile (jetty by default)
+#
+# derived from stuff in tomcat5.init
+#
+# Gomez Henri
+# Keith Irwin
+# Nicolas Mailhot
+#
+# version 1.01 - Fix webapps dir permissions
+#
+
+[ -r /etc/java/java.conf ] && . /etc/java/java.conf
+export JAVA_HOME
+
+# Path to the jetty launch script
+JETTY_SCRIPT=/usr/bin/djetty
+
+# Jetty name :)
+JETTY_PROG=jetty
+
+# if JETTY_USER is not set, use jetty
+if [ -z "$JETTY_USER" ]; then
+ JETTY_USER="jetty"
+fi
+
+# if JETTY_HOME is not set, use /usr/share/jetty
+if [ -z "$JETTY_HOME" ]; then
+ JETTY_HOME="/usr/share/jetty"
+fi
+
+pushd ${JETTY_HOME}/ext
+ rm -f jcert.jar
+ ln -s $(build-classpath jsse/jcert)
+ rm -f jnet.jar
+ ln -s $(build-classpath jsse/jnet)
+ rm -f jsse.jar
+ ln -s $(build-classpath jsse/jsse)
+popd
+
+
+
+RETVAL=0
+
+su - $JETTY_USER -c "$JETTY_SCRIPT $@"
+RETVAL=$?
+exit $RETVAL
diff --git a/jetty.spec b/jetty.spec
index 509772f..0607b3c 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -54,7 +54,7 @@
Name: jetty
Version: 5.1.12
-Release: 1jpp.5%{?dist}
+Release: 1jpp.6%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
@@ -70,14 +70,14 @@ URL: http://jetty.mortbay.org/jetty/
# popd
# zip jetty-5.1.12.fedora.zip jetty-5.1.12/*
Source0: %{jettyname}-%{version}.fedora.zip
-Source1: jetty5.script
-Source2: jetty5.init
-Source3: jetty5.logrotate
-Source4: jetty5-OSGi-MANIFEST.MF
-Patch0: jetty5-extra-j2ee-build_xml.patch
-Patch1: jetty5-PostFileFilter.patch
-Patch2: jetty5-libgcj-bad-serialization.patch
-Patch3: jetty5-TestRFC2616-libgcj-bad-date-parser.patch
+Source1: jetty.script
+Source2: jetty.init
+Source3: jetty.logrotate
+Source4: jetty-OSGi-MANIFEST.MF
+Patch0: jetty-extra-j2ee-build_xml.patch
+Patch1: jetty-PostFileFilter.patch
+Patch2: jetty-libgcj-bad-serialization.patch
+Patch3: jetty-TestRFC2616-libgcj-bad-date-parser.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
@@ -595,6 +595,10 @@ fi
%endif
%changelog
+* Thu Aug 30 2007 Jeff Johnston 5.1.12-1jpp.6
+- Rename all source files from jetty5 to jetty
+- Replace jetty5 references with jetty in source files
+
* Tue Aug 28 2007 Jeff Johnston 5.1.12-1jpp.5
- Rename from jetty5 to jetty
diff --git a/jetty5-OSGi-MANIFEST.MF b/jetty5-OSGi-MANIFEST.MF
deleted file mode 100644
index fa225ee..0000000
--- a/jetty5-OSGi-MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
-Created-By: 2.3 (IBM Corporation)
-Import-Package: javax.net.ssl,javax.security.cert,javax.servlet;versio
- n="[2.4.0,2.5.0)",javax.servlet.http;version="[2.4.0,2.5.0)",javax.se
- rvlet.resources;version="[2.4.0,2.5.0)",javax.xml.parsers,org.apache.
- commons.logging;version="[1.0.0,2.0.0)",org.xml.sax,org.xml.sax.helpe
- rs
-Bundle-ManifestVersion: 2
-Export-Package: org.mortbay.html;version="5.1.11",org.mortbay.http;ver
- sion="5.1.11",org.mortbay.http.ajp;version="5.1.11",org.mortbay.http.
- handler;version="5.1.11",org.mortbay.http.nio;version="5.1.11",org.mo
- rtbay.jetty;version="5.1.11",org.mortbay.jetty.servlet;version="5.1.1
- 1",org.mortbay.jetty.win32;version="5.1.11",org.mortbay.log;version="
- 5.1.11",org.mortbay.servlet;version="5.1.11",org.mortbay.util;version
- ="5.1.11",org.mortbay.xml;version="5.1.11"
-Bundle-Version: 5.1.11.v200706111724
-Bundle-SymbolicName: org.mortbay.jetty
-Bundle-Name: Jetty WebServer
-Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
- 2SE-1.3
-Bundle-Localization: plugin
-Bundle-Vendor: Mort Bay Consulting, Pty. Ltd.
-
diff --git a/jetty5-PostFileFilter.patch b/jetty5-PostFileFilter.patch
deleted file mode 100644
index 43e336a..0000000
--- a/jetty5-PostFileFilter.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/org/mortbay/servlet/PostFileFilter.java.sav 2006-08-10 14:03:26.000000000 +0200
-+++ src/org/mortbay/servlet/PostFileFilter.java 2006-08-10 14:04:24.000000000 +0200
-@@ -30,7 +30,7 @@
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
-
--import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
-+//import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
-
- /* ------------------------------------------------------------ */
- /** PostFileFilter.
diff --git a/jetty5-TestRFC2616-libgcj-bad-date-parser.patch b/jetty5-TestRFC2616-libgcj-bad-date-parser.patch
deleted file mode 100644
index bf008db..0000000
--- a/jetty5-TestRFC2616-libgcj-bad-date-parser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/src/org/mortbay/http/TestRFC2616.java~ 2006-04-05 17:24:44.000000000 -0700
-+++ test/src/org/mortbay/http/TestRFC2616.java 2006-08-08 12:47:50.000000000 -0700
-@@ -296,7 +296,7 @@
-
- fields.put("D1","Sun, 6 Nov 1994 08:49:37 GMT");
- fields.put("D2","Sunday, 6-Nov-94 08:49:37 GMT");
-- fields.put("D3","Sun Nov 6 08:49:37 1994");
-+ fields.put("D3","Sun Nov 6 08:49:37 1994");
- Date d1 = new Date(fields.getDateField("D1"));
- Date d2 = new Date(fields.getDateField("D2"));
- Date d3 = new Date(fields.getDateField("D3"));
diff --git a/jetty5-extra-j2ee-build_xml.patch b/jetty5-extra-j2ee-build_xml.patch
deleted file mode 100644
index fb89f8b..0000000
--- a/jetty5-extra-j2ee-build_xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- extra/j2ee/build.xml.sav 2006-06-20 19:17:28.000000000 +0200
-+++ extra/j2ee/build.xml 2006-06-20 19:18:23.000000000 +0200
-@@ -66,7 +66,7 @@
-
-
-
--
-+
-
-
-
diff --git a/jetty5-libgcj-bad-serialization.patch b/jetty5-libgcj-bad-serialization.patch
deleted file mode 100644
index bafec9f..0000000
--- a/jetty5-libgcj-bad-serialization.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- test/src/org/mortbay/jetty/TestServer.java~ 2005-08-13 10:12:14.000000000 -0700
-+++ test/src/org/mortbay/jetty/TestServer.java 2006-08-08 11:24:55.000000000 -0700
-@@ -96,19 +96,6 @@
-
-
-
-- System.err.println("Serialize and deserialize server");
--
-- ObjectInputStream oi = new ObjectInputStream(new FileInputStream(tmp));
-- server = (Server)oi.readObject();
-- oi.close();
--
--
-- System.err.println("start recovered server");
-- server.start();
-- assertTrue("restarted",server.isStarted());
-- server.stop();
-- assertTrue("restopped",!server.isStarted());
-- server.destroy();
- }
-
- /* ------------------------------------------------------------ */
diff --git a/jetty5.init b/jetty5.init
deleted file mode 100644
index be30bf1..0000000
--- a/jetty5.init
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-#
-# jetty5 This shell script takes care of starting and stopping jetty
-#
-# chkconfig: - 80 20
-# description: The Jetty Webserver and Servlet Container
-# processname: jetty
-# pidfile: /var/run/jetty5/jetty5.pid
-# config: /etc/jetty5/jetty5.conf
-#
-#
-# Portions from tomcat4.init by:
-#
-# Gomez Henri
-# Keith Irwin
-# Nicolas Mailhot
-#
-#
-
-
-# Source function library.
-if [ -x /etc/rc.d/init.d/functions ]; then
- . /etc/rc.d/init.d/functions
-fi
-
-[ -r /etc/java/java.conf ] && . /etc/java/java.conf
-export JAVA_HOME
-
-# Get Jetty5's config
-
-JETTY_CFG="/etc/jetty5/jetty5.conf"
-
-[ -r "$JETTY_CFG" ] && . "${JETTY_CFG}"
-
-# Path to the jetty5 launch script (direct don't use the wrapper)
-JETTY_SCRIPT=/usr/bin/djetty5
-
-# if JETTY_USER is not set, use jetty5
-if [ -z "$JETTY_USER" ]; then
- JETTY_USER="jetty5"
-fi
-
-# if JETTY_HOME is not set, use /usr/share/jetty5
-if [ -z "$JETTY_HOME" ]; then
- JETTY_HOME="/usr/share/jetty5"
-fi
-
-if [ -z "$SHUTDOWN_WAIT" ]; then
- SHUTDOWN_WAIT=10
-fi
-
-if [ -z "$JETTY_PID" ]; then
- JETTY_PID=/var/run/jetty5/jetty5.pid
-fi
-
-
-RETVAL=0
-
-start() {
- echo -n "Starting $JETTY_PROG: "
-
- if [ -f /var/lock/subsys/jetty5 ] ; then
- if [ -f $JETTY_PID ]; then
- read kpid < $JETTY_PID
- if checkpid $kpid 2>&1; then
- echo "process already running"
- return -1
- else
- echo "lock file found but no process running for pid $kpid, continuing"
- fi
- fi
- fi
-
-# touch $JETTY_PID
-# chown $JETTY_USER:$JETTY_USER $JETTY_PID
-
-# [ -x ${JETTY_HOME}/ext ] &&
-# rebuild-jar-repository -s ${JETTY_HOME}/ext
-
- if [ -x /etc/rc.d/init.d/functions ]; then
- daemon --user $JETTY_USER $JETTY_SCRIPT start
- else
- su - $JETTY_USER -c "$JETTY_SCRIPT start"
- fi
-
- RETVAL=$?
- echo
- [ $RETVAL = 0 ] && touch /var/lock/subsys/jetty5
- return $RETVAL
-}
-
-
-stop() {
- echo -n "Stopping $JETTY_PROG: "
-
- if [ -f /var/lock/subsys/jetty5 ] ; then
- if [ -x /etc/rc.d/init.d/functions ]; then
- daemon --user $JETTY_USER $JETTY_SCRIPT stop
- else
- su - $JETTY_USER -c "$JETTY_SCRIPT stop"
- fi
- RETVAL=$?
-
- if [ $RETVAL = 0 ]; then
- count=0;
-
- if [ -f /var/run/jetty5/jetty5.pid ]; then
-
- read kpid < $JETTY_PID
- let kwait=$SHUTDOWN_WAIT
-
- until [ `ps --pid $kpid 2> /dev/null | grep -c $kpid 2> /dev/null` -eq '0' ] || [ $count -gt $kwait ]
- do
- echo "waiting for processes to exit";
- sleep 1
- let count=$count+1;
- done
-
- if [ $count -gt $kwait ]; then
- echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
- kill -9 $kpid
- fi
- fi
- rm -f /var/lock/subsys/jetty5 $JETTY_PID
- fi
- fi
-}
-
-
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- sleep 2
- start
- ;;
- condrestart)
- if [ -f $JETTY_PID ] ; then
- stop
- start
- fi
- ;;
- *)
- echo "Usage: $JETTY_PROG {start|stop|restart|condrestart}"
- exit 1
-esac
-
-exit $RETVAL
-
-#
-#
-# end
diff --git a/jetty5.logrotate b/jetty5.logrotate
deleted file mode 100644
index 3a9c339..0000000
--- a/jetty5.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/jetty5/jetty-console.log {
- copytruncate
- weekly
- rotate 52
- compress
- missingok
-}
diff --git a/jetty5.script b/jetty5.script
deleted file mode 100644
index 0c20e76..0000000
--- a/jetty5.script
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# Wrapper script for Jetty5, to be sure it will allways
-# be run with correct user profile (jetty5 by default)
-#
-# derived from stuff in tomcat5.init
-#
-# Gomez Henri
-# Keith Irwin
-# Nicolas Mailhot
-#
-# version 1.01 - Fix webapps dir permissions
-#
-
-[ -r /etc/java/java.conf ] && . /etc/java/java.conf
-export JAVA_HOME
-
-# Path to the jetty launch script
-JETTY_SCRIPT=/usr/bin/djetty5
-
-# Jetty name :)
-JETTY_PROG=jetty5
-
-# if JETTY_USER is not set, use jetty5
-if [ -z "$JETTY_USER" ]; then
- JETTY_USER="jetty5"
-fi
-
-# if JETTY_HOME is not set, use /usr/share/jetty5
-if [ -z "$JETTY_HOME" ]; then
- JETTY_HOME="/usr/share/jetty5"
-fi
-
-pushd ${JETTY_HOME}/ext
- rm -f jcert.jar
- ln -s $(build-classpath jsse/jcert)
- rm -f jnet.jar
- ln -s $(build-classpath jsse/jnet)
- rm -f jsse.jar
- ln -s $(build-classpath jsse/jsse)
-popd
-
-
-
-RETVAL=0
-
-su - $JETTY_USER -c "$JETTY_SCRIPT $@"
-RETVAL=$?
-exit $RETVAL