djencks 2005/01/24 16:16:48
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:
More work on GERONIMO-450. Get the j2eeType from GBeanInfo. Also remove
unneeded attribute 'type' attributes
Revision Changes Path
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- default-database-plan.xml 22 Jan 2005 00:39:14 -0000 1.11
+++ default-database-plan.xml 24 Jan 2005 21:16:48 -0000 1.12
@@ -50,22 +50,22 @@
<gbean namePart="DerbySystem"
class="org.apache.geronimo.derby.DerbySystemGBean">
<reference
name="serverInfo">openejb.server:name=ServerInfo,*</reference>
- <attribute name="derbySystemHome"
type="java.lang.String">var/derby</attribute>
+ <attribute name="derbySystemHome">var/derby</attribute>
</gbean>
<gbean namePart="DerbyNetwork"
class="org.apache.geronimo.derby.DerbyNetworkGBean">
<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>
+ <attribute name="host">127.0.0.1</attribute>
+ <attribute name="port">1527</attribute>
</gbean>
<!--gbean name="geronimo.security:service=RealmBridge,name=TargetRealm"
class="org.apache.geronimo.security.bridge.ConfiguredIdentityUserPasswordRealmBridge">
- <attribute name="TargetRealm"
type="java.lang.String">TargetRealm</attribute>
- <attribute name="ConfiguredUser"
type="java.lang.String">testUser</attribute>
- <attribute name="ConfiguredPassword"
type="java.lang.String">testPassword</attribute>
+ <attribute name="TargetRealm">TargetRealm</attribute>
+ <attribute name="ConfiguredUser">testUser</attribute>
+ <attribute name="ConfiguredPassword">testPassword</attribute>
</gbean-->
<gbean namePart="JDBCTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
- <attribute name="repeatCount" type="int">5</attribute>
+ <attribute name="repeatCount">5</attribute>
<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>
1.8 +5 -5
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- deployer-system-plan.xml 22 Jan 2005 00:39:14 -0000 1.7
+++ deployer-system-plan.xml 24 Jan 2005 21:16:48 -0000 1.8
@@ -33,22 +33,22 @@
</gbean>
<!-- 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>
+ <gbean namePart="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
+ <attribute name="root">config-store/</attribute>
<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>
+ <attribute name="root">repository/</attribute>
<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>
+ <attribute
name="configurationFile">var/log/deployer-log4j.properties</attribute>
+ <attribute name="refreshPeriod">60</attribute>
<reference
name="ServerInfo">openejb.deployer:name=ServerInfo,*</reference>
</gbean>
</configuration>
1.36 +13 -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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- j2ee-deployer-plan.xml 22 Jan 2005 00:39:14 -0000 1.35
+++ j2ee-deployer-plan.xml 24 Jan 2005 21:16:48 -0000 1.36
@@ -107,17 +107,17 @@
</dependency>
- <gbean namePart="Deployer" type="Deployer"
class="org.apache.geronimo.deployment.Deployer">
+ <gbean namePart="Deployer"
class="org.apache.geronimo.deployment.Deployer">
<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">
+ <gbean namePart="ServiceBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<reference name="Repository">*:name=Repository,*</reference>
</gbean>
- <gbean namePart="EARBuilder" type="ConfigBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <gbean namePart="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute
name="transactionContextManagerObjectName">openejb.server:name=TransactionContextManager,*</attribute>
<attribute
name="connectionTrackerObjectName">openejb.server:name=ConnectionTracker,*</attribute>
@@ -131,29 +131,29 @@
<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">
+ <gbean namePart="EJBBuilder"
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">*:name=Repository,*</reference>
</gbean>
- <gbean namePart="ConnectorBuilder" type="ModuleBuilder"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <gbean namePart="ConnectorBuilder"
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>
- <attribute name="defaultBlockingTimeoutMilliseconds"
type="int">5000</attribute>
- <attribute name="defaultIdleTimeoutMinutes" type="int">15</attribute>
- <attribute name="defaultXATransactionCaching"
type="boolean">true</attribute>
- <attribute name="defaultXAThreadCaching"
type="boolean">false</attribute>
+ <attribute name="defaultMaxSize">10</attribute>
+ <attribute name="defaultMinSize">0</attribute>
+ <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+ <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+ <attribute name="defaultXATransactionCaching">true</attribute>
+ <attribute name="defaultXAThreadCaching">false</attribute>
<reference name="Repository">*:name=Repository,*</reference>
</gbean>
- <gbean namePart="WebServiceBuilder" type="ModuleBuilder"
class="org.apache.geronimo.axis.builder.AxisBuilder">
+ <gbean namePart="WebServiceBuilder"
class="org.apache.geronimo.axis.builder.AxisBuilder">
</gbean>
<!-- gbean name="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">
- <attribute name="props" type="java.util.Properties">
+ <attribute name="props">
</attribute>
<reference
name="Compiler">openejb.CORBA:type=Compiler,vendor=Ant</reference>
</gbean -->
1.54 +52 -52 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- j2ee-server-plan.xml 24 Jan 2005 19:57:28 -0000 1.53
+++ j2ee-server-plan.xml 24 Jan 2005 21:16:48 -0000 1.54
@@ -150,30 +150,30 @@
<!-- Default security realm using properties files -->
- <gbean namePart="properties-login" type="LoginModule"
+ <gbean namePart="properties-login"
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>
- <attribute name="options" type="java.util.Properties">
+ <attribute
name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
+ <attribute name="serverSide">true</attribute>
+ <attribute name="options">
usersURI=var/security/users.properties
groupsURI=var/security/groups.properties
</attribute>
- <attribute name="loginDomainName"
type="java.lang.String">geronimo-properties-realm</attribute>
+ <attribute
name="loginDomainName">geronimo-properties-realm</attribute>
</gbean>
- <gbean namePart="geronimo-properties-realm" type="SecurityRealm"
+ <gbean namePart="geronimo-properties-realm"
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">
+ <attribute name="realmName">geronimo-properties-realm</attribute>
+ <attribute name="loginModuleConfiguration">
LoginModule.1.REQUIRED=openejb.server:j2eeType=LoginModule,name=properties-login,J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=openejb
</attribute>
<reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
- <gbean namePart="JMX" type="ConfigurationEntry"
+ <gbean namePart="JMX"
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>
+ <attribute name="applicationConfigName">JMX</attribute>
+ <attribute name="realmName">geronimo-properties-realm</attribute>
</gbean>
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration
handler -->
@@ -185,49 +185,49 @@
</gbean>
<gbean namePart="SecurityService"
class="org.apache.geronimo.security.SecurityServiceImpl">
- <attribute name="policyConfigurationFactory"
type="java.lang.String">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
+ <attribute
name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
</gbean>
<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>
+ <attribute name="algorithm">HmacSHA1</attribute>
+ <attribute name="password">secret</attribute>
</gbean>
<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>
+ <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>
<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>
+ <attribute name="syncMaximumPoolSize">10</attribute>
+ <attribute name="startMaximumPoolSize">10</attribute>
+ <attribute name="scheduledMaximumPoolSize">10</attribute>
<reference
name="TransactionContextManager">openejb.server:name=TransactionContextManager,*</reference>
</gbean>
<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>
- <attribute name="flushSleepTimeMilliseconds"
type="int">50</attribute>
- <attribute name="logFileDir"
type="java.lang.String">var/txlog</attribute>
- <attribute name="logFileExt" type="java.lang.String">log</attribute>
- <attribute name="logFileName"
type="java.lang.String">howl</attribute>
- <attribute name="maxBlocksPerFile" type="int">-1</attribute>
- <attribute name="maxBuffers" type="int">0</attribute>
- <attribute name="maxLogFiles" type="int">2</attribute>
- <attribute name="minBuffers" type="int">4</attribute>
- <attribute name="threadsWaitingForceThreshold"
type="int">-1</attribute>
+ <attribute
name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
+ <attribute name="bufferSizeKBytes">32</attribute>
+ <attribute name="checksumEnabled">true</attribute>
+ <attribute name="flushSleepTimeMilliseconds">50</attribute>
+ <attribute name="logFileDir">var/txlog</attribute>
+ <attribute name="logFileExt">log</attribute>
+ <attribute name="logFileName">howl</attribute>
+ <attribute name="maxBlocksPerFile">-1</attribute>
+ <attribute name="maxBuffers">0</attribute>
+ <attribute name="maxLogFiles">2</attribute>
+ <attribute name="minBuffers">4</attribute>
+ <attribute name="threadsWaitingForceThreshold">-1</attribute>
<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>
+ <attribute name="defaultTransactionTimeoutSeconds">300</attribute>
<reference
name="TransactionLog">openejb.server:name=HOWLTransactionLog,*</reference>
<references name="ResourceManagers">
<pattern>openejb.server:j2eeType=JCAManagedConnectionFactory,*</pattern>
@@ -301,17 +301,17 @@
</gbean>
<!-- todo move to child config once we sort out the packaging -->
- <gbean namePart="Deployer" type="Deployer"
class="org.apache.geronimo.deployment.Deployer">
+ <gbean namePart="Deployer"
class="org.apache.geronimo.deployment.Deployer">
<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">
+ <gbean namePart="ServiceBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<reference name="Repository">*:name=Repository,*</reference>
</gbean>
- <gbean namePart="EARBuilder" type="ConfigBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <gbean namePart="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute
name="transactionContextManagerObjectName">openejb.server:name=TransactionContextManager,*</attribute>
<attribute
name="connectionTrackerObjectName">openejb.server:name=ConnectionTracker,*</attribute>
@@ -325,31 +325,31 @@
<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">
+ <gbean namePart="EJBBuilder"
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">*:name=Repository,*</reference>
</gbean>
- <gbean namePart="ConnectorBuilder" type="ModuleBuilder"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <gbean namePart="ConnectorBuilder"
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>
- <attribute name="defaultBlockingTimeoutMilliseconds"
type="int">5000</attribute>
- <attribute name="defaultIdleTimeoutMinutes" type="int">15</attribute>
- <attribute name="defaultXATransactionCaching"
type="boolean">true</attribute>
- <attribute name="defaultXAThreadCaching"
type="boolean">false</attribute>
+ <attribute name="defaultMaxSize">10</attribute>
+ <attribute name="defaultMinSize">0</attribute>
+ <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+ <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+ <attribute name="defaultXATransactionCaching">true</attribute>
+ <attribute name="defaultXAThreadCaching">false</attribute>
<reference name="Repository">*:name=Repository,*</reference>
</gbean>
- <gbean namePart="WebServiceBuilder" type="ModuleBuilder"
class="org.apache.geronimo.axis.builder.AxisBuilder">
+ <gbean namePart="WebServiceBuilder"
class="org.apache.geronimo.axis.builder.AxisBuilder">
</gbean>
<!-- these need names that include the parent id so they don't conflict
with the deployer namens-->
<gbean name="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">
- <attribute name="props" type="java.util.Properties">
+ <attribute name="props">
</attribute>
<reference
name="Compiler">openejb.CORBA:type=Compiler,vendor=Ant</reference>
</gbean>
@@ -357,9 +357,9 @@
<!-- end deployment block -->
<gbean name="openejb.CORBA:type=Server"
class="org.openejb.corba.CORBABean">
- <reference
name="ThreadPool">geronimo.server:name=DefaultThreadPool,*</reference>
- <attribute name="args" type="java.util.ArrayList">-ORBPort, 2001,
-ORBInitRef, NameService=corbaloc::localhost:1050/NameService, -ORBCSIv2,
-ORBGSSClientUser, "user1,a"</attribute>
- <attribute name="props" type="java.util.Properties">
+ <reference
name="ThreadPool">openejb.server:name=DefaultThreadPool,*</reference>
+ <attribute name="args">-ORBPort, 2001, -ORBInitRef,
NameService=corbaloc::localhost:1050/NameService, -ORBCSIv2, -ORBGSSClientUser,
"user1,a"</attribute>
+ <attribute name="props">
org.omg.CORBA.ORBClass=org.openorb.orb.core.ORB
org.omg.CORBA.ORBSingletonClass=org.openorb.orb.core.ORBSingleton
@@ -393,15 +393,15 @@
<gbean name="openejb.CORBA:type=NameServer"
class="org.openejb.corba.OpenORBNameBean">
<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">
+ <attribute name="args">-ORBPort, 1050</attribute>
+ <attribute name="props">
openorb.home=resource:org/openorb/
</attribute>
</gbean>
<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>
+ <attribute name="POAName">org/openejb/POA</attribute>
<reference name="Server">openejb.CORBA:type=Server</reference>
<reference
name="Containers">openejb.server:EJBModule=org/openejb/scenario001,*</reference>
<reference
name="TieLoader">openejb.CORBA:type=TieLoader,name=ClasspathTieLoader</reference>
1.10 +23 -23 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- security-plan.xml 22 Jan 2005 00:39:14 -0000 1.9
+++ security-plan.xml 24 Jan 2005 21:16:48 -0000 1.10
@@ -34,62 +34,62 @@
</dependency>
<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>
+ <attribute name="bindURI">tcp://0.0.0.0:4242</attribute>
<reference
name="loginService">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JaasLoginService</reference>
</gbean>
<!-- public security realm -->
- <gbean namePart="public-login" type="LoginModule"
+ <gbean namePart="public-login"
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>
- <attribute name="options" type="java.util.Properties">
+ <attribute
name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
+ <attribute name="serverSide">true</attribute>
+ <attribute name="options">
usersURI=var/security/public_users.properties
groupsURI=var/security/public_groups.properties
</attribute>
- <attribute name="loginDomainName"
type="java.lang.String">public-properties-realm</attribute>
+ <attribute name="loginDomainName">public-properties-realm</attribute>
</gbean>
- <gbean namePart="public-properties-realm" type="SecurityRealm"
+ <gbean namePart="public-properties-realm"
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">
+ <attribute name="realmName">public-properties-realm</attribute>
+ <attribute name="loginModuleConfiguration">
LoginModule.1.REQUIRED=openejb.server:j2eeType=LoginModule,J2EEServer=openejb,J2EEApplication=null,J2EEModule=org/openejb/Security,name=public-login
</attribute>
<reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
- <gbean namePart="public" type="ConfigurationEntry"
+ <gbean namePart="public"
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>
+ <attribute name="applicationConfigName">public</attribute>
+ <attribute name="realmName">public-properties-realm</attribute>
</gbean>
<!-- secret internal auditing security realm -->
- <gbean namePart="black-login" type="LoginModule"
+ <gbean namePart="black-login"
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>
- <attribute name="options" type="java.util.Properties">
+ <attribute
name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
+ <attribute name="serverSide">true</attribute>
+ <attribute name="options">
usersURI=var/security/black_users.properties
groupsURI=var/security/black_groups.properties
</attribute>
- <attribute name="loginDomainName"
type="java.lang.String">black-properties-realm</attribute>
+ <attribute name="loginDomainName">black-properties-realm</attribute>
</gbean>
- <gbean namePart="black-properties-realm" type="SecurityRealm"
+ <gbean namePart="black-properties-realm"
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">
+ <attribute name="realmName">black-properties-realm</attribute>
+ <attribute name="loginModuleConfiguration">
LoginModule.1.REQUIRED=openejb.server:j2eeType=LoginModule,J2EEServer=openejb,J2EEApplication=null,J2EEModule=org/openejb/Security,name=black-login
</attribute>
<reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
- <gbean namePart="black" type="ConfigurationEntry"
+ <gbean namePart="black"
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>
+ <attribute name="applicationConfigName">black</attribute>
+ <attribute name="realmName">black-properties-realm</attribute>
</gbean>
1.13 +7 -7 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- system-plan.xml 22 Jan 2005 00:39:14 -0000 1.12
+++ system-plan.xml 24 Jan 2005 21:16:48 -0000 1.13
@@ -40,32 +40,32 @@
<gbean namePart="URLFactory"
class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
<!-- 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>
+ <gbean namePart="Local"
class="org.apache.geronimo.system.configuration.LocalConfigStore">
+ <attribute name="root">config-store</attribute>
<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">openejb.server:name=ServerInfo,*</reference>
- <attribute name="configFile"
type="java.lang.String">var/config/config.list</attribute>
+ <attribute name="configFile">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>
+ <attribute name="root">repository/</attribute>
<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>
+ <attribute
name="configurationFile">var/log/server-log4j.properties</attribute>
+ <attribute name="refreshPeriod">60</attribute>
<reference
name="ServerInfo">openejb.server:name=ServerInfo,*</reference>
</gbean>
<!-- RMI Registry -->
<gbean namePart="RMIRegistry"
class="org.apache.geronimo.system.rmi.RMIRegistryService">
- <attribute name="port" type="int">1099</attribute>
+ <attribute name="port">1099</attribute>
</gbean>
</configuration>
