geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: rev 56022 - in geronimo/trunk/modules: axis/src/java/org/apache/geronimo/axis client-builder/src/java/org/apache/geronimo/client/builder client/src/java/org/apache/geronimo/client connector/src/java/org/apache/geronimo/connector connector/src/java/org/apache/geronimo/connector/deployment connector/src/java/org/apache/geronimo/connector/outbound connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking connector/src/java/org/apache/geronimo/connector/outbound/security connector/src/java/org/apache/geronimo/connector/outbound/transactionlog connector/src/java/org/apache/geronimo/connector/work connector/src/test/org/apache/geronimo/connector/outbound core/src/java/org/apache/geronimo/pool deployment/src/java/org/apache/geronimo/deployment deployment/src/java/org/apache/geronimo/deployment/plugin/application deployment/src/java/org/apache/geronimo/deployment/service deployment/src/java/org/apache/geronimo/deployment/xml deployment/src/test/org/apache/geronimo/deployment derby/src/java/org/apache/geronimo/derby j2ee/src/java/org/apache/geronimo/j2ee/deployment j2ee/src/java/org/apache/geronimo/j2ee/management/impl jetty/src/java/org/apache/geronimo/jetty jetty/src/java/org/apache/geronimo/jetty/connector jetty/src/java/org/apache/geronimo/jetty/deployment jmx-remoting/src/java/org/apache/geronimo/jmxremoting kernel/src/java/org/apache/geronimo/kernel/config kernel/src/test/org/apache/geronimo/gbean kernel/src/test/org/apache/geronimo/kernel kernel/src/test/org/apache/geronimo/kernel/config mail/src/java/org/apache/geronimo/mail naming/src/test/org/apache/geronimo/naming/java network/src/java/org/apache/geronimo/network remoting/src/java/org/apache/geronimo/remoting/jmx remoting/src/java/org/apache/geronimo/remoting/router remoting/src/java/org/apache/geronimo/remoting/transport security/src/java/org/apache/geronimo/security security/src/java/org/apache/geronimo/security/bridge security/src/java/org/apache/geronimo/security/jaas security/src/java/org/apache/geronimo/security/jacc security/src/java/org/apache/geronimo/security/realm/providers security/src/java/org/apache/geronimo/security/remoting/jmx security/src/test/org/apache/geronimo/security/bridge system/src/java/org/apache/geronimo/system/configuration system/src/java/org/apache/geronimo/system/logging/log4j system/src/java/org/apache/geronimo/system/logging/log4j/appender system/src/java/org/apache/geronimo/system/properties system/src/java/org/apache/geronimo/system/repository system/src/java/org/apache/geronimo/system/rmi system/src/java/org/apache/geronimo/system/serverinfo system/src/java/org/apache/geronimo/system/url timer/src/java/org/apache/geronimo/timer/jdbc timer/src/java/org/apache/geronimo/timer/vm tomcat/src/java/org/apache/geronimo/tomcat transaction/src/java/org/apache/geronimo/transaction transaction/src/java/org/apache/geronimo/transaction/context transaction/src/java/org/apache/geronimo/transaction/log transaction/src/java/org/apache/geronimo/transaction/manager
Date Sat, 30 Oct 2004 05:16:20 GMT
Author: chirino
Date: Fri Oct 29 22:16:18 2004
New Revision: 56022

Modified:
   geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGbean.java
   geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployerGbean.java
   geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
   geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java
   geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/StaticJndiContextPlugin.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContext.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContextImpl.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialRealm.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
   geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
   geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java
   geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ThreadPool.java
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java
   geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java
   geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java
   geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java
   geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
   geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
   geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
   geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoFactoryTest.java
   geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoTest.java
   geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockDynamicGBean.java
   geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockGBean.java
   geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/config/MyGBean.java
   geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java
   geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java
   geronimo/trunk/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java
   geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java
   geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java
   geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/InterceptorRegistryRouter.java
   geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXRouter.java
   geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java
   geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/AbstractPrincipalMappingUserPasswordRealmBridge.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/AbstractRealmBridge.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordRealmBridge.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordRealmBridge.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/PropertiesFilePrincipalMappingUserPasswordRealmBridge.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntry.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryLocal.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryRealmLocal.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryRealmRemote.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginService.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/AbstractModuleConfiguration.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/EJBModuleConfiguration.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/WebModuleConfiguration.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/AbstractSecurityRealm.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/KerberosSecurityRealm.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileSecurityRealm.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLSecurityRealm.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SimpleSecurityRealm.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/LoginServiceStub.java
   geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestRealm.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/AbstractAppenderService.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/ConsoleAppenderService.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/DailyRollingFileAppenderService.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/FileAppenderService.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/RollingFileAppenderService.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/url/GeronimoURLFactory.java
   geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
   geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
   geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCWorkerPersistence.java
   geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
   geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
   geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java
   geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/GeronimoTransactionManager.java
   geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/TransactionManagerProxy.java
   geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManager.java
   geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
   geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImpl.java
Log:
Renamed GBeanInfoFactory to GBeanInfoBuilder.

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGbean.java
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGbean.java	(original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGbean.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.Kernel;
@@ -62,7 +62,7 @@
     private J2EEManager j2eeManager;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("AxisGbean",
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("AxisGbean",
                 AxisGbean.class);
 
         // attributes

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployerGbean.java
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployerGbean.java	(original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployerGbean.java	Fri Oct 29 22:16:18 2004
@@ -16,7 +16,7 @@
 package org.apache.geronimo.axis;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.Kernel;
@@ -47,8 +47,8 @@
     private WebServiceDeployer wsdeployer;
 
     static {
-        GBeanInfoFactory infoFactory =
-                new GBeanInfoFactory("WebServiceDeployerGbean",
+        GBeanInfoBuilder infoFactory =
+                new GBeanInfoBuilder("WebServiceDeployerGbean",
                         WebServiceDeployerGbean.class);
 
         // attributes

Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java	(original)
+++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java	Fri Oct 29 22:16:18 2004
@@ -38,7 +38,7 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
 import org.apache.geronimo.j2ee.deployment.AppClientModule;
 import org.apache.geronimo.j2ee.deployment.EARContext;
@@ -581,7 +581,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AppClientModuleBuilder.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AppClientModuleBuilder.class);
         infoFactory.addAttribute("transactionContextManagerObjectName", ObjectName.class, true);
         infoFactory.addAttribute("connectionTrackerObjectName", ObjectName.class, true);
         infoFactory.addReference("EJBReferenceBuilder", EJBReferenceBuilder.class);

Modified: geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java
==============================================================================
--- geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java	(original)
+++ geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.transaction.context.TransactionContext;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 
@@ -95,7 +95,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AppClientContainer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AppClientContainer.class);
 
         infoFactory.addOperation("main", new Class[]{String[].class});
         infoFactory.addAttribute("mainClassName", String.class, true);

Modified: geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/StaticJndiContextPlugin.java
==============================================================================
--- geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/StaticJndiContextPlugin.java	(original)
+++ geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/StaticJndiContextPlugin.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import org.apache.geronimo.naming.java.ReadOnlyContext;
 import org.apache.geronimo.naming.java.RootContext;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * @version $Rev$ $Date$
@@ -49,7 +49,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(StaticJndiContextPlugin.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(StaticJndiContextPlugin.class);
 
         infoFactory.addAttribute("context", ReadOnlyContext.class, true);
         infoFactory.addInterface(AppClientPlugin.class);

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java	Fri Oct 29 22:16:18 2004
@@ -27,7 +27,7 @@
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.DynamicGBeanDelegate;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.transaction.manager.NamedXAResource;
 import org.apache.geronimo.transaction.manager.ResourceManager;
 import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
@@ -173,7 +173,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ActivationSpecWrapper.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ActivationSpecWrapper.class);
         infoFactory.addAttribute("activationSpecClass", Class.class, true);
         infoFactory.addAttribute("containerId", String.class, true);
 

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.DynamicGBeanDelegate;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * Wrapper around AdminObject that exposes its config-properties as GBeanAttributes and
@@ -122,7 +122,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AdminObjectWrapper.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AdminObjectWrapper.class);
         infoFactory.addAttribute("adminObjectInterface", Class.class, true);
         infoFactory.addAttribute("adminObjectClass", Class.class, true);
 

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContext.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContext.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContext.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import javax.resource.spi.work.WorkManager;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * GBean BootstrapContext implementation that refers to externally configured WorkManager
@@ -79,7 +79,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(BootstrapContext.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(BootstrapContext.class);
           //adding interface does not work, creates attributes for references???
 //        infoFactory.addInterface(javax.resource.spi.BootstrapContext.class);
 

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContextImpl.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContextImpl.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContextImpl.java	Fri Oct 29 22:16:18 2004
@@ -67,7 +67,7 @@
 //    public static final GBeanInfo GBEAN_INFO;
 //
 //    static {
-//        GBeanInfoFactory infoFactory = new GBeanInfoFactory(BootstrapContext.class);
+//        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(BootstrapContext.class);
 //          //adding interface does not work, creates attributes for references???
 ////        infoFactory.addInterface(javax.resource.spi.BootstrapContext.class);
 //

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java	Fri Oct 29 22:16:18 2004
@@ -32,7 +32,7 @@
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.DynamicGBeanDelegate;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 
@@ -137,7 +137,7 @@
     }
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ResourceAdapterWrapper.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ResourceAdapterWrapper.class);
         infoFactory.addAttribute("resourceAdapterClass", Class.class, true);
         infoFactory.addAttribute("activationSpecInfoMap", Map.class, true);
 

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java	Fri Oct 29 22:16:18 2004
@@ -55,7 +55,7 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.DynamicGAttributeInfo;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.InvalidConfigurationException;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
 import org.apache.geronimo.j2ee.deployment.ConnectorModule;
@@ -373,7 +373,7 @@
                 String resourceAdapterName = geronimoResourceAdapter.getResourceadapterInstance().getResourceadapterName();
 
                 // Create the resource adapter gbean
-                GBeanInfoFactory resourceAdapterInfoFactory = new GBeanInfoFactory("org.apache.geronimo.connector.ResourceAdapterWrapper", cl);
+                GBeanInfoBuilder resourceAdapterInfoFactory = new GBeanInfoBuilder("org.apache.geronimo.connector.ResourceAdapterWrapper", cl);
                 ConfigProperty[] configProperties = getConfigProperties(resourceadapter.getConfigPropertyArray(), geronimoResourceAdapter.getResourceadapterInstance().getConfigPropertySettingArray());
                 GBeanMBean resourceAdapterGBean = setUpDynamicGBean(resourceAdapterInfoFactory, configProperties, cl);
 
@@ -463,7 +463,7 @@
                  GerAdminobjectInstanceType gerAdminObjectInstance = gerAdminObject.getAdminobjectInstanceArray()[j];
 
                  // create the adminObjectGBean
-                 GBeanInfoFactory adminObjectInfoFactory = new GBeanInfoFactory("org.apache.geronimo.connector.AdminObjectWrapper", cl);
+                 GBeanInfoBuilder adminObjectInfoFactory = new GBeanInfoBuilder("org.apache.geronimo.connector.AdminObjectWrapper", cl);
                  ConfigProperty[] configProperties = getConfigProperties(adminObject.getConfigPropertyArray(), gerAdminObjectInstance.getConfigPropertySettingArray());
                  GBeanMBean adminObjectGBean = setUpDynamicGBean(adminObjectInfoFactory, configProperties, cl);
 
@@ -489,7 +489,7 @@
             String messageListenerInterface = messagelistenerType.getMessagelistenerType().getStringValue().trim();
             ActivationspecType activationspec = messagelistenerType.getActivationspec();
             String activationSpecClassName = activationspec.getActivationspecClass().getStringValue();
-            GBeanInfoFactory infoFactory = new GBeanInfoFactory("org.apache.geronimo.connector.ActivationSpecWrapper", cl);
+            GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("org.apache.geronimo.connector.ActivationSpecWrapper", cl);
 
             //add all javabean properties that have both getter and setter.  Ignore the "required" flag from the dd.
             BeanInfo beanInfo;
@@ -524,7 +524,7 @@
         return activationSpecInfos;
     }
 
-    private GBeanMBean setUpDynamicGBean(GBeanInfoFactory infoFactory, ConfigProperty[] configProperties, ClassLoader cl) throws DeploymentException {
+    private GBeanMBean setUpDynamicGBean(GBeanInfoBuilder infoFactory, ConfigProperty[] configProperties, ClassLoader cl) throws DeploymentException {
         for (int i = 0; i < configProperties.length; i++) {
             infoFactory.addAttribute(new DynamicGAttributeInfo(configProperties[i].getName(), true));
         }
@@ -702,7 +702,7 @@
         ObjectName connectionManagerObjectName = configureConnectionManager(earContext, j2eeContext, connectiondefinitionInstance, cl);
 
         // ManagedConnectionFactory
-        GBeanInfoFactory managedConnectionFactoryInfoFactory = new GBeanInfoFactory("org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper", cl);
+        GBeanInfoBuilder managedConnectionFactoryInfoFactory = new GBeanInfoBuilder("org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper", cl);
         GBeanMBean managedConnectionFactoryGBean = setUpDynamicGBean(managedConnectionFactoryInfoFactory, configProperties, cl);
         try {
             managedConnectionFactoryGBean.setAttribute("managedConnectionFactoryClass", cl.loadClass(managedConnectionFactoryClass));
@@ -832,7 +832,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConnectorModuleBuilder.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConnectorModuleBuilder.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addInterface(ModuleBuilder.class);
         infoFactory.addInterface(ResourceReferenceBuilder.class);

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/JCAConnectionFactoryImpl.java	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.management.J2EEServer;
 import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -78,7 +78,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JCAConnectionFactoryImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JCAConnectionFactoryImpl.class);
         infoFactory.addReference("J2EEServer", J2EEServer.class);
 
         infoFactory.addAttribute("objectName", String.class, false);

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java	Fri Oct 29 22:16:18 2004
@@ -25,7 +25,7 @@
 import org.apache.geronimo.connector.deployment.dconfigbean.ResourceAdapter_1_0DConfigRoot;
 import org.apache.geronimo.deployment.ModuleConfigurer;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  *
@@ -52,7 +52,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(RARConfigurer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(RARConfigurer.class);
         infoFactory.addInterface(ModuleConfigurer.class);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ResourceAdapterModuleImpl.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.management.J2EEApplication;
 import org.apache.geronimo.j2ee.management.J2EEServer;
 import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
@@ -109,7 +109,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ResourceAdapterModuleImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ResourceAdapterModuleImpl.class);
         infoFactory.addReference("J2EEServer", J2EEServer.class);
         infoFactory.addReference("J2EEApplication", J2EEApplication.class);
 

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import javax.resource.spi.ManagedConnectionFactory;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.transaction.manager.NamedXAResource;
 
 /**
@@ -129,7 +129,7 @@
 
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AbstractConnectionManager.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AbstractConnectionManager.class);
 
         infoFactory.addInterface(ConnectionManagerFactory.class);
         infoFactory.addInterface(PoolingAttributes.class);

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.bridge.RealmBridge;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 
@@ -119,7 +119,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(GenericConnectionManager.class, AbstractConnectionManager.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(GenericConnectionManager.class, AbstractConnectionManager.GBEAN_INFO);
 
         infoFactory.addAttribute("name", String.class, true);
         infoFactory.addAttribute("transactionSupport", TransactionSupport.class, true);

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java	Fri Oct 29 22:16:18 2004
@@ -34,7 +34,7 @@
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.DynamicGBeanDelegate;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.Kernel;
@@ -285,7 +285,7 @@
 
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ManagedConnectionFactoryWrapper.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ManagedConnectionFactoryWrapper.class);
 
         infoFactory.addAttribute("managedConnectionFactoryClass", Class.class, true);
         infoFactory.addAttribute("connectionFactoryInterface", Class.class, true);

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java	Fri Oct 29 22:16:18 2004
@@ -29,7 +29,7 @@
 import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
 import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.transaction.InstanceContext;
 import org.apache.geronimo.transaction.TrackedConnectionAssociator;
 
@@ -145,7 +145,7 @@
     }
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConnectionTrackingCoordinator.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConnectionTrackingCoordinator.class);
         infoFactory.addInterface(TrackedConnectionAssociator.class);
         infoFactory.addInterface(ConnectionTracker.class);
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialRealm.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialRealm.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialRealm.java	Fri Oct 29 22:16:18 2004
@@ -25,7 +25,7 @@
 import javax.security.auth.login.AppConfigurationEntry;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.GeronimoSecurityException;
 import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.geronimo.security.realm.providers.AbstractSecurityRealm;
@@ -93,7 +93,7 @@
     }
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(PasswordCredentialRealm.class, AbstractSecurityRealm.getGBeanInfo());
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(PasswordCredentialRealm.class, AbstractSecurityRealm.getGBeanInfo());
         infoFactory.addInterface(ManagedConnectionFactoryListener.class);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java	Fri Oct 29 22:16:18 2004
@@ -31,7 +31,7 @@
 
 import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.transaction.manager.LogException;
@@ -204,7 +204,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JDBCLog.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JDBCLog.class);
 
         infoFactory.addAttribute("systemId", String.class, true);
 

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java	(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java	Fri Oct 29 22:16:18 2004
@@ -33,7 +33,7 @@
 import org.apache.geronimo.connector.work.pool.WorkExecutor;
 import org.apache.geronimo.connector.work.pool.WorkExecutorPool;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
@@ -253,7 +253,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(GeronimoWorkManager.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(GeronimoWorkManager.class);
         infoFactory.addInterface(WorkManager.class);
 
         infoFactory.addAttribute("syncMaximumPoolSize", Integer.TYPE, true);

Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
==============================================================================
--- geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java	(original)
+++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java	Fri Oct 29 22:16:18 2004
@@ -40,7 +40,7 @@
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTransactions;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
 import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.J2eeContextImpl;
@@ -196,7 +196,7 @@
         static final GBeanInfo GBEAN_INFO;
 
         static {
-            GBeanInfoFactory infoFactory = new GBeanInfoFactory(MockConnectionTrackingCoordinator.class);
+            GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(MockConnectionTrackingCoordinator.class);
             infoFactory.addInterface(ConnectionTracker.class);
             GBEAN_INFO = infoFactory.getBeanInfo();
         }

Modified: geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java
==============================================================================
--- geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java	(original)
+++ geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 
@@ -80,7 +80,7 @@
     private static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ClockPool.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ClockPool.class);
 
         infoFactory.addAttribute("poolName", String.class, true);
 

Modified: geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ThreadPool.java
==============================================================================
--- geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ThreadPool.java	(original)
+++ geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ThreadPool.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 
@@ -106,7 +106,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ThreadPool.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ThreadPool.class);
 
         infoFactory.addAttribute("keepAliveTime", long.class, true);
         infoFactory.addAttribute("poolSize", int.class, true);

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java	(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java	Fri Oct 29 22:16:18 2004
@@ -37,7 +37,7 @@
 import org.apache.commons.cli.PosixParser;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 
@@ -329,7 +329,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(Deployer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(Deployer.class);
 
         infoFactory.addOperation("deploy", new Class[]{String[].class});
         infoFactory.addOperation("deploy", new Class[]{File.class, File.class});

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java	(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/application/EARConfigurer.java	Fri Oct 29 22:16:18 2004
@@ -23,7 +23,7 @@
 
 import org.apache.geronimo.deployment.ModuleConfigurer;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  *
@@ -42,7 +42,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(EARConfigurer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(EARConfigurer.class);
         infoFactory.addInterface(ModuleConfigurer.class);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java	(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java	Fri Oct 29 22:16:18 2004
@@ -39,7 +39,7 @@
 import org.apache.geronimo.deployment.xbeans.GbeanType;
 import org.apache.geronimo.deployment.xbeans.ServiceDocument;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Repository;
@@ -194,7 +194,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ServiceConfigBuilder.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ServiceConfigBuilder.class);
 
         infoFactory.addInterface(ConfigurationBuilder.class);
 

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java	(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java	Fri Oct 29 22:16:18 2004
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogEntry;
 import org.apache.xml.resolver.CatalogException;
@@ -396,7 +396,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("configurable local entity resolver", LocalEntityResolver.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("configurable local entity resolver", LocalEntityResolver.class);
 
         infoFactory.addAttribute("catalogFileURI", URI.class, true);
         infoFactory.addAttribute("localRepositoryURI", URI.class, true);

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java	(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
@@ -89,7 +89,7 @@
     public final static GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Factory for constructing suitable configured xml parsers", ParserFactoryImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Factory for constructing suitable configured xml parsers", ParserFactoryImpl.class);
 
         infoFactory.addOperation("getParser");
 

Modified: geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java	(original)
+++ geronimo/trunk/modules/deployment/src/test/org/apache/geronimo/deployment/MockGBean.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.deployment;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  *
@@ -78,7 +78,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("MockGBean", MockGBean.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("MockGBean", MockGBean.class);
 
         infoFactory.addAttribute("name", String.class, true);
         infoFactory.addAttribute("value", String.class, true);

Modified: geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java
==============================================================================
--- geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java	(original)
+++ geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.derby.drda.NetworkServerControl;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 
@@ -86,7 +86,7 @@
     }
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(DerbyNetworkGBean.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(DerbyNetworkGBean.class);
         infoFactory.addAttribute("host", String.class, true);
         infoFactory.addAttribute("port", Integer.TYPE, true);
         infoFactory.addReference("derbySystem", DerbySystem.class);

Modified: geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
==============================================================================
--- geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java	(original)
+++ geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java	Fri Oct 29 22:16:18 2004
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -89,7 +89,7 @@
     }
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(DerbySystemGBean.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(DerbySystemGBean.class);
         infoFactory.addAttribute("derbySystemHome", String.class, true);
         infoFactory.addReference("serverInfo", ServerInfo.class);
         infoFactory.setConstructor(new String[]{"serverInfo", "derbySystemHome"});

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java	(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java	Fri Oct 29 22:16:18 2004
@@ -43,7 +43,7 @@
 import org.apache.geronimo.deployment.util.NestedJarFile;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
 import org.apache.geronimo.j2ee.ApplicationInfo;
 import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.NameFactory;
@@ -537,7 +537,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(EARConfigBuilder.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(EARConfigBuilder.class);
         infoFactory.addAttribute("j2eeServer", ObjectName.class, true);
         infoFactory.addAttribute("transactionContextManagerObjectName", ObjectName.class, true);
         infoFactory.addAttribute("connectionTrackerObjectName", ObjectName.class, true);

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java	(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEAppClientModuleImpl.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 import javax.naming.Context;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.management.J2EEApplication;
 import org.apache.geronimo.j2ee.management.J2EEServer;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -104,7 +104,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(J2EEAppClientModuleImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(J2EEAppClientModuleImpl.class);
         infoFactory.addReference("J2EEServer", J2EEServer.class);
         infoFactory.addReference("J2EEApplication", J2EEApplication.class);
 

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java	(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEApplicationImpl.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.management.J2EEServer;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -91,7 +91,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(J2EEApplicationImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(J2EEApplicationImpl.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);
         infoFactory.addReference("j2eeServer", J2EEServer.class);

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java	(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEDomainImpl.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 
@@ -68,7 +68,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(J2EEDomainImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(J2EEDomainImpl.class);
 
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java	(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -98,7 +98,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(J2EEServerImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(J2EEServerImpl.class);
 
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java	(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 import java.net.UnknownHostException;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  *
@@ -94,7 +94,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JVMImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JVMImpl.class);
 
         infoFactory.addAttribute("javaVersion", String.class, false);
         infoFactory.addAttribute("javaVendor", String.class, false);

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java	Fri Oct 29 22:16:18 2004
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.security.ContextManager;
@@ -171,7 +171,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty Realm", JAASJettyRealm.class.getName());
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty Realm", JAASJettyRealm.class.getName());
         infoFactory.setConstructor(new String[]{"JettyContainer"});
         infoFactory.addReference("JettyContainer", JettyContainer.class);
         infoFactory.addAttribute("name", String.class, true);

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import org.mortbay.jetty.Server;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 
@@ -161,7 +161,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty Web Container", JettyContainerImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty Web Container", JettyContainerImpl.class);
         infoFactory.addAttribute("collectStatistics", Boolean.TYPE, true);
         infoFactory.addAttribute("collectStatisticsStarted", Long.TYPE, false);
         infoFactory.addAttribute("connections", Integer.TYPE, false);

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java	Fri Oct 29 22:16:18 2004
@@ -31,7 +31,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.naming.java.ReadOnlyContext;
@@ -349,7 +349,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty WebApplication Context", JettyWebAppContext.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty WebApplication Context", JettyWebAppContext.class);
 
         infoFactory.addAttribute("uri", URI.class, true);
         infoFactory.addAttribute("componentContext", ReadOnlyContext.class, true);

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppJACCContext.java	Fri Oct 29 22:16:18 2004
@@ -40,7 +40,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.naming.java.ReadOnlyContext;
 import org.apache.geronimo.security.ContextManager;
@@ -495,7 +495,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty JACC WebApplication Context", JettyWebAppJACCContext.class, JettyWebAppContext.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty JACC WebApplication Context", JettyWebAppJACCContext.class, JettyWebAppContext.GBEAN_INFO);
 
         infoFactory.addAttribute("policyContextID", String.class, true);
         infoFactory.addAttribute("securityConfig", Security.class, true);

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.jetty.connector;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.jetty.JettyContainer;
 import org.mortbay.http.ajp.AJP13Listener;
 
@@ -33,7 +33,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty AJP13 Connector", AJP13Connector.class, JettyConnector.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty AJP13 Connector", AJP13Connector.class, JettyConnector.GBEAN_INFO);
         infoFactory.setConstructor(new String[]{"JettyContainer"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.jetty.connector;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.jetty.JettyContainer;
 import org.mortbay.http.SocketListener;
 
@@ -33,7 +33,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty HTTP Connector", HTTPConnector.class, JettyConnector.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty HTTP Connector", HTTPConnector.class, JettyConnector.GBEAN_INFO);
         infoFactory.setConstructor(new String[]{"JettyContainer"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.jetty.connector;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.jetty.JettyContainer;
 import org.mortbay.http.SunJsseListener;
 
@@ -33,7 +33,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty HTTPS Connector", HTTPSConnector.class, JettyConnector.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty HTTPS Connector", HTTPSConnector.class, JettyConnector.GBEAN_INFO);
         infoFactory.setConstructor(new String[]{"JettyContainer"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.jetty.connector;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.jetty.JettyContainer;
@@ -78,7 +78,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty HTTP Connector", JettyConnector.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Jetty HTTP Connector", JettyConnector.class);
         infoFactory.addAttribute("port", int.class, true);
         infoFactory.addReference("JettyContainer", JettyContainer.class);
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java	Fri Oct 29 22:16:18 2004
@@ -35,7 +35,7 @@
 import org.apache.geronimo.deployment.service.GBeanHelper;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
@@ -500,7 +500,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JettyModuleBuilder.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JettyModuleBuilder.class);
         infoFactory.addInterface(ModuleBuilder.class);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java	(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java	Fri Oct 29 22:16:18 2004
@@ -23,7 +23,7 @@
 
 import org.apache.geronimo.deployment.ModuleConfigurer;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * @version $Rev$ $Date$
@@ -40,7 +40,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(WARConfigurer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(WARConfigurer.class);
         infoFactory.addInterface(ModuleConfigurer.class);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
==============================================================================
--- geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java	(original)
+++ geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java	Fri Oct 29 22:16:18 2004
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.Kernel;
@@ -129,7 +129,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JMXConnector.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JMXConnector.class);
         infoFactory.addAttribute("URL", String.class, true);
         infoFactory.addAttribute("applicationConfigName", String.class, true);
         infoFactory.addAttribute("kernel", Kernel.class, false);

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java	(original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java	Fri Oct 29 22:16:18 2004
@@ -44,7 +44,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
@@ -410,7 +410,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(Configuration.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(Configuration.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);
         infoFactory.addAttribute("ID", URI.class, true);

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java	(original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java	Fri Oct 29 22:16:18 2004
@@ -34,7 +34,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
 import org.apache.geronimo.kernel.Kernel;
@@ -252,7 +252,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConfigurationManagerImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConfigurationManagerImpl.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addReference("Stores", ConfigurationStore.class);
         infoFactory.addInterface(ConfigurationManager.class);

Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoFactoryTest.java
==============================================================================
--- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoFactoryTest.java	(original)
+++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoFactoryTest.java	Fri Oct 29 22:16:18 2004
@@ -29,62 +29,62 @@
 public class GBeanInfoFactoryTest extends TestCase {
 
     /*
-     * void GBeanInfoFactory(String)
+     * void GBeanInfoBuilder(String)
      */
     public void testGBeanInfoFactoryString() {
-        assertNotNull(new GBeanInfoFactory(""));
+        assertNotNull(new GBeanInfoBuilder(""));
         try {
-            new GBeanInfoFactory((String) null);
+            new GBeanInfoBuilder((String) null);
             fail("IllegalArgumentException expected");
         } catch (IllegalArgumentException expected) {
         }
 
         final String gbeanName = "gbeanName";
-        GBeanInfoFactory gbeanInfoFactory = new GBeanInfoFactory(gbeanName);
+        GBeanInfoBuilder gbeanInfoFactory = new GBeanInfoBuilder(gbeanName);
         assertEquals(gbeanName, gbeanInfoFactory.getBeanInfo().getName());
         assertEquals(gbeanName, gbeanInfoFactory.getBeanInfo().getClassName());
     }
 
     /*
-     * void GBeanInfoFactory(Class)
+     * void GBeanInfoBuilder(Class)
      */
     public void testGBeanInfoFactoryClass() {
-        assertNotNull(new GBeanInfoFactory(String.class));
+        assertNotNull(new GBeanInfoBuilder(String.class));
         try {
-            new GBeanInfoFactory((Class) null);
+            new GBeanInfoBuilder((Class) null);
             fail("IllegalArgumentException expected");
         } catch (IllegalArgumentException expected) {
         }
 
         final Class className = String.class;
-        GBeanInfoFactory gbeanInfoFactory = new GBeanInfoFactory(className);
+        GBeanInfoBuilder gbeanInfoFactory = new GBeanInfoBuilder(className);
         assertEquals(className.getName(), gbeanInfoFactory.getBeanInfo().getName());
         assertEquals(className.getName(), gbeanInfoFactory.getBeanInfo().getClassName());
     }
 
     /*
-     * test for void GBeanInfoFactory(Class, String)
+     * test for void GBeanInfoBuilder(Class, String)
      */
     public void testGBeanInfoFactoryClassString() {
         try {
-            new GBeanInfoFactory((Class) null, null);
+            new GBeanInfoBuilder((Class) null, null);
             fail("IllegalArgumentException expected");
         } catch (IllegalArgumentException expected) {
         }
     }
 
     /*
-     * test for void GBeanInfoFactory(Class, GBeanInfo)
+     * test for void GBeanInfoBuilder(Class, GBeanInfo)
      */
     public void testGBeanInfoFactoryClassGBeanInfo() {
         try {
-            new GBeanInfoFactory((Class) null, (GBeanInfo) null);
+            new GBeanInfoBuilder((Class) null, (GBeanInfo) null);
             fail("IllegalArgumentException expected");
         } catch (IllegalArgumentException expected) {
         }
 
         final Class className = String.class;
-        GBeanInfoFactory gbeanInfoFactory = new GBeanInfoFactory(className, MockGBean.getGBeanInfo());
+        GBeanInfoBuilder gbeanInfoFactory = new GBeanInfoBuilder(className, MockGBean.getGBeanInfo());
         assertEquals(className.getName(), gbeanInfoFactory.getBeanInfo().getName());
         assertEquals(className.getName(), gbeanInfoFactory.getBeanInfo().getClassName());
         assertTrue(gbeanInfoFactory.getBeanInfo().getAttributes().isEmpty());
@@ -95,20 +95,20 @@
      * Class to test for void addInterface(Class)
      */
     public void testAddInterfaceClass() {
-        GBeanInfoFactory gbeanInfoFactory;
+        GBeanInfoBuilder gbeanInfoFactory;
 
-        gbeanInfoFactory = new GBeanInfoFactory("");
+        gbeanInfoFactory = new GBeanInfoBuilder("");
         gbeanInfoFactory.addInterface(Serializable.class);
         assertTrue(gbeanInfoFactory.getBeanInfo().getAttributes().size() == 0);
         assertTrue(gbeanInfoFactory.getBeanInfo().getOperations().size() == 0);
 
-        gbeanInfoFactory = new GBeanInfoFactory("");
+        gbeanInfoFactory = new GBeanInfoBuilder("");
         gbeanInfoFactory.addInterface(GBeanLifecycle.class);
         GBeanInfo gbeanInfo = gbeanInfoFactory.getBeanInfo();
         assertTrue(gbeanInfo.getAttributes().size() == 0);
         assertTrue(gbeanInfo.getOperations().size() == 3);
 
-        gbeanInfoFactory = new GBeanInfoFactory("");
+        gbeanInfoFactory = new GBeanInfoBuilder("");
         gbeanInfoFactory.addInterface(SetterOnlyInterface.class);
         gbeanInfo = gbeanInfoFactory.getBeanInfo();
         assertEquals(1, gbeanInfo.getAttributes().size());
@@ -151,7 +151,7 @@
         public static final GBeanInfo GBEAN_INFO;
 
         static {
-            GBeanInfoFactory infoFactory = new GBeanInfoFactory(MockGBean.class);
+            GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(MockGBean.class);
             infoFactory.setConstructor(new String[]{"foo", "bar"});
             infoFactory.addNotification(notificationInfo);
             infoFactory.addReference(refInfo);

Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoTest.java
==============================================================================
--- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoTest.java	(original)
+++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/GBeanInfoTest.java	Fri Oct 29 22:16:18 2004
@@ -147,7 +147,7 @@
         public static final GBeanInfo GBEAN_INFO;
 
         static {
-            GBeanInfoFactory infoFactory = new GBeanInfoFactory(MockGBean.class);
+            GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(MockGBean.class);
 
             infoFactory.addAttribute(nonPersistentAttrInfo);
             infoFactory.addAttribute(persistentAttrInfo);

Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockDynamicGBean.java
==============================================================================
--- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockDynamicGBean.java	(original)
+++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockDynamicGBean.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * @version $Rev$ $Date$
@@ -58,7 +58,7 @@
     }
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("MockDynamicGBean", MockDynamicGBean.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("MockDynamicGBean", MockDynamicGBean.class);
         infoFactory.addAttribute("mutableInt", Integer.class, false);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockGBean.java
==============================================================================
--- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockGBean.java	(original)
+++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/MockGBean.java	Fri Oct 29 22:16:18 2004
@@ -23,7 +23,7 @@
 import java.util.Iterator;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycleController;
 
 /**
@@ -59,7 +59,7 @@
     }
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory("MockGBean", MockGBean.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("MockGBean", MockGBean.class);
         infoFactory.addAttribute("name", String.class, true);
         infoFactory.addAttribute("actualObjectName", String.class, false);
         infoFactory.addAttribute("objectName", String.class, false);

Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/config/MyGBean.java
==============================================================================
--- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/config/MyGBean.java	(original)
+++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/config/MyGBean.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.kernel.config;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * 
@@ -32,7 +32,7 @@
 
     public static final GBeanInfo GBEAN_INFO;
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(MyGBean.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(MyGBean.class);
         infoFactory.addOperation("main", new Class[] {String[].class});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java
==============================================================================
--- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java	(original)
+++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 
@@ -102,7 +102,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(MailGBean.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(MailGBean.class);
 
         infoFactory.addAttribute("useDefault", Boolean.TYPE, true);
         infoFactory.addAttribute("properties", Properties.class, true);

Modified: geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java
==============================================================================
--- geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java	(original)
+++ geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java	Fri Oct 29 22:16:18 2004
@@ -29,7 +29,7 @@
 
 import junit.framework.TestCase;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
 import org.apache.geronimo.kernel.Kernel;
 
@@ -153,7 +153,7 @@
     }
 
     public GBeanInfo getGbeanInfo() {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(TestProxyFactory.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TestProxyFactory.class);
         infoFactory.addAttribute("Content", Object.class, true);
         infoFactory.addOperation("getProxy");
         infoFactory.setConstructor(new String[]{"Content"});

Modified: geronimo/trunk/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java
==============================================================================
--- geronimo/trunk/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java	(original)
+++ geronimo/trunk/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java	Fri Oct 29 22:16:18 2004
@@ -30,7 +30,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.pool.ThreadPool;
@@ -263,7 +263,7 @@
     private static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(SelectorManager.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SelectorManager.class);
 
         infoFactory.addAttribute("timeout", long.class, true);
         infoFactory.addReference("ThreadPool", ThreadPool.class);

Modified: geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java
==============================================================================
--- geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java	(original)
+++ geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/jmx/MBeanServerStub.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 
 import org.apache.geronimo.core.service.Interceptor;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -82,7 +82,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(MBeanServerStub.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(MBeanServerStub.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);
         infoFactory.addOperation("getRemotingEndpointInterceptor");

Modified: geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java
==============================================================================
--- geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java	(original)
+++ geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/AbstractInterceptorRouter.java	Fri Oct 29 22:16:18 2004
@@ -26,7 +26,7 @@
 import org.apache.geronimo.core.service.InvocationResult;
 import org.apache.geronimo.core.service.SimpleInvocation;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.remoting.InvocationSupport;
 import org.apache.geronimo.remoting.MarshalledObject;
@@ -112,7 +112,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AbstractInterceptorRouter.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AbstractInterceptorRouter.class);
         infoFactory.addOperation("sendRequest", new Class[]{URI.class, Msg.class});
         infoFactory.addOperation("sendDatagram", new Class[]{URI.class, Msg.class});
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/InterceptorRegistryRouter.java
==============================================================================
--- geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/InterceptorRegistryRouter.java	(original)
+++ geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/InterceptorRegistryRouter.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 
 import org.apache.geronimo.core.service.Interceptor;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.remoting.InterceptorRegistry;
 
 /**
@@ -60,7 +60,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(InterceptorRegistryRouter.class, AbstractInterceptorRouter.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(InterceptorRegistryRouter.class, AbstractInterceptorRouter.GBEAN_INFO);
         infoFactory.addReference("SubsystemRouter", SubsystemRouter.class);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXRouter.java
==============================================================================
--- geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXRouter.java	(original)
+++ geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/JMXRouter.java	Fri Oct 29 22:16:18 2004
@@ -27,7 +27,7 @@
 
 import org.apache.geronimo.core.service.Interceptor;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * Uses JMX Object names to route the request to a JMX object that implements the
@@ -85,7 +85,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JMXRouter.class, AbstractInterceptorRouter.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JMXRouter.class, AbstractInterceptorRouter.GBEAN_INFO);
         infoFactory.addReference("SubsystemRouter", SubsystemRouter.class);
         infoFactory.addOperation("register", new Class[]{ObjectName.class, JMXTarget.class});
         infoFactory.addOperation("unregister", new Class[]{ObjectName.class});

Modified: geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java
==============================================================================
--- geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java	(original)
+++ geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/router/SubsystemRouter.java	Fri Oct 29 22:16:18 2004
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * @version $Rev$ $Date$
@@ -74,7 +74,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(SubsystemRouter.class, AbstractInterceptorRouter.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SubsystemRouter.class, AbstractInterceptorRouter.GBEAN_INFO);
         infoFactory.addOperation("addRoute", new Class[]{String.class, Router.class});
         infoFactory.addOperation("removeRoute", new Class[]{String.class});
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java
==============================================================================
--- geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java	(original)
+++ geronimo/trunk/modules/remoting/src/java/org/apache/geronimo/remoting/transport/TransportLoader.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.remoting.router.Router;
 
@@ -90,7 +90,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(TransportLoader.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TransportLoader.class);
 
         infoFactory.addAttribute("clientConnectURI", URI.class, false);
         infoFactory.addAttribute("bindURI", URI.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityService.java	Fri Oct 29 22:16:18 2004
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -137,7 +137,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(SecurityService.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SecurityService.class);
 
         infoFactory.addAttribute("policyConfigurationFactory", String.class, true);
 

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/AbstractPrincipalMappingUserPasswordRealmBridge.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/AbstractPrincipalMappingUserPasswordRealmBridge.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/AbstractPrincipalMappingUserPasswordRealmBridge.java	Fri Oct 29 22:16:18 2004
@@ -29,7 +29,7 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 
 /**
@@ -155,7 +155,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(CallerIdentityUserPasswordRealmBridge.class, AbstractRealmBridge.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CallerIdentityUserPasswordRealmBridge.class, AbstractRealmBridge.GBEAN_INFO);
 
         infoFactory.addAttribute("principalSourceType", Class.class, true);
         infoFactory.addAttribute("principalTargetCallbackName", String.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/AbstractRealmBridge.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/AbstractRealmBridge.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/AbstractRealmBridge.java	Fri Oct 29 22:16:18 2004
@@ -23,7 +23,7 @@
 import javax.security.auth.login.LoginException;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 
 /**
@@ -59,7 +59,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AbstractRealmBridge.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AbstractRealmBridge.class);
         infoFactory.addAttribute("targetRealm", String.class, true);
         infoFactory.setConstructor(new String[]{"targetRealm"});
         infoFactory.addOperation("mapSubject", new Class[] {Subject.class});

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordRealmBridge.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordRealmBridge.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/CallerIdentityUserPasswordRealmBridge.java	Fri Oct 29 22:16:18 2004
@@ -26,7 +26,7 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.realm.providers.GeronimoPasswordCredential;
 
 
@@ -70,7 +70,7 @@
     }
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(CallerIdentityUserPasswordRealmBridge.class, AbstractRealmBridge.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(CallerIdentityUserPasswordRealmBridge.class, AbstractRealmBridge.GBEAN_INFO);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordRealmBridge.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordRealmBridge.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/ConfiguredIdentityUserPasswordRealmBridge.java	Fri Oct 29 22:16:18 2004
@@ -25,7 +25,7 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 
 /**
@@ -85,7 +85,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConfiguredIdentityUserPasswordRealmBridge.class, AbstractRealmBridge.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConfiguredIdentityUserPasswordRealmBridge.class, AbstractRealmBridge.GBEAN_INFO);
         infoFactory.addAttribute("configuredUser", String.class, true);
         infoFactory.addAttribute("configuredPassword", String.class, true);
         infoFactory.setConstructor(new String[]{"targetRealm", "configuredUser", "configuredPassword"});

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/PropertiesFilePrincipalMappingUserPasswordRealmBridge.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/PropertiesFilePrincipalMappingUserPasswordRealmBridge.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/bridge/PropertiesFilePrincipalMappingUserPasswordRealmBridge.java	Fri Oct 29 22:16:18 2004
@@ -25,7 +25,7 @@
 import java.util.StringTokenizer;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 
 /**
@@ -93,7 +93,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(PropertiesFilePrincipalMappingUserPasswordRealmBridge.class, AbstractPrincipalMappingUserPasswordRealmBridge.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(PropertiesFilePrincipalMappingUserPasswordRealmBridge.class, AbstractPrincipalMappingUserPasswordRealmBridge.GBEAN_INFO);
         infoFactory.addAttribute("propertyFileURL", URL.class, true);
         infoFactory.setConstructor(new String[]{"targetRealm", "principalSourceType", "principalTargetCallbackName", "userNameSourceType", "userNameTargetCallbackName", "passwordSourceType", "propertyFileURL"});
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntry.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntry.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntry.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 import javax.security.auth.login.AppConfigurationEntry;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.gbean.jmx.GBeanMBeanLifecycleController;
@@ -104,7 +104,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConfigurationEntry.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConfigurationEntry.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("applicationConfigName", String.class, true);
         infoFactory.addAttribute("controlFlag", LoginModuleControlFlag.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryLocal.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryLocal.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryLocal.java	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import javax.security.auth.login.AppConfigurationEntry;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.Kernel;
 
 
@@ -68,7 +68,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConfigurationEntryLocal.class, ConfigurationEntry.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConfigurationEntryLocal.class, ConfigurationEntry.GBEAN_INFO);
         infoFactory.addAttribute("loginModuleName", String.class, true);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryRealmLocal.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryRealmLocal.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryRealmLocal.java	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import javax.security.auth.login.AppConfigurationEntry;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.Kernel;
 
@@ -80,7 +80,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConfigurationEntryRealmLocal.class, ConfigurationEntry.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConfigurationEntryRealmLocal.class, ConfigurationEntry.GBEAN_INFO);
         infoFactory.addAttribute("realmName", String.class, true);
 
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryRealmRemote.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryRealmRemote.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/ConfigurationEntryRealmRemote.java	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import javax.security.auth.login.AppConfigurationEntry;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.Kernel;
 
@@ -79,7 +79,7 @@
     private static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConfigurationEntryRealmRemote.class, ConfigurationEntryRealmLocal.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConfigurationEntryRealmRemote.class, ConfigurationEntryRealmLocal.GBEAN_INFO);
         infoFactory.addAttribute("URI", String.class, true);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java	Fri Oct 29 22:16:18 2004
@@ -23,7 +23,7 @@
 import javax.security.auth.login.Configuration;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.security.SecurityService;
@@ -88,7 +88,7 @@
     private static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(GeronimoLoginConfiguration.class.getName());
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(GeronimoLoginConfiguration.class.getName());
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 }

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginService.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginService.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginService.java	Fri Oct 29 22:16:18 2004
@@ -48,7 +48,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -437,7 +437,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(LoginService.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(LoginService.class);
 
         infoFactory.addOperation("getAppConfigurationEntry", new Class[]{String.class});
         infoFactory.addOperation("allocateLoginModule", new Class[]{String.class});

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/AbstractModuleConfiguration.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/AbstractModuleConfiguration.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/AbstractModuleConfiguration.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import javax.security.jacc.PolicyContextException;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.security.GeronimoSecurityException;
 
@@ -245,7 +245,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AbstractModuleConfiguration.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AbstractModuleConfiguration.class);
 
         infoFactory.addAttribute("contextID", String.class, true);
         infoFactory.addAttribute("roles", HashSet.class, true); //??persistent

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/EJBModuleConfiguration.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/EJBModuleConfiguration.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/EJBModuleConfiguration.java	Fri Oct 29 22:16:18 2004
@@ -28,7 +28,7 @@
 import noNamespace.RoleType;
 import noNamespace.SecurityType;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.GeronimoSecurityException;
 import org.apache.geronimo.security.RealmPrincipal;
 import org.apache.geronimo.security.util.ConfigurationUtil;
@@ -116,7 +116,7 @@
     private static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(EJBModuleConfiguration.class, AbstractModuleConfiguration.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(EJBModuleConfiguration.class, AbstractModuleConfiguration.GBEAN_INFO);
         infoFactory.addAttribute("EJBJar", EjbJarType.class, true);
         infoFactory.addAttribute("security", SecurityType.class, true);
         infoFactory.setConstructor(new String[]{"contextID", "EJBJar", "security"});

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/WebModuleConfiguration.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/WebModuleConfiguration.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jacc/WebModuleConfiguration.java	Fri Oct 29 22:16:18 2004
@@ -28,7 +28,7 @@
 import noNamespace.RoleType;
 import noNamespace.SecurityType;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.GeronimoSecurityException;
 import org.apache.geronimo.security.RealmPrincipal;
 import org.apache.geronimo.security.util.ConfigurationUtil;
@@ -120,7 +120,7 @@
     private static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(WebModuleConfiguration.class, AbstractModuleConfiguration.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(WebModuleConfiguration.class, AbstractModuleConfiguration.GBEAN_INFO);
         //TODO make sure this attribute not backed by a getter or setter works.
         infoFactory.addAttribute("webApp", WebAppType.class, true);
         infoFactory.addAttribute("security", SecurityType.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/AbstractSecurityRealm.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/AbstractSecurityRealm.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/AbstractSecurityRealm.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.security.realm.providers;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.security.realm.SecurityRealm;
 import org.apache.regexp.RE;
@@ -70,7 +70,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AbstractSecurityRealm.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AbstractSecurityRealm.class);
 
         infoFactory.addAttribute("realmName", String.class, true);
         infoFactory.addAttribute("maxLoginModuleAge", long.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/KerberosSecurityRealm.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/KerberosSecurityRealm.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/KerberosSecurityRealm.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.GeronimoSecurityException;
 import org.apache.regexp.RE;
 
@@ -238,7 +238,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(KerberosSecurityRealm.class, AbstractSecurityRealm.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(KerberosSecurityRealm.class, AbstractSecurityRealm.GBEAN_INFO);
 
         infoFactory.addAttribute("debug", boolean.class, true);
         infoFactory.addAttribute("storeKey", boolean.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileSecurityRealm.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileSecurityRealm.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileSecurityRealm.java	Fri Oct 29 22:16:18 2004
@@ -30,7 +30,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.GeronimoSecurityException;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.regexp.RE;
@@ -197,7 +197,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(PropertiesFileSecurityRealm.class, AbstractSecurityRealm.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(PropertiesFileSecurityRealm.class, AbstractSecurityRealm.GBEAN_INFO);
 
         infoFactory.addAttribute("usersURI", URI.class, true);
         infoFactory.addAttribute("groupsURI", URI.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLSecurityRealm.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLSecurityRealm.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SQLSecurityRealm.java	Fri Oct 29 22:16:18 2004
@@ -33,7 +33,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.GeronimoSecurityException;
 import org.apache.regexp.RE;
 
@@ -290,7 +290,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(SQLSecurityRealm.class, AbstractSecurityRealm.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SQLSecurityRealm.class, AbstractSecurityRealm.GBEAN_INFO);
 
         infoFactory.addAttribute("connectionURL", String.class, true);
         infoFactory.addAttribute("user", String.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SimpleSecurityRealm.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SimpleSecurityRealm.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/providers/SimpleSecurityRealm.java	Fri Oct 29 22:16:18 2004
@@ -25,12 +25,12 @@
 import org.apache.regexp.RE;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.GeronimoSecurityException;
 
 
 /**
- * @version $Revision: $ $Date$
+ * @version $Revision$ $Date$
  */
 public class SimpleSecurityRealm extends AbstractSecurityRealm {
 
@@ -128,7 +128,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(SimpleSecurityRealm.class, AbstractSecurityRealm.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SimpleSecurityRealm.class, AbstractSecurityRealm.GBEAN_INFO);
 
         infoFactory.addAttribute("loginModuleName", String.class, true);
         infoFactory.addAttribute("options", Properties.class, true);

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/LoginServiceStub.java
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/LoginServiceStub.java	(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/LoginServiceStub.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 
 import org.apache.geronimo.core.service.Interceptor;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
@@ -96,7 +96,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(LoginServiceStub.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(LoginServiceStub.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);
         infoFactory.addReference("Router", JMXRouter.class);

Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestRealm.java
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestRealm.java	(original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/bridge/TestRealm.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import javax.security.auth.login.AppConfigurationEntry;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.security.GeronimoSecurityException;
 import org.apache.geronimo.security.realm.providers.AbstractSecurityRealm;
 import org.apache.regexp.RE;
@@ -74,7 +74,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(TestRealm.class, AbstractSecurityRealm.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TestRealm.class, AbstractSecurityRealm.GBEAN_INFO);
         infoFactory.addAttribute("debug", boolean.class, true);
         infoFactory.addOperation("isLoginModuleLocal");
 

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -34,7 +34,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.Kernel;
@@ -144,7 +144,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(FileConfigurationList.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(FileConfigurationList.class);
         infoFactory.addInterface(PersistentConfigurationList.class);
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addReference("ServerInfo", ServerInfo.class);

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -44,7 +44,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.gbean.jmx.GBeanMBean;
@@ -384,7 +384,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(LocalConfigStore.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(LocalConfigStore.class);
 
         infoFactory.addAttribute("kernel", Kernel.class, false);
         infoFactory.addAttribute("objectName", String.class, false);

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -27,7 +27,7 @@
 import org.apache.commons.logging.LogConfigurationException;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.kernel.log.GeronimoLogFactory;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -343,7 +343,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(Log4jService.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(Log4jService.class);
 
         infoFactory.addAttribute("rootLoggerLevel", String.class, true);
         infoFactory.addAttribute("configurationFile", String.class, true);

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/AbstractAppenderService.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/AbstractAppenderService.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/AbstractAppenderService.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.system.logging.log4j.appender;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.system.logging.log4j.PatternLayout;
 import org.apache.geronimo.system.logging.log4j.XLevel;
@@ -88,7 +88,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(AbstractAppenderService.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(AbstractAppenderService.class);
         infoFactory.addAttribute("layoutPattern", String.class, true);
         infoFactory.addAttribute("threshold", String.class, true);
         infoFactory.addAttribute("encoding", String.class, true);

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/ConsoleAppenderService.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/ConsoleAppenderService.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/ConsoleAppenderService.java	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import java.util.Enumeration;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.log4j.Appender;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Logger;
@@ -70,7 +70,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConsoleAppenderService.class, AbstractAppenderService.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConsoleAppenderService.class, AbstractAppenderService.GBEAN_INFO);
         infoFactory.addAttribute("target", String.class, true);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/DailyRollingFileAppenderService.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/DailyRollingFileAppenderService.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/DailyRollingFileAppenderService.java	Fri Oct 29 22:16:18 2004
@@ -19,7 +19,7 @@
 
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.log4j.DailyRollingFileAppender;
 
@@ -45,7 +45,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(DailyRollingFileAppenderService.class, FileAppenderService.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(DailyRollingFileAppenderService.class, FileAppenderService.GBEAN_INFO);
         infoFactory.addAttribute("datePattern", String.class, true);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/FileAppenderService.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/FileAppenderService.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/FileAppenderService.java	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import java.io.File;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.log4j.FileAppender;
 
@@ -100,7 +100,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(FileAppenderService.class, AbstractAppenderService.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(FileAppenderService.class, AbstractAppenderService.GBEAN_INFO);
 
         infoFactory.addAttribute("append", boolean.class, true);
         infoFactory.addAttribute("file", String.class, true);

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/RollingFileAppenderService.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/RollingFileAppenderService.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/RollingFileAppenderService.java	Fri Oct 29 22:16:18 2004
@@ -18,7 +18,7 @@
 package org.apache.geronimo.system.logging.log4j.appender;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
 import org.apache.log4j.RollingFileAppender;
 
@@ -49,7 +49,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(RollingFileAppenderService.class, FileAppenderService.GBEAN_INFO);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(RollingFileAppenderService.class, FileAppenderService.GBEAN_INFO);
         infoFactory.addAttribute("maxBackupIndex", int.class, true);
         infoFactory.addAttribute("maxFileSize", String.class, true);
         GBEAN_INFO = infoFactory.getBeanInfo();

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/properties/NamingProperties.java	Fri Oct 29 22:16:18 2004
@@ -1,7 +1,7 @@
 package org.apache.geronimo.system.properties;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /** java.naming.factory.initial=com.sun.jndi.rmi.registry.RegistryContextFactory
 java.naming.factory.url.pkgs=org.apache.geronimo.naming
@@ -47,7 +47,7 @@
     public static final GBeanInfo gbeanInfo;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(NamingProperties.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(NamingProperties.class);
         infoFactory.addAttribute("namingFactoryInitial", String.class, true);
         infoFactory.addAttribute("namingFactoryUrlPkgs", String.class, true);
         infoFactory.addAttribute("namingProviderUrl", String.class, true);

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.repository.Repository;
@@ -91,7 +91,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ReadOnlyRepository.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ReadOnlyRepository.class);
 
         infoFactory.addAttribute("root", URI.class, true);
 

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java	Fri Oct 29 22:16:18 2004
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 
@@ -67,7 +67,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(RMIRegistryService.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(RMIRegistryService.class);
         infoFactory.addAttribute("port", int.class, true);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java	Fri Oct 29 22:16:18 2004
@@ -24,7 +24,7 @@
 import java.net.URL;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * @version $Rev$ $Date$
@@ -105,7 +105,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(ServerInfo.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ServerInfo.class);
 
         infoFactory.addAttribute("baseDirectory", String.class, true);
         infoFactory.addAttribute("version", String.class, false);

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/url/GeronimoURLFactory.java
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/url/GeronimoURLFactory.java	(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/url/GeronimoURLFactory.java	Fri Oct 29 22:16:18 2004
@@ -30,7 +30,7 @@
 import java.util.StringTokenizer;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 
@@ -275,7 +275,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(GeronimoURLFactory.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(GeronimoURLFactory.class);
         infoFactory.addOperation("registerHandler", new Class[]{String.class, URLStreamHandler.class});
         infoFactory.addOperation("getRegisteredHandler", new Class[]{String.class});
         infoFactory.addOperation("getRegisteredHandlers", new Class[]{});

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import EDU.oswego.cs.dl.util.concurrent.Executor;
 import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.timer.NontransactionalExecutorTaskFactory;
 import org.apache.geronimo.timer.PersistentTimer;
@@ -44,7 +44,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JDBCStoreThreadPooledNonTransactionalTimer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JDBCStoreThreadPooledNonTransactionalTimer.class);
         infoFactory.addInterface(PersistentTimer.class);
 
         infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class);

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -20,7 +20,7 @@
 import EDU.oswego.cs.dl.util.concurrent.Executor;
 import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.geronimo.timer.PersistentTimer;
@@ -48,7 +48,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JDBCStoreThreadPooledTransactionalTimer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JDBCStoreThreadPooledTransactionalTimer.class);
         infoFactory.addInterface(PersistentTimer.class);
 
         infoFactory.addAttribute("repeatCount", int.class, true);

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCWorkerPersistence.java
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCWorkerPersistence.java	(original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCWorkerPersistence.java	Fri Oct 29 22:16:18 2004
@@ -31,7 +31,7 @@
 import com.thoughtworks.xstream.XStream;
 import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.kernel.Kernel;
@@ -319,7 +319,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(JDBCWorkerPersistence.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(JDBCWorkerPersistence.class);
         infoFactory.addAttribute("sequenceSQL", String.class, true);
         infoFactory.addAttribute("insertSQL", String.class, true);
         infoFactory.addAttribute("deleteSQL", String.class, true);

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -19,7 +19,7 @@
 
 import EDU.oswego.cs.dl.util.concurrent.Executor;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.timer.NontransactionalExecutorTaskFactory;
 import org.apache.geronimo.timer.PersistentTimer;
 import org.apache.geronimo.timer.ThreadPooledTimer;
@@ -42,7 +42,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(VMStoreThreadPooledNonTransactionalTimer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(VMStoreThreadPooledNonTransactionalTimer.class);
         infoFactory.addInterface(PersistentTimer.class);
 
         infoFactory.addReference("ThreadPool", Executor.class);

Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -19,7 +19,7 @@
 
 import EDU.oswego.cs.dl.util.concurrent.Executor;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.timer.PersistentTimer;
 import org.apache.geronimo.timer.ThreadPooledTimer;
 import org.apache.geronimo.timer.TransactionalExecutorTaskFactory;
@@ -44,7 +44,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(VMStoreThreadPooledTransactionalTimer.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(VMStoreThreadPooledTransactionalTimer.class);
         infoFactory.addInterface(PersistentTimer.class);
 
         infoFactory.addAttribute("repeatCount", int.class, true);

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java	(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java	Fri Oct 29 22:16:18 2004
@@ -21,7 +21,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.GReferenceInfo;
 
@@ -111,7 +111,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(TomcatGBean.class.getName());
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TomcatGBean.class.getName());
 
         infoFactory.setConstructor(new String[] { "ServerInfo", "CatalinaHome", "CatalinaBase", "CatalinaConfig" });
 

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/GeronimoTransactionManager.java
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/GeronimoTransactionManager.java	(original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/GeronimoTransactionManager.java	Fri Oct 29 22:16:18 2004
@@ -22,7 +22,7 @@
 import javax.transaction.TransactionManager;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.transaction.log.UnrecoverableLog;
 import org.apache.geronimo.transaction.manager.Recovery;
@@ -64,7 +64,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(GeronimoTransactionManager.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(GeronimoTransactionManager.class);
 
         infoFactory.addAttribute("defaultTransactionTimeoutSeconds", int.class, true);
         infoFactory.addReference("TransactionLog", TransactionLog.class);

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/TransactionManagerProxy.java
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/TransactionManagerProxy.java	(original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/TransactionManagerProxy.java	Fri Oct 29 22:16:18 2004
@@ -37,7 +37,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.ReferenceCollection;
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
@@ -279,7 +279,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(TransactionManagerProxy.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TransactionManagerProxy.class);
 
         infoFactory.addReference("delegate", ExtendedTransactionManager.class);
         infoFactory.addReference("xidImporter", XidImporter.class);

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManager.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -32,7 +32,7 @@
 import javax.transaction.xa.Xid;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.transaction.ExtendedTransactionManager;
 import org.apache.geronimo.transaction.ImportedTransactionActiveException;
 import org.apache.geronimo.transaction.XAWork;
@@ -280,7 +280,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(TransactionContextManager.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TransactionContextManager.class);
 
         infoFactory.addOperation("getTransactionManager");
         infoFactory.addOperation("getContext");

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
==============================================================================
--- 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	Fri Oct 29 22:16:18 2004
@@ -28,7 +28,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -392,7 +392,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(HOWLLog.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(HOWLLog.class);
         infoFactory.addAttribute("bufferClassName", String.class, true);
         infoFactory.addAttribute("bufferSizeKBytes", Integer.TYPE, true);
         infoFactory.addAttribute("checksumEnabled", Boolean.TYPE, true);

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImpl.java
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImpl.java	(original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImpl.java	Fri Oct 29 22:16:18 2004
@@ -23,7 +23,7 @@
 import javax.transaction.xa.Xid;
 
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 
 /**
  * Factory for transaction ids.
@@ -115,7 +115,7 @@
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoFactory infoFactory = new GBeanInfoFactory(XidFactoryImpl.class);
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(XidFactoryImpl.class);
         infoFactory.addInterface(XidFactory.class);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Mime
View raw message