ammulder    2004/11/22 21:09:03

  Modified:    modules/assembly/src/plan j2ee-server-plan.xml
                        security-plan.xml
  Log:

  Update to latest Geronimo security syntax
  
  Revision  Changes    Path
  1.39      +2 -1      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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- j2ee-server-plan.xml      21 Nov 2004 20:18:26 -0000      1.38
  +++ j2ee-server-plan.xml      23 Nov 2004 02:09:03 -0000      1.39
  @@ -147,6 +147,7 @@
               usersURI=var/security/users.properties
               groupsURI=var/security/groups.properties
           </attribute>
  +        <attribute name="loginDomainName" 
type="java.lang.String">geronimo-properties-realm</attribute>
       </gbean>
   
       <gbean 
name="geronimo.security:type=SecurityRealm,realm=geronimo-properties-realm"
  @@ -156,7 +157,7 @@
               
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>
  +<!--        <attribute name="autoMapPrincipalClasses" 
type="java.lang.String">org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal</attribute>-->
       </gbean>
   
       <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=JMX"
  
  
  
  1.4       +4 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- security-plan.xml 20 Nov 2004 07:44:19 -0000      1.3
  +++ security-plan.xml 23 Nov 2004 02:09:03 -0000      1.4
  @@ -55,6 +55,7 @@
               usersURI=var/security/public_users.properties
               groupsURI=var/security/public_groups.properties
           </attribute>
  +        <attribute name="loginDomainName" 
type="java.lang.String">public-properties-realm</attribute>
       </gbean>
   
       <gbean 
name="geronimo.security:type=SecurityRealm,realm=public-properties-realm"
  @@ -64,7 +65,7 @@
               
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>
  +<!--        <attribute name="autoMapPrincipalClasses" 
type="java.lang.String">org.apache.geronimo.security.realm.providers.PropertiesFileGroupPrincipal</attribute>
 -->
       </gbean>
   
       <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=public"
  @@ -82,6 +83,7 @@
               usersURI=var/security/black_users.properties
               groupsURI=var/security/black_groups.properties
           </attribute>
  +        <attribute name="loginDomainName" 
type="java.lang.String">black-properties-realm</attribute>
       </gbean>
   
       <gbean 
name="geronimo.security:type=SecurityRealm,realm=black-properties-realm"
  @@ -91,7 +93,7 @@
               
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>
  +<!--        <attribute name="autoMapPrincipalClasses" 
type="java.lang.String">org.apache.geronimo.security.realm.providers.PropertiesFileGroupPrincipal</attribute>-->
       </gbean>
   
       <gbean name="geronimo.security:type=ConfigurationEntry,jaasId=black"
  
  
  

Reply via email to