You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2006/04/25 15:26:45 UTC
svn commit: r396880 - in /geronimo/branches/1.1/modules:
jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Author: kevan
Date: Tue Apr 25 06:26:04 2006
New Revision: 396880
URL: http://svn.apache.org/viewcvs?rev=396880&view=rev
Log:
Fix test failures caused by revision 396767
Modified:
geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Modified: geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=396880&r1=396879&r2=396880&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java Tue Apr 25 06:26:04 2006
@@ -48,7 +48,7 @@
/**
- * @version $Rev: 386763 $ $Date$
+ * @version $Rev$ $Date$
*/
public class AbstractWebModuleTest extends TestCase {
protected ClassLoader cl;
@@ -185,7 +185,7 @@
configurationBaseURL = cl.getResource("deployables/");
- container = new JettyContainerImpl("test:name=JettyContainer");
+ container = new JettyContainerImpl("test:name=JettyContainer", null);
container.doStart();
connector = new HTTPConnector(container);
connector.setPort(5678);
Modified: geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=396880&r1=396879&r2=396880&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Tue Apr 25 06:26:04 2006
@@ -174,7 +174,7 @@
engine.doStart();
ServerInfo serverInfo = new BasicServerInfo(".");
- container = new TomcatContainer(cl, "target/var/catalina", engine, serverInfo, null);
+ container = new TomcatContainer(cl, "target/var/catalina", engine, serverInfo, null, null);
container.doStart();
connector = new ConnectorGBean("HTTP", null, "localhost", 8181, container);
Re: svn commit: r396880 - in /geronimo/branches/1.1/modules: jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Posted by Aaron Mulder <am...@alumni.princeton.edu>.
Oops, guess I forgot to run a full set of tests. :) Thanks!
Aaron
On 4/25/06, kevan@apache.org <ke...@apache.org> wrote:
> Author: kevan
> Date: Tue Apr 25 06:26:04 2006
> New Revision: 396880
>
> URL: http://svn.apache.org/viewcvs?rev=396880&view=rev
> Log:
> Fix test failures caused by revision 396767
>
> Modified:
> geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
> geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
>
> Modified: geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
> URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=396880&r1=396879&r2=396880&view=diff
> ==============================================================================
> --- geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
> +++ geronimo/branches/1.1/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java Tue Apr 25 06:26:04 2006
> @@ -48,7 +48,7 @@
>
>
> /**
> - * @version $Rev: 386763 $ $Date$
> + * @version $Rev$ $Date$
> */
> public class AbstractWebModuleTest extends TestCase {
> protected ClassLoader cl;
> @@ -185,7 +185,7 @@
>
> configurationBaseURL = cl.getResource("deployables/");
>
> - container = new JettyContainerImpl("test:name=JettyContainer");
> + container = new JettyContainerImpl("test:name=JettyContainer", null);
> container.doStart();
> connector = new HTTPConnector(container);
> connector.setPort(5678);
>
> Modified: geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
> URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=396880&r1=396879&r2=396880&view=diff
> ==============================================================================
> --- geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
> +++ geronimo/branches/1.1/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Tue Apr 25 06:26:04 2006
> @@ -174,7 +174,7 @@
> engine.doStart();
>
> ServerInfo serverInfo = new BasicServerInfo(".");
> - container = new TomcatContainer(cl, "target/var/catalina", engine, serverInfo, null);
> + container = new TomcatContainer(cl, "target/var/catalina", engine, serverInfo, null, null);
> container.doStart();
>
> connector = new ConnectorGBean("HTTP", null, "localhost", 8181, container);
>
>
>