rpms/jetty/devel djetty.script, NONE, 1.1 jetty.init, 1.2, 1.3 jetty.spec, 1.19, 1.20
Jeff Johnston
jjohnstn at fedoraproject.org
Fri Sep 18 19:42:08 UTC 2009
Author: jjohnstn
Update of /cvs/pkgs/rpms/jetty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3153
Modified Files:
jetty.init jetty.spec
Added Files:
djetty.script
Log Message:
* Fri Sep 18 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-3
- Add djetty script source and fix init script to work properly.
--- NEW FILE djetty.script ---
#!/bin/bash
if [ -z "$JETTY_PID" ]
then
export JETTY_PID=/dev/null
fi
if [ -z "$JETTY_PORT" ]
then
export JETTY_PORT=8088
fi
export JETTY_HOME=/usr/share/jetty
if [ -z "$JETTY_HOME" ]
then
JETTY_HOME_1=`dirname "$0"`
JETTY_HOME_1=`dirname "$JETTY_HOME_1"`
JETTY_HOME=${JETTY_HOME_1}
fi
cd $JETTY_HOME
exec /usr/bin/java -Djetty.class.path=/usr/share/java/commons-logging.jar -Djetty.port=$JETTY_PORT -jar start.jar etc/jetty-logging.xml etc/jetty.xml 2>/dev/null &
echo $! >$JETTY_PID
Index: jetty.init
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- jetty.init 6 Jan 2009 21:57:36 -0000 1.2
+++ jetty.init 18 Sep 2009 19:42:06 -0000 1.3
@@ -24,7 +24,7 @@
[ -r /etc/java/java.conf ] && . /etc/java/java.conf
export JAVA_HOME
-# Get Jetty5's config
+# Get Jetty's config
JETTY_CFG="/etc/jetty/jetty.conf"
@@ -56,7 +56,6 @@ prog=jetty
RETVAL=0
start() {
- echo -n $"Starting $prog: "
if [ -f /var/lock/subsys/jetty ] ; then
if [ -f $JETTY_PID ]; then
@@ -70,34 +69,27 @@ start() {
fi
fi
+ echo -n $"Starting $prog: "
# [ -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_PID=$JETTY_PID $JETTY_SCRIPT start
+ daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT
else
- su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT start"
+ su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT"
fi
RETVAL=$?
- echo
- [ $RETVAL = 0 ] && touch /var/lock/subsys/jetty
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/jetty && success || failure
+ echo
return $RETVAL
}
stop() {
- echo -n $"Stopping $prog: "
if [ -f /var/lock/subsys/jetty ] ; then
- if [ -x /etc/rc.d/init.d/functions ]; then
- daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop
- else
- su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT stop"
- fi
- RETVAL=$?
-
- if [ $RETVAL = 0 ]; then
+ echo -n $"Stopping $prog: "
count=0;
if [ -f $JETTY_PID ]; then
@@ -105,20 +97,24 @@ stop() {
read kpid < $JETTY_PID
let kwait=$SHUTDOWN_WAIT
+# Try issuing SIGTERM
+
+ kill -15 $kpid
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";
+# 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"
+# 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
+ success
+ echo
fi
}
Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/devel/jetty.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- jetty.spec 15 Sep 2009 14:16:56 -0000 1.19
+++ jetty.spec 18 Sep 2009 19:42:06 -0000 1.20
@@ -42,13 +42,14 @@
Name: jetty
Version: 6.1.20
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Jetty Webserver and Servlet Container
Group: Applications/Internet
License: ASL 2.0
URL: http://jetty.mortbay.org/jetty/
Source0: http://dist.codehaus.org/jetty/jetty-6.1.20/jetty-6.1.20-src.zip
+Source1: djetty.script
Source2: jetty.init
Source3: jetty.logrotate
Source4: %{name}-depmap.xml
@@ -146,6 +147,8 @@ find . -name "*.class" -exec rm {} \;
cp %{SOURCE7} settings.xml
+cp %{SOURCE1} djetty
+
#remove glassfish specific file
rm -fr modules/jsp-2.1/src/main/java/com/sun/org/apache/commons/logging/impl/JettyLog.java
@@ -171,6 +174,7 @@ sed -i -e "s|<url>__MAVENREPO_DIR_PLACEH
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
+sed -i -e "s|/usr/share|%{_datadir}|g" djetty
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
@@ -218,7 +222,8 @@ mv $RPM_BUILD_ROOT%{homedir}/%{name}-%{v
rm -fr $RPM_BUILD_ROOT%{homedir}/%{name}-%{version}
chmod +x $RPM_BUILD_ROOT%{homedir}/bin/jetty-xinetd.sh
-ln -s %{homedir}/bin/jetty-xinetd.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
+chmod +x djetty
+mv djetty $RPM_BUILD_ROOT%{_bindir}/djetty
ln -s %{homedir}/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
@@ -358,6 +363,9 @@ fi
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Fri Sep 18 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.20-3
+- Add djetty script source and fix init script to work properly.
+
* Tue Sep 15 2009 Alexander Kurtakov <akurtako at redhat.com> 6.1.20-2
- Fix requires.
More information about the fedora-extras-commits
mailing list