continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r420358 - /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml
Date Sun, 09 Jul 2006 22:09:22 GMT
Author: carlos
Date: Sun Jul  9 15:09:22 2006
New Revision: 420358

URL: http://svn.apache.org/viewvc?rev=420358&view=rev
Log:
Fix user database configuration

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml?rev=420358&r1=420357&r2=420358&view=diff
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml
Sun Jul  9 15:09:22 2006
@@ -312,51 +312,41 @@
       </requirements>
     </component>
 
+    <!-- In memory database used only for testing -->
     <component>
-      <role>org.acegisecurity.userdetails.memory.InMemoryDaoImpl</role>
+      <role>org.acegisecurity.userdetails.UserDetailsService</role>
       <implementation>org.acegisecurity.userdetails.memory.InMemoryDaoImpl</implementation>
       <configuration>
-        <userMap>
-          <users>
-            <user>
-              <name>marissa</name>
-              <userAttribute>
-                <password>koala</password>
-                <authorities>
-                  <grantedAuthority>ROLE_USER</grantedAuthority>
-                  <grantedAuthority>ROLE_SUPERVISOR</grantedAuthority>
-                </authorities>
-              </userAttribute>
-            </user>
-            <user>
-              <name>dianne</name>
-              <userAttribute>
-                <password>emu</password>
-                <authorities>
-                  <grantedAuthority>ROLE_USER</grantedAuthority>
-                </authorities>
-              </userAttribute>
-            </user>
-            <user>
-              <name>scott</name>
-              <userAttribute>
-                <password>wombat</password>
-                <authorities>
-                  <grantedAuthority>ROLE_USER</grantedAuthority>
-                </authorities>
-              </userAttribute>
-            </user>
-          </users>
-        </userMap>
+        <userProperties>
+          <property>
+            <name>marissa</name>
+            <value>koala,ROLE_USER,ROLE_SUPERVISOR</value>
+          </property>
+          <property>
+            <name>dianne</name>
+            <value>emu,ROLE_USER</value>
+          </property>
+          <property>
+            <name>scott</name>
+            <value>wombat,ROLE_USER</value>
+          </property>
+        </userProperties>
       </configuration>
     </component>
 
+<!-- Bridge between Acegi and Continuum database
+    <component>
+      <role>org.acegisecurity.userdetails.UserDetailsService</role>
+      <implementation>org.apache.maven.continuum.security.ContinuumAuthenticator</implementation>
+    </component>
+-->
+
     <component>
       <role>org.acegisecurity.providers.dao.DaoAuthenticationProvider</role>
       <implementation>org.acegisecurity.providers.dao.DaoAuthenticationProvider</implementation>
       <requirements>
         <requirement>
-          <role>org.acegisecurity.userdetails.memory.InMemoryDaoImpl</role>
+          <role>org.acegisecurity.userdetails.UserDetailsService</role>
           <field-name>userDetailsService</field-name>
         </requirement>
       </requirements>



Mime
View raw message