rpms/jetty/devel jetty-OSGi-MANIFEST.MF, NONE, 1.1 jetty-PostFileFilter.patch, NONE, 1.1 jetty-TestRFC2616-libgcj-bad-date-parser.patch, NONE, 1.1 jetty-extra-j2ee-build_xml.patch, NONE, 1.1 jetty-libgcj-bad-serialization.patch, NONE, 1.1 jetty.init, NONE, 1.1 jetty.logrotate, NONE, 1.1 jetty.script, NONE, 1.1 jetty.spec, 1.1, 1.2 jetty5-OSGi-MANIFEST.MF, 1.1, NONE jetty5-PostFileFilter.patch, 1.1, NONE jetty5-TestRFC2616-libgcj-bad-date-parser.patch, 1.1, NONE jetty5-extra-j2ee-build_xml.patch, 1.1, NONE jetty5-libgcj-bad-serialization.patch, 1.1, NONE jetty5.init, 1.1, NONE jetty5.logrotate, 1.1, NONE jetty5.script, 1.1, NONE
Jeff Johnston (jjohnstn)
fedora-extras-commits at redhat.com
Thu Aug 30 19:07:18 UTC 2007
- Previous message (by thread): rpms/lesstif/devel lesstif-0.95-resource-fix.patch, NONE, 1.1 lesstif-0.95-text.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 lesstif.spec, 1.13, 1.14 sources, 1.3, 1.4
- Next message (by thread): fedora-security/audit fc7,1.85,1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjohnstn
Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1796
Modified Files:
jetty.spec
Added Files:
jetty-OSGi-MANIFEST.MF jetty-PostFileFilter.patch
jetty-TestRFC2616-libgcj-bad-date-parser.patch
jetty-extra-j2ee-build_xml.patch
jetty-libgcj-bad-serialization.patch jetty.init
jetty.logrotate jetty.script
Removed Files:
jetty5-OSGi-MANIFEST.MF jetty5-PostFileFilter.patch
jetty5-TestRFC2616-libgcj-bad-date-parser.patch
jetty5-extra-j2ee-build_xml.patch
jetty5-libgcj-bad-serialization.patch jetty5.init
jetty5.logrotate jetty5.script
Log Message:
* Thu Aug 30 2007 Jeff Johnston <jjohnstn at redhat.com> 5.1.12-1jpp.6
- Rename all source files from jetty5 to jetty
- Replace jetty5 references with jetty in source files
--- NEW FILE jetty-OSGi-MANIFEST.MF ---
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.
jetty-PostFileFilter.patch:
--- NEW FILE jetty-PostFileFilter.patch ---
--- 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.
jetty-TestRFC2616-libgcj-bad-date-parser.patch:
--- NEW FILE jetty-TestRFC2616-libgcj-bad-date-parser.patch ---
--- 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"));
jetty-extra-j2ee-build_xml.patch:
--- NEW FILE jetty-extra-j2ee-build_xml.patch ---
--- 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 @@
<path id="xdoclet.classpath">
<path refid="j2ee.classpath"/>
- <fileset dir="${xdoclet.home}/lib">
+ <fileset dir="${xdoclet.home}">
<include name="**/*.jar"/>
</fileset>
</path>
jetty-libgcj-bad-serialization.patch:
--- NEW FILE jetty-libgcj-bad-serialization.patch ---
--- 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();
}
/* ------------------------------------------------------------ */
--- NEW FILE jetty.init ---
#!/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 <hgomez at users.sourceforge.net>
# Keith Irwin <keith_irwin at non.hp.com>
# Nicolas Mailhot <nicolas.mailhot at one2team.com>
#
#
# 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
--- NEW FILE jetty.logrotate ---
/var/log/jetty/jetty-console.log {
copytruncate
weekly
rotate 52
compress
missingok
}
--- NEW FILE jetty.script ---
#!/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 <hgomez at slib.fr>
# Keith Irwin <keith_irwin at non.hp.com>
# Nicolas Mailhot <nicolas.mailhot at one2team.com>
#
# 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
Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jetty.spec 28 Aug 2007 21:44:54 -0000 1.1
+++ jetty.spec 30 Aug 2007 19:06:45 -0000 1.2
@@ -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 @@
# 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 @@
%endif
%changelog
+* Thu Aug 30 2007 Jeff Johnston <jjohnstn at redhat.com> 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 <jjohnstn at redhat.com> 5.1.12-1jpp.5
- Rename from jetty5 to jetty
--- jetty5-OSGi-MANIFEST.MF DELETED ---
--- jetty5-PostFileFilter.patch DELETED ---
--- jetty5-TestRFC2616-libgcj-bad-date-parser.patch DELETED ---
--- jetty5-extra-j2ee-build_xml.patch DELETED ---
--- jetty5-libgcj-bad-serialization.patch DELETED ---
--- jetty5.init DELETED ---
--- jetty5.logrotate DELETED ---
--- jetty5.script DELETED ---
- Previous message (by thread): rpms/lesstif/devel lesstif-0.95-resource-fix.patch, NONE, 1.1 lesstif-0.95-text.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 lesstif.spec, 1.13, 1.14 sources, 1.3, 1.4
- Next message (by thread): fedora-security/audit fc7,1.85,1.86
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list