[jboss-cvs] Repository SVN: r320 - in apache-tomcat: 5.5.23-brew and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 30 10:18:26 EDT 2007
Author: vivekl at redhat.com
Date: 2007-04-30 10:18:26 -0400 (Mon, 30 Apr 2007)
New Revision: 320
Added:
apache-tomcat/5.5.23-brew/
apache-tomcat/5.5.23-brew/component-info.xml
apache-tomcat/5.5.23-brew/lib/
apache-tomcat/5.5.23-brew/lib/catalina-manager.jar
apache-tomcat/5.5.23-brew/lib/catalina-optional.jar
apache-tomcat/5.5.23-brew/lib/catalina.jar
apache-tomcat/5.5.23-brew/lib/jasper-compiler-jdt.jar
apache-tomcat/5.5.23-brew/lib/jasper-compiler.jar
apache-tomcat/5.5.23-brew/lib/jasper-runtime.jar
apache-tomcat/5.5.23-brew/lib/naming-resources.jar
apache-tomcat/5.5.23-brew/lib/servlets-default.jar
apache-tomcat/5.5.23-brew/lib/servlets-invoker.jar
apache-tomcat/5.5.23-brew/lib/servlets-webdav.jar
apache-tomcat/5.5.23-brew/lib/tomcat-ajp.jar
apache-tomcat/5.5.23-brew/lib/tomcat-apr.jar
apache-tomcat/5.5.23-brew/lib/tomcat-coyote.jar
apache-tomcat/5.5.23-brew/lib/tomcat-http.jar
apache-tomcat/5.5.23-brew/lib/tomcat-util.jar
apache-tomcat/5.5.23-brew/src/
apache-tomcat/5.5.23-brew/src/apache-tomcat-5.5.23-src.tar.gz
apache-tomcat/5.5.23-brew/src/tomcat5-5.5-javaxssl.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jk-build.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jspc-classpath.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jt5-build.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jtc-build.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jtj-build.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5-skip-build-on-install.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5-util-build.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5.23-http11-build.patch
apache-tomcat/5.5.23-brew/src/tomcat5-5.5.link_admin_jar.patch
Log:
- Brew built apache-tomcat 5.5.23
Added: apache-tomcat/5.5.23-brew/component-info.xml
===================================================================
--- apache-tomcat/5.5.23-brew/component-info.xml (rev 0)
+++ apache-tomcat/5.5.23-brew/component-info.xml 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,61 @@
+<project name="apache-tomcat-component-info">
+
+ <component id="apache-tomcat"
+ licenseType="apache-2.0"
+ version="5.5.23-brew"
+ projectHome="http://tomcat.apache.org"
+ description="Tomcat 5.5 servlet 2.4 web container"
+ scm=":ext:cvs.devel.redhat.com:/cvs/dist/tomcat5"
+ tag="tomcat5-5_5_23-0jpp_1_jb_1">
+ <!-- Built using JDK 1.4 -->
+ <artifact id="catalina-manager.jar"/>
+ <artifact id="catalina-optional.jar"/>
+ <artifact id="catalina.jar"/>
+ <artifact id="jasper-compiler-jdt.jar"/>
+ <artifact id="jasper-compiler.jar"/>
+ <artifact id="jasper-runtime.jar"/>
+ <artifact id="naming-resources.jar"/>
+ <artifact id="servlets-default.jar"/>
+ <artifact id="servlets-invoker.jar"/>
+ <artifact id="servlets-webdav.jar"/>
+ <artifact id="tomcat-ajp.jar"/>
+ <artifact id="tomcat-apr.jar"/>
+ <artifact id="tomcat-coyote.jar"/>
+ <artifact id="tomcat-http.jar"/>
+ <artifact id="tomcat-util.jar"/>
+
+ <import componentref="apache-logging">
+ <compatible version="1.0.3"/>
+ <compatible version="1.0.4jboss"/>
+ <compatible version="1.0.4.1jboss"/>
+ <compatible version="1.0.5.GA-jboss"/>
+ <compatible version="1.0.5.SP1-jboss"/>
+ <compatible version="1.1"/>
+ <compatible version="1.1.0.jboss"/>
+ </import>
+ <import componentref="apache-modeler">
+ <compatible version="2.0-brew" />
+ </import>
+ <import componentref="commons-el">
+ <compatible version="1.0"/>
+ </import>
+ <export>
+ <include input="catalina-manager.jar"/>
+ <include input="catalina-optional.jar"/>
+ <include input="catalina.jar"/>
+ <include input="jasper-compiler-jdt.jar"/>
+ <include input="jasper-compiler.jar"/>
+ <include input="jasper-runtime.jar"/>
+ <include input="naming-resources.jar"/>
+ <include input="servlets-default.jar"/>
+ <include input="servlets-invoker.jar"/>
+ <include input="servlets-webdav.jar"/>
+ <include input="tomcat-ajp.jar"/>
+ <include input="tomcat-apr.jar"/>
+ <include input="tomcat-coyote.jar"/>
+ <include input="tomcat-http.jar"/>
+ <include input="tomcat-util.jar"/>
+
+ </export>
+ </component>
+</project>
Added: apache-tomcat/5.5.23-brew/lib/catalina-manager.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/catalina-manager.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/catalina-optional.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/catalina-optional.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/catalina.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/catalina.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/jasper-compiler-jdt.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/jasper-compiler-jdt.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/jasper-compiler.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/jasper-compiler.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/jasper-runtime.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/jasper-runtime.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/naming-resources.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/naming-resources.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/servlets-default.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/servlets-default.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/servlets-invoker.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/servlets-invoker.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/servlets-webdav.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/servlets-webdav.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/tomcat-ajp.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/tomcat-ajp.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/tomcat-apr.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/tomcat-apr.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/tomcat-coyote.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/tomcat-coyote.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/tomcat-http.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/tomcat-http.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/lib/tomcat-util.jar
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/lib/tomcat-util.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/src/apache-tomcat-5.5.23-src.tar.gz
===================================================================
(Binary files differ)
Property changes on: apache-tomcat/5.5.23-brew/src/apache-tomcat-5.5.23-src.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5-javaxssl.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5-javaxssl.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5-javaxssl.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,72 @@
+--- connectors/jk/java/org/apache/jk/server/JkMain.java.sav 2006-03-23 16:56:20.000000000 +0100
++++ connectors/jk/java/org/apache/jk/server/JkMain.java 2006-03-23 16:57:27.000000000 +0100
+@@ -101,7 +101,7 @@
+ return jkMain;
+ }
+
+- private static String DEFAULT_HTTPS="com.sun.net.ssl.internal.www.protocol";
++ private static String DEFAULT_HTTPS="javax.net.ssl.internal.www.protocol";
+ private void initHTTPSUrls() {
+ try {
+ // 11657: if only ajp is used, https: redirects need to work ( at least for 1.3+)
+--- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java.sav 2006-03-23 16:58:48.000000000 +0100
++++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java 2006-03-23 17:01:34.000000000 +0100
+@@ -67,13 +67,13 @@
+ */
+ void init() throws IOException {
+ try {
+- try {
+- Class ssps = Class.forName("sun.security.provider.Sun");
+- Security.addProvider ((Provider)ssps.newInstance());
+- }catch(Exception cnfe) {
++ //try {
++ // Class ssps = Class.forName("sun.security.provider.Sun");
++ // Security.addProvider ((Provider)ssps.newInstance());
++ //}catch(Exception cnfe) {
+ //Ignore, since this is a non-Sun JVM
+- }
+- Security.addProvider (new com.sun.net.ssl.internal.ssl.Provider());
++ //}
++ //Security.addProvider (new com.sun.net.ssl.internal.ssl.Provider());
+
+ String clientAuthStr = (String)attributes.get("clientauth");
+ if("true".equalsIgnoreCase(clientAuthStr) ||
+@@ -91,8 +91,8 @@
+ if (algorithm == null) algorithm = defaultAlgorithm;
+
+ // Set up KeyManager, which will extract server key
+- com.sun.net.ssl.KeyManagerFactory kmf =
+- com.sun.net.ssl.KeyManagerFactory.getInstance(algorithm);
++ javax.net.ssl.KeyManagerFactory kmf =
++ javax.net.ssl.KeyManagerFactory.getInstance(algorithm);
+ String keystoreType = (String)attributes.get("keystoreType");
+ if (keystoreType == null) {
+ keystoreType = defaultKeystoreType;
+@@ -102,22 +102,22 @@
+ keystorePass.toCharArray());
+
+ // Set up TrustManager
+- com.sun.net.ssl.TrustManager[] tm = null;
++ javax.net.ssl.TrustManager[] tm = null;
+ String truststoreType = (String)attributes.get("truststoreType");
+ if(truststoreType == null) {
+ truststoreType = keystoreType;
+ }
+ KeyStore trustStore = getTrustStore(truststoreType);
+ if (trustStore != null) {
+- com.sun.net.ssl.TrustManagerFactory tmf =
+- com.sun.net.ssl.TrustManagerFactory.getInstance("SunX509");
++ javax.net.ssl.TrustManagerFactory tmf =
++ javax.net.ssl.TrustManagerFactory.getInstance("SunX509");
+ tmf.init(trustStore);
+ tm = tmf.getTrustManagers();
+ }
+
+ // Create and init SSLContext
+- com.sun.net.ssl.SSLContext context =
+- com.sun.net.ssl.SSLContext.getInstance(protocol);
++ javax.net.ssl.SSLContext context =
++ javax.net.ssl.SSLContext.getInstance(protocol);
+ context.init(kmf.getKeyManagers(), tm, new SecureRandom());
+
+ // Create proxy
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jk-build.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jk-build.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jk-build.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,27 @@
+--- connectors/jk/build.xml.p14 2006-03-05 02:25:22.000000000 +0100
++++ connectors/jk/build.xml 2006-03-23 19:25:51.000000000 +0100
+@@ -28,7 +28,7 @@
+ <property name="tomcat-jkshm.jar" value="${jk.build}/lib/jkshm.jar" />
+ <property name="tomcat-jk2.jar" value="${jk.build}/lib/tomcat-jk2.jar" />
+ <property name="tomcat-jni.jar" value="${jk.build}/lib/tomcat-jni.jar" />
+- <property name="tomcat-apr.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
++ <property name="tomcat-apr.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
+
+ <!-- default locations, overrident by properties -->
+ <property name="base.path" location="/usr/share/java"/>
+@@ -211,6 +211,7 @@
+ <exclude name="org/apache/jk/ant/**" />
+ <classpath>
+ <pathelement location="${tomcat-apr.jar}" />
++ <pathelement location="${jk.build}/../../build/build/classes"/>
+ <path refid="xml-apis.classpath"/>
+ <path refid="build-main.classpath"/>
+ </classpath>
+@@ -252,6 +252,7 @@
+ <include name="org/apache/coyote/ajp/**"/>
+ <include name="org/apache/jk/config/**"/>
+ <classpath>
++ <pathelement location="${jk.build}/../../build/build/classes"/>
+ <path refid="xml-apis.classpath"/>
+ <path refid="build-main.classpath"/>
+ <path refid="build-tc5.classpath"/>
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jspc-classpath.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jspc-classpath.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jspc-classpath.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,10 @@
+--- build/build.xml.sav 2006-02-21 13:48:51.743828000 -0500
++++ build/build.xml 2006-02-21 13:48:56.499065000 -0500
+@@ -416,6 +416,7 @@
+
+ <path id="jspc.classpath">
+ <pathelement location="${java.home}/../lib/tools.jar"/>
++ <pathelement location="/usr/lib/jvm/java/jre/lib/rt.jar"/>
+ <pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${tomcat.build}/server/classes"/>
+ <fileset dir="${tomcat.build}/server/lib">
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jt5-build.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jt5-build.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jt5-build.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,46 @@
+--- ./build/build.xml.p2 2007-04-29 11:47:03.000000000 -0400
++++ ./build/build.xml 2007-04-29 11:48:48.000000000 -0400
+@@ -59,10 +59,10 @@
+ <property name="tomcat.release" value="${basedir}/release"/>
+ <property name="webapps.build" value="${catalina.home}/webapps/build"/>
+ <property name="webapps.dist" value="${catalina.home}/webapps/dist"/>
+- <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" />
++ <property name="tomcat-dbcp.home" value="${base.path}" />
+ <property name="tomcat-dbcp.jar"
+- value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
+- <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
++ value="${tomcat-dbcp.home}/commons-dbcp.jar"/>
++ <property name="jasper-compiler-jdt.home" value="/tmp/jasper-compiler-jdt-home" />
+ <property name="jasper-compiler-jdt.jar"
+ value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
+
+@@ -160,11 +160,17 @@
+ failonerror="false" />
+
+ <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+- file="${tomcat-native.tar.gz}" />
++ file="${tomcat-native.tar.gz}"
++ failonerror="false" />
+
+ <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+ <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
++<!--
+ <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
++-->
++<!-- these should be links -->
++ <copy todir="${tomcat.build}/common/lib" file="${base.path}/jdtcore.jar" failonerror="false"/>
++
+ </target>
+
+ <!-- ====================== Build all components =================== -->
+@@ -956,7 +962,9 @@
+ <copy todir="embed/lib">
+ <fileset dir="build/common/lib">
+ <include name="jasper-compiler.jar"/>
+- <include name="jasper-compiler-jdt.jar"/>
++ <!-- <include name="jasper-compiler-jdt.jar"/> -->
++ <include name="jdtcore.jar"/>
++
+ </fileset>
+ </copy>
+
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jtc-build.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jtc-build.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jtc-build.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,22 @@
+--- container/catalina/build.xml.sav 2006-03-23 16:46:37.000000000 +0100
++++ container/catalina/build.xml 2006-03-23 16:47:44.000000000 +0100
+@@ -42,7 +42,7 @@
+ <property name="tomcat-http11.jar"
+ value="${tomcat-http11.home}/build/lib/tomcat-http11.jar"/>
+ <property name="tomcat-dbcp.jar"
+- value="${base.path}/tomcat-deps/naming-factory-dbcp.jar"/>
++ value="${base.path}/commons-dbcp.jar"/>
+ <!-- Construct Catalina classpath -->
+ <path id="catalina.classpath">
+ <pathelement location="${activation.jar}"/>
+--- container/modules/cluster/build.xml.sav 2006-03-23 16:49:04.000000000 +0100
++++ container/modules/cluster/build.xml 2006-03-23 16:49:54.000000000 +0100
+@@ -20,7 +20,7 @@
+ <pathelement location="${commons-modeler.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${jmx.jar}"/>
+- <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/>
++ <pathelement location="${servlet-api.jar}"/>
+ </path>
+
+ <!-- Source path -->
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jtj-build.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jtj-build.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5-jtj-build.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,20 @@
+--- jasper/build.xml.sav 2006-03-23 16:52:01.000000000 +0100
++++ jasper/build.xml 2006-03-23 16:53:17.000000000 +0100
+@@ -38,6 +38,8 @@
+ <pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-daemon-launcher.jar}"/>
+ <pathelement location="${jasper.build}/shared/classes"/>
++ <pathelement location="${base.path}/jdtcore.jar"/>
++
+ </path>
+
+ <!-- Construct unit tests classpath -->
+@@ -54,6 +56,8 @@
+ <pathelement location="${commons-launcher.jar}"/>
+ <pathelement location="${jasper.build}/shared/classes"/>
+ <pathelement location="${jasper.build}/tests"/>
++ <pathelement location="${base.path}/jdtcore.jar"/>
++
+ </path>
+
+
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5-skip-build-on-install.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5-skip-build-on-install.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5-skip-build-on-install.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,15 @@
+--- build/build.xml.sav 2006-03-23 16:22:33.000000000 +0100
++++ build/build.xml 2006-03-23 16:23:40.000000000 +0100
+@@ -763,10 +763,12 @@
+ <mkdir dir="${tomcat.build}/server/webapps" />
+
+ <!-- The build files are far too difficult to hack - just build it and copy -->
++ <!--
+ <ant dir="${api.home}/jsr154" target="dist">
+ </ant>
+ <ant dir="${api.home}/jsr152" target="dist">
+ </ant>
++ -->
+
+ <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
+ <copy todir="${tomcat.build}/webapps/servlets-examples">
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5-util-build.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5-util-build.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5-util-build.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,23 @@
+--- connectors/util/build.xml.sav 2006-03-23 19:16:02.000000000 +0100
++++ connectors/util/build.xml 2006-03-23 19:17:46.000000000 +0100
+@@ -23,7 +23,7 @@
+ <property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
+ <property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
+ <property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.jar" />
+- <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
++ <property name="tomcat-jni.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
+
+ <path id="compile.classpath">
+ <pathelement location="${jmx.jar}" />
+@@ -73,7 +73,10 @@
+ optimize="off"
+ verbose="off"
+ excludes="**/CVS/**">
+- <classpath refid="compile.classpath"/>
++ <classpath>
++ <path refid="compile.classpath"/>
++ <pathelement location="${tomcat-util.build}/../../jakarta-tomcat-5/build/classes"/>
++ </classpath>
+ <exclude name="**/util/net/jsse/*" unless="jsse.present"/>
+ <exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
+ <exclude name="**/util/net/puretls/*" unless="puretls.present"/>
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5.23-http11-build.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5.23-http11-build.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5.23-http11-build.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,23 @@
+--- connectors/http11/build.xml.orig 2007-02-26 10:27:04.000000000 -0500
++++ connectors/http11/build.xml 2007-02-26 10:28:11.000000000 -0500
+@@ -31,7 +31,7 @@
+
+ <!-- The locations of necessary jar files -->
+ <property name="tomcat-util.jar" value="${util.home}/build/lib/tomcat-util.jar"/>
+- <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
++ <property name="tomcat-jni.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
+ <property name="tomcat-coyote.jar" value="${coyote.home}/build/lib/tomcat-coyote.jar"/>
+ <property name="tomcat33-coyote.jar"
+ value="${coyote.home}/build/lib/tomcat33-coyote.jar"/>
+@@ -169,7 +169,10 @@
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}">
+ <exclude name="org\apache\coyote\http11\*Apr*" unless="jdk.1.4.present" />
+- <classpath refid="compile.classpath"/>
++ <classpath>
++ <path refid="compile.classpath"/>
++ <pathelement location="${build.home}/../../jakarta-tomcat-5/build/classes"/>
++ </classpath>
+ </javac>
+ <copy todir="${build.home}/classes" filtering="on">
+ <fileset dir="${source.home}" excludes="**/*.java"/>
Added: apache-tomcat/5.5.23-brew/src/tomcat5-5.5.link_admin_jar.patch
===================================================================
--- apache-tomcat/5.5.23-brew/src/tomcat5-5.5.link_admin_jar.patch (rev 0)
+++ apache-tomcat/5.5.23-brew/src/tomcat5-5.5.link_admin_jar.patch 2007-04-30 14:18:26 UTC (rev 320)
@@ -0,0 +1,12 @@
+--- container/webapps/admin/admin.xml.sav 2006-03-23 16:16:51.000000000 +0100
++++ container/webapps/admin/admin.xml 2006-03-23 16:17:49.000000000 +0100
+@@ -17,4 +17,9 @@
+ allow="127.0.0.1"/>
+ -->
+
++ <!-- Allow linking since JPackage do not install jar as copies -->
++
++ <Resources className="org.apache.naming.resources.FileDirContext"
++ allowLinking="true"/>
++
+ </Context>
More information about the jboss-cvs-commits
mailing list