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/08/15 04:16:12 UTC
svn commit: r232698 - in /geronimo/trunk/modules/tomcat-builder/src:
java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Author: jgenender
Date: Sun Aug 14 19:16:09 2005
New Revision: 232698
URL: http://svn.apache.org/viewcvs?rev=232698&view=rev
Log:
Added camelcase for GBean references to make consistent
Modified:
geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Modified: geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=232698&r1=232697&r2=232698&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Sun Aug 14 19:16:09 2005
@@ -384,8 +384,8 @@
webModuleData.setAttribute("contextPriorityClassLoader", Boolean.valueOf(contextPriorityClassLoader));
- webModuleData.setReferencePattern("transactionContextManager", earContext.getTransactionContextManagerObjectName());
- webModuleData.setReferencePattern("trackedConnectionAssociator", earContext.getConnectionTrackerObjectName());
+ webModuleData.setReferencePattern("TransactionContextManager", earContext.getTransactionContextManagerObjectName());
+ webModuleData.setReferencePattern("TrackedConnectionAssociator", earContext.getConnectionTrackerObjectName());
webModuleData.setReferencePattern("Container", tomcatContainerObjectName);
String virtualServer = null;
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=232698&r1=232697&r2=232698&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 Sun Aug 14 19:16:09 2005
@@ -418,14 +418,14 @@
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);
+ 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");
- container.setReferencePattern("engineGBean", engineName);
+ container.setReferencePattern("EngineGBean", engineName);
container.setReferencePattern("ServerInfo", serverInfoName);
initParams.clear();