geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r156292 [3/3] - in geronimo/trunk: itests/naming/client/src/plan/ modules/assembly/src/plan/ modules/axis/src/java/org/apache/geronimo/axis/ modules/axis/src/plans/ modules/client-builder/src/java/org/apache/geronimo/client/builder/ modules/client/src/java/org/apache/geronimo/client/ modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ modules/connector-builder/src/test-data/connector_1_0/ modules/connector-builder/src/test-data/connector_1_5/ modules/connector-builder/src/test-data/data/ modules/connector/src/java/org/apache/geronimo/connector/ modules/connector/src/java/org/apache/geronimo/connector/outbound/ modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/ modules/connector/src/java/org/apache/geronimo/connector/work/ modules/deployment/src/java/org/apache/geronimo/deployment/ modules/deployment/src/java/org/apache/geronimo/deployment/xml/ modules/derby/src/java/org/apache/geronimo/derby/ modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ modules/j2ee-builder/src/test-ear/META-INF/ modules/j2ee-builder/src/test-ear13/META-INF/ modules/j2ee-builder/src/test-unpacked-ear/META-INF/ modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/ modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/ modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/ modules/jetty-builder/src/test-resources/services/ modules/jetty/src/java/org/apache/geronimo/jetty/ modules/jetty/src/java/org/apache/geronimo/jetty/connector/ modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/ modules/jetty/src/test-resources/services/ modules/kernel/src/java/org/apache/geronimo/gbean/ modules/kernel/src/java/org/apache/geronimo/kernel/config/ modules/kernel/src/test/org/apache/geronimo/gbean/ modules/kernel/src/test/org/apache/geronimo/kernel/ modules/mail/src/java/org/apache/geronimo/mail/ modules/security/src/java/org/apache/geronimo/security/ modules/security/src/java/org/apache/geronimo/security/jaas/ modules/security/src/java/org/apache/geronimo/security/realm/ modules/security/src/java/org/apache/geronimo/security/remoting/jmx/ modules/security/src/test/org/apache/geronimo/security/ modules/security/src/test/org/apache/geronimo/security/jaas/ modules/security/src/test/org/apache/geronimo/security/remoting/jmx/ modules/service-builder/src/java/org/apache/geronimo/deployment/service/ modules/service-builder/src/schema/ modules/service-builder/src/test-resources/services/ modules/service-builder/src/test/org/apache/geronimo/deployment/ modules/service-builder/src/test/org/apache/geronimo/deployment/service/ modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/ modules/system/src/java/org/apache/geronimo/system/configuration/ modules/system/src/java/org/apache/geronimo/system/logging/log4j/ modules/system/src/java/org/apache/geronimo/system/repository/ modules/timer/src/java/org/apache/geronimo/timer/jdbc/ modules/timer/src/java/org/apache/geronimo/timer/vm/ modules/tomcat/src/java/org/apache/geronimo/tomcat/ modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/ modules/tomcat/src/plan/ modules/transaction/src/java/org/apache/geronimo/transaction/context/ modules/transaction/src/java/org/apache/geronimo/transaction/log/ modules/transaction/src/java/org/apache/geronimo/transaction/manager/
Date Sun, 06 Mar 2005 02:48:21 GMT
Modified: geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java
(original)
+++ geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java
Sat Mar  5 18:48:02 2005
@@ -50,7 +50,7 @@
 
         GbeanType[] gbeans = configuration.getGbeanArray();
         assertEquals(1, gbeans.length);
-        assertEquals("geronimo.test:name=MyMockGMBean", gbeans[0].getName());
+        assertEquals("geronimo.test:name=MyMockGMBean", gbeans[0].getGbeanName());
         AttributeType[] attrs = gbeans[0].getAttributeArray();
         assertEquals(2, attrs.length);
         assertEquals("value", attrs[0].getName());
@@ -60,8 +60,8 @@
 
         ReferenceType[] refs = gbeans[0].getReferenceArray();
         assertEquals(1, refs.length);
-        assertEquals("MockEndpoint", refs[0].getName());
-        assertEquals("geronimo.test:name=MyMockGMBean", refs[0].getStringValue());
+        assertEquals("MockEndpoint", refs[0].getName2());
+        assertEquals("geronimo.test:name=MyMockGMBean", refs[0].getGbeanName());
     }
 
     protected void setUp() throws Exception {

Modified: geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java
(original)
+++ geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java
Sat Mar  5 18:48:02 2005
@@ -19,25 +19,19 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
-import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ConfigurationBuilder;
-import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -45,8 +39,8 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.spring.SpringGBean;
 import org.apache.geronimo.spring.SpringApplicationImpl;
+import org.apache.geronimo.spring.SpringGBean;
 
 /**
  * @version $Rev: 126313 $ $Date: 2005-01-24 21:03:52 +0000 (Mon, 24 Jan 2005) $
@@ -78,7 +72,7 @@
   {
     GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SPRConfigBuilder.class, NameFactory.CONFIG_BUILDER);
     infoFactory.addAttribute("defaultParentId" , URI.class, true);
-    infoFactory.addReference("Repository"      , Repository.class);
+    infoFactory.addReference("Repository"      , Repository.class, NameFactory.GERONIMO_SERVICE);
     infoFactory.addAttribute("kernel"          , Kernel.class, false);
     infoFactory.addInterface(ConfigurationBuilder.class);
     infoFactory.setConstructor(new String[]{"defaultParentId", "Repository", "kernel"});

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
Sat Mar  5 18:48:02 2005
@@ -188,7 +188,7 @@
         infoFactory.addInterface(PersistentConfigurationList.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("kernelFullyStarted", boolean.class, false);
-        infoFactory.addReference("ServerInfo", ServerInfo.class);
+        infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
         infoFactory.addAttribute("configFile", String.class, true);
         infoFactory.setConstructor(new String[]{"kernel", "ServerInfo", "configFile"});
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
Sat Mar  5 18:48:02 2005
@@ -388,7 +388,7 @@
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);
         infoFactory.addAttribute("root", URI.class, true);
-        infoFactory.addReference("ServerInfo", ServerInfo.class);
+        infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
         infoFactory.addInterface(ConfigurationStore.class);
 
         infoFactory.setConstructor(new String[]{"kernel", "objectName", "root", "ServerInfo"});

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
Sat Mar  5 18:48:02 2005
@@ -452,7 +452,7 @@
         infoFactory.addAttribute("configuration", String.class, false);
         infoFactory.addAttribute("rootLoggerLevel", String.class, false);
 
-        infoFactory.addReference("ServerInfo", ServerInfo.class);
+        infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
 
         infoFactory.addOperation("reconfigure");
         infoFactory.addOperation("setLoggerLevel", new Class[]{String.class, String.class});

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
Sat Mar  5 18:48:02 2005
@@ -94,7 +94,7 @@
 
         infoFactory.addAttribute("root", URI.class, true);
 
-        infoFactory.addReference("ServerInfo", ServerInfo.class);
+        infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
 
         infoFactory.addInterface(Repository.class);
 

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
(original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
Sat Mar  5 18:48:02 2005
@@ -31,6 +31,7 @@
 import org.apache.geronimo.timer.PersistentTimer;
 import org.apache.geronimo.timer.ThreadPooledTimer;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  * @version $Rev$ $Date$
@@ -53,10 +54,10 @@
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JDBCStoreThreadPooledNonTransactionalTimer.class);
         infoFactory.addInterface(PersistentTimer.class);
 
-        infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class);
-        infoFactory.addReference("ThreadPool", Executor.class);
-        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class);
-        infoFactory.addReference("DerbySystem", Serializable.class);
+        infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class,
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
+        infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.JTA_RESOURCE);
+        infoFactory.addReference("DerbySystem", Serializable.class, NameFactory.GERONIMO_SERVICE);
         
         infoFactory.addAttribute("kernel", Kernel.class, false);
 

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
(original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
Sat Mar  5 18:48:02 2005
@@ -31,6 +31,7 @@
 import org.apache.geronimo.timer.PersistentTimer;
 import org.apache.geronimo.timer.ThreadPooledTimer;
 import org.apache.geronimo.timer.TransactionalExecutorTaskFactory;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  *
@@ -58,10 +59,10 @@
         infoFactory.addInterface(PersistentTimer.class);
 
         infoFactory.addAttribute("repeatCount", int.class, true);
-        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class);
-        infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class);
-        infoFactory.addReference("ThreadPool", Executor.class);
-        infoFactory.addReference("DerbySystem", Serializable.class);
+        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.JTA_RESOURCE);
+        infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class,
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
+        infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("DerbySystem", Serializable.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addAttribute("kernel", Kernel.class, false);
 
         infoFactory.setConstructor(new String[] {"repeatCount", "TransactionContextManager",
"ManagedConnectionFactoryWrapper", "ThreadPool", "DerbySystem", "kernel"});

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
(original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
Sat Mar  5 18:48:02 2005
@@ -24,6 +24,7 @@
 import org.apache.geronimo.timer.PersistentTimer;
 import org.apache.geronimo.timer.ThreadPooledTimer;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  *
@@ -45,8 +46,8 @@
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(VMStoreThreadPooledNonTransactionalTimer.class);
         infoFactory.addInterface(PersistentTimer.class);
 
-        infoFactory.addReference("ThreadPool", Executor.class);
-        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class);
+        infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.JTA_RESOURCE);
 
         infoFactory.setConstructor(new String[] {"TransactionContextManager", "ThreadPool"});
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
(original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
Sat Mar  5 18:48:02 2005
@@ -24,6 +24,7 @@
 import org.apache.geronimo.timer.ThreadPooledTimer;
 import org.apache.geronimo.timer.TransactionalExecutorTaskFactory;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  *
@@ -48,8 +49,8 @@
         infoFactory.addInterface(PersistentTimer.class);
 
         infoFactory.addAttribute("repeatCount", int.class, true);
-        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class);
-        infoFactory.addReference("ThreadPool", Executor.class);
+        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.JTA_RESOURCE);
+        infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
 
         infoFactory.setConstructor(new String[] {"repeatCount", "TransactionContextManager",
"ThreadPool"});
         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?view=diff&r1=156291&r2=156292
==============================================================================
--- 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
Sat Mar  5 18:48:02 2005
@@ -244,7 +244,7 @@
         infoFactory.addAttribute("catalinaHome", String.class, true);
         infoFactory.addAttribute("endorsedDirs", String.class, true);
 
-        infoFactory.addReference("ServerInfo", ServerInfo.class);
+        infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
 
         infoFactory.addOperation("addContext", new Class[] { TomcatContext.class });
         infoFactory.addOperation("removeContext", new Class[] { TomcatContext.class });

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?view=diff&r1=156291&r2=156292
==============================================================================
--- 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
Sat Mar  5 18:48:02 2005
@@ -46,6 +46,7 @@
 import org.apache.geronimo.transaction.TrackedConnectionAssociator;
 import org.apache.geronimo.transaction.context.OnlineUserTransaction;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 import javax.naming.NamingException;
 
@@ -239,7 +240,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Tomcat WebApplication Context",
TomcatWebAppContext.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Tomcat WebApplication Context",
TomcatWebAppContext.class, NameFactory.WEB_MODULE);
 
         infoFactory.addAttribute("webAppRoot", URI.class, true);
         infoFactory.addAttribute("webClassPath", URI[].class, true);
@@ -262,10 +263,10 @@
 
         infoFactory.addAttribute("componentContext", Map.class, true);
         infoFactory.addAttribute("userTransaction", OnlineUserTransaction.class, true);
-        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class);
-        infoFactory.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class);
+        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.JTA_RESOURCE);
+        infoFactory.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class,
NameFactory.JCA_RESOURCE);
 
-        infoFactory.addReference("Container", TomcatContainer.class);
+        infoFactory.addReference("Container", TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addAttribute("kernel", Kernel.class, false);
 
         infoFactory.setConstructor(new String[]{

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java
Sat Mar  5 18:48:02 2005
@@ -23,6 +23,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.tomcat.TomcatContainer;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
  * Apache Tomcat HTTP 1.1 connector
@@ -55,7 +56,7 @@
     static {
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Tomcat HTTP Connector", HTTPConnector.class);
         infoFactory.addAttribute("port", int.class, true);
-        infoFactory.addReference("TomcatContainer", TomcatContainer.class);
+        infoFactory.addReference("TomcatContainer", TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.setConstructor(new String[] { "TomcatContainer" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml (original)
+++ geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml Sat Mar  5 18:48:02 2005
@@ -85,15 +85,15 @@
         <uri>mx4j/jars/mx4j-${mx4j-version}.jar</uri>
     </dependency>
 
-    <gbean name="geronimo.server:type=WebContainer,container=Tomcat" class="org.apache.geronimo.tomcat.TomcatContainer">
+    <gbean gbeanName="geronimo.server:type=WebContainer,container=Tomcat" class="org.apache.geronimo.tomcat.TomcatContainer">
         <attribute name="catalinaHome">var/catalina</attribute>
         <attribute name="port">8090</attribute>
         <attribute name="endorsedDirs">lib</attribute>
-        <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+        <reference name="ServerInfo"><gbean-name>geronimo.system:role=ServerInfo</gbean-name></reference>
     </gbean>
-    <gbean name="geronimo.server:type=WebConnector,container=Tomcat,port=8090" class="org.apache.geronimo.tomcat.connector.HTTPConnector">
+    <gbean gbeanName="geronimo.server:type=WebConnector,container=Tomcat,port=8090" class="org.apache.geronimo.tomcat.connector.HTTPConnector">
         <attribute name="port">8090</attribute>
-        <reference name="TomcatContainer">geronimo.server:type=WebContainer,container=Tomcat</reference>
+        <reference name="TomcatContainer"><gbean-name>geronimo.server:type=WebContainer,container=Tomcat</gbean-name></reference>
     </gbean>
 
 </configuration>

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManager.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManager.java
(original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManager.java
Sat Mar  5 18:48:02 2005
@@ -374,8 +374,8 @@
         infoFactory.addOperation("setRollbackOnly");
         infoFactory.addOperation("setTransactionTimeout", new Class[] {int.class});
 
-        infoFactory.addReference("TransactionManager", ExtendedTransactionManager.class);
-        infoFactory.addReference("XidImporter", XidImporter.class);
+        infoFactory.addReference("TransactionManager", ExtendedTransactionManager.class,
NameFactory.JTA_RESOURCE);
+        infoFactory.addReference("XidImporter", XidImporter.class, NameFactory.JTA_RESOURCE);
 
         infoFactory.addInterface(XATerminator.class);
         infoFactory.addInterface(XAWork.class);

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
(original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
Sat Mar  5 18:48:02 2005
@@ -406,8 +406,8 @@
         infoFactory.addAttribute("minBuffers", Integer.TYPE, true);
         infoFactory.addAttribute("threadsWaitingForceThreshold", Integer.TYPE, true);
 
-        infoFactory.addReference("XidFactory", XidFactory.class);
-        infoFactory.addReference("serverInfo", ServerInfo.class);
+        infoFactory.addReference("XidFactory", XidFactory.class, NameFactory.JTA_RESOURCE);
+        infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
 
         infoFactory.addInterface(TransactionLog.class);
 
@@ -425,7 +425,7 @@
             "minBuffers",
             "threadsWaitingForceThreshold",
             "XidFactory",
-            "serverInfo"});
+            "ServerInfo"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
(original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
Sat Mar  5 18:48:02 2005
@@ -285,8 +285,8 @@
         GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(TransactionManagerImpl.class,
NameFactory.JTA_RESOURCE);
 
         infoBuilder.addAttribute("defaultTransactionTimeoutSeconds", int.class, true);
-        infoBuilder.addReference("TransactionLog", TransactionLog.class);
-        infoBuilder.addReference("ResourceManagers", ResourceManager.class);
+        infoBuilder.addReference("TransactionLog", TransactionLog.class, NameFactory.JTA_RESOURCE);
+        infoBuilder.addReference("ResourceManagers", ResourceManager.class);//two kinds of
things, so specify the type in each pattern.
 
         infoBuilder.addInterface(ExtendedTransactionManager.class);
         infoBuilder.addInterface(XidImporter.class);



Mime
View raw message