remm 2005/06/16 10:03:12
Modified: . build.xml
catalina/src/share/org/apache/catalina/connector
Connector.java LocalStrings.properties
jk build.xml
Log:
- So, compile in AJP on APR, and enable it if APR is present.
- Obviously, it's experimental, but I don't think anyone will bother with even
basic testing if it's not at least compiled.
Revision Changes Path
1.230 +1 -0 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- build.xml 28 Apr 2005 12:32:05 -0000 1.229
+++ build.xml 16 Jun 2005 17:03:12 -0000 1.230
@@ -224,6 +224,7 @@
<!-- Protocol handlers - AJP -->
<jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar" index="true">
<fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/coyote/ajp/**" />
<include name="org/apache/jk/**" />
<exclude name="org/apache/jk/ant/**" />
<!-- Javadoc and i18n exclusions -->
1.26 +2 -12
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java
Index: Connector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Connector.java 9 Jun 2005 20:24:25 -0000 1.25
+++ Connector.java 16 Jun 2005 17:03:12 -0000 1.26
@@ -619,13 +619,7 @@
method.invoke(null, paramValues);
apr = true;
} catch (Throwable t) {
- if (!log.isDebugEnabled()) {
- log.info(sm.getString("coyoteConnector.noApr",
- System.getProperty("java.library.path")));
- } else {
- log.debug(sm.getString("coyoteConnector.noApr",
- System.getProperty("java.library.path")), t);
- }
+ // Ignore
}
if (apr) {
@@ -633,12 +627,8 @@
setProtocolHandlerClassName
("org.apache.coyote.http11.Http11AprProtocol");
} else if ("AJP/1.3".equals(protocol)) {
- /*
setProtocolHandlerClassName
("org.apache.coyote.ajp.AjpAprProtocol");
- */
- setProtocolHandlerClassName
- ("org.apache.jk.server.JkCoyoteHandler");
} else if (protocol != null) {
setProtocolHandlerClassName(protocol);
} else {
1.8 +0 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/LocalStrings.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LocalStrings.properties 28 Apr 2005 12:29:51 -0000 1.7
+++ LocalStrings.properties 16 Jun 2005 17:03:12 -0000 1.8
@@ -16,7 +16,6 @@
coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
coyoteConnector.MapperRegistration=register Mapper: {0}
coyoteConnector.protocolUnregistrationFailed=Protocol handler stop failed
-coyoteConnector.noApr=The Apache Portable Runtime which allows optimal
performance in production environments was not found on the java.library.path:
{0}
#
1.81 +1 -0 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- build.xml 23 Mar 2005 16:27:03 -0000 1.80
+++ build.xml 16 Jun 2005 17:03:12 -0000 1.81
@@ -243,6 +243,7 @@
debug="${compile.debug}"
optimize="${optimize}"
verbose="off" >
+ <include name="org/apache/coyote/ajp/**"/>
<include name="org/apache/jk/config/**"/>
<classpath>
<path refid="xml-apis.classpath"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
