Author: djencks
Date: Sat Mar 5 18:48:02 2005
New Revision: 156292
URL: http://svn.apache.org/viewcvs?view=rev&rev=156292
Log:
GERONIMO-450. Change name to gbeanName, namePart to name, and break up
reference patterns into pieces
Modified:
geronimo/trunk/itests/naming/client/src/plan/plan1.xml
geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-plan.xml
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
geronimo/trunk/modules/axis/src/plans/plan1.xml
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/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.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/transactionlog/JDBCLog.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.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-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/trunk/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml
geronimo/trunk/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml
geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml
geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/trunk/modules/jetty-builder/src/test-resources/services/local.xml
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyAxisPOJOWebService.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterHolder.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyServletHolder.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.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/requestlog/NCSARequestLog.java
geronimo/trunk/modules/jetty/src/test-resources/services/local.xml
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GReferenceInfo.java
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.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/MockGBean.java
geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.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/JaasLoginService.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd
geronimo/trunk/modules/service-builder/src/test-resources/services/plan1.xml
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/MockGBean.java
geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ConfigPlanTest.java
geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.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/repository/ReadOnlyRepository.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/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/TomcatContainer.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/connector/HTTPConnector.java
geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml
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/TransactionManagerImpl.java
Modified: geronimo/trunk/itests/naming/client/src/plan/plan1.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/itests/naming/client/src/plan/plan1.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/itests/naming/client/src/plan/plan1.xml (original)
+++ geronimo/trunk/itests/naming/client/src/plan/plan1.xml Sat Mar 5 18:48:02
2005
@@ -118,16 +118,16 @@
</adminobject>
</resourceadapter>
- <gbean namePart="ActiveMQ"
class="org.codehaus.activemq.gbean.ActiveMQContainer">
+ <gbean name="ActiveMQ"
class="org.codehaus.activemq.gbean.ActiveMQContainer">
<attribute name="brokerName">possibly-unique-broker</attribute>
</gbean>
<gbean namePart='ActiveMQ,url="tcp://localhost:61616"'
class="org.codehaus.activemq.gbean.ActiveMQConnector">
<attribute name="Url">tcp://localhost:61616</attribute>
- <reference
name="ActiveMQContainer">geronimo.client:type=JMSServer,name=ActiveMQ,*</reference>
+ <reference
name="ActiveMQContainer"><gbean-name>geronimo.client:type=JMSServer,name=ActiveMQ,*</gbean-name></reference>
</gbean>
<gbean namePart='ActiveMQ,url="vm://localhost"'
class="org.codehaus.activemq.gbean.ActiveMQConnector">
<attribute name="Url">vm://localhost</attribute>
- <reference
name="ActiveMQContainer">geronimo.client:type=JMSServer,name=ActiveMQ,*</reference>
+ <reference
name="ActiveMQContainer"><gbean-name>geronimo.client:type=JMSServer,name=ActiveMQ,*</gbean-name></reference>
</gbean>
</connector>
Modified: geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml Sat Mar 5
18:48:02 2005
@@ -34,32 +34,32 @@
>
<!-- ServerInfo service -->
- <gbean namePart="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
+ <gbean name="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
<!-- URLFactory service -->
- <gbean namePart="URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
+ <gbean name="URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
<!-- Configuration Store service -->
- <gbean namePart="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
+ <gbean name="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
<attribute name="root">config-store</attribute>
- <reference name="ServerInfo">*:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
<!-- Repository -->
- <gbean namePart="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
+ <gbean name="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root">repository/</attribute>
- <reference name="ServerInfo">*:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
<!-- Logging service -->
- <gbean namePart="Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <gbean name="Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
<attribute
name="configurationFile">var/log/client-log4j.properties</attribute>
<attribute name="refreshPeriod">60</attribute>
- <reference name="ServerInfo">*:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
<!-- Naming properties -->
- <gbean namePart="NamingProperties"
class="org.apache.geronimo.system.properties.NamingProperties">
+ <gbean name="NamingProperties"
class="org.apache.geronimo.system.properties.NamingProperties">
<attribute
name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
<attribute
name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
<attribute name="namingProviderUrl">rmi://localhost:1099</attribute>
Modified: geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
(original)
+++ geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml Sat Mar
5 18:48:02 2005
@@ -65,7 +65,7 @@
</outbound-resourceadapter>
</resourceadapter>
- <!--gbean name="geronimo.security:service=RealmBridge,name=TargetRealm"
class="org.apache.geronimo.security.bridge.ConfiguredIdentityUserPasswordRealmBridge">
+ <!--gbean
gbeanName="geronimo.security:service=RealmBridge,name=TargetRealm"
class="org.apache.geronimo.security.bridge.ConfiguredIdentityUserPasswordRealmBridge">
<attribute name="TargetRealm">TargetRealm</attribute>
<attribute name="ConfiguredUser">testUser</attribute>
<attribute name="ConfiguredPassword">testPassword</attribute>
Modified: geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml Sat Mar
5 18:48:02 2005
@@ -29,26 +29,26 @@
>
<!-- ServerInfo service -->
- <gbean namePart="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo">
+ <gbean name="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo">
</gbean>
<!-- Configuration Store service -->
- <gbean namePart="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
+ <gbean name="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
<attribute name="root">config-store/</attribute>
- <reference
name="ServerInfo">geronimo.deployer:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
<!-- Repository -->
- <gbean namePart="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
+ <gbean name="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root">repository/</attribute>
- <reference
name="ServerInfo">geronimo.deployer:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
<!-- Logging service -->
- <gbean namePart="Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <gbean name="Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
<attribute
name="configurationFile">var/log/deployer-log4j.properties</attribute>
<attribute name="refreshPeriod">60</attribute>
- <reference
name="ServerInfo">geronimo.deployer:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Sat Mar 5
18:48:02 2005
@@ -72,34 +72,34 @@
</dependency>
<!--client connector support-->
- <gbean namePart="DefaultThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
+ <gbean name="DefaultThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
<attribute name="keepAliveTime">5000</attribute>
<attribute name="poolSize">10</attribute>
<attribute name="poolName">DefaultThreadPool</attribute>
</gbean>
- <gbean namePart="ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
+ <gbean name="ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
</gbean>
- <gbean namePart="DefaultWorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
+ <gbean name="DefaultWorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
<attribute name="syncMaximumPoolSize">10</attribute>
<attribute name="startMaximumPoolSize">10</attribute>
<attribute name="scheduledMaximumPoolSize">10</attribute>
- <reference
name="TransactionContextManager">*:name=TransactionContextManager,*</reference>
+ <reference
name="TransactionContextManager"><name>TransactionContextManager</name></reference>
</gbean>
- <gbean namePart="TransactionManager"
class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
+ <gbean name="TransactionManager"
class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
<!--no transaction log on the client-->
<attribute name="defaultTransactionTimeoutSeconds">600</attribute>
<references name="ResourceManagers">
- <pattern>*:j2eeType=JCAManagedConnectionFactory,*</pattern>
- <pattern>*:j2eeType=ActivationSpec,*</pattern>
+
<pattern><gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
+
<pattern><gbean-name>*:j2eeType=ActivationSpec,*</gbean-name></pattern>
</references>
</gbean>
- <gbean namePart="TransactionContextManager"
class="org.apache.geronimo.transaction.context.TransactionContextManager">
- <reference
name="TransactionManager">*:name=TransactionManager,*</reference>
- <reference name="XidImporter">*:name=TransactionManager,*</reference>
+ <gbean name="TransactionContextManager"
class="org.apache.geronimo.transaction.context.TransactionContextManager">
+ <reference
name="TransactionManager"><name>TransactionManager</name></reference>
+ <reference
name="XidImporter"><name>TransactionManager</name></reference>
</gbean>
</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sat Mar 5
18:48:02 2005
@@ -124,18 +124,18 @@
- <gbean namePart="Deployer" class="org.apache.geronimo.deployment.Deployer">
- <reference
name="Builders">geronimo.deployer:j2eeType=ConfigBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
- <reference
name="Store">geronimo.deployer:j2eeType=ConfigurationStore,*</reference>
+ <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
+ <reference name="Builders"><name>*</name></reference>
+ <reference
name="Store"><module>org/apache/geronimo/DeployerSystem</module><name>*</name></reference>
</gbean>
- <gbean namePart="ServiceBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+ <gbean name="ServiceBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <reference name="Repository">*:name=Repository,*</reference>
- <reference
name="XmlAttributeBuilders">*:j2eeType=XmlAttributeBuilder,*</reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <reference name="XmlAttributeBuilders"><name>*</name></reference>
</gbean>
- <gbean namePart="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <gbean name="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<!--domain set to wildcard so datasources may be deployed
independently on client. -->
<!--a better solution is to get the domain and server from the parent
configuration -->
@@ -143,28 +143,28 @@
<attribute
name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
<attribute
name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
<attribute
name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
- <reference name="Repository">*:name=Repository,*</reference>
- <reference
name="EJBConfigBuilder">geronimo.deployer:name=EJBBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
- <reference
name="EJBReferenceBuilder">geronimo.deployer:name=EJBBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
- <reference
name="WebConfigBuilder">geronimo.deployer:name=WebBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
- <reference
name="ConnectorConfigBuilder">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=deployer,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
- <reference
name="ResourceReferenceBuilder">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=deployer,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
- <reference
name="AppClientConfigBuilder">geronimo.deployer:name=AppClientBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
- <reference
name="ServiceReferenceBuilder">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=deployer,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <reference name="EJBConfigBuilder"><name>EJBBuilder</name></reference>
+ <reference
name="EJBReferenceBuilder"><name>EJBBuilder</name></reference>
+ <reference name="WebConfigBuilder"><name>WebBuilder</name></reference>
+ <reference
name="ConnectorConfigBuilder"><name>ConnectorBuilder</name></reference>
+ <reference
name="ResourceReferenceBuilder"><name>ConnectorBuilder</name></reference>
+ <reference
name="AppClientConfigBuilder"><name>AppClientBuilder</name></reference>
+ <reference
name="ServiceReferenceBuilder"><name>WebServiceBuilder</name></reference>
</gbean>
- <gbean namePart="SecurityService"
class="org.apache.geronimo.security.SecurityServiceImpl">
+ <gbean name="SecurityService"
class="org.apache.geronimo.security.SecurityServiceImpl">
<attribute
name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
<attribute
name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
</gbean>
- <gbean namePart="WebBuilder"
class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+ <gbean name="WebBuilder"
class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="defaultSessionTimeoutSeconds">1800</attribute>
<attribute
name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
<attribute
name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
<attribute
name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
- <reference name="Repository">*:name=Repository,*</reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
<!--
@@ -185,13 +185,13 @@
<dependency>
<uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
</dependency>
- <gbean namePart="WebBuilder"
class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
+ <gbean name="WebBuilder"
class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Tomcat</attribute>
<attribute
name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
</gbean>
-->
- <gbean namePart="StaticContent"
class="org.apache.geronimo.jetty.JettyServletHolder">
+ <gbean name="StaticContent"
class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">default</attribute>
<attribute
name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
<attribute name="loadOnStartup">0</attribute>
@@ -205,7 +205,7 @@
<attribute name="servletMappings">/</attribute>
</gbean>
- <gbean namePart="JSPServlet"
class="org.apache.geronimo.jetty.JettyServletHolder">
+ <gbean name="JSPServlet"
class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">jsp</attribute>
<attribute
name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
<attribute name="loadOnStartup">0</attribute>
@@ -216,17 +216,17 @@
<attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
</gbean>
- <gbean namePart="EJBBuilder"
class="org.openejb.deployment.OpenEJBModuleBuilder">
+ <gbean name="EJBBuilder"
class="org.openejb.deployment.OpenEJBModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute
name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
-<!-- <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>-->
- <reference name="Repository">*:name=Repository,*</reference>
+<!-- <reference
name="SkeletonGenerator"><gbean-name>openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</gbean-name></reference>-->
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
- <gbean namePart="ClientEJBReferenceBuilder"
class="org.openejb.deployment.RemoteEJBReferenceBuilder">
+ <gbean name="ClientEJBReferenceBuilder"
class="org.openejb.deployment.RemoteEJBReferenceBuilder">
</gbean>
- <gbean namePart="ConnectorBuilder"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <gbean name="ConnectorBuilder"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="defaultMaxSize">10</attribute>
<attribute name="defaultMinSize">0</attribute>
@@ -234,31 +234,31 @@
<attribute name="defaultIdleTimeoutMinutes">15</attribute>
<attribute name="defaultXATransactionCaching">true</attribute>
<attribute name="defaultXAThreadCaching">false</attribute>
- <reference name="Repository">*:name=Repository,*</reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
- <gbean namePart="AppClientBuilder"
class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
+ <gbean name="AppClientBuilder"
class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
<attribute
name="defaultClientParentId">org/apache/geronimo/Client</attribute>
<attribute
name="defaultServerParentId">org/apache/geronimo/Server</attribute>
<attribute
name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
<attribute
name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
- <reference
name="EJBReferenceBuilder">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=deployer,j2eeType=GBean,name=ClientEJBReferenceBuilder</reference>
- <reference
name="ConnectorModuleBuilder">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=deployer,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
- <reference
name="ResourceReferenceBuilder">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=deployer,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
- <reference
name="ServiceReferenceBuilder">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=deployer,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
- <reference
name="Store">geronimo.deployer:j2eeType=ConfigurationStore,*</reference>
- <reference name="Repository">*:name=Repository,*</reference>
+ <reference
name="EJBReferenceBuilder"><name>ClientEJBReferenceBuilder</name></reference>
+ <reference
name="ConnectorModuleBuilder"><name>ConnectorBuilder</name></reference>
+ <reference
name="ResourceReferenceBuilder"><name>ConnectorBuilder</name></reference>
+ <reference
name="ServiceReferenceBuilder"><name>WebServiceBuilder</name></reference>
+ <reference
name="Store"><module>org/apache/geronimo/DeployerSystem</module><name>*</name></reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
- <gbean namePart="WebServiceBuilder"
class="org.apache.geronimo.axis.builder.AxisBuilder">
+ <gbean name="WebServiceBuilder"
class="org.apache.geronimo.axis.builder.AxisBuilder">
</gbean>
-<!-- <gbean name="openejb.CORBA:type=Compiler,vendor=Ant"
class="org.openejb.corba.compiler.AntCompiler"/>-->
+<!-- <gbean gbeanName="openejb.CORBA:type=Compiler,vendor=Ant"
class="org.openejb.corba.compiler.AntCompiler"/>-->
<!---->
-<!-- <gbean name="openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB"
class="org.openejb.corba.compiler.OpenORBSkeletonGenerator">-->
+<!-- <gbean gbeanName="openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB"
class="org.openejb.corba.compiler.OpenORBSkeletonGenerator">-->
<!-- <attribute name="props">-->
<!-- </attribute>-->
-<!-- <reference
name="Compiler">openejb.CORBA:type=Compiler,vendor=Ant</reference>-->
+<!-- <reference
name="Compiler"><gbean-name>openejb.CORBA:type=Compiler,vendor=Ant</gbean-name></reference>-->
<!-- </gbean>-->
</configuration>
Modified:
geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Sat
Mar 5 18:48:02 2005
@@ -65,31 +65,31 @@
</dependency>
<!-- deployer gbeans -->
- <gbean namePart="Deployer" class="org.apache.geronimo.deployment.Deployer">
- <reference
name="Builders">geronimo.server:j2eeType=ConfigBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="Store">geronimo.server:j2eeType=ConfigurationStore,*</reference>
+ <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
+ <reference name="Builders"><name>*</name></reference>
+ <reference
name="Store"><module>org/apache/geronimo/System</module><name>*</name></reference>
</gbean>
- <gbean namePart="ServiceBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+ <gbean name="ServiceBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <reference name="Repository">*:name=Repository,*</reference>
- <reference
name="XmlAttributeBuilders">*:j2eeType=XmlAttributeBuilder,*</reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <reference name="XmlAttributeBuilders"><name>*</name></reference>
</gbean>
- <gbean namePart="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <gbean name="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute
name="transactionContextManagerObjectName">geronimo.server:name=TransactionContextManager,*</attribute>
<attribute
name="connectionTrackerObjectName">geronimo.server:name=ConnectionTracker,*</attribute>
<attribute
name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
<attribute
name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
- <reference name="Repository">*:name=Repository,*</reference>
- <reference
name="EJBConfigBuilder">geronimo.server:name=EJBBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="EJBReferenceBuilder">geronimo.server:name=EJBBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="WebConfigBuilder">geronimo.server:name=WebBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="ConnectorConfigBuilder">geronimo.server:name=ConnectorBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="ResourceReferenceBuilder">geronimo.server:name=ConnectorBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="AppClientConfigBuilder">geronimo.server:name=AppClientBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="ServiceReferenceBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <reference name="EJBConfigBuilder"><name>EJBBuilder</name></reference>
+ <reference
name="EJBReferenceBuilder"><name>EJBBuilder</name></reference>
+ <reference name="WebConfigBuilder"><name>WebBuilder</name></reference>
+ <reference
name="ConnectorConfigBuilder"><name>ConnectorBuilder</name></reference>
+ <reference
name="ResourceReferenceBuilder"><name>ConnectorBuilder</name></reference>
+ <reference
name="AppClientConfigBuilder"><name>AppClientBuilder</name></reference>
+ <reference
name="ServiceReferenceBuilder"><name>WebServiceBuilder</name></reference>
</gbean>
<!--
@@ -111,7 +111,7 @@
<dependency>
<uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
</dependency>
- <gbean namePart="WebBuilder"
class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
+ <gbean name="WebBuilder"
class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Tomcat</attribute>
<attribute
name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
</gbean>
@@ -119,18 +119,18 @@
<!-- Comment out the next WebBuilder gbean to enable Tomcat deployer
-->
- <gbean namePart="WebBuilder"
class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+ <gbean name="WebBuilder"
class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="defaultSessionTimeoutSeconds">1800</attribute>
<attribute
name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
<attribute
name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
<attribute
name="defaultServlets">geronimo.server:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</attribute>
<attribute
name="pojoWebServiceTemplate">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=AxisPOJOTemplate</attribute>
- <reference
name="WebServiceBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
- <reference name="Repository">*:name=Repository,*</reference>
+ <reference
name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
- <gbean namePart="StaticContent"
class="org.apache.geronimo.jetty.JettyServletHolder">
+ <gbean name="StaticContent"
class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">default</attribute>
<attribute
name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
<attribute name="loadOnStartup">0</attribute>
@@ -144,7 +144,7 @@
<attribute name="servletMappings">/</attribute>
</gbean>
- <gbean namePart="JSPServlet"
class="org.apache.geronimo.jetty.JettyServletHolder">
+ <gbean name="JSPServlet"
class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">jsp</attribute>
<attribute
name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
<attribute name="loadOnStartup">0</attribute>
@@ -155,20 +155,20 @@
<attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
</gbean>
- <gbean namePart="AxisPOJOTemplate"
class="org.apache.geronimo.jetty.JettyAxisPOJOWebService">
+ <gbean name="AxisPOJOTemplate"
class="org.apache.geronimo.jetty.JettyAxisPOJOWebService">
<attribute name="servletName">dummy</attribute>
</gbean>
- <gbean namePart="EJBBuilder"
class="org.openejb.deployment.OpenEJBModuleBuilder">
+ <gbean name="EJBBuilder"
class="org.openejb.deployment.OpenEJBModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute
name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
- <!-- <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>-->
- <reference name="Repository">*:name=Repository,*</reference>
+ <!-- <reference
name="SkeletonGenerator"><gbean-name>openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</gbean-name></reference>-->
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
- <gbean namePart="ClientEJBReferenceBuilder"
class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
+ <gbean name="ClientEJBReferenceBuilder"
class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
- <gbean namePart="ConnectorBuilder"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <gbean name="ConnectorBuilder"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="defaultMaxSize">10</attribute>
<attribute name="defaultMinSize">0</attribute>
@@ -176,30 +176,30 @@
<attribute name="defaultIdleTimeoutMinutes">15</attribute>
<attribute name="defaultXATransactionCaching">true</attribute>
<attribute name="defaultXAThreadCaching">false</attribute>
- <reference name="Repository">*:name=Repository,*</reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
- <gbean namePart="AppClientBuilder"
class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
+ <gbean name="AppClientBuilder"
class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
<attribute
name="defaultClientParentId">org/apache/geronimo/Client</attribute>
<attribute
name="defaultServerParentId">org/apache/geronimo/Server</attribute>
<attribute
name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
<attribute
name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
- <reference
name="EJBReferenceBuilder">geronimo.server:name=ClientEJBReferenceBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="ConnectorModuleBuilder">geronimo.server:name=ConnectorBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="ResourceReferenceBuilder">geronimo.server:name=ConnectorBuilder,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</reference>
- <reference
name="ServiceReferenceBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
- <reference name="Store">*:j2eeType=ConfigurationStore,*</reference>
- <reference name="Repository">*:name=Repository,*</reference>
+ <reference
name="EJBReferenceBuilder"><name>ClientEJBReferenceBuilder</name></reference>
+ <reference
name="ConnectorModuleBuilder"><name>ConnectorBuilder</name></reference>
+ <reference
name="ResourceReferenceBuilder"><name>ConnectorBuilder</name></reference>
+ <reference
name="ServiceReferenceBuilder"><name>WebServiceBuilder</name></reference>
+ <reference
name="Store"><module>org/apache/geronimo/System</module><name>*</name></reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
- <gbean namePart="WebServiceBuilder"
class="org.apache.geronimo.axis.builder.AxisBuilder">
+ <gbean name="WebServiceBuilder"
class="org.apache.geronimo.axis.builder.AxisBuilder">
</gbean>
- <!-- <gbean name="openejb.CORBA:type=Compiler,vendor=Ant"
class="org.openejb.corba.compiler.AntCompiler"/>-->
+ <!-- <gbean gbeanName="openejb.CORBA:type=Compiler,vendor=Ant"
class="org.openejb.corba.compiler.AntCompiler"/>-->
<!---->
- <!-- <gbean name="openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB"
class="org.openejb.corba.compiler.OpenORBSkeletonGenerator">-->
+ <!-- <gbean
gbeanName="openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB"
class="org.openejb.corba.compiler.OpenORBSkeletonGenerator">-->
<!-- <attribute name="props">-->
<!-- </attribute>-->
- <!-- <reference
name="Compiler">openejb.CORBA:type=Compiler,vendor=Ant</reference>-->
+ <!-- <reference
name="Compiler"><gbean-name>openejb.CORBA:type=Compiler,vendor=Ant</gbean-name></reference>-->
<!-- </gbean>-->
<!---->
<!-- end deployment block -->
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml Sat Mar 5
18:48:02 2005
@@ -32,7 +32,7 @@
<!-- Security GBeans -->
- <gbean name="geronimo.security:type=LoginModule,name=demo-properties-login"
+ <gbean
gbeanName="geronimo.security:type=LoginModule,name=demo-properties-login"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
<attribute
name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
<attribute name="serverSide">true</attribute>
@@ -43,16 +43,16 @@
<attribute name="loginDomainName">demo-properties-realm</attribute>
</gbean>
- <gbean
name="geronimo.security:type=SecurityRealm,name=demo-properties-realm"
+ <gbean
gbeanName="geronimo.security:type=SecurityRealm,name=demo-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">demo-properties-realm</attribute>
<attribute name="loginModuleConfiguration">
LoginModule.1.REQUIRED=geronimo.server:j2eeType=LoginModule,J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/apache/geronimo/Secure,name=demo-properties-login
</attribute>
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
</gbean>
- <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=jaasTest"
+ <gbean
gbeanName="geronimo.security:type=ConfigurationEntry,jaasId=jaasTest"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
<attribute name="applicationConfigName">jaasTest</attribute>
<attribute name="realmName">demo-properties-realm</attribute>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Sat Mar 5
18:48:02 2005
@@ -117,7 +117,7 @@
<!-- Default security realm using properties files -->
- <gbean namePart="properties-login"
+ <gbean name="properties-login"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
<attribute
name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
<attribute name="serverSide">true</attribute>
@@ -128,59 +128,59 @@
<attribute name="loginDomainName">geronimo-properties-realm</attribute>
</gbean>
- <gbean namePart="geronimo-properties-realm"
+ <gbean name="geronimo-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">geronimo-properties-realm</attribute>
<attribute name="loginModuleConfiguration">
LoginModule.1.REQUIRED=geronimo.server:j2eeType=LoginModule,J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,name=properties-login
</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
</gbean>
- <gbean namePart="JMX"
+ <gbean name="JMX"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
<attribute name="applicationConfigName">JMX</attribute>
<attribute name="realmName">geronimo-properties-realm</attribute>
</gbean>
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration handler
-->
- <gbean namePart="LoginConfiguration"
class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
+ <gbean name="LoginConfiguration"
class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
<references name="Configurations">
- <pattern>geronimo.server:j2eeType=SecurityRealm,*</pattern>
- <pattern>geronimo.server:j2eeType=ConfigurationEntry,*</pattern>
+
<pattern><gbean-name>geronimo.server:j2eeType=SecurityRealm,*</gbean-name></pattern>
+
<pattern><gbean-name>geronimo.server:j2eeType=ConfigurationEntry,*</gbean-name></pattern>
</references>
</gbean>
- <gbean namePart="SecurityService"
class="org.apache.geronimo.security.SecurityServiceImpl">
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <gbean name="SecurityService"
class="org.apache.geronimo.security.SecurityServiceImpl">
+ <reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
<attribute
name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
<attribute
name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
</gbean>
- <gbean namePart="JaasLoginService"
class="org.apache.geronimo.security.jaas.JaasLoginService">
- <reference
name="Realms">geronimo.server:j2eeType=SecurityRealm,*</reference>
+ <gbean name="JaasLoginService"
class="org.apache.geronimo.security.jaas.JaasLoginService">
+ <reference
name="Realms"><application>*</application><module>*</module><name>*</name></reference>
<!-- <attribute name="reclaimPeriod">100000</attribute>-->
<attribute name="algorithm">HmacSHA1</attribute>
<attribute name="password">secret</attribute>
</gbean>
- <gbean namePart="DefaultThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
+ <gbean name="DefaultThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
<attribute name="keepAliveTime">5000</attribute>
<attribute name="poolSize">10</attribute>
<attribute name="poolName">DefaultThreadPool</attribute>
</gbean>
- <gbean namePart="ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
+ <gbean name="ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
</gbean>
- <gbean namePart="DefaultWorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
+ <gbean name="DefaultWorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
<attribute name="syncMaximumPoolSize">10</attribute>
<attribute name="startMaximumPoolSize">10</attribute>
<attribute name="scheduledMaximumPoolSize">10</attribute>
- <reference
name="TransactionContextManager">geronimo.server:name=TransactionContextManager,*</reference>
+ <reference
name="TransactionContextManager"><name>TransactionContextManager</name></reference>
</gbean>
- <gbean namePart="HOWLTransactionLog"
class="org.apache.geronimo.transaction.log.HOWLLog">
+ <gbean name="HOWLTransactionLog"
class="org.apache.geronimo.transaction.log.HOWLLog">
<attribute
name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
<attribute name="bufferSizeKBytes">32</attribute>
<attribute name="checksumEnabled">true</attribute>
@@ -193,45 +193,45 @@
<attribute name="maxLogFiles">2</attribute>
<attribute name="minBuffers">4</attribute>
<attribute name="threadsWaitingForceThreshold">-1</attribute>
- <reference
name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
</gbean>
- <gbean namePart="TransactionManager"
class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
+ <gbean name="TransactionManager"
class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
<attribute name="defaultTransactionTimeoutSeconds">600</attribute>
- <reference
name="TransactionLog">geronimo.server:name=HOWLTransactionLog,*</reference>
+ <reference
name="TransactionLog"><name>HOWLTransactionLog</name></reference>
<references name="ResourceManagers">
-
<pattern>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</pattern>
- <pattern>geronimo.server:j2eeType=ActivationSpec,*</pattern>
+
<pattern><gbean-name>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
+
<pattern><gbean-name>geronimo.server:j2eeType=ActivationSpec,*</gbean-name></pattern>
</references>
</gbean>
- <gbean namePart="TransactionContextManager"
class="org.apache.geronimo.transaction.context.TransactionContextManager">
- <reference
name="TransactionManager">geronimo.server:name=TransactionManager,*</reference>
- <reference
name="XidImporter">geronimo.server:name=TransactionManager,*</reference>
+ <gbean name="TransactionContextManager"
class="org.apache.geronimo.transaction.context.TransactionContextManager">
+ <reference
name="TransactionManager"><name>TransactionManager</name></reference>
+ <reference
name="XidImporter"><name>TransactionManager</name></reference>
</gbean>
<!-- default WAR container using Jetty -->
- <gbean namePart="JettyWebContainer"
class="org.apache.geronimo.jetty.JettyContainerImpl">
+ <gbean name="JettyWebContainer"
class="org.apache.geronimo.jetty.JettyContainerImpl">
</gbean>
- <gbean namePart="JettyRequestLog"
class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
- <reference
name="JettyContainer">geronimo.server:name=JettyWebContainer,*</reference>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <gbean name="JettyRequestLog"
class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
+ <reference
name="JettyContainer"><name>JettyWebContainer</name></reference>
+ <reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
<attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
<attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
<attribute name="logTimeZone">GMT</attribute>
</gbean>
- <gbean namePart="JettyWebConnector"
class="org.apache.geronimo.jetty.connector.HTTPConnector">
+ <gbean name="JettyWebConnector"
class="org.apache.geronimo.jetty.connector.HTTPConnector">
<attribute name="port">8080</attribute>
- <reference
name="JettyContainer">geronimo.server:name=JettyWebContainer,*</reference>
+ <reference
name="JettyContainer"><name>JettyWebContainer</name></reference>
<!-- <attribute name="MaxConnections">10</attribute>-->
<!-- <attribute name="MaxIdleTime">10</attribute>-->
</gbean>
<!-- EJB Protocol -->
- <gbean name="openejb:type=NetworkService,name=EJB"
class="org.openejb.server.StandardServiceStackGBean">
+ <gbean gbeanName="openejb:type=NetworkService,name=EJB"
class="org.openejb.server.StandardServiceStackGBean">
<attribute name="name">EJB</attribute>
<attribute name="port">4201</attribute>
<attribute name="address">127.0.0.1</attribute>
@@ -240,17 +240,17 @@
<attribute name="threads">20</attribute>
<attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
<attribute name="logOnFailure">HOST,NAME</attribute>
- <reference name="Server">openejb:type=Server,name=EJB</reference>
+ <reference
name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
</gbean>
- <gbean name="openejb:type=Server,name=EJB"
class="org.openejb.server.ejbd.EjbServerGBean">
- <reference
name="ContainerIndex">openejb:type=ContainerIndex</reference>
+ <gbean gbeanName="openejb:type=Server,name=EJB"
class="org.openejb.server.ejbd.EjbServerGBean">
+ <reference
name="ContainerIndex"><gbean-name>openejb:type=ContainerIndex</gbean-name></reference>
</gbean>
<!-- pattern domain name must match the domain of the j2eeServer attribute
of the EAR builder in the deployer plan -->
- <gbean name="openejb:type=ContainerIndex"
class="org.openejb.ContainerIndex">
+ <gbean gbeanName="openejb:type=ContainerIndex"
class="org.openejb.ContainerIndex">
<references name="EJBContainers">
- <pattern>geronimo.server:j2eeType=StatelessSessionBean,*</pattern>
- <pattern>geronimo.server:j2eeType=StatefulSessionBean,*</pattern>
- <pattern>geronimo.server:j2eeType=EntityBean,*</pattern>
+
<pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
+
<pattern><gbean-name>geronimo.server:j2eeType=StatefulSessionBean,*</gbean-name></pattern>
+
<pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
</references>
</gbean>
@@ -258,22 +258,22 @@
<!-- HTTP/SOAP Protocol is now run through jetty-->
<!-- JSR77 Management Objects -->
- <gbean name="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server"
class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
- <gbean name="geronimo.server:j2eeType=J2EEServer,name=geronimo"
class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <gbean
gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server"
class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
+ <gbean gbeanName="geronimo.server:j2eeType=J2EEServer,name=geronimo"
class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
+ <reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
</gbean>
- <gbean name="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM"
class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
+ <gbean
gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM"
class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
<!-- JMX Remoting -->
- <gbean namePart="JMXService"
class="org.apache.geronimo.jmxremoting.JMXConnector">
+ <gbean name="JMXService"
class="org.apache.geronimo.jmxremoting.JMXConnector">
<attribute
name="URL">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
<attribute name="applicationConfigName">JMX</attribute>
</gbean>
- <gbean namePart="eis/JAXR"
class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
+ <gbean name="eis/JAXR"
class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
- <gbean
name="geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB"
class="org.openejb.mejb.MEJB"/>
+ <gbean
gbeanName="geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB"
class="org.openejb.mejb.MEJB"/>
</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml Sat
Mar 5 18:48:02 2005
@@ -91,15 +91,15 @@
<uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
</dependency>
- <gbean namePart="TomcatWebContainer"
class="org.apache.geronimo.tomcat.TomcatContainer">
+ <gbean name="TomcatWebContainer"
class="org.apache.geronimo.tomcat.TomcatContainer">
<attribute name="catalinaHome">var/catalina</attribute>
<attribute name="endorsedDirs">lib</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
</gbean>
- <gbean namePart="TomcatWebConnector"
class="org.apache.geronimo.tomcat.connector.HTTPConnector">
+ <gbean name="TomcatWebConnector"
class="org.apache.geronimo.tomcat.connector.HTTPConnector">
<attribute name="port" type="int">8090</attribute>
- <reference
name="TomcatContainer">geronimo.server:name=TomcatWebContainer,*</reference>
+ <reference
name="TomcatContainer"><name>TomcatWebContainer</name></reference>
</gbean>
</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml Sat Mar
5 18:48:02 2005
@@ -37,14 +37,14 @@
<uri>geronimo/jars/geronimo-spring-builder-${geronimo_version}.jar</uri>
</dependency>
- <gbean namePart="Deployer" class="org.apache.geronimo.deployment.Deployer">
- <reference
name="Builders">geronimo.server:j2eeType=ConfigBuilder,J2EEModule=org/apache/geronimo/SpringDeployer,*</reference>
- <reference
name="Store">geronimo.server:j2eeType=ConfigurationStore,*</reference>
+ <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
+ <reference name="Builders"><name>SPRBuilder</name></reference>
+ <reference
name="Store"><module>org/apache/geronimo/System</module><name>*</name></reference>
</gbean>
- <gbean namePart="SPRBuilder"
class="org.apache.geronimo.spring.deployment.SPRConfigBuilder">
+ <gbean name="SPRBuilder"
class="org.apache.geronimo.spring.deployment.SPRConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/SpringRuntime</attribute>
- <reference name="Repository">*:name=Repository,*</reference>
+ <reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml Sat Mar 5
18:48:02 2005
@@ -32,7 +32,7 @@
</dependency>
<!--
- <gbean namePart="Spring" class="org.apache.geronimo.spring.SpringGBean">
+ <gbean name="Spring" class="org.apache.geronimo.spring.SpringGBean">
</gbean>
-->
Modified: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml Sat Mar
5 18:48:02 2005
@@ -40,35 +40,36 @@
</dependency>
<!-- message broker -->
- <gbean namePart="ActiveMQ"
class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
+ <gbean name="ActiveMQ"
class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
<attribute name="brokerName">possibly-unique-broker</attribute>
- <reference
name="persistenceAdapter">geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.cache,*</reference>
+ <reference
name="persistenceAdapter"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.cache,*</gbean-name></reference>
</gbean>
- <gbean namePart="ActiveMQ.cache"
class="org.codehaus.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
+ <gbean name="ActiveMQ.cache"
class="org.codehaus.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
<attribute name="cacheSize">10000</attribute>
- <reference
name="longTermPersistence">geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.journal,*</reference>
+ <reference
name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.journal,*</gbean-name></reference>
</gbean>
- <gbean namePart="ActiveMQ.journal"
class="org.codehaus.activemq.store.journal.JournalPersistenceAdapterGBean">
- <reference
name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
+ <gbean name="ActiveMQ.journal"
class="org.codehaus.activemq.store.journal.JournalPersistenceAdapterGBean">
+ <!--TODO change to ServerInfo -->
+ <reference
name="serverInfo"><module>org/apache/geronimo/System</module><type>GBean</type><name>ServerInfo</name></reference>
<attribute name="directory">var/activemq/journal</attribute>
<attribute name="journalType">default</attribute>
- <reference
name="longTermPersistence">geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</reference>
+ <reference
name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</gbean-name></reference>
</gbean>
- <gbean namePart="ActiveMQ.jdbc"
class="org.codehaus.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
- <reference
name="dataSource">geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</reference>
+ <gbean name="ActiveMQ.jdbc"
class="org.codehaus.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
+ <reference
name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
</gbean>
- <gbean namePart="ActiveMQ.tcp.localhost.61616"
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
+ <gbean name="ActiveMQ.tcp.localhost.61616"
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="url">tcp://localhost:61616</attribute>
- <reference
name="activeMQContainer">geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</reference>
+ <reference
name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
</gbean>
- <gbean namePart="ActiveMQ.vm.localhost"
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
+ <gbean name="ActiveMQ.vm.localhost"
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="url">vm://localhost</attribute>
- <reference
name="activeMQContainer">geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</reference>
+ <reference
name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
</gbean>
</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Sat Mar
5 18:48:02 2005
@@ -57,29 +57,32 @@
</outbound-resourceadapter>
</resourceadapter>
- <gbean namePart="DerbySystem"
class="org.apache.geronimo.derby.DerbySystemGBean">
- <reference
name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
+ <gbean name="DerbySystem"
class="org.apache.geronimo.derby.DerbySystemGBean">
+ <reference
name="ServerInfo"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
<attribute name="derbySystemHome">var/derby</attribute>
</gbean>
- <gbean namePart="DerbyNetwork"
class="org.apache.geronimo.derby.DerbyNetworkGBean">
- <reference
name="derbySystem">geronimo.server:name=DerbySystem,*</reference>
+ <gbean name="DerbyNetwork"
class="org.apache.geronimo.derby.DerbyNetworkGBean">
+ <!--TODO remove moduleType when gbeans get the moduleType of the plan
they are in -->
+ <reference
name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
<attribute name="host">127.0.0.1</attribute>
<attribute name="port">1527</attribute>
</gbean>
- <gbean namePart="JDBCTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
+ <gbean name="JDBCTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
<attribute name="repeatCount">5</attribute>
- <reference
name="TransactionContextManager">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=JTAResource,name=TransactionContextManager,*</reference>
- <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource,*</reference>
- <reference
name="ThreadPool">geronimo.server:J2EEServer=geronimo,j2eeType=GBean,name=DefaultThreadPool,*</reference>
- <reference
name="DerbySystem">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/SystemDatabase,J2EEServer=geronimo,j2eeType=GBean,name=DerbySystem</reference>
+ <reference
name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
+ <reference
name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
+ <reference
name="ThreadPool"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>DefaultThreadPool</name></reference>
+ <!--TODO remove moduleType when gbeans get the moduleType of the plan
they are in -->
+ <reference
name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
</gbean>
- <gbean namePart="JDBCNonTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
- <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource,*</reference>
- <reference
name="TransactionContextManager">geronimo.server:J2EEServer=geronimo,j2eeType=JTAResource,name=TransactionContextManager,*</reference>
- <reference
name="ThreadPool">geronimo.server:J2EEServer=geronimo,j2eeType=GBean,name=DefaultThreadPool,*</reference>
- <reference
name="DerbySystem">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/SystemDatabase,J2EEServer=geronimo,j2eeType=GBean,name=DerbySystem</reference>
+ <gbean name="JDBCNonTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
+ <reference
name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
+ <reference
name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
+ <reference
name="ThreadPool"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>DefaultThreadPool</name></reference>
+ <!--TODO remove moduleType when gbeans get the moduleType of the plan
they are in -->
+ <reference
name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
</gbean>
</connector>
Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-plan.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-plan.xml Sat Mar 5
18:48:02 2005
@@ -34,43 +34,43 @@
>
<!-- ServerInfo service -->
- <gbean namePart="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
+ <gbean name="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
<!-- URLFactory service -->
- <gbean namePart="URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
+ <gbean name="URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
<!-- Configuration Store service -->
- <gbean namePart="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
+ <gbean name="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
<attribute name="root">config-store</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
<!-- Persistent List of running Configurations service -->
- <gbean namePart="Default"
class="org.apache.geronimo.system.configuration.FileConfigurationList">
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <gbean name="Default"
class="org.apache.geronimo.system.configuration.FileConfigurationList">
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
<attribute name="configFile">var/config/config.list</attribute>
</gbean>
<!-- Repository -->
- <gbean namePart="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
+ <gbean name="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root">repository/</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
<!-- Logging service -->
- <gbean namePart="Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <gbean name="Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
<attribute
name="configurationFile">var/log/server-log4j.properties</attribute>
<attribute name="refreshPeriod">60</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
</gbean>
<!-- RMI Registry -->
- <gbean namePart="RMIRegistry"
class="org.apache.geronimo.system.rmi.RMIRegistryService">
+ <gbean name="RMIRegistry"
class="org.apache.geronimo.system.rmi.RMIRegistryService">
<attribute name="port">1099</attribute>
</gbean>
<!-- Naming properties -->
- <gbean namePart="NamingProperties"
class="org.apache.geronimo.system.properties.NamingProperties">
+ <gbean name="NamingProperties"
class="org.apache.geronimo.system.properties.NamingProperties">
<attribute
name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
<attribute
name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
<attribute name="namingProviderUrl">rmi://localhost:1099</attribute>
Modified:
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java?view=diff&r1=156291&r2=156292
==============================================================================
---
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java
(original)
+++
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java
Sat Mar 5 18:48:02 2005
@@ -45,7 +45,7 @@
EJBWSGBean.class);
// attributes
infoFactory.addAttribute("objectName", String.class, false);
- infoFactory.addReference("ejbConfig", Configuration.class);
+ infoFactory.addReference("ejbConfig", Configuration.class, null);
infoFactory.addAttribute("classList", Collection.class, true);
// operations
Modified:
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java?view=diff&r1=156291&r2=156292
==============================================================================
---
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
(original)
+++
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java
Sat Mar 5 18:48:02 2005
@@ -52,7 +52,7 @@
// attributes
infoFactory.addAttribute("objectName", String.class, false);
- infoFactory.addReference("AxisGbean",AxisGbean.class);
+ infoFactory.addReference("AxisGbean",AxisGbean.class, null);
infoFactory.addInterface(ConfigurationBuilder.class);
// operations
Modified: geronimo/trunk/modules/axis/src/plans/plan1.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/plans/plan1.xml?view=diff&r1=156291&r2=156292
==============================================================================
--- geronimo/trunk/modules/axis/src/plans/plan1.xml (original)
+++ geronimo/trunk/modules/axis/src/plans/plan1.xml Sat Mar 5 18:48:02 2005
@@ -10,25 +10,25 @@
</dependency>
<!-- Use the default deployer -->
- <gbean
name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <gbean
gbeanName="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute
name="j2eeServer">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
<attribute
name="transactionContextManagerObjectName">geronimo.server:type=TransactionContextManager</attribute>
<attribute
name="connectionTrackerObjectName">geronimo.server:type=ConnectionTracker</attribute>
<attribute
name="transactionalTimerObjectName">geronimo.server:type=ThreadPooledTimer,name=TransactionalThreadPooledTimer</attribute>
<attribute
name="nonTransactionalTimerObjectName">geronimo.server:type=ThreadPooledTimer,name=NonTransactionalThreadPooledTimer</attribute>
- <reference name="Repository">*:role=Repository,*</reference>
- <reference
name="EJBConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server</reference>
- <reference
name="EJBReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server</reference>
- <reference
name="WebConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/Server</reference>
- <reference
name="ConnectorConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
- <reference
name="ResourceReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
- <reference
name="AppClientConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=AppClient,config=org/apache/geronimo/Server</reference>
+ <reference
name="Repository"><gbean-name>*:role=Repository,*</gbean-name></reference>
+ <reference
name="EJBConfigBuilder"><gbean-name>geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server</gbean-name></reference>
+ <reference
name="EJBReferenceBuilder"><gbean-name>geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server</gbean-name></reference>
+ <reference
name="WebConfigBuilder"><gbean-name>geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/Server</gbean-name></reference>
+ <reference
name="ConnectorConfigBuilder"><gbean-name>geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</gbean-name></reference>
+ <reference
name="ResourceReferenceBuilder"><gbean-name>geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</gbean-name></reference>
+ <reference
name="AppClientConfigBuilder"><gbean-name>geronimo.deployer:role=ModuleBuilder,type=AppClient,config=org/apache/geronimo/Server</gbean-name></reference>
</gbean>
<!-- Start Axis GBean from the plan -->
- <gbean name="geronimo.server:type=WebServiceContainer,container=axis"
class="org.apache.geronimo.axis.AxisGBean">
- <reference
name="EARConfigBuilder">geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server</reference>
- <reference
name="Store">geronimo.system:role=ConfigurationStore,type=Local</reference>
+ <gbean gbeanName="geronimo.server:type=WebServiceContainer,container=axis"
class="org.apache.geronimo.axis.AxisGBean">
+ <reference
name="EARConfigBuilder"><gbean-name>geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server</gbean-name></reference>
+ <reference
name="Store"><gbean-name>geronimo.system:role=ConfigurationStore,type=Local</gbean-name></reference>
</gbean>
</configuration>
Modified:
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&r1=156291&r2=156292
==============================================================================
---
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
Sat Mar 5 18:48:02 2005
@@ -582,12 +582,12 @@
infoBuilder.addAttribute("defaultServerParentId", URI.class, true);
infoBuilder.addAttribute("transactionContextManagerObjectName",
ObjectName.class, true);
infoBuilder.addAttribute("connectionTrackerObjectName",
ObjectName.class, true);
- infoBuilder.addReference("EJBReferenceBuilder",
EJBReferenceBuilder.class);
- infoBuilder.addReference("ConnectorModuleBuilder",
ModuleBuilder.class);
- infoBuilder.addReference("ResourceReferenceBuilder",
ResourceReferenceBuilder.class);
- infoBuilder.addReference("ServiceReferenceBuilder",
ServiceReferenceBuilder.class);
- infoBuilder.addReference("Store", ConfigurationStore.class);
- infoBuilder.addReference("Repository", Repository.class);
+ infoBuilder.addReference("EJBReferenceBuilder",
EJBReferenceBuilder.class, NameFactory.MODULE_BUILDER);
+ infoBuilder.addReference("ConnectorModuleBuilder",
ModuleBuilder.class, NameFactory.MODULE_BUILDER);
+ infoBuilder.addReference("ResourceReferenceBuilder",
ResourceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
+ infoBuilder.addReference("ServiceReferenceBuilder",
ServiceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
+ infoBuilder.addReference("Store", ConfigurationStore.class,
NameFactory.CONFIGURATION_STORE);
+ infoBuilder.addReference("Repository", Repository.class,
NameFactory.GERONIMO_SERVICE);
infoBuilder.addAttribute("kernel", Kernel.class, false);
Modified:
geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java?view=diff&r1=156291&r2=156292
==============================================================================
---
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
Sat Mar 5 18:48:02 2005
@@ -110,8 +110,8 @@
infoFactory.addOperation("main", new Class[]{String[].class});
infoFactory.addAttribute("mainClassName", String.class, true);
infoFactory.addAttribute("appClientModuleName", ObjectName.class,
true);
- infoFactory.addReference("JNDIContext", AppClientPlugin.class);
- infoFactory.addReference("TransactionContextManager",
TransactionContextManager.class);
+ infoFactory.addReference("JNDIContext", AppClientPlugin.class,
NameFactory.GERONIMO_SERVICE);
+ infoFactory.addReference("TransactionContextManager",
TransactionContextManager.class, NameFactory.JTA_RESOURCE);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
infoFactory.addAttribute("kernel", Kernel.class, false);
Modified:
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?view=diff&r1=156291&r2=156292
==============================================================================
---
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Sat Mar 5 18:48:02 2005
@@ -864,7 +864,7 @@
infoBuilder.addAttribute("defaultXATransactionCaching", boolean.class,
true);
infoBuilder.addAttribute("defaultXAThreadCaching", boolean.class,
true);
- infoBuilder.addReference("Repository", Repository.class);
+ infoBuilder.addReference("Repository", Repository.class,
NameFactory.GERONIMO_SERVICE);
infoBuilder.addAttribute("kernel", Kernel.class, false);
infoBuilder.addInterface(ModuleBuilder.class);
