SPECS: apache-tomcat.spec - removed mx4j depndency. It is no longer needed ...

[pawelz]

Author: pawelz                       Date: Thu Jan 22 08:20:41 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed mx4j depndency. It is no longer needed since jmx is provided by
  jre package.
- some struts-related fixes, tested with struts 1.3.10
- it builds and works now!!!
- please help to test it.

---- Files affected:
SPECS:
   apache-tomcat.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: SPECS/apache-tomcat.spec
diff -u SPECS/apache-tomcat.spec:1.58 SPECS/apache-tomcat.spec:1.59
--- SPECS/apache-tomcat.spec:1.58	Fri Oct  3 21:27:53 2008
+++ SPECS/apache-tomcat.spec	Thu Jan 22 09:20:35 2009
@@ -57,8 +57,6 @@
 BuildRequires:	jta >= 0:1.0.1
 BuildRequires:	junit >= 0:3.8.1
 BuildRequires:	logging-log4j
-#BuildRequires:	mx4j >= 0:3.0.1
-BuildRequires:	mx4j >= 1.1.1
 BuildRequires:	puretls
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	xerces-j >= 0:2.7.1
@@ -90,7 +88,6 @@
 Requires:	jre >= 1.2
 Requires:	jsse >= 1.0.2
 Requires:	jta >= 1.0.1
-Requires:	mx4j >= 1.1.1
 Requires:	rc-scripts
 Requires:	xml-commons
 Provides:	group(http)
@@ -148,6 +145,9 @@
 # Remove pre-built jars
 find -name '*.jar' | xargs rm -fv
 
+# for jakarta-struts >= 1.3.10
+find -name '*.jsp' | xargs sed -i 's/<html:html locale="true">/<html:html>/'
+
 %build
 TOPDIR=$(pwd)
 
@@ -182,7 +182,7 @@
 
 # build tomcat 5.5
 cat > build.properties <<EOF
-commons-beanutils.jar=$(find-jar commons-beanutils)
+commons-beanutils.jar=$(find-jar commons-beanutils-core)
 commons-launcher.jar=$(find-jar commons-launcher)
 commons-daemon.jar=$(find-jar commons-daemon)
 commons-digester.jar=$(find-jar commons-digester)
@@ -201,7 +201,9 @@
 jmx.jar=$(find-jar jmx)
 jmx-tools.jar=$(find-jar jmx)
 junit.jar=$(find-jar junit)
-struts.jar=$(find-jar struts)
+struts.jar=$(find-jar struts-core)
+struts-core.jar=$(find-jar struts-core)
+struts-taglib.jar=$(find-jar struts-taglib)
 jcert.jar=$(find-jar jcert)
 jnet.jar=$(find-jar jnet)
 jsse.jar=$(find-jar jsse)
@@ -212,7 +214,8 @@
 jsp-api.jar=$(find-jar jsp-api)
 jspapi.build.notrequired=true
 log4j.jar=$(find-jar log4j)
-tomcat-dbcp.jar=$(find-jar jakarta-commons-dbcp-tomcat5)
+tomcat-dbcp.jar=$(find-jar commons-dbcp-tomcat5)
+struts.lib=%{_datadir}/jakarta-struts
 EOF
 
 %ant \
@@ -290,7 +293,6 @@
 ln -sf $(find-jar commons-fileupload) $TOMCATDIR/server/lib/commons-fileupload.jar
 ln -sf $(find-jar commons-logging) $TOMCATDIR/server/lib/commons-logging.jar
 ln -sf $(find-jar jaas) $TOMCATDIR/server/lib/jaas.jar
-ln -sf $(find-jar mx4j-jmx) $TOMCATDIR/server/lib/mx4j-jmx.jar
 ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/regexp.jar
 ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/jakarta-regexp-1.2.jar
 ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/regexp-1.2.jar
@@ -298,7 +300,7 @@
 
 ln -sf $(find-jar jaxp_parser_impl) $TOMCATDIR/common/endorsed/jaxp_parser_impl.jar
 ln -sf $(find-jar xml-commons-apis) $TOMCATDIR/common/endorsed/xml-commons-apis.jar
-ln -sf $(find-jar struts) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/struts.jar
+ln -sf $(find-jar struts-core) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/struts-core.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -373,6 +375,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2009/01/22 08:20:35  pawelz
+- removed mx4j depndency. It is no longer needed since jmx is provided by
+  jre package.
+- some struts-related fixes, tested with struts 1.3.10
+- it builds and works now!!!
+- please help to test it.
+
 Revision 1.58  2008/10/03 19:27:53  glen
 - BR commons-io >= 1.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-tomcat.spec?r1=1.58&r2=1.59&f=u