You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/07/20 01:33:57 UTC
svn commit: r219810 -
/geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Author: jgenender
Date: Tue Jul 19 16:33:56 2005
New Revision: 219810
URL: http://svn.apache.org/viewcvs?rev=219810&view=rev
Log:
Fixed builder errors with new tomcat gbean infrastructure
Modified:
geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Modified: geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=219810&r1=219809&r2=219810&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Tue Jul 19 16:33:56 2005
@@ -88,8 +88,7 @@
* @version $Rev: 159325 $ $Date: 2005-03-28 15:53:03 -0700 (Mon, 28 Mar 2005) $
*/
public class TomcatModuleBuilderTest extends TestCase {
- public void testRemoveMeWhenTestsBelowAreFixed() {}
-/*
+
protected Kernel kernel;
private GBeanData container;
@@ -394,16 +393,6 @@
realm.setAttribute("initParams", initParams);
start(realm);
- // Default Engine
- initParams.clear();
- initParams.put("name", "Geronimo");
- initParams.put("defaultHost", "localhost");
- engine = new GBeanData(engineName, EngineGBean.GBEAN_INFO);
- engine.setAttribute("className", "org.apache.geronimo.tomcat.TomcatEngine");
- engine.setAttribute("initParams", initParams);
- engine.setReferencePattern("realmGBean", realmName);
- start(engine);
-
// Default Host
initParams.clear();
initParams.put("workDir", "work");
@@ -412,9 +401,19 @@
host = new GBeanData(hostName, HostGBean.GBEAN_INFO);
host.setAttribute("className", "org.apache.catalina.core.StandardHost");
host.setAttribute("initParams", initParams);
- host.setReferencePattern("engineGBean", engineName);
start(host);
+ // Default Engine
+ initParams.clear();
+ initParams.put("name", "Geronimo");
+ initParams.put("defaultHost", "localhost");
+ engine = new GBeanData(engineName, EngineGBean.GBEAN_INFO);
+ engine.setAttribute("className", "org.apache.geronimo.tomcat.TomcatEngine");
+ engine.setAttribute("initParams", initParams);
+ engine.setReferencePattern("realmGBean", realmName);
+ engine.setReferencePattern("hosts", hostName);
+ start(engine);
+
container = new GBeanData(containerName, TomcatContainer.GBEAN_INFO);
container.setAttribute("classLoader", cl);
container.setAttribute("catalinaHome", "target/var/catalina");
@@ -426,6 +425,7 @@
connector = new GBeanData(connectorName, ConnectorGBean.GBEAN_INFO);
connector.setAttribute("initParams", initParams);
connector.setReferencePattern("TomcatContainer", containerName);
+ connector.setReferencePattern("ServerInfo", serverInfoName);
start(container);
start(connector);
@@ -546,5 +546,5 @@
throw new RuntimeException(e);
}
}
- }*/
+ }
}