Author: jfclere
Date: Wed May 19 16:06:51 2010
New Revision: 946250
URL: http://svn.apache.org/viewvc?rev=946250&view=rev
Log:
Allow to test with APR.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=946250&r1=946249&r2=946250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Wed May 19
16:06:51 2010
@@ -363,10 +363,11 @@ public class Tomcat {
}
// This will load Apr connector if available,
// default to nio. I'm having strange problems with apr
+ // XXX: jfclere weird... Don't add the AprLifecycleListener then.
// and for the use case the speed benefit wouldn't matter.
- //connector = new Connector("HTTP/1.1");
- connector = new Connector("org.apache.coyote.http11.Http11Protocol");
+ connector = new Connector("HTTP/1.1");
+ // connector = new
Connector("org.apache.coyote.http11.Http11Protocol");
connector.setPort(port);
service.addConnector( connector );
return connector;
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=946250&r1=946249&r2=946250&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Wed May
19 16:06:51 2010
@@ -32,6 +32,10 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.LifecycleState;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.core.AprLifecycleListener;
+
import org.apache.tomcat.util.buf.ByteChunk;
import junit.framework.TestCase;
@@ -103,6 +107,12 @@ public abstract class TomcatBaseTest ext
}
tomcat = new Tomcat();
+
+ // Add AprLifecycleListener
+ StandardServer server = (StandardServer) tomcat.getServer();
+ AprLifecycleListener listener = new AprLifecycleListener();
+ server.addLifecycleListener((LifecycleListener) listener);
+
tomcat.setBaseDir(tempDir.getAbsolutePath());
tomcat.getHost().setAppBase(appBase.getAbsolutePath());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
