djencks 2005/05/01 03:13:12
Modified: modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml security-plan.xml
Log:
Use the LoginConfigBuilder xml reference builder to simplify construction of
LoginModuleUse gbeans
Revision Changes Path
1.41 +5 -0 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- j2ee-deployer-plan.xml 15 Mar 2005 00:07:45 -0000 1.40
+++ j2ee-deployer-plan.xml 1 May 2005 07:13:12 -0000 1.41
@@ -116,10 +116,15 @@
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
<reference name="XmlAttributeBuilders"><name>*</name></reference>
+ <reference name="XmlReferenceBuilders">
+ <name>*</name>
+ </reference>
</gbean>
<gbean name="CSSAttributeBuilder"
class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
<gbean name="TSSAttributeBuilder"
class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
+
+ <gbean name="LoginConfigurationBuilder"
class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
<gbean name="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
1.78 +5 -0 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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- j2ee-server-plan.xml 29 Apr 2005 21:25:50 -0000 1.77
+++ j2ee-server-plan.xml 1 May 2005 07:13:12 -0000 1.78
@@ -361,10 +361,15 @@
<reference name="XmlAttributeBuilders">
<name>*</name>
</reference>
+ <reference name="XmlReferenceBuilders">
+ <name>*</name>
+ </reference>
</gbean>
<gbean name="CSSAttributeBuilder"
class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
<gbean name="TSSAttributeBuilder"
class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
+
+ <gbean name="LoginConfigurationBuilder"
class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
<gbean name="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
1.13 +17 -29 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- security-plan.xml 29 Apr 2005 21:25:51 -0000 1.12
+++ security-plan.xml 1 May 2005 07:13:12 -0000 1.13
@@ -39,33 +39,23 @@
</gbean>
<!-- public security realm -->
- <gbean name="public-login"
- class="org.apache.geronimo.security.jaas.LoginModuleGBean">
- <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">public-properties-realm</attribute>
- </gbean>
<gbean name="public-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">public-properties-realm</attribute>
- <reference name="LoginModuleConfiguration">
- <name>public-login</name>
- </reference>
<reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
- </gbean>
- <gbean name="public-login"
class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
- <attribute name="controlFlag">REQUIRED</attribute>
- <reference name="LoginModule">
- <name>public-login</name>
- </reference>
+ <xml-reference name="LoginModuleConfiguration">
+ <lc:login-config
xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig";>
+ <lc:login-module control-flag="REQUIRED" server-side="true">
+ <lc:login-domain-name>public-login</lc:login-domain-name>
+
<lc:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</lc:login-module-class>
+ <lc:option
name="usersURI">var/security/public_users.properties</lc:option>
+ <lc:option
name="groupsURI">var/security/public_groups.properties</lc:option>
+ </lc:login-module>
+ </lc:login-config>
+ </xml-reference>
</gbean>
-
<gbean name="public"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
<attribute name="applicationConfigName">public</attribute>
@@ -87,16 +77,14 @@
<gbean name="black-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">black-properties-realm</attribute>
- <reference name="LoginModuleConfiguration">
- <name>black-login</name>
- </reference>
<reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
- </gbean>
- <gbean name="black-login"
class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
- <attribute name="controlFlag">REQUIRED</attribute>
- <reference name="LoginModule">
- <name>black-login</name>
- </reference>
+ <xml-reference name="LoginModuleConfiguration">
+ <lc:login-config
xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig";>
+ <lc:login-module-ref control-flag="REQUIRED">
+ <lc:name>black-login</lc:name>
+ </lc:login-module-ref>
+ </lc:login-config>
+ </xml-reference>
</gbean>
<gbean name="black"
