Return-Path: 
 <continuum-commits-return-2050-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 3777 invoked from network); 5 Sep 2006 23:05:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Sep 2006 23:05:29 -0000
Received: (qmail 79991 invoked by uid 500); 5 Sep 2006 23:05:29 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 79968 invoked by uid 500); 5 Sep 2006 23:05:29 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 79957 invoked by uid 99); 5 Sep 2006 23:05:29 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Sep 2006 16:05:29 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Sep 2006 16:05:28 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id A3DDE1A981A; Tue,  5 Sep 2006 16:05:08 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r440521 -
 /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Date: Tue, 05 Sep 2006 23:05:08 -0000
To: continuum-commits@maven.apache.org
From: carlos@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20060905230508.A3DDE1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: carlos
Date: Tue Sep  5 16:05:07 2006
New Revision: 440521

URL: http://svn.apache.org/viewvc?view=rev&rev=440521
Log:
Use MavenUserDetailsService and fixe role-hints

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

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=440521&r1=440520&r2=440521
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Tue Sep  5 16:05:07 2006
@@ -329,6 +329,7 @@
     <component>
       <role>org.acegisecurity.userdetails.UserDetailsService</role>
       <implementation>org.acegisecurity.userdetails.memory.InMemoryDaoImpl</implementation>
+      <role-hint>memory</role-hint>
       <configuration>
         <userProperties>
           <property>
@@ -350,7 +351,8 @@
     <!-- Bridge between Acegi and Continuum database -->
     <component>
       <role>org.acegisecurity.userdetails.UserDetailsService</role>
-      <implementation>org.apache.maven.continuum.security.acegi.ContinuumUserDetailsService</implementation>
+      <role-hint>maven</role-hint>
+      <implementation>org.apache.maven.user.acegi.MavenUserDetailsService</implementation>
       <requirements>
         <requirement>
           <role>org.apache.maven.user.model.UserManager</role>
@@ -366,6 +368,7 @@
         <requirement>
           <role>org.acegisecurity.userdetails.UserDetailsService</role>
           <field-name>userDetailsService</field-name>
+          <role-hint>maven</role-hint>
         </requirement>
         <requirement>
           <role>org.acegisecurity.providers.encoding.PasswordEncoder</role>
@@ -979,7 +982,8 @@
           <field-name>securityPolicy</field-name>
         </requirement>
         <requirement>
-          <role>org.apache.maven.user.acegi.AcegiUserHolder</role>
+          <role>org.apache.maven.user.model.UserHolder</role>
+          <role-hint>acegi</role-hint>
           <field-name>userHolder</field-name>
         </requirement>
       </requirements>