djencks 2005/01/21 19:39:14
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:
GERONIMO-450 progress: get the domain and J2EEServer for gbeans from the
parent config, or specify them explicitly if there is not parent. Also some
improvements in storing enhanced/generated classes in a config.
Revision Changes Path
1.11 +7 -7
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- default-database-plan.xml 10 Jan 2005 19:12:43 -0000 1.10
+++ default-database-plan.xml 22 Jan 2005 00:39:14 -0000 1.11
@@ -49,11 +49,11 @@
</resourceadapter>
<gbean namePart="DerbySystem"
class="org.apache.geronimo.derby.DerbySystemGBean">
- <reference
name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="serverInfo">openejb.server:name=ServerInfo,*</reference>
<attribute name="derbySystemHome"
type="java.lang.String">var/derby</attribute>
</gbean>
<gbean namePart="DerbyNetwork"
class="org.apache.geronimo.derby.DerbyNetworkGBean">
- <reference
name="derbySystem">geronimo.server:name=DerbySystem,*</reference>
+ <reference
name="derbySystem">openejb.server:name=DerbySystem,*</reference>
<attribute name="host" type="java.lang.String">127.0.0.1</attribute>
<attribute name="port" type="int">1527</attribute>
</gbean>
@@ -66,14 +66,14 @@
<gbean namePart="JDBCTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
<attribute name="repeatCount" type="int">5</attribute>
- <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>
+ <reference
name="TransactionContextManager">openejb.server:name=TransactionContextManager,*</reference>
+ <reference
name="ManagedConnectionFactoryWrapper">openejb.server:J2EEApplication=null,J2EEServer=openejb,JCAResource=org/apache/geronimo/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
+ <reference
name="ThreadPool">openejb.server:name=DefaultThreadPool,*</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/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
- <reference
name="ThreadPool">geronimo.server:name=DefaultThreadPool,*</reference>
+ <reference
name="ManagedConnectionFactoryWrapper">openejb.server:J2EEApplication=null,J2EEServer=openejb,JCAResource=org/apache/geronimo/DefaultDatabase,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
+ <reference
name="ThreadPool">openejb.server:name=DefaultThreadPool,*</reference>
</gbean>
</connector>
1.7 +5 -4
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- deployer-system-plan.xml 10 Jan 2005 19:12:43 -0000 1.6
+++ deployer-system-plan.xml 22 Jan 2005 00:39:14 -0000 1.7
@@ -24,7 +24,8 @@
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
configId="org/apache/geronimo/DeployerSystem"
- parentId=""
+ domain="openejb.deployer"
+ server="openejb"
>
<!-- ServerInfo service -->
@@ -34,20 +35,20 @@
<!-- Configuration Store service -->
<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.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.deployer:name=ServerInfo,*</reference>
</gbean>
<!-- Repository -->
<gbean namePart="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root" type="java.net.URI">repository/</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.deployer:name=ServerInfo,*</reference>
</gbean>
<!-- Logging service -->
<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.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.deployer:name=ServerInfo,*</reference>
</gbean>
</configuration>
1.35 +11 -13 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- j2ee-deployer-plan.xml 18 Jan 2005 06:13:39 -0000 1.34
+++ j2ee-deployer-plan.xml 22 Jan 2005 00:39:14 -0000 1.35
@@ -108,29 +108,27 @@
<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>
+ <reference
name="Builders">openejb.deployer:j2eeType=ConfigBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
+ <reference
name="Store">openejb.deployer:j2eeType=ConfigurationStore,*</reference>
</gbean>
<gbean namePart="ServiceBuilder" type="ConfigBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
<reference name="Repository">*:name=Repository,*</reference>
</gbean>
<gbean namePart="EARBuilder" type="ConfigBuilder"
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: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>
+ <attribute
name="transactionContextManagerObjectName">openejb.server:name=TransactionContextManager,*</attribute>
+ <attribute
name="connectionTrackerObjectName">openejb.server:name=ConnectionTracker,*</attribute>
+ <attribute
name="transactionalTimerObjectName">openejb.server:name=TransactionalThreadPooledTimer,*</attribute>
+ <attribute
name="nonTransactionalTimerObjectName">openejb.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>
- <reference
name="ServiceReferenceBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
+ <reference
name="EJBConfigBuilder">openejb.deployer:name=EJBBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
+ <reference
name="EJBReferenceBuilder">openejb.deployer:name=EJBBuilder,J2EEModule=org/apache/geronimo/J2EEDeployer,*</reference>
+ <reference
name="ConnectorConfigBuilder">openejb.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=openejb,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
+ <reference
name="ResourceReferenceBuilder">openejb.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=openejb,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
+ <reference
name="ServiceReferenceBuilder">openejb.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=openejb,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
</gbean>
<gbean namePart="EJBBuilder" type="ModuleBuilder"
class="org.openejb.deployment.OpenEJBModuleBuilder">
1.52 +36 -38 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- j2ee-server-plan.xml 18 Jan 2005 06:13:39 -0000 1.51
+++ j2ee-server-plan.xml 22 Jan 2005 00:39:14 -0000 1.52
@@ -162,9 +162,9 @@
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.server:j2eeType=LoginModule,name=properties-login,J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo
+
LoginModule.1.REQUIRED=openejb.server:j2eeType=LoginModule,name=properties-login,J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=openejb
</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
<gbean namePart="JMX" type="ConfigurationEntry"
@@ -176,8 +176,8 @@
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration
handler -->
<gbean namePart="LoginConfiguration"
class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration">
<references name="Configurations">
- <pattern>geronimo.server:j2eeType=SecurityRealm,*</pattern>
- <pattern>geronimo.server:j2eeType=ConfigurationEntry,*</pattern>
+ <pattern>openejb.server:j2eeType=SecurityRealm,*</pattern>
+ <pattern>openejb.server:j2eeType=ConfigurationEntry,*</pattern>
</references>
</gbean>
@@ -185,8 +185,8 @@
<attribute name="policyConfigurationFactory"
type="java.lang.String">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
</gbean>
- <gbean namePart="JaasLoginService"
class="org.apache.geronimo.security.jaas.JaasLoginService">
- <reference
name="Realms">geronimo.server:j2eeType=SecurityRealm,*</reference>
+ <gbean
name="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JaasLoginService"
class="org.apache.geronimo.security.jaas.JaasLoginService">
+ <reference
name="Realms">openejb.server:j2eeType=SecurityRealm,*</reference>
<attribute name="algorithm"
type="java.lang.String">HmacSHA1</attribute>
<attribute name="password" type="java.lang.String">secret</attribute>
</gbean>
@@ -204,7 +204,7 @@
<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:name=TransactionContextManager,*</reference>
+ <reference
name="TransactionContextManager">openejb.server:name=TransactionContextManager,*</reference>
</gbean>
<gbean namePart="HOWLTransactionLog"
class="org.apache.geronimo.transaction.log.HOWLLog">
@@ -220,21 +220,21 @@
<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.server:name=ServerInfo,*</reference>
+ <reference
name="serverInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
<gbean namePart="TransactionManager"
class="org.apache.geronimo.transaction.manager.TransactionManagerImpl">
<attribute name="defaultTransactionTimeoutSeconds"
type="int">300</attribute>
- <reference
name="TransactionLog">geronimo.server:name=HOWLTransactionLog,*</reference>
+ <reference
name="TransactionLog">openejb.server:name=HOWLTransactionLog,*</reference>
<references name="ResourceManagers">
-
<pattern>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</pattern>
- <pattern>geronimo.server:j2eeType=ActivationSpec,*</pattern>
+
<pattern>openejb.server:j2eeType=JCAManagedConnectionFactory,*</pattern>
+ <pattern>openejb.server:j2eeType=ActivationSpec,*</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>
+ <reference
name="TransactionManager">openejb.server:name=TransactionManager,*</reference>
+ <reference
name="XidImporter">openejb.server:name=TransactionManager,*</reference>
</gbean>
<!-- EJB Protocol -->
@@ -247,18 +247,18 @@
<attribute name="threads">20</attribute>
<attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
<attribute name="logOnFailure">HOST,NAME</attribute>
- <reference name="Server">geronimo.server:name=EJBServer,*</reference>
+ <reference name="Server">openejb.server:name=EJBServer,*</reference>
</gbean>
<gbean namePart="EJBServer"
class="org.openejb.server.ejbd.EjbServerGBean">
- <reference
name="ContainerIndex">geronimo.server:name=ContainerIndex,*</reference>
+ <reference
name="ContainerIndex">openejb.server:name=ContainerIndex,*</reference>
</gbean>
<gbean namePart="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>openejb.server:j2eeType=StatelessSessionBean,*</pattern>
+ <pattern>openejb.server:j2eeType=StatefulSessionBean,*</pattern>
+ <pattern>openejb.server:j2eeType=EntityBean,*</pattern>
</references>
</gbean>
@@ -285,11 +285,11 @@
</gbean>
<!-- 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 name="openejb.server:j2eeType=J2EEDomain,name=openejb.server"
class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
+ <gbean name="openejb.server:j2eeType=J2EEServer,name=openejb"
class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
+ <reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
- <gbean name="geronimo.server:j2eeType=JVM,J2EEServer=geronimo"
class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
+ <gbean name="openejb.server:j2eeType=JVM,J2EEServer=openejb"
class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
<!-- JMX Remoting -->
<gbean namePart="JMXService"
class="org.apache.geronimo.jmxremoting.JMXConnector">
@@ -299,29 +299,27 @@
<!-- todo move to child config once we sort out the packaging -->
<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>
+ <reference
name="Builders">openejb.server:j2eeType=ConfigBuilder,J2EEModule=org/apache/geronimo/Server,*</reference>
+ <reference
name="Store">openejb.server:j2eeType=ConfigurationStore,*</reference>
</gbean>
<gbean namePart="ServiceBuilder" type="ConfigBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- <attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
<reference name="Repository">*:name=Repository,*</reference>
</gbean>
<gbean namePart="EARBuilder" type="ConfigBuilder"
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: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>
+ <attribute
name="transactionContextManagerObjectName">openejb.server:name=TransactionContextManager,*</attribute>
+ <attribute
name="connectionTrackerObjectName">openejb.server:name=ConnectionTracker,*</attribute>
+ <attribute
name="transactionalTimerObjectName">openejb.server:name=TransactionalThreadPooledTimer,*</attribute>
+ <attribute
name="nonTransactionalTimerObjectName">openejb.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>
- <reference
name="ServiceReferenceBuilder">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
+ <reference
name="EJBConfigBuilder">openejb.server:name=EJBBuilder,J2EEModule=org/apache/geronimo/Server,*</reference>
+ <reference
name="EJBReferenceBuilder">openejb.server:name=EJBBuilder,J2EEModule=org/apache/geronimo/Server,*</reference>
+ <reference
name="ConnectorConfigBuilder">openejb.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=openejb,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
+ <reference
name="ResourceReferenceBuilder">openejb.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=openejb,j2eeType=ModuleBuilder,name=ConnectorBuilder</reference>
+ <reference
name="ServiceReferenceBuilder">openejb.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=openejb,j2eeType=ModuleBuilder,name=WebServiceBuilder</reference>
</gbean>
<gbean namePart="EJBBuilder" type="ModuleBuilder"
class="org.openejb.deployment.OpenEJBModuleBuilder">
@@ -356,7 +354,7 @@
<!-- end deployment block -->
<gbean name="openejb.CORBA:type=Server"
class="org.openejb.corba.CORBABean">
- <reference
name="ThreadPool">geronimo.server:name=DefaultThreadPool,*</reference>
+ <reference
name="ThreadPool">openejb.server:name=DefaultThreadPool,*</reference>
<attribute name="args" type="java.util.ArrayList">-ORBPort, 2001,
-ORBInitRef, NameService=corbaloc::localhost:1050/NameService</attribute>
<attribute name="props" type="java.util.Properties">
@@ -370,7 +368,7 @@
</gbean>
<gbean name="openejb.CORBA:type=NameServer"
class="org.openejb.corba.OpenORBNameBean">
- <reference
name="ThreadPool">geronimo.server:name=DefaultThreadPool,*</reference>
+ <reference
name="ThreadPool">openejb.server:name=DefaultThreadPool,*</reference>
<attribute name="args" type="java.util.ArrayList">-ORBPort,
1050</attribute>
<attribute name="props" type="java.util.Properties">
openorb.home=resource:org/openorb/
@@ -381,7 +379,7 @@
<gbean name="openejb.CORBA:type=POA,domain=org/openejb/Itests"
class="org.openejb.corba.POABean">
<attribute name="POAName"
type="java.lang.String">org/openejb/POA</attribute>
<reference name="Server">openejb.CORBA:type=Server</reference>
- <reference
name="Containers">geronimo.server:EJBModule=org/openejb/scenario001,*</reference>
+ <reference
name="Containers">openejb.server:EJBModule=org/openejb/scenario001,*</reference>
<reference
name="TieLoader">openejb.CORBA:type=TieLoader,name=ClasspathTieLoader</reference>
</gbean>
1.9 +5 -5 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- security-plan.xml 10 Jan 2005 19:12:43 -0000 1.8
+++ security-plan.xml 22 Jan 2005 00:39:14 -0000 1.9
@@ -35,7 +35,7 @@
<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.server:name=JaasLoginService,*</reference>
+ <reference
name="loginService">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JaasLoginService</reference>
</gbean>
<!-- public security realm -->
@@ -54,9 +54,9 @@
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.server:j2eeType=LoginModule,J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/openejb/Security,name=public-login
+
LoginModule.1.REQUIRED=openejb.server:j2eeType=LoginModule,J2EEServer=openejb,J2EEApplication=null,J2EEModule=org/openejb/Security,name=public-login
</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
<gbean namePart="public" type="ConfigurationEntry"
@@ -81,9 +81,9 @@
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.server:j2eeType=LoginModule,J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/openejb/Security,name=black-login
+
LoginModule.1.REQUIRED=openejb.server:j2eeType=LoginModule,J2EEServer=openejb,J2EEApplication=null,J2EEModule=org/openejb/Security,name=black-login
</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
<gbean namePart="black" type="ConfigurationEntry"
1.12 +6 -5 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- system-plan.xml 10 Jan 2005 19:12:43 -0000 1.11
+++ system-plan.xml 22 Jan 2005 00:39:14 -0000 1.12
@@ -29,7 +29,8 @@
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
configId="org/apache/geronimo/System"
- parentId=""
+ domain="openejb.server"
+ server="openejb"
>
<!-- ServerInfo service -->
@@ -41,26 +42,26 @@
<!-- Configuration Store service -->
<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.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
<!-- Persistent List of running Configurations service -->
<gbean namePart="PersistentConfigurationList"
class="org.apache.geronimo.system.configuration.FileConfigurationList">
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
<attribute name="configFile"
type="java.lang.String">var/config/config.list</attribute>
</gbean>
<!-- Repository -->
<gbean namePart="Repository"
class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root" type="java.net.URI">repository/</attribute>
- <reference
name="ServerInfo">geronimo.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
<!-- Logging service -->
<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.server:name=ServerInfo,*</reference>
+ <reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
<!-- RMI Registry -->
