geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r232696 - in /geronimo/trunk/modules/tomcat/src: java/org/apache/geronimo/tomcat/ test/org/apache/geronimo/tomcat/
Date Mon, 15 Aug 2005 02:15:47 GMT
Author: jgenender
Date: Sun Aug 14 19:15:42 2005
New Revision: 232696

URL: http://svn.apache.org/viewcvs?rev=232696&view=rev
Log:
Added camelcase for GBean references to make consistent

Modified:
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java?rev=232696&r1=232695&r2=232696&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java Sun
Aug 14 19:15:42 2005
@@ -110,11 +110,11 @@
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("TomcatEngine", EngineGBean.class);
         infoFactory.addAttribute("className", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
-        infoFactory.addReference("hosts", ObjectRetriever.class, HostGBean.J2EE_TYPE);
-        infoFactory.addReference("realmGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("Hosts", ObjectRetriever.class, HostGBean.J2EE_TYPE);
+        infoFactory.addReference("RealmGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addReference("TomcatValveChain", ValveGBean.class, ValveGBean.J2EE_TYPE);
         infoFactory.addOperation("getInternalObject");
-        infoFactory.setConstructor(new String[] { "className", "initParams", "hosts", "realmGBean",
"TomcatValveChain" });
+        infoFactory.setConstructor(new String[] { "className", "initParams", "Hosts", "RealmGBean",
"TomcatValveChain" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java?rev=232696&r1=232695&r2=232696&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java Sun Aug
14 19:15:42 2005
@@ -95,10 +95,10 @@
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("TomcatHost", HostGBean.class,
J2EE_TYPE);
         infoFactory.addAttribute("className", String.class, true);
         infoFactory.addAttribute("initParams", Map.class, true);
-        infoFactory.addReference("realmGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("RealmGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addReference("TomcatValveChain", ValveGBean.class, ValveGBean.J2EE_TYPE);
         infoFactory.addOperation("getInternalObject");
-        infoFactory.setConstructor(new String[] { "className", "initParams", "realmGBean",
"TomcatValveChain" });
+        infoFactory.setConstructor(new String[] { "className", "initParams", "RealmGBean",
"TomcatValveChain" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=232696&r1=232695&r2=232696&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
Sun Aug 14 19:15:42 2005
@@ -333,13 +333,13 @@
     static {
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Tomcat Web Container", TomcatContainer.class);
 
-        infoFactory.setConstructor(new String[] { "classLoader", "catalinaHome", "engineGBean",
"ServerInfo" });
+        infoFactory.setConstructor(new String[] { "classLoader", "catalinaHome", "EngineGBean",
"ServerInfo" });
 
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
 
         infoFactory.addAttribute("catalinaHome", String.class, true);
 
-        infoFactory.addReference("engineGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("EngineGBean", ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
 
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
 

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=232696&r1=232695&r2=232696&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Sun Aug 14 19:15:42 2005
@@ -412,9 +412,9 @@
         infoBuilder.addAttribute("applicationManagedSecurityResources", Set.class, true);
         infoBuilder.addAttribute("userTransaction",
                 OnlineUserTransaction.class, true);
-        infoBuilder.addReference("transactionContextManager",
+        infoBuilder.addReference("TransactionContextManager",
                 TransactionContextManager.class, NameFactory.JTA_RESOURCE);
-        infoBuilder.addReference("trackedConnectionAssociator",
+        infoBuilder.addReference("TrackedConnectionAssociator",
                 TrackedConnectionAssociator.class, NameFactory.JCA_CONNECTION_TRACKER);
 
         infoBuilder.addReference("Container", TomcatContainer.class,
@@ -445,8 +445,8 @@
                 "unshareableResources",
                 "applicationManagedSecurityResources",
                 "userTransaction",
-                "transactionContextManager",
-                "trackedConnectionAssociator",
+                "TransactionContextManager",
+                "TrackedConnectionAssociator",
                 "Container",
                 "RoleDesignateSource",
                 "TomcatRealm",

Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=232696&r1=232695&r2=232696&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
(original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Sun Aug 14 19:15:42 2005
@@ -111,8 +111,8 @@
         app.setReferencePattern("Container", containerName);
         OnlineUserTransaction userTransaction = new OnlineUserTransaction();
         app.setAttribute("userTransaction", userTransaction);
-        app.setReferencePattern("transactionContextManager", tcmName);
-        app.setReferencePattern("trackedConnectionAssociator", ctcName);
+        app.setReferencePattern("TransactionContextManager", tcmName);
+        app.setReferencePattern("TrackedConnectionAssociator", ctcName);
         app.setAttribute("path", "/test");
 
         start(app);
@@ -158,8 +158,8 @@
 
         OnlineUserTransaction userTransaction = new OnlineUserTransaction();
         app.setAttribute("userTransaction", userTransaction);
-        app.setReferencePattern("transactionContextManager", tcmName);
-        app.setReferencePattern("trackedConnectionAssociator", ctcName);
+        app.setReferencePattern("TransactionContextManager", tcmName);
+        app.setReferencePattern("TrackedConnectionAssociator", ctcName);
 
         app.setAttribute("componentContext", Collections.EMPTY_MAP);
         app.setReferencePattern("Container", containerName);
@@ -203,8 +203,8 @@
 
         OnlineUserTransaction userTransaction = new OnlineUserTransaction();
         app.setAttribute("userTransaction", userTransaction);
-        app.setReferencePattern("transactionContextManager", tcmName);
-        app.setReferencePattern("trackedConnectionAssociator", ctcName);
+        app.setReferencePattern("TransactionContextManager", tcmName);
+        app.setReferencePattern("TrackedConnectionAssociator", ctcName);
 
         app.setAttribute("componentContext", Collections.EMPTY_MAP);
         app.setReferencePattern("Container", containerName);
@@ -359,15 +359,15 @@
         engine.setAttribute("className", "org.apache.geronimo.tomcat.TomcatEngine");
         engine.setAttribute("initParams", initParams);
         if (realmClass != null)
-            engine.setReferencePattern("realmGBean", realmName);
-        engine.setReferencePattern("hosts", hostName);
+            engine.setReferencePattern("RealmGBean", realmName);
+        engine.setReferencePattern("Hosts", hostName);
         start(engine);
 
         // Need to override the constructor for unit tests
         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();

Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java?rev=232696&r1=232695&r2=232696&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java Sun
Aug 14 19:15:42 2005
@@ -278,13 +278,13 @@
        engine = new GBeanData(engineName, EngineGBean.GBEAN_INFO);
        engine.setAttribute("className", "org.apache.geronimo.tomcat.TomcatEngine");
        engine.setAttribute("initParams", initParams);
-       engine.setReferencePattern("hosts", hostName);
+       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);
        start(container);
 



Mime
View raw message