OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Jan-2003 13:51:55
Branch: HEAD Handle: 2003012012515500
Modified files:
openpkg-src/tomcat4 rc.tomcat4 tomcat4.spec
Log:
provide rc %restart, move webapps from libexec to var, enable WARP
connector
Summary:
Revision Changes Path
1.3 +8 -0 openpkg-src/tomcat4/rc.tomcat4
1.12 +13 -4 openpkg-src/tomcat4/tomcat4.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4/rc.tomcat4
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.tomcat4
--- openpkg-src/tomcat4/rc.tomcat4 16 Dec 2002 17:36:17 -0000 1.2
+++ openpkg-src/tomcat4/rc.tomcat4 20 Jan 2003 12:51:55 -0000 1.3
@@ -14,6 +14,14 @@
$CATALINA_HOME/bin/startup.sh
fi
+%restart -p 200 -u @l_rusr@
+ if opServiceEnabled tomcat4; then
+ JAVA_HOME="$j2se_home"; export JAVA_HOME
+ CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
+ $CATALINA_HOME/bin/shutdown.sh
+ $CATALINA_HOME/bin/startup.sh
+ fi
+
%stop -p 200 -u @l_rusr@
if opServiceEnabled tomcat4; then
JAVA_HOME="$j2se_home"; export JAVA_HOME
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4/tomcat4.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 tomcat4.spec
--- openpkg-src/tomcat4/tomcat4.spec 8 Jan 2003 15:18:06 -0000 1.11
+++ openpkg-src/tomcat4/tomcat4.spec 20 Jan 2003 12:51:55 -0000 1.12
@@ -33,7 +33,7 @@
Group: Web
License: Apache Software License 1.1
Version: 4.1.18
-Release: 20030108
+Release: 20030120
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -81,18 +81,27 @@
mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf \
$RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf
- # provide symlink for ${jkHome}/work and ${jkHome}/conf
+ # move ${jkHome}/webapps to var
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/webapps \
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/webapps
+
+ # provide symlink for ${jkHome}/{work,conf,webapps}
ln -s \
%{l_prefix}/var/tomcat/work \
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/work
ln -s \
%{l_prefix}/var/tomcat/conf \
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf
+ ln -s \
+ %{l_prefix}/var/tomcat/webapps \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/webapps
# patch paths for logs and temp
- %{l_shtool} subst \
+ %{l_shtool} -d subst \
-e 's;directory="logs";directory="%{l_prefix}/var/tomcat/log";' \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf/server.xml
+ -e '13,$s;^<!--.*;;' \
+ -e '13,$s;^-->;;' \
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf/server.xml
%{l_shtool} subst \
-e 's;"$CATALINA_BASE"/temp;%{l_prefix}/var/tomcat/temp;' \
-e 's;"$CATALINA_BASE"/logs;%{l_prefix}/var/tomcat/log;' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
