djencks 2005/01/10 14:12:43
Modified: modules/assembly/src/plan default-database-plan.xml
deployer-system-plan.xml j2ee-deployer-plan.xml
j2ee-server-plan.xml security-plan.xml
system-plan.xml
Log:
Partial implementation of GERONIMO-450. GBean names are (mostly) constructed
like jsr-77 names and xml config usually only needs to specify namePart and
optionally type
Revision Changes Path
1.10 +11 -11
openejb/modules/assembly/src/plan/default-database-plan.xml
Index: default-database-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/default-database-plan.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- default-database-plan.xml 27 Dec 2004 02:52:37 -0000 1.9
+++ default-database-plan.xml 10 Jan 2005 19:12:43 -0000 1.10
@@ -48,12 +48,12 @@
</outbound-resourceadapter>
</resourceadapter>
- <gbean name="geronimo.server:role=DerbySystem"
class="org.apache.geronimo.derby.DerbySystemGBean">
- <reference
name="serverInfo">geronimo.system:role=ServerInfo</reference>
+ <gbean namePart="DerbySystem"
class="org.apache.geronimo.derby.DerbySystemGBean">
+ <reference
name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
<attribute name="derbySystemHome"
type="java.lang.String">var/derby</attribute>
</gbean>
- <gbean name="geronimo.server:role=DerbyNetwork"
class="org.apache.geronimo.derby.DerbyNetworkGBean">
- <reference
name="derbySystem">geronimo.server:role=DerbySystem</reference>
+ <gbean namePart="DerbyNetwork"
class="org.apache.geronimo.derby.DerbyNetworkGBean">
+ <reference
name="derbySystem">geronimo.server:name=DerbySystem,*</reference>
<attribute name="host" type="java.lang.String">127.0.0.1</attribute>
<attribute name="port" type="int">1527</attribute>
</gbean>
@@ -64,16 +64,16 @@
<attribute name="ConfiguredPassword"
type="java.lang.String">testPassword</attribute>
</gbean-->
- <gbean
name="geronimo.server:type=ThreadPooledTimer,name=JDBCTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
+ <gbean namePart="JDBCTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
<attribute name="repeatCount" type="int">5</attribute>
- <reference
name="TransactionContextManager">geronimo.server:type=TransactionContextManager</reference>
- <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:name=DefaultDatasource</reference>
- <reference
name="ThreadPool">geronimo.server:type=ThreadPool,name=DefaultThreadPool</reference>
+ <reference
name="TransactionContextManager">geronimo.server:name=TransactionContextManager,*</reference>
+ <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
+ <reference
name="ThreadPool">geronimo.server:name=DefaultThreadPool,*</reference>
</gbean>
- <gbean
name="geronimo.server:type=ThreadPooledTimer,name=JDBCNonTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
- <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:name=DefaultDatasource</reference>
- <reference
name="ThreadPool">geronimo.server:type=ThreadPool,name=DefaultThreadPool</reference>
+ <gbean namePart="JDBCNonTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
+ <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
+ <reference
name="ThreadPool">geronimo.server:name=DefaultThreadPool,*</reference>
</gbean>
</connector>
1.6 +8 -8
openejb/modules/assembly/src/plan/deployer-system-plan.xml
Index: deployer-system-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/deployer-system-plan.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- deployer-system-plan.xml 10 Nov 2004 08:20:23 -0000 1.5
+++ deployer-system-plan.xml 10 Jan 2005 19:12:43 -0000 1.6
@@ -28,26 +28,26 @@
>
<!-- ServerInfo service -->
- <gbean name="geronimo.deployment:role=ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo">
+ <gbean namePart="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo">
</gbean>
<!-- Configuration Store service -->
- <gbean name="geronimo.deployment:role=ConfigurationStore,type=Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
+ <gbean namePart="Local" type="ConfigurationStore"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
<attribute name="root" type="java.net.URI">config-store/</attribute>
- <reference
name="ServerInfo">geronimo.deployment:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
<!-- Repository -->
- <gbean name="geronimo.deployment:role=Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
+ <gbean namePart="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root" type="java.net.URI">repository/</attribute>
- <reference
name="ServerInfo">geronimo.deployment:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
<!-- Logging service -->
- <gbean name="geronimo.deployment:role=Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
- <attribute name="configurationFile"
type="java.lang.String">var/log/deployer-log4j.xml</attribute>
+ <gbean namePart="Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <attribute name="configurationFile"
type="java.lang.String">var/log/deployer-log4j.properties</attribute>
<attribute name="refreshPeriod" type="int">60</attribute>
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
</configuration>
1.33 +21 -48 openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- j2ee-deployer-plan.xml 8 Jan 2005 02:03:50 -0000 1.32
+++ j2ee-deployer-plan.xml 10 Jan 2005 19:12:43 -0000 1.33
@@ -100,66 +100,39 @@
<uri>antlr/jars/antlr-${antlr_version}.jar</uri>
</dependency>
- <!-- OpenORB Skeleton generator -->
- <dependency>
- <uri>ant/jars/ant-${ant_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-tools-${openorb_version}.jar</uri>
- </dependency>
- <!-- HTTP/SOAP with XFire -->
- <dependency>
- <uri>xfire/jars/xfire-${xfire_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>xfire/jars/xfire-java-${xfire_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>xfire/jars/xfire-jaxrpc-${xfire_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>wsdl4j/jars/wsdl4j-${wsdl4j_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>stax/jars/stax-${stax_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
- </dependency>
-
-
- <gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.Deployer">
- <reference
name="Builders">geronimo.deployer:role=Builder,config=org/apache/geronimo/J2EEDeployer,*</reference>
- <reference
name="Store">geronimo.deployment:role=ConfigurationStore,type=Local</reference>
+ <gbean namePart="Deployer" type="Deployer"
class="org.apache.geronimo.deployment.Deployer">
+ <reference
name="Builders">geronimo.server:j2eeType=ConfigBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
+ <reference
name="Store">geronimo.server:j2eeType=ConfigurationStore,*</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=Builder,type=Service,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+ <gbean namePart="ServiceBuilder" type="ConfigBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <reference name="Repository">*:role=Repository,*</reference>
+ <attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
+ <reference name="Repository">*:name=Repository,*</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <gbean namePart="EARBuilder" type="ConfigBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
- <attribute name="transactionContextManagerObjectName"
type="javax.management.ObjectName">geronimo.server:type=TransactionContextManager</attribute>
- <attribute name="connectionTrackerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
- <attribute name="transactionalTimerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=TransactionalThreadPooledTimer</attribute>
- <attribute name="nonTransactionalTimerObjectName"
type="javax.management.ObjectName">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/J2EEDeployer</reference>
- <reference
name="EJBReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer</reference>
- <reference
name="ConnectorConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer</reference>
- <reference
name="ResourceReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer</reference>
+ <attribute
name="j2eeServer">geronimo.server:j2eeType=J2EEServer,name=geronimo</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/J2EEDeployer,*</reference>
+ <reference
name="EJBReferenceBuilder">geronimo.server:name=EJBBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
+ <reference
name="ConnectorConfigBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
+ <reference
name="ResourceReferenceBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer"
class="org.openejb.deployment.OpenEJBModuleBuilder">
+ <gbean namePart="EJBBuilder" type="ModuleBuilder"
class="org.openejb.deployment.OpenEJBModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<!-- <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>-->
- <reference name="Repository">*:role=Repository,*</reference>
+ <reference name="Repository">*:name=Repository,*</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <gbean namePart="ConnectorBuilder" type="ModuleBuilder"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="defaultMaxSize" type="int">10</attribute>
<attribute name="defaultMinSize" type="int">0</attribute>
@@ -167,7 +140,7 @@
<attribute name="defaultIdleTimeoutMinutes" type="int">15</attribute>
<attribute name="defaultXATransactionCaching"
type="boolean">true</attribute>
<attribute name="defaultXAThreadCaching"
type="boolean">false</attribute>
- <reference name="Repository">*:role=Repository,*</reference>
+ <reference name="Repository">*:name=Repository,*</reference>
</gbean>
<!-- gbean name="openejb.CORBA:type=Compiler,vendor=Ant"
class="org.openejb.corba.compiler.AntCompiler"/>
1.49 +52 -92 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- j2ee-server-plan.xml 6 Jan 2005 20:22:29 -0000 1.48
+++ j2ee-server-plan.xml 10 Jan 2005 19:12:43 -0000 1.49
@@ -121,53 +121,11 @@
<uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
</dependency>
- <!-- CORBA -->
- <dependency>
- <uri>openorb/jars/openorb-orb-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-orb-omg-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-orb-tools-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-tools-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
-
<uri>avalon/jars/avalon-framework-${avalon_framework_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>avalon/jars/avalon-logkit-${avalon_logkit_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>ant/jars/ant-${ant_version}.jar</uri>
- </dependency>
-
- <!-- HTTP/SOAP -->
- <dependency>
- <uri>xfire/jars/xfire-${xfire_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>xfire/jars/xfire-java-${xfire_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>xfire/jars/xfire-jaxrpc-${xfire_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>wsdl4j/jars/wsdl4j-${wsdl4j_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>stax/jars/stax-${stax_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
- </dependency>
<!-- Default security realm using properties files -->
- <gbean name="geronimo.security:type=LoginModule,name=properties-login"
+ <gbean namePart="properties-login" type="LoginModule"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
<attribute name="loginModuleClass"
type="java.lang.String">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
<attribute name="serverSide" type="boolean">true</attribute>
@@ -178,56 +136,56 @@
<attribute name="loginDomainName"
type="java.lang.String">geronimo-properties-realm</attribute>
</gbean>
- <gbean
name="geronimo.security:type=SecurityRealm,realm=geronimo-properties-realm"
+ <gbean namePart="geronimo-properties-realm" type="SecurityRealm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName"
type="java.lang.String">geronimo-properties-realm</attribute>
<attribute name="loginModuleConfiguration"
type="java.util.Properties">
-
LoginModule.1.REQUIRED=geronimo.security:type=LoginModule,name=properties-login
+
LoginModule.1.REQUIRED=geronimo.server:j2eeType=LoginModule,name=properties-login,J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo
</attribute>
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
- <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=JMX"
+ <gbean namePart="JMX" type="ConfigurationEntry"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
<attribute name="applicationConfigName"
type="java.lang.String">JMX</attribute>
<attribute name="realmName"
type="java.lang.String">geronimo-properties-realm</attribute>
</gbean>
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration
handler -->
- <gbean name="geronimo.security:type=LoginConfiguration"
class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
+ <gbean namePart="LoginConfiguration"
class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
<references name="Configurations">
- <pattern>geronimo.security:type=SecurityRealm,*</pattern>
- <pattern>geronimo.security:type=ConfigurationEntry,*</pattern>
+ <pattern>geronimo.server:j2eeType=SecurityRealm,*</pattern>
+ <pattern>geronimo.server:j2eeType=ConfigurationEntry,*</pattern>
</references>
</gbean>
- <gbean name="geronimo.security:type=SecurityService"
class="org.apache.geronimo.security.SecurityServiceImpl">
+ <gbean namePart="SecurityService"
class="org.apache.geronimo.security.SecurityServiceImpl">
<attribute name="policyConfigurationFactory"
type="java.lang.String">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
</gbean>
- <gbean name="geronimo.security:type=JaasLoginService"
class="org.apache.geronimo.security.jaas.JaasLoginService">
- <reference
name="Realms">geronimo.security:type=SecurityRealm,*</reference>
+ <gbean namePart="JaasLoginService"
class="org.apache.geronimo.security.jaas.JaasLoginService">
+ <reference
name="Realms">geronimo.server:j2eeType=SecurityRealm,*</reference>
<attribute name="algorithm"
type="java.lang.String">HmacSHA1</attribute>
<attribute name="password" type="java.lang.String">secret</attribute>
</gbean>
- <gbean name="geronimo.server:type=ThreadPool,name=DefaultThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
+ <gbean namePart="DefaultThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
<attribute name="keepAliveTime" type="long">5000</attribute>
<attribute name="poolSize" type="int">10</attribute>
<attribute name="poolName"
type="java.lang.String">DefaultThreadPool</attribute>
</gbean>
- <gbean name="geronimo.server:type=ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
+ <gbean namePart="ConnectionTracker"
class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
</gbean>
- <gbean name="geronimo.server:type=WorkManager,name=DefaultWorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
+ <gbean namePart="DefaultWorkManager"
class="org.apache.geronimo.connector.work.GeronimoWorkManager">
<attribute name="syncMaximumPoolSize" type="int">10</attribute>
<attribute name="startMaximumPoolSize" type="int">10</attribute>
<attribute name="scheduledMaximumPoolSize" type="int">10</attribute>
<reference
name="TransactionContextManager">geronimo.server:type=TransactionContextManager</reference>
</gbean>
- <gbean name="geronimo.server:type=HOWLTransactionLog"
class="org.apache.geronimo.transaction.log.HOWLLog">
+ <gbean namePart="HOWLTransactionLog"
class="org.apache.geronimo.transaction.log.HOWLLog">
<attribute name="bufferClassName"
type="java.lang.String">org.objectweb.howl.log.BlockLogBuffer</attribute>
<attribute name="bufferSizeKBytes" type="int">32</attribute>
<attribute name="checksumEnabled" type="boolean">true</attribute>
@@ -240,25 +198,25 @@
<attribute name="maxLogFiles" type="int">2</attribute>
<attribute name="minBuffers" type="int">4</attribute>
<attribute name="threadsWaitingForceThreshold"
type="int">-1</attribute>
- <reference
name="serverInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
- <gbean name="geronimo.server:type=TransactionManager"
class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
+ <gbean namePart="TransactionManager"
class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
<attribute name="defaultTransactionTimeoutSeconds"
type="int">300</attribute>
- <reference
name="TransactionLog">geronimo.server:type=HOWLTransactionLog</reference>
+ <reference
name="TransactionLog">geronimo.server:name=HOWLTransactionLog,*</reference>
<references name="ResourceManagers">
<pattern>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</pattern>
<pattern>geronimo.server:j2eeType=ActivationSpec,*</pattern>
</references>
</gbean>
- <gbean name="geronimo.server:type=TransactionContextManager"
class="org.apache.geronimo.transaction.context.TransactionContextManager">
- <reference
name="TransactionManager">geronimo.server:type=TransactionManager</reference>
- <reference
name="XidImporter">geronimo.server:type=TransactionManager</reference>
+ <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>
<!-- EJB Protocol -->
- <gbean name="openejb:type=NetworkService,name=EJB"
class="org.openejb.server.StandardServiceStackGBean">
+ <gbean namePart="EJBNetworkService"
class="org.openejb.server.StandardServiceStackGBean">
<attribute name="name">EJB</attribute>
<attribute name="port">4201</attribute>
<attribute name="address">127.0.0.1</attribute>
@@ -267,13 +225,14 @@
<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">geronimo.server:name=EJBServer,*</reference>
</gbean>
- <gbean name="openejb:type=Server,name=EJB"
class="org.openejb.server.ejbd.EjbServerGBean">
- <reference
name="ContainerIndex">openejb:type=ContainerIndex</reference>
+
+ <gbean namePart="EJBServer"
class="org.openejb.server.ejbd.EjbServerGBean">
+ <reference
name="ContainerIndex">geronimo.server:name=ContainerIndex,*</reference>
</gbean>
- <gbean name="openejb:type=ContainerIndex"
class="org.openejb.ContainerIndex">
+ <gbean namePart="ContainerIndex" class="org.openejb.ContainerIndex">
<references name="EJBContainers">
<pattern>geronimo.server:j2eeType=StatelessSessionBean,*</pattern>
<pattern>geronimo.server:j2eeType=StatefulSessionBean,*</pattern>
@@ -306,48 +265,49 @@
<!-- 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.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
<gbean name="geronimo.server:j2eeType=JVM,J2EEServer=geronimo"
class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
<!-- JMX Remoting -->
- <gbean name="geronimo.server:role=JMXService,name=localhost"
class="org.apache.geronimo.jmxremoting.JMXConnector">
- <attribute name="URL"
type="java.lang.String">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
- <attribute name="applicationConfigName"
type="java.lang.String">JMX</attribute>
+ <gbean namePart="JMXService"
class="org.apache.geronimo.jmxremoting.JMXConnector">
+ <attribute
name="URL">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
+ <attribute name="applicationConfigName">JMX</attribute>
</gbean>
<!-- todo move to child config once we sort out the packaging -->
- <gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/Server"
class="org.apache.geronimo.deployment.Deployer">
- <reference
name="Builders">geronimo.deployer:role=Builder,config=org/apache/geronimo/Server,*</reference>
- <reference
name="Store">geronimo.system:role=ConfigurationStore,type=Local</reference>
+ <gbean namePart="Deployer" type="Deployer"
class="org.apache.geronimo.deployment.Deployer">
+ <reference
name="Builders">geronimo.server:j2eeType=ConfigBuilder,J2EEModule=org/apache/geronimo/Server,*</reference>
+ <reference
name="Store">geronimo.server:j2eeType=ConfigurationStore,*</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=Builder,type=Service,config=org/apache/geronimo/Server"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+ <gbean namePart="ServiceBuilder" type="ConfigBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <reference name="Repository">*:role=Repository,*</reference>
+ <attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
+ <reference name="Repository">*:name=Repository,*</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <gbean namePart="EARBuilder" type="ConfigBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
- <attribute name="transactionContextManagerObjectName"
type="javax.management.ObjectName">geronimo.server:type=TransactionContextManager</attribute>
- <attribute name="connectionTrackerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
- <attribute name="transactionalTimerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=TransactionalThreadPooledTimer</attribute>
- <attribute name="nonTransactionalTimerObjectName"
type="javax.management.ObjectName">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="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>
+ <attribute
name="j2eeServer">geronimo.server:j2eeType=J2EEServer,name=geronimo</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/Server,*</reference>
+ <reference
name="EJBReferenceBuilder">geronimo.server:name=EJBBuilder,J2EEModule=org/apache/geronimo/Server,*</reference>
+ <reference
name="ConnectorConfigBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
+ <reference
name="ResourceReferenceBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server"
class="org.openejb.deployment.OpenEJBModuleBuilder">
+ <gbean namePart="EJBBuilder" type="ModuleBuilder"
class="org.openejb.deployment.OpenEJBModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>>
- <reference name="Repository">*:role=Repository,*</reference>
+ <reference name="Repository">*:name=Repository,*</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <gbean namePart="ConnectorBuilder" type="ModuleBuilder"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="defaultMaxSize" type="int">10</attribute>
<attribute name="defaultMinSize" type="int">0</attribute>
@@ -355,7 +315,7 @@
<attribute name="defaultIdleTimeoutMinutes" type="int">15</attribute>
<attribute name="defaultXATransactionCaching"
type="boolean">true</attribute>
<attribute name="defaultXAThreadCaching"
type="boolean">false</attribute>
- <reference name="Repository">*:role=Repository,*</reference>
+ <reference name="Repository">*:name=Repository,*</reference>
</gbean>
<!-- these need names that include the parent id so they don't conflict
with the deployer namens-->
1.8 +11 -11 openejb/modules/assembly/src/plan/security-plan.xml
Index: security-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/security-plan.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- security-plan.xml 6 Jan 2005 20:22:29 -0000 1.7
+++ security-plan.xml 10 Jan 2005 19:12:43 -0000 1.8
@@ -35,11 +35,11 @@
<gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer"
class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
<attribute name="bindURI"
type="java.net.URI">tcp://0.0.0.0:4242</attribute>
- <reference
name="loginService">geronimo.security:type=JaasLoginService</reference>
+ <reference
name="loginService">geronimo.server:name=JaasLoginService,*</reference>
</gbean>
<!-- public security realm -->
- <gbean name="geronimo.security:type=LoginModule,name=public-login"
+ <gbean namePart="public-login" type="LoginModule"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
<attribute name="loginModuleClass"
type="java.lang.String">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
<attribute name="serverSide" type="boolean">true</attribute>
@@ -50,23 +50,23 @@
<attribute name="loginDomainName"
type="java.lang.String">public-properties-realm</attribute>
</gbean>
- <gbean
name="geronimo.security:type=SecurityRealm,name=public-properties-realm"
+ <gbean namePart="public-properties-realm" type="SecurityRealm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName"
type="java.lang.String">public-properties-realm</attribute>
<attribute name="loginModuleConfiguration"
type="java.util.Properties">
-
LoginModule.1.REQUIRED=geronimo.security:type=LoginModule,name=public-login
+
LoginModule.1.REQUIRED=geronimo.server:j2eeType=LoginModule,J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/openejb/Security,name=public-login
</attribute>
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
- <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=public"
+ <gbean namePart="public" type="ConfigurationEntry"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
<attribute name="applicationConfigName"
type="java.lang.String">public</attribute>
<attribute name="realmName"
type="java.lang.String">public-properties-realm</attribute>
</gbean>
<!-- secret internal auditing security realm -->
- <gbean name="geronimo.security:type=LoginModule,name=black-login"
+ <gbean namePart="black-login" type="LoginModule"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
<attribute name="loginModuleClass"
type="java.lang.String">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
<attribute name="serverSide" type="boolean">true</attribute>
@@ -77,16 +77,16 @@
<attribute name="loginDomainName"
type="java.lang.String">black-properties-realm</attribute>
</gbean>
- <gbean
name="geronimo.security:type=SecurityRealm,name=black-properties-realm"
+ <gbean namePart="black-properties-realm" type="SecurityRealm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName"
type="java.lang.String">black-properties-realm</attribute>
<attribute name="loginModuleConfiguration"
type="java.util.Properties">
-
LoginModule.1.REQUIRED=geronimo.security:type=LoginModule,name=black-login
+
LoginModule.1.REQUIRED=geronimo.server:j2eeType=LoginModule,J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/openejb/Security,name=black-login
</attribute>
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
- <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=black"
+ <gbean namePart="black" type="ConfigurationEntry"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
<attribute name="applicationConfigName"
type="java.lang.String">black</attribute>
<attribute name="realmName"
type="java.lang.String">black-properties-realm</attribute>
1.11 +12 -12 openejb/modules/assembly/src/plan/system-plan.xml
Index: system-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/system-plan.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- system-plan.xml 10 Nov 2004 08:20:23 -0000 1.10
+++ system-plan.xml 10 Jan 2005 19:12:43 -0000 1.11
@@ -33,38 +33,38 @@
>
<!-- ServerInfo service -->
- <gbean name="geronimo.system:role=ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
+ <gbean namePart="ServerInfo"
class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
<!-- URLFactory service -->
- <gbean name="geronimo.system:role=URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
+ <gbean namePart="URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
<!-- Configuration Store service -->
- <gbean name="geronimo.system:role=ConfigurationStore,type=Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
+ <gbean namePart="Local" type="ConfigurationStore"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
<attribute name="root" type="java.net.URI">config-store</attribute>
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
<!-- Persistent List of running Configurations service -->
- <gbean name="geronimo.boot:role=PersistentConfigurationList"
class="org.apache.geronimo.system.configuration.FileConfigurationList">
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <gbean namePart="PersistentConfigurationList"
class="org.apache.geronimo.system.configuration.FileConfigurationList">
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
<attribute name="configFile"
type="java.lang.String">var/config/config.list</attribute>
</gbean>
<!-- Repository -->
- <gbean name="geronimo.system:role=Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
+ <gbean namePart="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root" type="java.net.URI">repository/</attribute>
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
<!-- Logging service -->
- <gbean name="geronimo.system:role=Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
- <attribute name="configurationFile"
type="java.lang.String">var/log/server-log4j.xml</attribute>
+ <gbean namePart="Logger"
class="org.apache.geronimo.system.logging.log4j.Log4jService">
+ <attribute name="configurationFile"
type="java.lang.String">var/log/server-log4j.properties</attribute>
<attribute name="refreshPeriod" type="int">60</attribute>
- <reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
</gbean>
<!-- RMI Registry -->
- <gbean name="geronimo.server:role=RMIRegistry"
class="org.apache.geronimo.system.rmi.RMIRegistryService">
+ <gbean namePart="RMIRegistry"
class="org.apache.geronimo.system.rmi.RMIRegistryService">
<attribute name="port" type="int">1099</attribute>
</gbean>
</configuration>
