rpms/tomcat5/devel tomcat5-5.0.30-bz157205.patch, NONE, 1.1 tomcat5.spec, 1.20, 1.21 tomcat5-5.0.30-nojspc.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 10 10:49:43 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30046
Modified Files:
tomcat5.spec
Added Files:
tomcat5-5.0.30-bz157205.patch
Removed Files:
tomcat5-5.0.30-nojspc.patch
Log Message:
Precompile the webapps
tomcat5-5.0.30-bz157205.patch:
build.xml | 3 +++
1 files changed, 3 insertions(+)
--- NEW FILE tomcat5-5.0.30-bz157205.patch ---
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml~ 2005-05-09 13:41:39.000000000 +0100
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml 2005-05-09 14:50:41.000000000 +0100
@@ -275,6 +275,9 @@
<path id="jspc.classpath">
<pathelement location="${java.home}/../lib/tools.jar"/>
<pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${jmx.jar}"/>
+ <pathelement location="${taglibs-core.jar}"/>
+ <pathelement location="${taglibs-standard.jar}"/>
<pathelement location="${tomcat.build}/server/classes"/>
<fileset dir="${tomcat.build}/server/lib">
<include name="*.jar"/>
Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tomcat5.spec 6 May 2005 16:15:20 -0000 1.20
+++ tomcat5.spec 10 May 2005 10:49:41 -0000 1.21
@@ -2,7 +2,7 @@
%define full_name jakarta-%{name}
%define version 5.0.30
%define majversion 5.0
-%define release 5jpp_5fc
+%define release 5jpp_6fc
%define section free
%define summary Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
@@ -50,7 +50,7 @@
Patch7: %{jname}_command.patch
Patch8: %{name}-%{version}-bootstrap.MF.patch
Patch9: %{name}-%{version}-catalina.sh.patch
-Patch10: %{name}-%{version}-nojspc.patch
+Patch10: %{name}-%{version}-bz157205.patch
Patch11: %{name}-%{version}-no-daemon.patch
BuildRoot: %{_tmppath}/%{name}-root-%{version}
Obsoletes: tomcat tomcat-libs tomcat-devel tomcat-test
@@ -62,7 +62,6 @@
Requires: xml-commons-apis
Requires: regexp >= 0:1.3
Requires: puretls
-#Requires: tyrex >= 0:1.0.1
# jakarta packages
Requires: jakarta-commons-beanutils >= 0:1.7.0
Requires: jakarta-commons-collections >= 0:3.1
@@ -115,8 +114,7 @@
BuildRequires: mx4j >= 0:1.1.1
BuildRequires: regexp >= 0:1.3
BuildRequires: puretls
-BuildRequires: struts11 = 0:1.1
-#BuildRequires: tyrex >= 0:1.0
+BuildRequires: struts11 >= 0:1.1-1jpp_6fc
BuildRequires: xerces-j2 >= 0:2.6.2
BuildRequires: xml-commons-apis
BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
@@ -283,7 +281,6 @@
activation.jar=$(build-classpath jaf)
mail.jar=$(build-classpath javamail/mailapi)
jta.jar=$(build-classpath jta)
-tyrex.jar=$(build-classpath tyrex)
jaas.jar=$(build-classpath jaas)
jndi.jar=$(build-classpath jndi)
jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -293,6 +290,8 @@
jsse.jar=$(build-classpath jsse/jsse)
servletapi.build.notrequired=true
jspapi.build.notrequired=true
+taglibs-core.jar=$(build-classpath taglibs-core)
+taglibs-standard.jar=$(build-classpath taglibs-standard)
EOBP
# can't use jikes to build tomcat5 (strange)
@@ -304,6 +303,7 @@
pushd %{packdname}/jakarta-tomcat-connectors
# this is just plain and simply evil but something changed in a major way between 5.0.16 and 5.0.18
+oldclasspath=$CLASSPATH
export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar:\
$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-5/build/server/lib/catalina.jar
@@ -325,7 +325,6 @@
activation.jar=$(build-classpath jaf)
mail.jar=$(build-classpath javamail/mailapi)
jta.jar=$(build-classpath jta)
-tyrex.jar=$(build-classpath tyrex)
jaas.jar=$(build-classpath jaas)
jndi.jar=$(build-classpath jndi)
jdbc20ext.jar=$(build-classpath jdbc-stdext)
@@ -335,13 +334,19 @@
jsse.jar=$(build-classpath jsse/jsse)
EOBP
ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
+export CLASSPATH=$oldclasspath
+popd
+
+# build the webapps and make the tree ready to install
+pushd %{packdname}/jakarta-tomcat-5
+ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
popd
# BC-compile everything
pushd %{packdname}
-for jar in jakarta-tomcat-5/build/bin/bootstrap.jar \
- jakarta-tomcat-5/build/common/lib/{naming,jasper}-*.jar \
- jakarta-tomcat-5/build/server/lib/{catalina,tomcat,servlets}*.jar \
+for jar in jakarta-tomcat-5/dist/bin/bootstrap.jar \
+ jakarta-tomcat-5/dist/common/lib/{naming,jasper}-*.jar \
+ jakarta-tomcat-5/dist/server/lib/{catalina,tomcat,servlets}*.jar \
jakarta-servletapi-5/jsr15[24]/dist/lib/*.jar; do
[ `basename $jar .jar` = catalina-ant ] && continue
opts="$RPM_OPT_FLAGS -fPIC"
@@ -366,10 +371,6 @@
# install RPM README
cp %{SOURCE3} .
-CLASSPATH=%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard)
-CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar
-export CLASSPATH
-
# build initial path structure
install -d -m 755 $RPM_BUILD_ROOT/{%{confdir},%{logdir},%{homedir},%{bindir}}
install -d -m 755 $RPM_BUILD_ROOT/{%{serverdir},%{tempdir},%{workdir}}
@@ -403,9 +404,6 @@
install %{SOURCE5} $RPM_BUILD_ROOT/%{confdir}/%{name}.conf
pushd %{packdname}/jakarta-tomcat-5
-export usejikes=false
-ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
-
pushd dist
mv bin/* ${RPM_BUILD_ROOT}%{bindir}
mv common/* ${RPM_BUILD_ROOT}%{commondir}
@@ -873,6 +871,9 @@
%{serverdir}/webapps/*
%changelog
+* Tue May 10 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_6fc
+- Precompile webapps (#157205).
+
* Fri May 6 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_5fc
- Add ant-launcher.jar to common classloader.
- Use absolute paths for rebuild-gcj-db.
--- tomcat5-5.0.30-nojspc.patch DELETED ---
More information about the fedora-cvs-commits
mailing list