Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 83955 invoked from network); 15 Aug 2005 02:16:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Aug 2005 02:16:14 -0000 Received: (qmail 14378 invoked by uid 500); 15 Aug 2005 02:16:14 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 14369 invoked by uid 500); 15 Aug 2005 02:16:14 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 14350 invoked by uid 99); 15 Aug 2005 02:16:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Aug 2005 19:16:14 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 14 Aug 2005 19:16:34 -0700 Received: (qmail 83948 invoked by uid 65534); 15 Aug 2005 02:16:13 -0000 Message-ID: <20050815021613.83947.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Mon, 15 Aug 2005 02:16:12 -0000 To: scm@geronimo.apache.org From: jgenender@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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();