From a0446376cedc9837d068d78b83e81ae8c8a1262f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 24 Aug 2002 20:44:36 +0000 Subject: [PATCH 1/1] - standarized JAVA_HOME, added versions to BR/R - fixed xerces path - fixes patch: for build dependencies and for typo in examples/jsp/index.html - moved work dir to /var/lib/tomcat (it's used to write compiled jsp pages) - changed permissions for /var dirs (group http for now... not root) - added missing dirs - JAVA_HOME patch - detect standard JAVA_HOME, so setting it is not needed - added simple init script Changed files: apache-tomcat.init -> 1.1 jakarta-tomcat-JAVA_HOME.patch -> 1.1 jakarta-tomcat-fixes.patch -> 1.1 jakarta-tomcat.init -> 1.1 tomcat.spec -> 1.13 --- apache-tomcat.init | 91 +++++++++++++++++++++++++++ jakarta-tomcat-JAVA_HOME.patch | 30 +++++++++ jakarta-tomcat-fixes.patch | 22 +++++++ jakarta-tomcat.init | 91 +++++++++++++++++++++++++++ tomcat.spec | 112 ++++++++++++++++++--------------- 5 files changed, 297 insertions(+), 49 deletions(-) create mode 100644 apache-tomcat.init create mode 100644 jakarta-tomcat-JAVA_HOME.patch create mode 100644 jakarta-tomcat-fixes.patch create mode 100644 jakarta-tomcat.init diff --git a/apache-tomcat.init b/apache-tomcat.init new file mode 100644 index 0000000..ce64eea --- /dev/null +++ b/apache-tomcat.init @@ -0,0 +1,91 @@ +#!/bin/sh +# +# tomcat Jakarta Tomcat Servlet/JSP container +# +# chkconfig: 345 84 16 +# +# description: Jakarta Tomcat Servlet/JSP container +# +# $Id$ + + +# Source function library +. /etc/rc.d/init.d/functions + +# Get network config +. /etc/sysconfig/network + +# Get service config - may override defaults +[ -f /etc/sysconfig/tomcat ] && . /etc/sysconfig/tomcat + +# Check that networking is up. +if is_yes "${NETWORKING}"; then + if [ ! -f /var/lock/subsys/network ]; then + # nls "ERROR: Networking is down. %s can't be run." + msg_network_down tomcat + exit 1 + fi +else + exit 0 +fi + +# See how we were called. +case "$1" in + start) + # Check if the service is already running? + if [ ! -f /var/lock/subsys/tomcat ]; then + # show "Starting %s service" tomcat + msg_starting tomcat + busy + su - http -s /bin/sh -c /usr/lib/tomcat/bin/startup.sh >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + ok + else + fail + fi + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tomcat + else + # show "%s service is already running." tomcat + msg_already_running tomcat + exit 1 + fi + ;; + stop) + # Stop daemons. + # show "Stopping %s service" tomcat + if [ -f /var/lock/subsys/tomcat ]; then + msg_stopping tomcat + busy + su - http -s /bin/sh -c /usr/lib/tomcat/bin/shutdown.sh >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + ok + else + fail + fi + rm -f /var/lock/subsys/tomcat + else + # show "%s service is not running." tomcat + msg_not_running tomcat + exit 1 + fi + ;; + restart|reload|force-reload) + $0 stop + $0 start + ;; + status) + echo "Not supported (yet?)" + RETVAL=0 + ;; + *) + # show "Usage: %s {start|stop|status|restart|reload|force-reload}" $0 + msg_usage "$0 {start|stop|status|restart|reload|force-reload}" + exit 1 +esac + +exit $RETVAL + +# This must be last line ! +# vi:syntax=sh:tw=78:ts=8:sw=4 diff --git a/jakarta-tomcat-JAVA_HOME.patch b/jakarta-tomcat-JAVA_HOME.patch new file mode 100644 index 0000000..04fbb2c --- /dev/null +++ b/jakarta-tomcat-JAVA_HOME.patch @@ -0,0 +1,30 @@ +--- jakarta-tomcat-4.0.1-src/catalina/src/bin/catalina.sh.orig Tue Nov 13 03:02:50 2001 ++++ jakarta-tomcat-4.0.1-src/catalina/src/bin/catalina.sh Sat Aug 24 18:35:45 2002 +@@ -62,8 +62,12 @@ + fi + + if [ -z "$JAVA_HOME" ] ; then ++ if [ -x /usr/lib/java/bin/java ]; then ++ JAVA_HOME=/usr/lib/java ++ else + echo You must set JAVA_HOME to point at your Java Development Kit installation + exit 1 ++ fi + fi + + +--- jakarta-tomcat-4.0.1-src/catalina/src/bin/digest.sh.orig Tue Nov 13 03:02:50 2001 ++++ jakarta-tomcat-4.0.1-src/catalina/src/bin/digest.sh Sat Aug 24 18:36:05 2002 +@@ -40,8 +40,12 @@ + fi + + if [ -z "$JAVA_HOME" ] ; then ++ if [ -x /usr/lib/java/bin/java ]; then ++ JAVA_HOME=/usr/lib/java ++ else + echo You must set JAVA_HOME to point at your Java Development Kit installation + exit 1 ++ fi + fi + + diff --git a/jakarta-tomcat-fixes.patch b/jakarta-tomcat-fixes.patch new file mode 100644 index 0000000..23d91e0 --- /dev/null +++ b/jakarta-tomcat-fixes.patch @@ -0,0 +1,22 @@ +--- jakarta-tomcat-4.0.1-src/webapps/examples/build.xml.orig Tue Nov 13 03:02:50 2001 ++++ jakarta-tomcat-4.0.1-src/webapps/examples/build.xml Sat Aug 24 15:22:07 2002 +@@ -70,7 +70,7 @@ + + + +- ++ + + + Include  + +-Execute ++Execute + + Source + diff --git a/jakarta-tomcat.init b/jakarta-tomcat.init new file mode 100644 index 0000000..ce64eea --- /dev/null +++ b/jakarta-tomcat.init @@ -0,0 +1,91 @@ +#!/bin/sh +# +# tomcat Jakarta Tomcat Servlet/JSP container +# +# chkconfig: 345 84 16 +# +# description: Jakarta Tomcat Servlet/JSP container +# +# $Id$ + + +# Source function library +. /etc/rc.d/init.d/functions + +# Get network config +. /etc/sysconfig/network + +# Get service config - may override defaults +[ -f /etc/sysconfig/tomcat ] && . /etc/sysconfig/tomcat + +# Check that networking is up. +if is_yes "${NETWORKING}"; then + if [ ! -f /var/lock/subsys/network ]; then + # nls "ERROR: Networking is down. %s can't be run." + msg_network_down tomcat + exit 1 + fi +else + exit 0 +fi + +# See how we were called. +case "$1" in + start) + # Check if the service is already running? + if [ ! -f /var/lock/subsys/tomcat ]; then + # show "Starting %s service" tomcat + msg_starting tomcat + busy + su - http -s /bin/sh -c /usr/lib/tomcat/bin/startup.sh >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + ok + else + fail + fi + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tomcat + else + # show "%s service is already running." tomcat + msg_already_running tomcat + exit 1 + fi + ;; + stop) + # Stop daemons. + # show "Stopping %s service" tomcat + if [ -f /var/lock/subsys/tomcat ]; then + msg_stopping tomcat + busy + su - http -s /bin/sh -c /usr/lib/tomcat/bin/shutdown.sh >/dev/null 2>&1 + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + ok + else + fail + fi + rm -f /var/lock/subsys/tomcat + else + # show "%s service is not running." tomcat + msg_not_running tomcat + exit 1 + fi + ;; + restart|reload|force-reload) + $0 stop + $0 start + ;; + status) + echo "Not supported (yet?)" + RETVAL=0 + ;; + *) + # show "Usage: %s {start|stop|status|restart|reload|force-reload}" $0 + msg_usage "$0 {start|stop|status|restart|reload|force-reload}" + exit 1 +esac + +exit $RETVAL + +# This must be last line ! +# vi:syntax=sh:tw=78:ts=8:sw=4 diff --git a/tomcat.spec b/tomcat.spec index dacec13..5850607 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -7,44 +7,49 @@ Release: 3 License: Apache Group: Development/Languages/Java Source0: http://jakarta.apache.org/builds/%{name}-%{base_version}/release/v%{version}/src/%{name}-%{version}-src.tar.gz +Source1: %{name}.init +Patch0: %{name}-fixes.patch +Patch1: %{name}-JAVA_HOME.patch URL: http://jakarta.apache.org/tomcat/index.html -Requires: jre -Requires: jaxp -Requires: xerces-j -Requires: jakarta-servletapi -Requires: jdbc-stdext -Requires: jmx -Requires: jndi -Requires: jaf -Requires: javamail -Requires: jta -Requires: jsse -Requires: tyrex -Requires: jakarta-regexp -Requires: junit -Requires: ldap -BuildRequires: jdk -BuildRequires: jakarta-ant -BuildRequires: jaxp -BuildRequires: xerces-j -BuildRequires: jakarta-servletapi -BuildRequires: jdbc-stdext -BuildRequires: jmx -BuildRequires: jndi -BuildRequires: jaf -BuildRequires: javamail -BuildRequires: jta -BuildRequires: jsse -BuildRequires: tyrex +# required: +BuildRequires: jdk >= 1.2 +BuildRequires: jakarta-ant >= 1.4 +BuildRequires: jaxp >= 1.1 +BuildRequires: xerces-j >= 1 +BuildRequires: jakarta-servletapi >= 4 BuildRequires: jakarta-regexp -BuildRequires: junit -BuildRequires: ldap +# optional: +BuildRequires: jdbc-stdext >= 2.0 +BuildRequires: jmx >= 1.0 +BuildRequires: jndi >= 1.2.1 +BuildRequires: jndi-provider-ldap +BuildRequires: jaf >= 1.0.1 +BuildRequires: javamail >= 1.2 +BuildRequires: jsse >= 1.0.2 +BuildRequires: jta >= 1.0.1 +BuildRequires: tyrex >= 0.9.7 +BuildRequires: junit >= 3.7 +Requires: jre >= 1.2 +Requires: jaxp >= 1.1 +Requires: xerces-j >= 1 +Requires: jakarta-servletapi >= 4 +Requires: jakarta-regexp +Requires: jdbc-stdext >= 2.0 +Requires: jmx >= 1.0 +Requires: jndi >= 1.2.1 +Requires: jndi-provider-ldap +Requires: jaf >= 1.0.1 +Requires: javamail >= 1.2 +Requires: jsse >= 1.0.2 +Requires: jta >= 1.0.1 +Requires: tyrex >= 0.9.7 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _javalibdir /usr/share/java %define _tomcatdir %{_libdir}/tomcat %define _logdir %{_var}/log +%define _vardir %{_var}/lib/tomcat %description Tomcat 4.0, a server that implements the Servlet 2.3 and JSP 1.2 @@ -67,15 +72,15 @@ Dokumentacja do Tomcata. %prep %setup -q -n %{name}-%{version}-src +%patch0 -p1 +%patch1 -p1 %build -if [ ! `echo $JAVA_HOME` ]; then - echo "You haven't JAVA_HOME variable set. Can't continue." - exit 1 +if [ -z "$JAVA_HOME" ]; then + JAVA_HOME=/usr/lib/java fi - ANT_HOME=%{_javalibdir} -export ANT_HOME +export JAVA_HOME ANT_HOME cat > build.properties << EOF # ----- Compile Control Flags ----- @@ -152,7 +157,7 @@ tyrex.lib=\${tyrex.home} tyrex.jar=\${tyrex.lib}/tyrex.jar # ----- Xerces XML Parser, version 1.4.3 or later ----- -xerces.home=%{_javalibdir}/classes +xerces.home=%{_javalibdir} xerces.lib=\${xerces.home} xerces.jar=\${xerces.lib}/xerces.jar EOF @@ -170,9 +175,10 @@ install -d $RPM_BUILD_ROOT%{_tomcatdir}/bin \ $RPM_BUILD_ROOT%{_tomcatdir}/lib \ $RPM_BUILD_ROOT%{_tomcatdir}/server/{lib,classes} \ $RPM_BUILD_ROOT%{_tomcatdir}/webapps \ - $RPM_BUILD_ROOT%{_tomcatdir}/work \ $RPM_BUILD_ROOT%{_sysconfdir}/tomcat \ - $RPM_BUILD_ROOT%{_logdir}/tomcat + $RPM_BUILD_ROOT%{_logdir}/tomcat \ + $RPM_BUILD_ROOT%{_vardir}/work \ + $RPM_BUILD_ROOT/etc/rc.d/init.d install build/bin/*.sh $RPM_BUILD_ROOT%{_tomcatdir}/bin install build/bin/*.jar $RPM_BUILD_ROOT%{_tomcatdir}/bin @@ -183,11 +189,12 @@ install build/lib/*.jar $RPM_BUILD_ROOT%{_tomcatdir}/lib cp -rf build/webapps $RPM_BUILD_ROOT%{_tomcatdir} ln -sf %{_logdir}/tomcat $RPM_BUILD_ROOT%{_tomcatdir}/logs +ln -sf %{_vardir}/work $RPM_BUILD_ROOT%{_tomcatdir}/work ln -sf %{_sysconfdir}/tomcat $RPM_BUILD_ROOT%{_tomcatdir}/conf ln -sf %{_javalibdir}/jaxp.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jaxp.jar -ln -sf %{_javalibdir}/classes/xerces.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/xerces.jar +ln -sf %{_javalibdir}/xerces.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/xerces.jar ln -sf %{_javalibdir}/servlet.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/servlet.jar ln -sf %{_javalibdir}/jdbc2_0-stdext.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jdbc2_0.jar ln -sf %{_javalibdir}/jmxri.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jmxri.jar @@ -202,29 +209,36 @@ ln -sf %{_javalibdir}/tyrex.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/tyrex.ja ln -sf %{_javalibdir}/junit.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/junit.jar ln -sf %{_javalibdir}/regexp.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/regexp.jar +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc *.txt LICENSE +%dir %{_tomcatdir} +%dir %{_tomcatdir}/bin %attr(755,root,root) %{_tomcatdir}/bin/*.sh -%dir %{_tomcatdir}/common/classes -%dir %{_tomcatdir}/classes -%dir %{_tomcatdir}/server -%dir %{_tomcatdir}/server/classes -%dir %{_tomcatdir}/webapps -%dir %{_tomcatdir}/work -%dir %{_sysconfdir}/tomcat -%dir %{_logdir}/tomcat %{_tomcatdir}/bin/*.jar +%dir %{_tomcatdir}/classes +%dir %{_tomcatdir}/common +%dir %{_tomcatdir}/common/classes %{_tomcatdir}/common/lib %{_tomcatdir}/conf %{_tomcatdir}/lib %{_tomcatdir}/logs +%dir %{_tomcatdir}/server +%dir %{_tomcatdir}/server/classes %{_tomcatdir}/server/lib -%{_tomcatdir}/webapps/* -%{_sysconfdir}/tomcat/* +%{_tomcatdir}/webapps +%{_tomcatdir}/work +%dir %{_sysconfdir}/tomcat +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tomcat/* +%attr(754,root,root) /etc/rc.d/init.d/tomcat +%dir %{_vardir} +%attr(1730,root,http) %dir %{_vardir}/work +%attr(1730,root,http) %dir %{_logdir}/tomcat %files doc %defattr(644,root,root,755) -- 2.44.0