You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/11/02 00:38:52 UTC

svn commit: r709802 - /geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml

Author: djencks
Date: Sat Nov  1 16:38:52 2008
New Revision: 709802

URL: http://svn.apache.org/viewvc?rev=709802&view=rev
Log:
use shorter login module configuration style

Modified:
    geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml

Modified: geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml?rev=709802&r1=709801&r2=709802&view=diff
==============================================================================
--- geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml (original)
+++ geronimo/plugins/openid-provider/trunk/default-openid-provider-realm/src/main/plan/plan.xml Sat Nov  1 16:38:52 2008
@@ -20,32 +20,48 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="openid-provider"
-           class="org.apache.geronimo.security.jaas.LoginModuleGBean">
-        <attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
-        <attribute name="options">
-            usersURI=var/openid/users.properties
-            groupsURI=var/openid/groups.properties
-        </attribute>
-        <attribute name="loginDomainName">openid-provider</attribute>
-    </gbean>
-
-    <gbean name="openid-provider"
-           class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+    <gbean name="openid-provider" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
         <attribute name="realmName">openid-provider</attribute>
-        <reference name="LoginModuleConfiguration">
-            <name>openid-provider</name>
-        </reference>
+        <xml-reference name="LoginModuleConfiguration">
+            <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-${geronimoSchemaVersion}">
+                <lc:login-module control-flag="REQUIRED" wrap-principals="false">
+                    <lc:login-domain-name>openid-provider</lc:login-domain-name>
+                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</lc:login-module-class>
+                    <lc:option name="usersURI">var/openid/users.properties</lc:option>
+                    <lc:option name="groupsURI">var/openid/groups.properties</lc:option>
+                </lc:login-module>
+            </lc:login-config>
+        </xml-reference>
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
     </gbean>
+    <!--<gbean name="openid-provider"-->
+           <!--class="org.apache.geronimo.security.jaas.LoginModuleGBean">-->
+        <!--<attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>-->
+        <!--<attribute name="options">-->
+            <!--usersURI=var/openid/users.properties-->
+            <!--groupsURI=var/openid/groups.properties-->
+        <!--</attribute>-->
+        <!--<attribute name="loginDomainName">openid-provider</attribute>-->
+    <!--</gbean>-->
 
-    <gbean name="openid-provider" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
-        <attribute name="controlFlag">REQUIRED</attribute>
-        <reference name="LoginModule">
-            <name>openid-provider</name>
-        </reference>
-    </gbean>
+    <!--<gbean name="openid-provider"-->
+           <!--class="org.apache.geronimo.security.realm.GenericSecurityRealm">-->
+        <!--<attribute name="realmName">openid-provider</attribute>-->
+        <!--<reference name="LoginModuleConfiguration">-->
+            <!--<name>openid-provider</name>-->
+        <!--</reference>-->
+        <!--<reference name="ServerInfo">-->
+            <!--<name>ServerInfo</name>-->
+        <!--</reference>-->
+    <!--</gbean>-->
+
+    <!--<gbean name="openid-provider" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">-->
+        <!--<attribute name="controlFlag">REQUIRED</attribute>-->
+        <!--<reference name="LoginModule">-->
+            <!--<name>openid-provider</name>-->
+        <!--</reference>-->
+    <!--</gbean>-->
 
 </module>