cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject svn commit: r1565450 [2/2] - in /cxf/fediz/trunk/services: idp/src/main/resources/ idp/src/main/resources/META-INF/ idp/src/main/webapp/WEB-INF/ idp/src/test/resources/ sts/src/main/webapp/WEB-INF/
Date Thu, 06 Feb 2014 21:48:55 GMT
Modified: cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml (original)
+++ cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml Thu Feb  6 21:48:55 2014
@@ -1,18 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws"
-	xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util" xmlns:http="http://cxf.apache.org/transports/http/configuration"
-	xmlns:sec="http://cxf.apache.org/configuration/security"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
+    xmlns:cxf="http://cxf.apache.org/core"
+    xmlns:jaxws="http://cxf.apache.org/jaxws"
+    xmlns:test="http://apache.org/hello_world_soap_http"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:http="http://cxf.apache.org/transports/http/configuration"
+    xmlns:sec="http://cxf.apache.org/configuration/security"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
         http://www.springframework.org/schema/context
         http://www.springframework.org/schema/context/spring-context-3.0.xsd
-        http://cxf.apache.org/jaxws                                     
+        http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd
@@ -21,124 +42,122 @@
         http://cxf.apache.org/configuration/security
         http://cxf.apache.org/schemas/configuration/security.xsd">
 
-	<context:property-placeholder location="classpath:realm.properties"/>
+    <context:property-placeholder location="classpath:realm.properties" />
+
+    <bean id="config"
+        class="org.apache.cxf.fediz.service.idp.service.ConfigServiceSpring">
+        <property name="idpConfigs">
+            <util:list>
+                <ref bean="idp-realmA" />
+            </util:list>
+        </property>
+        <property name="serviceConfigs">
+            <util:list>
+                <ref bean="srv-fedizhelloworld" />
+            </util:list>
+        </property>
+    </bean>
 
-    <bean id="config" class="org.apache.cxf.fediz.service.idp.service.ConfigServiceSpring">
-    	<property name="idpConfigs">
-    		<util:list>
-    			<ref bean="idp-realmA" />
-    		</util:list>
-    	</property>
-    	<property name="serviceConfigs">
-    		<util:list>
-    			<ref bean="srv-fedizhelloworld" />
-    		</util:list>
-    	</property>     	
-    </bean>        
-	
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.model.IDPConfig">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />
         <property name="uri" value="realma" />
-        <!--<property name="hrds" value="" />--> <!-- TBD, not defined, provide list if enabled -->
+        <!--<property name="hrds" value="" /> --> <!-- TBD, not defined, provide list if enabled -->
         <property name="provideIDPList" value="true" />
         <property name="useCurrentIDP" value="true" />
-        <!-- <property name="certificate" value="realma.cert" />  -->   <!--  STS will sign token, IDP signs Metadata -->
+        <!-- <property name="certificate" value="realma.cert" /> -->   <!-- STS will sign token, IDP signs Metadata -->
         <property name="certificate" value="stsKeystoreA.properties" />
         <property name="certificatePassword" value="realma" />
-        <property name="stsUrl" value="https://localhost:0/fediz-idp-sts/REALMA" />
-        <property name="idpUrl" value="https://localhost:${realmA.port}/fediz-idp/federation" />
+        <property name="stsUrl"
+            value="https://localhost:0/fediz-idp-sts/REALMA" />
+        <property name="idpUrl"
+            value="https://localhost:${realmA.port}/fediz-idp/federation" />
         <property name="supportedProtocols">
-        	<util:list>
-        		<value>http://docs.oasis-open.org/wsfed/federation/200706</value>
-        		<value>http://docs.oasis-open.org/ws-sx/ws-trust/200512</value>
-        	</util:list>
+            <util:list>
+                <value>http://docs.oasis-open.org/wsfed/federation/200706
+                </value>
+                <value>http://docs.oasis-open.org/ws-sx/ws-trust/200512
+                </value>
+            </util:list>
         </property>
         <property name="services">
-        	<util:map>
-				<entry key="urn:org:apache:cxf:fediz:fedizhelloworld" value-ref="srv-fedizhelloworld" />
-        	</util:map>
+            <util:map>
+                <entry key="urn:org:apache:cxf:fediz:fedizhelloworld"
+                    value-ref="srv-fedizhelloworld" />
+            </util:map>
         </property>
         <property name="authenticationURIs">
-         	<util:map>
-				<entry key="default" value="/login/default" />
-        	</util:map>       
+            <util:map>
+                <entry key="default" value="/login/default" />
+            </util:map>
         </property>
         <property name="trustedIDPs">
-        	<util:map>
-				<entry key="urn:org:apache:cxf:fediz:idp:realm-B" value-ref="trusted-idp-realmB" />
-        	</util:map>
+            <util:map>
+                <entry key="urn:org:apache:cxf:fediz:idp:realm-B"
+                    value-ref="trusted-idp-realmB" />
+            </util:map>
         </property>
         <property name="serviceDisplayName" value="REALM A" />
         <property name="serviceDescription" value="IDP of Realm A" />
     </bean>
 
-
-    <bean id="trusted-idp-realmB" class="org.apache.cxf.fediz.service.idp.model.TrustedIDPConfig">
+    <bean id="trusted-idp-realmB"
+        class="org.apache.cxf.fediz.service.idp.model.TrustedIDPConfig">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-B" />
         <property name="cacheTokens" value="true" />
-        <property name="url" value="https://localhost:${realmB.port}/fediz-idp-remote/federation" />
+        <property name="url"
+            value="https://localhost:${realmB.port}/fediz-idp-remote/federation" />
         <property name="certificate" value="realmb.cert" />
         <property name="trustType" value="PEER_TRUST" />  <!-- Required for Fediz Core, Process SignInResponse -->
-        <property name="protocol" value="http://docs.oasis-open.org/wsfed/federation/200706" />
+        <property name="protocol"
+            value="http://docs.oasis-open.org/wsfed/federation/200706" />
         <property name="federationType" value="FederateIdentity" /> <!-- Required for STS Relationship -->
         <property name="name" value="REALM B" />
         <property name="description" value="IDP of Realm B" />
-        <!--<property name="logo" value="true" />--> 
+        <!--<property name="logo" value="true" /> -->
     </bean>
-    
-    
+
     <bean id="srv-fedizhelloworld" class="org.apache.cxf.fediz.service.idp.model.ServiceConfig">
-        <property name="realm" value="urn:org:apache:cxf:fediz:fedizhelloworld" />
-        <property name="protocol" value="http://docs.oasis-open.org/wsfed/federation/200706" />
+        <property name="realm"
+            value="urn:org:apache:cxf:fediz:fedizhelloworld" />
+        <property name="protocol"
+            value="http://docs.oasis-open.org/wsfed/federation/200706" />
         <property name="serviceDisplayName" value="Fedizhelloworld" />
-        <property name="serviceDescription" value="Web Application to illustrate WS-Federation" />
+        <property name="serviceDescription"
+            value="Web Application to illustrate WS-Federation" />
         <property name="role" value="ApplicationServiceType" />
-        <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" />
+        <property name="tokenType"
+            value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" />
         <property name="lifeTime" value="3600" />
         <!-- <property name="encryptionCertificate" value="" /> -->
         <property name="requestedClaims">
-        	<util:list>
-        		<bean class="org.apache.cxf.fediz.service.idp.model.RequestClaim">
-        			<property name="claimType" value="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" />
-        			<property name="optional" value="false" />
-        		</bean>
-        		<bean class="org.apache.cxf.fediz.service.idp.model.RequestClaim">
-        			<property name="claimType" value="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" />
-        			<property name="optional" value="false" />
-        		</bean>
-        		<bean class="org.apache.cxf.fediz.service.idp.model.RequestClaim">
-        			<property name="claimType" value="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" />
-        			<property name="optional" value="false" />
-        		</bean>
-        		<bean class="org.apache.cxf.fediz.service.idp.model.RequestClaim">
-        			<property name="claimType" value="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" />
-        			<property name="optional" value="true" />
-        		</bean>        		        		        		
-        	</util:list>
+            <util:list>
+                <bean
+                    class="org.apache.cxf.fediz.service.idp.model.RequestClaim">
+                    <property name="claimType"
+                        value="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" />
+                    <property name="optional" value="false" />
+                </bean>
+                <bean
+                    class="org.apache.cxf.fediz.service.idp.model.RequestClaim">
+                    <property name="claimType"
+                        value="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" />
+                    <property name="optional" value="false" />
+                </bean>
+                <bean
+                    class="org.apache.cxf.fediz.service.idp.model.RequestClaim">
+                    <property name="claimType"
+                        value="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" />
+                    <property name="optional" value="false" />
+                </bean>
+                <bean
+                    class="org.apache.cxf.fediz.service.idp.model.RequestClaim">
+                    <property name="claimType"
+                        value="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" />
+                    <property name="optional" value="true" />
+                </bean>
+            </util:list>
         </property>
     </bean>
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 </beans>
 

Modified: cxf/fediz/trunk/services/idp/src/test/resources/rest-client.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/resources/rest-client.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/resources/rest-client.xml (original)
+++ cxf/fediz/trunk/services/idp/src/test/resources/rest-client.xml Thu Feb  6 21:48:55 2014
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="         http://www.springframework.org/schema/beans                 http://www.springframework.org/schema/beans/spring-beans.xsd         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd         ">
     <!-- -->

Modified: cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml (original)
+++ cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml Thu Feb  6 21:48:55 2014
@@ -28,24 +28,25 @@
         http://www.springframework.org/schema/util/spring-util-2.0.xsd
         http://www.springframework.org/schema/context
         http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-    
+
     <import resource="classpath:persistenceContext.xml" />
-    
-    <context:component-scan base-package="org.apache.cxf.fediz.service.idp.service"/>
-    
+
+    <context:component-scan base-package="org.apache.cxf.fediz.service.idp.service" />
+
     <!-- Use http://www.baeldung.com/2012/02/06/properties-with-spring/ instead -->
-      <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-    <property name="locations">
-      <list>
-        <value>classpath:persistence.properties</value>
-      </list>
-    </property>
-    <property name="ignoreResourceNotFound" value="true"/>
-    <property name="ignoreUnresolvablePlaceholders" value="true"/>
-  </bean>
-  
-  
-  <bean id="dbLoadertest" class="org.apache.cxf.fediz.service.idp.service.jpa.TestDBLoader" />
+    <bean
+        class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="locations">
+            <list>
+                <value>classpath:persistence.properties</value>
+            </list>
+        </property>
+        <property name="ignoreResourceNotFound" value="true" />
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
+    </bean>
+
+    <bean id="dbLoadertest"
+        class="org.apache.cxf.fediz.service.idp.service.jpa.TestDBLoader" />
 
 </beans>
 

Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml Thu Feb  6 21:48:55 2014
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <beans 
     xmlns="http://www.springframework.org/schema/beans"
     xmlns:cxf="http://cxf.apache.org/core"
@@ -11,10 +29,11 @@
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-        http://cxf.apache.org/jaxws                                     
+        http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+    
     <import resource="classpath:META-INF/cxf/cxf.xml"/>   
     <import resource="cxf-transport.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=1565450&r1=1565449&r2=1565450&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 Thu Feb  6 21:48:55 2014
@@ -1,14 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws"
-	xmlns:test="http://apache.org/hello_world_soap_http" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util" xmlns:http="http://cxf.apache.org/transports/http/configuration"
-	xmlns:sec="http://cxf.apache.org/configuration/security"
-	xsi:schemaLocation="
+    xmlns:cxf="http://cxf.apache.org/core"
+    xmlns:jaxws="http://cxf.apache.org/jaxws"
+    xmlns:test="http://apache.org/hello_world_soap_http"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:http="http://cxf.apache.org/transports/http/configuration"
+    xmlns:sec="http://cxf.apache.org/configuration/security"
+    xsi:schemaLocation="
         http://cxf.apache.org/core
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-        http://cxf.apache.org/jaxws                                     
+        http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd
@@ -17,180 +39,165 @@
         http://cxf.apache.org/configuration/security
         http://cxf.apache.org/schemas/configuration/security.xsd">
 
-	<import resource="classpath:META-INF/cxf/cxf.xml" />
-	
-	 
-	<bean id="loggerListener" class="org.apache.cxf.sts.event.map.EventMapper">
-	   <constructor-arg>
-	       <bean class="org.apache.cxf.sts.event.map.MapEventLogger" />
-	   </constructor-arg>
-	</bean>
-	
-
-	<!--
-		Per default the resource <file.xml> is imported.
-		If built with Maven Profile 'ldap', the resource <ldap.xml> is imported
-	-->
-	<import resource="${adapter.resource}.xml" />
-
-	<cxf:bus>
-		<cxf:features>
-			<cxf:logging />
-		</cxf:features>
-	</cxf:bus>
-	
-	<bean id="samlDelegationHandler" 
-	      class="org.apache.cxf.fediz.service.sts.FedizSAMLDelegationHandler" />
-
-	<bean id="transportSTSProviderBean"
-		class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
-		<property name="issueOperation" ref="transportIssueDelegate" />
-		<property name="validateOperation" ref="transportValidateDelegate" />
-	</bean>
-
-	<bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
-		<property name="tokenProviders" ref="transportTokenProviders" />
-		<property name="services" ref="transportService" />
-		<property name="stsProperties" ref="transportSTSProperties" />
-		<property name="claimsManager" ref="claimsManager" />
-		<property name="tokenValidators" ref="transportTokenValidators" />
-		<property name="eventListener" ref="loggerListener" />
-		<property name="delegationHandlers" ref="samlDelegationHandler" />
-	</bean>
-
-	<bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
-		<property name="tokenValidators" ref="transportTokenValidators" />
-		<property name="stsProperties" ref="transportSTSProperties" />
-		<property name="eventListener" ref="loggerListener" />
-	</bean>
-    
-    <util:list id="relationships">
-		<bean class="org.apache.cxf.sts.token.realm.Relationship">
-			<property name="sourceRealm" value="REALMA" />
-			<property name="targetRealm" value="REALMB"/>
-			<property name="identityMapper" ref="identityMapper" />
-			<property name="type" value="FederatedIdentity" />
-		</bean>
-		<bean class="org.apache.cxf.sts.token.realm.Relationship">
-			<property name="sourceRealm" value="REALMB" />
-			<property name="targetRealm" value="REALMA"/>
-			<property name="identityMapper" ref="identityMapper" />
-			<property name="type" value="FederatedIdentity" />
-		</bean>		
-	</util:list>
- 
- 
-	<util:list id="transportTokenProviders">
-		<ref bean="transportSamlTokenProvider" />
-	</util:list>
-
-	<util:list id="transportTokenValidators">
-		<ref bean="transportSamlTokenValidator" />
-	</util:list>
+    <import resource="classpath:META-INF/cxf/cxf.xml" />
+
+    <bean id="loggerListener" class="org.apache.cxf.sts.event.map.EventMapper">
+        <constructor-arg>
+            <bean class="org.apache.cxf.sts.event.map.MapEventLogger" />
+        </constructor-arg>
+    </bean>
+
+    <!-- Per default the resource <file.xml> is imported.
+         If built with Maven Profile 'ldap', the resource <ldap.xml> is imported -->
+    <import resource="${adapter.resource}.xml" />
+
+    <cxf:bus>
+        <cxf:features>
+            <cxf:logging />
+        </cxf:features>
+    </cxf:bus>
+
+    <bean id="samlDelegationHandler"
+        class="org.apache.cxf.fediz.service.sts.FedizSAMLDelegationHandler" />
+
+    <bean id="transportSTSProviderBean"
+        class="org.apache.cxf.ws.security.sts.provider.SecurityTokenServiceProvider">
+        <property name="issueOperation" ref="transportIssueDelegate" />
+        <property name="validateOperation" ref="transportValidateDelegate" />
+    </bean>
 
+    <bean id="transportIssueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+        <property name="tokenProviders" ref="transportTokenProviders" />
+        <property name="services" ref="transportService" />
+        <property name="stsProperties" ref="transportSTSProperties" />
+        <property name="claimsManager" ref="claimsManager" />
+        <property name="tokenValidators" ref="transportTokenValidators" />
+        <property name="eventListener" ref="loggerListener" />
+        <property name="delegationHandlers" ref="samlDelegationHandler" />
+    </bean>
 
-	<bean id="realmA"
-        class="org.apache.cxf.sts.token.realm.SAMLRealm">
-        <property name="issuer" value="STS Realm A"/>
+    <bean id="transportValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
+        <property name="tokenValidators" ref="transportTokenValidators" />
+        <property name="stsProperties" ref="transportSTSProperties" />
+        <property name="eventListener" ref="loggerListener" />
+    </bean>
+
+    <util:list id="relationships">
+        <bean class="org.apache.cxf.sts.token.realm.Relationship">
+            <property name="sourceRealm" value="REALMA" />
+            <property name="targetRealm" value="REALMB" />
+            <property name="identityMapper" ref="identityMapper" />
+            <property name="type" value="FederatedIdentity" />
+        </bean>
+        <bean class="org.apache.cxf.sts.token.realm.Relationship">
+            <property name="sourceRealm" value="REALMB" />
+            <property name="targetRealm" value="REALMA" />
+            <property name="identityMapper" ref="identityMapper" />
+            <property name="type" value="FederatedIdentity" />
+        </bean>
+    </util:list>
+
+    <util:list id="transportTokenProviders">
+        <ref bean="transportSamlTokenProvider" />
+    </util:list>
+
+    <util:list id="transportTokenValidators">
+        <ref bean="transportSamlTokenValidator" />
+    </util:list>
+
+    <bean id="realmA" class="org.apache.cxf.sts.token.realm.SAMLRealm">
+        <property name="issuer" value="STS Realm A" />
         <property name="signaturePropertiesFile" value="stsKeystoreA.properties" />
-        <property name="callbackHandlerClass" value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
+        <property name="callbackHandlerClass"
+            value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
     </bean>
-    
-    <bean id="realmB"
-        class="org.apache.cxf.sts.token.realm.SAMLRealm">
-        <property name="issuer" value="STS Realm B"/>
+
+    <bean id="realmB" class="org.apache.cxf.sts.token.realm.SAMLRealm">
+        <property name="issuer" value="STS Realm B" />
         <property name="signaturePropertiesFile" value="stsKeystoreB.properties" />
-        <property name="callbackHandlerClass" value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
+        <property name="callbackHandlerClass"
+            value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
     </bean>
-    
+
     <util:map id="realms">
-        <entry key="REALMA" value-ref="realmA"/>
-        <entry key="REALMB" value-ref="realmB"/>
+        <entry key="REALMA" value-ref="realmA" />
+        <entry key="REALMB" value-ref="realmB" />
     </util:map>
 
+    <bean id="transportSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
+        <property name="attributeStatementProviders" ref="attributeStatementProvidersList" />
+        <property name="realmMap" ref="realms" />
+        <property name="conditionsProvider" ref="conditionsProvider" />
+    </bean>
 
-	<bean id="transportSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
-		<property name="attributeStatementProviders" ref="attributeStatementProvidersList" />
-		<property name="realmMap" ref="realms" />
-		<property name="conditionsProvider" ref="conditionsProvider" />
-	</bean>
-	
-	<bean id="conditionsProvider"
-		class="org.apache.cxf.sts.token.provider.DefaultConditionsProvider">
-		<property name="lifetime" value="1200" />
-		<property name="acceptClientLifetime" value="true" />
-	</bean>
-
-	<util:list id="attributeStatementProvidersList">
-		<ref bean="claimAttributeProvider" />
-	</util:list>
-
-	<bean id="claimAttributeProvider"
-		class="org.apache.cxf.sts.claims.ClaimsAttributeStatementProvider">
-	</bean>
-
-	<bean id="claimsManager" class="org.apache.cxf.sts.claims.ClaimsManager">
-		<property name="claimHandlers" ref="claimHandlerList" />
-	</bean>
-
-
-	
-	<bean id="identityMapper" class="org.apache.cxf.fediz.service.sts.realms.IdentityMapperImpl" />
-	
-	<bean id="samlRealmCodec" class="org.apache.cxf.fediz.service.sts.realms.SamlRealmCodec" />
-	
-	<bean id="customRealmParser" class="org.apache.cxf.fediz.service.sts.realms.UriRealmParser"/>
-	
-
-	
-	<bean id="transportSamlTokenValidator" class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
-	    <property name="samlRealmCodec" ref="samlRealmCodec" />
-	</bean>
-	
-	<bean id="transportUsernameTokenValidator"
-		class="org.apache.cxf.sts.token.validator.UsernameTokenValidator">
-	</bean>
-
-	<bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
-		<property name="endpoints" ref="transportEndpoints" />
-	</bean>
-
-	<util:list id="transportEndpoints">
-		<value>.*</value>
-	</util:list>
-	  
-	<bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-		<property name="callbackHandlerClass"
-			value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
-		<property name="issuer" value="Fediz STS" />
-		<property name="realmParser" ref="customRealmParser"/>
-		<property name="signaturePropertiesFile" value="stsTruststore.properties" />
-		<property name="relationships" ref="relationships" />
-	</bean>
-	
-	
-	<jaxws:endpoint id="transportSTSRealmA" implementor="#transportSTSProviderBean"
-		address="/REALMA/STSServiceTransport" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
-		xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
-		serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port">
-		<jaxws:properties>
-		</jaxws:properties>
-	</jaxws:endpoint>
-	
-
-
-	<jaxws:endpoint id="transportSTSRealmB" implementor="#transportSTSProviderBean"
-		address="/REALMB/STSServiceTransport" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
-		xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
-		serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port">
-		<jaxws:properties>
-		</jaxws:properties>
-	</jaxws:endpoint>
+    <bean id="conditionsProvider"
+        class="org.apache.cxf.sts.token.provider.DefaultConditionsProvider">
+        <property name="lifetime" value="1200" />
+        <property name="acceptClientLifetime" value="true" />
+    </bean>
 
+    <util:list id="attributeStatementProvidersList">
+        <ref bean="claimAttributeProvider" />
+    </util:list>
 
+    <bean id="claimAttributeProvider"
+        class="org.apache.cxf.sts.claims.ClaimsAttributeStatementProvider">
+    </bean>
 
+    <bean id="claimsManager" class="org.apache.cxf.sts.claims.ClaimsManager">
+        <property name="claimHandlers" ref="claimHandlerList" />
+    </bean>
 
+    <bean id="identityMapper"
+        class="org.apache.cxf.fediz.service.sts.realms.IdentityMapperImpl" />
 
- 
+    <bean id="samlRealmCodec"
+        class="org.apache.cxf.fediz.service.sts.realms.SamlRealmCodec" />
+
+    <bean id="customRealmParser"
+        class="org.apache.cxf.fediz.service.sts.realms.UriRealmParser" />
+
+    <bean id="transportSamlTokenValidator"
+        class="org.apache.cxf.sts.token.validator.SAMLTokenValidator">
+        <property name="samlRealmCodec" ref="samlRealmCodec" />
+    </bean>
+
+    <bean id="transportUsernameTokenValidator"
+        class="org.apache.cxf.sts.token.validator.UsernameTokenValidator">
+    </bean>
+
+    <bean id="transportService" class="org.apache.cxf.sts.service.StaticService">
+        <property name="endpoints" ref="transportEndpoints" />
+    </bean>
+
+    <util:list id="transportEndpoints">
+        <value>.*</value>
+    </util:list>
+
+    <bean id="transportSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
+        <property name="callbackHandlerClass"
+            value="org.apache.cxf.fediz.service.sts.PasswordCallbackHandler" />
+        <property name="issuer" value="Fediz STS" />
+        <property name="realmParser" ref="customRealmParser" />
+        <property name="signaturePropertiesFile" value="stsTruststore.properties" />
+        <property name="relationships" ref="relationships" />
+    </bean>
+
+    <jaxws:endpoint id="transportSTSRealmA" implementor="#transportSTSProviderBean"
+        address="/REALMA/STSServiceTransport" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+        xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+        serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port">
+        <jaxws:properties>
+        </jaxws:properties>
+    </jaxws:endpoint>
+
+    <jaxws:endpoint id="transportSTSRealmB" implementor="#transportSTSProviderBean"
+        address="/REALMB/STSServiceTransport" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+        xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+        serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port">
+        <jaxws:properties>
+        </jaxws:properties>
+    </jaxws:endpoint>
+    
 </beans>
 

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=1565450&r1=1565449&r2=1565450&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 Thu Feb  6 21:48:55 2014
@@ -1,48 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:jaxws="http://cxf.apache.org/jaxws"
-	xsi:schemaLocation="
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:jaxws="http://cxf.apache.org/jaxws"
+    xsi:schemaLocation="
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd
-        http://cxf.apache.org/jaxws                                     
+        http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd">
 
-
     <import resource="userClaims.xml" />
     <import resource="passwords.xml" />
-    
 
     <util:list id="claimHandlerList">
         <ref bean="claimsHandlerA" />
         <ref bean="claimsHandlerB" />
     </util:list>
-    
-    <bean id="claimsHandlerA" class="org.apache.cxf.fediz.service.sts.realms.RealmFileClaimsHandler">
+
+    <bean id="claimsHandlerA"
+        class="org.apache.cxf.fediz.service.sts.realms.RealmFileClaimsHandler">
         <property name="userClaims" ref="userClaimsREALMA" />
         <property name="supportedClaims" ref="supportedClaims" />
         <property name="realm" value="REALMA" />
     </bean>
-	
-    <bean id="claimsHandlerB" class="org.apache.cxf.fediz.service.sts.realms.RealmFileClaimsHandler">
+
+    <bean id="claimsHandlerB"
+        class="org.apache.cxf.fediz.service.sts.realms.RealmFileClaimsHandler">
         <property name="userClaims" ref="userClaimsREALMB" />
         <property name="supportedClaims" ref="supportedClaims" />
         <property name="realm" value="REALMB" />
     </bean>
 
-    
-    <bean id="upCallBackHandlerRealmA" class="org.apache.cxf.fediz.service.sts.UsernamePasswordCallbackHandler">
+    <bean id="upCallBackHandlerRealmA"
+        class="org.apache.cxf.fediz.service.sts.UsernamePasswordCallbackHandler">
         <property name="passwords" ref="REALMA" />
     </bean>
 
-    <bean id="upCallBackHandlerRealmB" class="org.apache.cxf.fediz.service.sts.UsernamePasswordCallbackHandler">
+    <bean id="upCallBackHandlerRealmB"
+        class="org.apache.cxf.fediz.service.sts.UsernamePasswordCallbackHandler">
         <property name="passwords" ref="REALMB" />
     </bean>
-	
-    <jaxws:endpoint id="transportSTSRealmAUT" implementor="#transportSTSProviderBean"
-        address="/REALMA/STSServiceTransportUT" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+
+    <jaxws:endpoint id="transportSTSRealmAUT"
+        implementor="#transportSTSProviderBean" address="/REALMA/STSServiceTransportUT"
+        wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
         xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
         serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port">
         <jaxws:properties>
@@ -50,8 +71,9 @@
         </jaxws:properties>
     </jaxws:endpoint>
 
-    <jaxws:endpoint id="transportSTSRealmBUT" implementor="#transportSTSProviderBean"
-        address="/REALMB/STSServiceTransportUT" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+    <jaxws:endpoint id="transportSTSRealmBUT"
+        implementor="#transportSTSProviderBean" address="/REALMB/STSServiceTransportUT"
+        wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
         xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
         serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port">
         <jaxws:properties>

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=1565450&r1=1565449&r2=1565450&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 Thu Feb  6 21:48:55 2014
@@ -1,86 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:jaxws="http://cxf.apache.org/jaxws"
-	xsi:schemaLocation="
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:jaxws="http://cxf.apache.org/jaxws"
+    xsi:schemaLocation="
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd
-        http://cxf.apache.org/jaxws                                     
+        http://cxf.apache.org/jaxws
         http://cxf.apache.org/schemas/jaxws.xsd">
 
     <util:list id="claimHandlerList">
-		<ref bean="userClaimsHandler" />
-		<ref bean="groupClaimsHandler" />
-	</util:list>
-
-	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource">
-		<property name="url" value="ldap://localhost:389/" />
-		<property name="userDn" value="uid=admin,ou=system" />
-		<property name="password" value="secret" />
-	</bean>
-
-	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
-		<constructor-arg ref="contextSource" />
-	</bean>
-
-	<util:map id="claimsToLdapAttributeMapping">
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
-			value="givenName" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
-			value="sn" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-			value="mail" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country"
-			value="c" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/postalcode"
-			value="postalCode" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress"
-			value="postalAddress" />						
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/locality"
-			value="town" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/stateorprovince"
-			value="st" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/gender"
-			value="gender" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/dateofbirth"
-			value="dateofbirth" />												
-	    <entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
-	        value="member" />
-	</util:map>
+        <ref bean="userClaimsHandler" />
+        <ref bean="groupClaimsHandler" />
+    </util:list>
+
+    <bean id="contextSource"
+        class="org.springframework.ldap.core.support.LdapContextSource">
+        <property name="url" value="ldap://localhost:389/" />
+        <property name="userDn" value="uid=admin,ou=system" />
+        <property name="password" value="secret" />
+    </bean>
+
+    <bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
+        <constructor-arg ref="contextSource" />
+    </bean>
+
+    <util:map id="claimsToLdapAttributeMapping">
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+            value="givenName" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+            value="sn" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+            value="mail" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country"
+            value="c" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/postalcode"
+            value="postalCode" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress"
+            value="postalAddress" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/locality"
+            value="town" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/stateorprovince"
+            value="st" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/gender"
+            value="gender" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/dateofbirth"
+            value="dateofbirth" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
+            value="member" />
+    </util:map>
 
     <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" />
-		<property name="userNameAttribute" value="uid" />
-	</bean>
-	
-	<util:map id="appliesToScopeMapping">
-		<entry key="urn:org:apache:cxf:fediz:fedizhelloworld"
-			value="Example" />
-	</util:map>
-	
-	<bean id="groupClaimsHandler" class="org.apache.cxf.sts.claims.LdapGroupClaimsHandler">
-		<property name="ldapTemplate" ref="ldapTemplate" />
-		<property name="userBaseDN" value="ou=users,dc=fediz,dc=org" />
-		<property name="groupBaseDN" value="ou=groups,dc=fediz,dc=org" />
-		<property name="appliesToScopeMapping" ref="appliesToScopeMapping" />
-		<property name="userNameAttribute" value="uid" />
-	</bean>
-	
-	<jaxws:endpoint id="transportSTS1" implementor="#transportSTSProviderBean"
-		address="/STSService" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
-		xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
-		serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port">
-		<jaxws:properties>
-			<entry key="ws-security.ut.validator">
-				<bean class="org.apache.ws.security.validate.JAASUsernameTokenValidator">
-					<property name="contextName" value="LDAP" />
-				</bean>
-			</entry>
-		</jaxws:properties>
-	</jaxws:endpoint>
+        <property name="ldapTemplate" ref="ldapTemplate" />
+        <property name="claimsLdapAttributeMapping" ref="claimsToLdapAttributeMapping" />
+        <property name="userBaseDN" value="ou=users,dc=fediz,dc=org" />
+        <property name="userNameAttribute" value="uid" />
+    </bean>
+
+    <util:map id="appliesToScopeMapping">
+        <entry key="urn:org:apache:cxf:fediz:fedizhelloworld"
+            value="Example" />
+    </util:map>
+
+    <bean id="groupClaimsHandler" class="org.apache.cxf.sts.claims.LdapGroupClaimsHandler">
+        <property name="ldapTemplate" ref="ldapTemplate" />
+        <property name="userBaseDN" value="ou=users,dc=fediz,dc=org" />
+        <property name="groupBaseDN" value="ou=groups,dc=fediz,dc=org" />
+        <property name="appliesToScopeMapping" ref="appliesToScopeMapping" />
+        <property name="userNameAttribute" value="uid" />
+    </bean>
+
+    <jaxws:endpoint id="transportSTS1" implementor="#transportSTSProviderBean"
+        address="/STSService" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+        xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
+        serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port">
+        <jaxws:properties>
+            <entry key="ws-security.ut.validator">
+                <bean class="org.apache.ws.security.validate.JAASUsernameTokenValidator">
+                    <property name="contextName" value="LDAP" />
+                </bean>
+            </entry>
+        </jaxws:properties>
+    </jaxws:endpoint>
 	
 </beans>
\ No newline at end of file

Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/passwords.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/passwords.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/passwords.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/passwords.xml Thu Feb  6 21:48:55 2014
@@ -1,29 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
+    <util:map id="REALMA">
+        <entry key="alice" value="ecila" />
+        <entry key="bob" value="bob" />
+        <entry key="ted" value="det" />
+    </util:map>
 
-	<util:map id="REALMA">
-		<entry key="alice"
-			value="ecila" />
-		<entry key="bob"
-			value="bob" />
-		<entry key="ted"
-			value="det" />
-	</util:map>
-	
-	<util:map id="REALMB">
-		<entry key="ALICE"
-			value="ECILA" />
-		<entry key="BOB"
-			value="BOB" />
-		<entry key="TED"
-			value="DET" />
-	</util:map>
+    <util:map id="REALMB">
+        <entry key="ALICE" value="ECILA" />
+        <entry key="BOB" value="BOB" />
+        <entry key="TED" value="DET" />
+    </util:map>
 
 </beans>
\ No newline at end of file

Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/userClaims.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/userClaims.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/userClaims.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/userClaims.xml Thu Feb  6 21:48:55 2014
@@ -1,103 +1,138 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
-	<util:map id="userClaimsREALMA">
-		<entry key="alice"
-			value-ref="REALMA_aliceClaims" />
-		<entry key="bob"
-			value-ref="REALMA_bobClaims" />
-		<entry key="ted"
-			value-ref="REALMA_tedClaims" />
-	</util:map>
-	
-	<util:map id="REALMA_aliceClaims">
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
-			value="Alice" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
-			value="Smith" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-			value="alice@realma.org" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
-			value="User" />
-			
-	</util:map>
-	
-	<util:map id="REALMA_bobClaims">
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
-			value="Bob" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
-			value="Windsor" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-			value="bobwindsor@realma.org" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
-			value="User,Manager,Admin" />
-	</util:map>
-	
-	<util:map id="REALMA_tedClaims">
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
-			value="Ted" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
-			value="Cooper" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-			value="tcooper@realma.org" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
-			value="" />			
-	</util:map>
-	
-	<util:map id="userClaimsREALMB">
-		<entry key="ALICE"
-			value-ref="REALMB_aliceClaims" />
-		<entry key="BOB"
-			value-ref="REALMB_bobClaims" />
-		<entry key="TED"
-			value-ref="REALMB_tedClaims" />
-	</util:map>
-	
-	<util:map id="REALMB_aliceClaims">
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
-			value="Alice" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
-			value="Smith" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-			value="alice@realmb.org" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
-			value="USER" />
-			
-	</util:map>
-	
-	<util:map id="REALMB_bobClaims">
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
-			value="Bob" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
-			value="Windsor" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-			value="bobwindsor@realmb.org" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
-			value="USER,MANAGER,ADMIN" />
-	</util:map>
-	
-	<util:map id="REALMB_tedClaims">
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
-			value="Ted" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
-			value="Cooper" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-			value="tcooper@realmb.org" />
-		<entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
-			value="" />			
-	</util:map>
-	
-	<util:list id="supportedClaims">
-		<value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname</value>
-		<value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname</value>
-		<value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress</value>
-		<value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</value>
-	</util:list>
+    <util:map id="userClaimsREALMA">
+        <entry key="alice" value-ref="REALMA_aliceClaims" />
+        <entry key="bob" value-ref="REALMA_bobClaims" />
+        <entry key="ted" value-ref="REALMA_tedClaims" />
+    </util:map>
+
+    <util:map id="REALMA_aliceClaims">
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+            value="Alice" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+            value="Smith" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+            value="alice@realma.org" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
+            value="User" />
+    </util:map>
+
+    <util:map id="REALMA_bobClaims">
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+            value="Bob" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+            value="Windsor" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+            value="bobwindsor@realma.org" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
+            value="User,Manager,Admin" />
+    </util:map>
+
+    <util:map id="REALMA_tedClaims">
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+            value="Ted" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+            value="Cooper" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+            value="tcooper@realma.org" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
+            value="" />
+    </util:map>
+
+    <util:map id="userClaimsREALMB">
+        <entry key="ALICE" value-ref="REALMB_aliceClaims" />
+        <entry key="BOB" value-ref="REALMB_bobClaims" />
+        <entry key="TED" value-ref="REALMB_tedClaims" />
+    </util:map>
+
+    <util:map id="REALMB_aliceClaims">
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+            value="Alice" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+            value="Smith" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+            value="alice@realmb.org" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
+            value="USER" />
+    </util:map>
+
+    <util:map id="REALMB_bobClaims">
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+            value="Bob" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+            value="Windsor" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+            value="bobwindsor@realmb.org" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
+            value="USER,MANAGER,ADMIN" />
+    </util:map>
+
+    <util:map id="REALMB_tedClaims">
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+            value="Ted" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+            value="Cooper" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+            value="tcooper@realmb.org" />
+        <entry
+            key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
+            value="" />
+    </util:map>
+
+    <util:list id="supportedClaims">
+        <value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname</value>
+        <value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname</value>
+        <value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress</value>
+        <value>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</value>
+    </util:list>
 
 </beans>
\ No newline at end of file

Modified: cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml Thu Feb  6 21:48:55 2014
@@ -1,32 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
-         http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>CXF STS</display-name>
-	
-	<context-param>
-		<param-name>contextConfigLocation</param-name>		
-		<param-value>WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<servlet>
-		<servlet-name>sts</servlet-name>
-		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>sts</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-
-	<session-config>
-		<session-timeout>60</session-timeout>
-	</session-config>
-	
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    <display-name>CXF STS</display-name>
+
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>WEB-INF/applicationContext.xml</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+
+    <servlet>
+        <servlet-name>sts</servlet-name>
+        <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>sts</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <session-timeout>60</session-timeout>
+    </session-config>
+
 </web-app>



Mime
View raw message