djencks 2005/04/29 17:25:52
Modified: modules/assembly/src/plan j2ee-server-plan.xml
security-plan.xml
Log:
GERONIMO-639. Make GenericSecurityRealm have references to the gbeans it
depends on
Revision Changes Path
1.77 +9 -3 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.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- j2ee-server-plan.xml 23 Apr 2005 18:44:29 -0000 1.76
+++ j2ee-server-plan.xml 29 Apr 2005 21:25:50 -0000 1.77
@@ -152,14 +152,20 @@
<gbean name="geronimo-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">geronimo-properties-realm</attribute>
- <attribute name="loginModuleConfiguration">
-
LoginModule.1.REQUIRED=openejb.server:j2eeType=LoginModule,name=properties-login,J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=openejb
- </attribute>
+ <reference name="LoginModuleConfiguration">
+ <name>properties-login</name>
+ </reference>
<reference name="ServerInfo">
<module>org/apache/geronimo/System</module>
<name>ServerInfo</name>
</reference>
</gbean>
+ <gbean name="properties-login"
class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
+ <attribute name="controlFlag">REQUIRED</attribute>
+ <reference name="LoginModule">
+ <name>properties-login</name>
+ </reference>
+ </gbean>
<gbean name="JMX"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
1.12 +19 -6 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- security-plan.xml 6 Mar 2005 02:49:24 -0000 1.11
+++ security-plan.xml 29 Apr 2005 21:25:51 -0000 1.12
@@ -53,11 +53,18 @@
<gbean name="public-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<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="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>
+ </gbean>
+
<gbean name="public"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
@@ -80,10 +87,16 @@
<gbean name="black-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<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="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>
</gbean>
<gbean name="black"
