ammulder 2004/11/20 02:44:19
Modified: modules/assembly/src/plan j2ee-server-plan.xml
security-plan.xml
Log:
Update deployment plans to use the newest Geronimo security code
Revision Changes Path
1.37 +20 -6 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- j2ee-server-plan.xml 16 Nov 2004 22:40:08 -0000 1.36
+++ j2ee-server-plan.xml 20 Nov 2004 07:44:19 -0000 1.37
@@ -139,19 +139,33 @@
</dependency>
<!-- Default security realm using properties files -->
- <gbean
name="geronimo.security:type=SecurityRealm,realm=geronimo-properties-realm"
class="org.apache.geronimo.security.realm.providers.PropertiesFileSecurityRealm">
+ <gbean name="geronimo.security:type=LoginModule,name=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">
+ usersURI=var/security/users.properties
+ groupsURI=var/security/groups.properties
+ </attribute>
+ </gbean>
+
+ <gbean
name="geronimo.security:type=SecurityRealm,realm=geronimo-properties-realm"
+ class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName"
type="java.lang.String">geronimo-properties-realm</attribute>
- <attribute name="maxLoginModuleAge" type="long">10000</attribute>
- <attribute name="usersURI"
type="java.net.URI">var/security/users.properties</attribute>
- <attribute name="groupsURI"
type="java.net.URI">var/security/groups.properties</attribute>
+ <attribute name="loginModuleConfiguration"
type="java.util.Properties">
+
LoginModule.1.REQUIRED=geronimo.security:type=LoginModule,name=properties-login
+ </attribute>
<reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <attribute name="autoMapPrincipalClasses"
type="java.lang.String">org.apache.geronimo.security.realm.providers.PropertiesFileGroupPrincipal</attribute>
</gbean>
- <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=JMX"
class="org.apache.geronimo.security.jaas.ConfigurationEntryRealmLocal">
+ <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=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="controlFlag"
type="org.apache.geronimo.security.jaas.LoginModuleControlFlag">REQUIRED</attribute>
</gbean>
+
+
<!-- Register GeronimoLoginConfiguration as the LoginConfiguration
handler -->
<gbean name="geronimo.security:type=LoginConfiguration"
class="org.apache.geronimo.security.jaas.GeronimoLoginConfiguration"/>
1.3 +37 -13 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- security-plan.xml 16 Nov 2004 22:40:08 -0000 1.2
+++ security-plan.xml 20 Nov 2004 07:44:19 -0000 1.3
@@ -47,34 +47,58 @@
</gbean>
<!-- public security realm -->
- <gbean
name="geronimo.security:type=SecurityRealm,realm=public-properties-realm"
class="org.apache.geronimo.security.realm.providers.PropertiesFileSecurityRealm">
+ <gbean name="geronimo.security:type=LoginModule,name=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">
+ usersURI=var/security/public_users.properties
+ groupsURI=var/security/public_groups.properties
+ </attribute>
+ </gbean>
+
+ <gbean
name="geronimo.security:type=SecurityRealm,realm=public-properties-realm"
+ class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName"
type="java.lang.String">public-properties-realm</attribute>
- <attribute name="maxLoginModuleAge" type="long">86400000</attribute>
- <attribute name="usersURI"
type="java.net.URI">var/security/public_users.properties</attribute>
- <attribute name="groupsURI"
type="java.net.URI">var/security/public_groups.properties</attribute>
+ <attribute name="loginModuleConfiguration"
type="java.util.Properties">
+
LoginModule.1.REQUIRED=geronimo.security:type=LoginModule,name=public-login
+ </attribute>
<reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <attribute name="autoMapPrincipalClasses"
type="java.lang.String">org.apache.geronimo.security.realm.providers.PropertiesFileGroupPrincipal</attribute>
</gbean>
- <!-- JAAS login configuration entry for the public security realm -->
- <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=public"
class="org.apache.geronimo.security.jaas.ConfigurationEntryRealmLocal">
+ <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=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="controlFlag"
type="org.apache.geronimo.security.jaas.LoginModuleControlFlag">REQUIRED</attribute>
</gbean>
<!-- secret internal auditing security realm -->
- <gbean
name="geronimo.security:type=SecurityRealm,realm=black-properties-realm"
class="org.apache.geronimo.security.realm.providers.PropertiesFileSecurityRealm">
+ <gbean name="geronimo.security:type=LoginModule,name=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">
+ usersURI=var/security/black_users.properties
+ groupsURI=var/security/black_groups.properties
+ </attribute>
+ </gbean>
+
+ <gbean
name="geronimo.security:type=SecurityRealm,realm=black-properties-realm"
+ class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName"
type="java.lang.String">black-properties-realm</attribute>
- <attribute name="maxLoginModuleAge" type="long">86400000</attribute>
- <attribute name="usersURI"
type="java.net.URI">var/security/black_users.properties</attribute>
- <attribute name="groupsURI"
type="java.net.URI">var/security/black_groups.properties</attribute>
+ <attribute name="loginModuleConfiguration"
type="java.util.Properties">
+
LoginModule.1.REQUIRED=geronimo.security:type=LoginModule,name=black-login
+ </attribute>
<reference
name="ServerInfo">geronimo.system:role=ServerInfo</reference>
+ <attribute name="autoMapPrincipalClasses"
type="java.lang.String">org.apache.geronimo.security.realm.providers.PropertiesFileGroupPrincipal</attribute>
</gbean>
- <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=black"
class="org.apache.geronimo.security.jaas.ConfigurationEntryRealmLocal">
+ <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=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="controlFlag"
type="org.apache.geronimo.security.jaas.LoginModuleControlFlag">REQUIRED</attribute>
</gbean>
+
</configuration>
