Return-Path: 
 <commits-return-26569-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 37687F103
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon, 13 May 2013 21:02:21 +0000 (UTC)
Received: (qmail 3460 invoked by uid 500); 13 May 2013 20:35:40 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 3400 invoked by uid 500); 13 May 2013 20:35:40 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 3387 invoked by uid 99); 13 May 2013 20:35:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 May 2013 20:35:40 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 May 2013 20:35:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 22082238890D;
	Mon, 13 May 2013 20:35:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1482089 - in
 /cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF: cxf-transport.xml
 file.xml ldap.xml
Date: Mon, 13 May 2013 20:35:15 -0000
To: commits@cxf.apache.org
From: owulff@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130513203516.22082238890D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: owulff
Date: Mon May 13 20:35:15 2013
New Revision: 1482089

URL: http://svn.apache.org/r1482089
Log:
[FEDIZ-54] Provide Maven profile to build STS with LDAP backend

Modified:
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/file.xml
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/ldap.xml

Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml?rev=1482089&r1=1482088&r2=1482089&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml Mon May 13 20:35:15 2013
@@ -89,10 +89,6 @@
 		<property name="claimHandlers" ref="claimHandlerList" />
 	</bean>
 
-	<util:list id="claimHandlerList">
-		<ref bean="claimsHandler" />
-	</util:list>
-
 	<bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
 		<property name="endpoints" ref="transportEndpoints" />
 	</bean>
@@ -107,7 +103,7 @@
 		<property name="callbackHandlerClass"
 			value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
 		<property name="encryptionPropertiesFile" value="stsKeystore.properties" />
-		<property name="issuer" value="DoubleItSTSIssuer" />
+		<property name="issuer" value="Fediz STS" />
 		<property name="encryptionUsername" value="myservicekey" />
 	</bean>
 	

Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/file.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/file.xml?rev=1482089&r1=1482088&r2=1482089&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/file.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/file.xml Mon May 13 20:35:15 2013
@@ -14,6 +14,10 @@
     <import resource="userClaims.xml" />
     <import resource="passwords.xml" />
     
+    <util:list id="claimHandlerList">
+		<ref bean="claimsHandler" />
+	</util:list>
+    
 	<bean id="claimsHandler" class="org.apache.cxf.fediz.service.sts.FileClaimsHandler">
 		<property name="userClaims" ref="userClaims" />
 		<property name="supportedClaims" ref="supportedClaims" />

Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/ldap.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/ldap.xml?rev=1482089&r1=1482088&r2=1482089&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/ldap.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/ldap.xml Mon May 13 20:35:15 2013
@@ -10,6 +10,9 @@
         http://cxf.apache.org/jaxws                                     
         http://cxf.apache.org/schemas/jaxws.xsd">
 
+    <util:list id="claimHandlerList">
+		<ref bean="userClaimsHandler" />
+	</util:list>
 
 	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource">
 		<property name="url" value="ldap://localhost:389/" />
@@ -46,7 +49,7 @@
 	        value="member" />
 	</util:map>
 
-    <bean id="claimsHandler" class="org.apache.cxf.sts.claims.LdapClaimsHandler">
+    <bean id="userClaimsHandler" class="org.apache.cxf.sts.claims.LdapClaimsHandler">
 		<property name="ldapTemplate" ref="ldapTemplate" />
 		<property name="claimsLdapAttributeMapping" ref="claimsToLdapAttributeMapping" />
 		<property name="userBaseDN" value="ou=users,dc=fediz,dc=org" />