cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject svn commit: r1565450 [1/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
Author: owulff
Date: Thu Feb  6 21:48:55 2014
New Revision: 1565450

URL: http://svn.apache.org/r1565450
Log:
Fix indention of XML configs in idp/sts

Modified:
    cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml
    cxf/fediz/trunk/services/idp/src/main/resources/META-INF/spring-persistence.xml
    cxf/fediz/trunk/services/idp/src/main/resources/persistenceContext.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-response.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml
    cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml
    cxf/fediz/trunk/services/idp/src/test/resources/idp-config.xml
    cxf/fediz/trunk/services/idp/src/test/resources/rest-client.xml
    cxf/fediz/trunk/services/idp/src/test/resources/testContext.xml
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/applicationContext.xml
    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
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/passwords.xml
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/userClaims.xml
    cxf/fediz/trunk/services/sts/src/main/webapp/WEB-INF/web.xml

Modified: cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/resources/META-INF/orm.xml Thu Feb  6 21:48:55 2014
@@ -1,128 +1,140 @@
 <?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
-
+  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.
-
+ 
+  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.
 -->
-<entity-mappings  xmlns="http://java.sun.com/xml/ns/persistence/orm"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm 
-                                      http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
-                  version="2.0">
-
-  <entity class="org.apache.cxf.fediz.service.idp.service.jpa.ClaimEntity">
-    <table>
-      <unique-constraint>
-        <column-name>claimtype</column-name>
-      </unique-constraint>
-    </table>
-    <attributes>
-      <id name="id">
-        <generated-value generator="SEQ_Claim" strategy="TABLE"/>
-        <table-generator name="SEQ_Claim" pk-column-value="SEQ_Claim" initial-value="100"/>
-      </id>
-    </attributes>
-  </entity>
-
-  <entity class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
-    <table>
-      <unique-constraint>
-        <column-name>realm</column-name>
-      </unique-constraint>
-    </table>
-    <attributes>
-      <id name="id">
-        <generated-value generator="SEQ_IDP" strategy="TABLE"/>
-        <table-generator name="SEQ_IDP" pk-column-value="SEQ_IDP" initial-value="100"/>
-      </id>
-      <many-to-many name="claimTypesOffered">
-	      <join-table name="idp_claims">
-		      <join-column name="idp_id" />
-		      <inverse-join-column name="claim_id"/>
-		      <unique-constraint>
-			      <column-name>idp_id</column-name>
-			      <column-name>claim_id</column-name>
-		      </unique-constraint>
-	      </join-table>
-      </many-to-many>
-      <many-to-many name="trustedIDPs">
-	      <join-table name="idp_trustedidps">
-		      <join-column name="idp_id" />
-		      <inverse-join-column name="trustedidp_id"/>
-		      <unique-constraint>
-			      <column-name>idp_id</column-name>
-			      <column-name>trustedidp_id</column-name>
-		      </unique-constraint>
-	      </join-table>
-      </many-to-many>     
-      <many-to-many name="applications">
-	      <join-table name="idp_applications">
-		      <join-column name="idp_id" />
-		      <inverse-join-column name="application_id"/>
-		      <unique-constraint>
-			      <column-name>idp_id</column-name>
-			      <column-name>application_id</column-name>
-		      </unique-constraint>
-	      </join-table>
-      </many-to-many>
-          
-    </attributes>
-  </entity>
-
-  <entity class="org.apache.cxf.fediz.service.idp.service.jpa.ApplicationEntity">
-    <table>
-      <unique-constraint>
-        <column-name>realm</column-name>
-      </unique-constraint>
-    </table>
-    <attributes>
-      <id name="id">
-        <generated-value generator="SEQ_Application" strategy="TABLE"/>
-        <table-generator name="SEQ_Application" pk-column-value="SEQ_Application" initial-value="100"/>
-      </id>
-    </attributes>
-  </entity>
-
-  <entity class="org.apache.cxf.fediz.service.idp.service.jpa.TrustedIdpEntity">
-    <table>
-      <unique-constraint>
-        <column-name>realm</column-name>
-      </unique-constraint>
-    </table>  
-    <attributes>
-      <id name="id">
-        <generated-value generator="SEQ_TrustedIDP" strategy="TABLE"/>
-        <table-generator name="SEQ_TrustedIDP" pk-column-value="SEQ_TrustedIDP" initial-value="100"/>
-      </id>
-    </attributes>
-  </entity>
-  
-  <entity class="org.apache.cxf.fediz.service.idp.service.jpa.ApplicationClaimEntity">
-    <table>
-      <unique-constraint>
-        <column-name>claimid</column-name>
-        <column-name>applicationid</column-name>
-      </unique-constraint>
-    </table>
-    <attributes>
-      <id name="id">
-        <generated-value generator="SEQ_ApplicationClaim" strategy="TABLE"/>
-        <table-generator name="SEQ_ApplicationClaim" pk-column-value="SEQ_ApplicationClaim" initial-value="100"/>
-      </id>
-    </attributes>
-  </entity>
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
+    version="2.0">
+
+    <entity class="org.apache.cxf.fediz.service.idp.service.jpa.ClaimEntity">
+        <table>
+            <unique-constraint>
+                <column-name>claimtype</column-name>
+            </unique-constraint>
+        </table>
+        <attributes>
+            <id name="id">
+                <generated-value generator="SEQ_Claim"
+                    strategy="TABLE" />
+                <table-generator name="SEQ_Claim"
+                    pk-column-value="SEQ_Claim" initial-value="100" />
+            </id>
+        </attributes>
+    </entity>
+
+    <entity class="org.apache.cxf.fediz.service.idp.service.jpa.IdpEntity">
+        <table>
+            <unique-constraint>
+                <column-name>realm</column-name>
+            </unique-constraint>
+        </table>
+        <attributes>
+            <id name="id">
+                <generated-value generator="SEQ_IDP"
+                    strategy="TABLE" />
+                <table-generator name="SEQ_IDP"
+                    pk-column-value="SEQ_IDP" initial-value="100" />
+            </id>
+            <many-to-many name="claimTypesOffered">
+                <join-table name="idp_claims">
+                    <join-column name="idp_id" />
+                    <inverse-join-column name="claim_id" />
+                    <unique-constraint>
+                        <column-name>idp_id</column-name>
+                        <column-name>claim_id</column-name>
+                    </unique-constraint>
+                </join-table>
+            </many-to-many>
+            <many-to-many name="trustedIDPs">
+                <join-table name="idp_trustedidps">
+                    <join-column name="idp_id" />
+                    <inverse-join-column name="trustedidp_id" />
+                    <unique-constraint>
+                        <column-name>idp_id</column-name>
+                        <column-name>trustedidp_id</column-name>
+                    </unique-constraint>
+                </join-table>
+            </many-to-many>
+            <many-to-many name="applications">
+                <join-table name="idp_applications">
+                    <join-column name="idp_id" />
+                    <inverse-join-column name="application_id" />
+                    <unique-constraint>
+                        <column-name>idp_id</column-name>
+                        <column-name>application_id</column-name>
+                    </unique-constraint>
+                </join-table>
+            </many-to-many>
+
+        </attributes>
+    </entity>
+
+    <entity
+        class="org.apache.cxf.fediz.service.idp.service.jpa.ApplicationEntity">
+        <table>
+            <unique-constraint>
+                <column-name>realm</column-name>
+            </unique-constraint>
+        </table>
+        <attributes>
+            <id name="id">
+                <generated-value generator="SEQ_Application"
+                    strategy="TABLE" />
+                <table-generator name="SEQ_Application"
+                    pk-column-value="SEQ_Application" initial-value="100" />
+            </id>
+        </attributes>
+    </entity>
+
+    <entity
+        class="org.apache.cxf.fediz.service.idp.service.jpa.TrustedIdpEntity">
+        <table>
+            <unique-constraint>
+                <column-name>realm</column-name>
+            </unique-constraint>
+        </table>
+        <attributes>
+            <id name="id">
+                <generated-value generator="SEQ_TrustedIDP"
+                    strategy="TABLE" />
+                <table-generator name="SEQ_TrustedIDP"
+                    pk-column-value="SEQ_TrustedIDP" initial-value="100" />
+            </id>
+        </attributes>
+    </entity>
+
+    <entity
+        class="org.apache.cxf.fediz.service.idp.service.jpa.ApplicationClaimEntity">
+        <table>
+            <unique-constraint>
+                <column-name>claimid</column-name>
+                <column-name>applicationid</column-name>
+            </unique-constraint>
+        </table>
+        <attributes>
+            <id name="id">
+                <generated-value generator="SEQ_ApplicationClaim"
+                    strategy="TABLE" />
+                <table-generator name="SEQ_ApplicationClaim"
+                    pk-column-value="SEQ_ApplicationClaim"
+                    initial-value="100" />
+            </id>
+        </attributes>
+    </entity>
 </entity-mappings>

Modified: cxf/fediz/trunk/services/idp/src/main/resources/META-INF/spring-persistence.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resources/META-INF/spring-persistence.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/resources/META-INF/spring-persistence.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/resources/META-INF/spring-persistence.xml Thu Feb  6 21:48:55 2014
@@ -1,30 +1,30 @@
 <?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
-
+  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.
-
+ 
+  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.
 -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-             http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-  <persistence-unit name="fedizPersistenceUnit">
-    <mapping-file>META-INF/orm.xml</mapping-file>
-    <validation-mode>NONE</validation-mode>
-  </persistence-unit>
+<persistence
+    xmlns="http://java.sun.com/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+    version="2.0">
+
+    <persistence-unit name="fedizPersistenceUnit">
+        <mapping-file>META-INF/orm.xml</mapping-file>
+        <validation-mode>NONE</validation-mode>
+    </persistence-unit>
 </persistence>
\ No newline at end of file

Modified: cxf/fediz/trunk/services/idp/src/main/resources/persistenceContext.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/resources/persistenceContext.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/resources/persistenceContext.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/resources/persistenceContext.xml Thu Feb  6 21:48:55 2014
@@ -32,105 +32,67 @@
     http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd"
        default-autowire="byName">
 
-	<!-- 
-	<jdbc:initialize-database data-source="dataSource" enabled="${jpa.defaultData}" >
-	    <jdbc:script location="classpath:default.sql"/>
-	</jdbc:initialize-database>
-	-->
-	<context:component-scan base-package="org.apache.cxf.fediz.service.idp.service"/>
-	<context:component-scan base-package="org.apache.cxf.fediz.service.idp.rest"/>
+    <context:component-scan base-package="org.apache.cxf.fediz.service.idp.service" />
+    <context:component-scan base-package="org.apache.cxf.fediz.service.idp.rest" />
 
     <bean id="entityManagerFactory"
-          class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-        <property name="persistenceXmlLocation" value="classpath*:META-INF/spring-persistence.xml"/>
-        <property name="persistenceUnitName" value="fedizPersistenceUnit"/>
-        <property name="dataSource" ref="dataSource"/>
+        class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+        <property name="persistenceXmlLocation"
+            value="classpath*:META-INF/spring-persistence.xml" />
+        <property name="persistenceUnitName" value="fedizPersistenceUnit" />
+        <property name="dataSource" ref="dataSource" />
         <property name="jpaVendorAdapter">
-            <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
-                <property name="showSql" value="false"/>
-                <property name="generateDdl" value="true"/>
-                <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.${jpa.platform}"/>
+            <bean
+                class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
+                <property name="showSql" value="false" />
+                <property name="generateDdl" value="true" />
+                <property name="databasePlatform" value="org.apache.openjpa.jdbc.sql.${jpa.platform}" />
             </bean>
         </property>
     </bean>
-    
-    <!-- 
-    <bean id="entityManagerFactory"
-        class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-    <property name="persistenceXmlLocation" value="classpath*:META-INF/spring-persistence.xml"/>
-    <property name="persistenceUnitName" value="syncopePersistenceUnit"/>
-    <property name="dataSource" ref="dataSource"/>
-    <property name="jpaVendorAdapter">
-      <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
-        <property name="showSql" value="false"/>
-        <property name="generateDdl" value="true"/>
-        <property name="databasePlatform" value="${jpa.dialect}"/>
-      </bean>
-    </property>
-    <property name="jpaPropertyMap">
-      <map>
--->      
-        <!--<entry key="openjpa.Log" value="SQL=TRACE"/>
-        <entry key="openjpa.ConnectionFactoryProperties" 
-               value="PrintParameters=true, PrettyPrint=true, PrettyPrintLineLength=80"/>-->
-                <!-- 
-        <entry key="openjpa.NontransactionalWrite" value="false"/>
-        <entry key="openjpa.AutoDetach" value="close, commit, nontx-read, rollback"/>
-
-        <entry key="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)"/>
-        <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"/>
-                
-        <entry key="openjpa.DataCache" value="true"/>
-        <entry key="openjpa.QueryCache" value="true"/>
-        <entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
-      </map>
-    </property>
-  </bean>
-     -->
-
-  <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-    <property name="jndiName" value="java:comp/env/jdbc/fedizDataSource"/>
-    <property name="defaultObject" ref="localDataSource"/>
-  </bean>
-
-    <bean id="localDataSource"
-          class="org.apache.commons.dbcp.BasicDataSource"
-          destroy-method="close">
-        <property name="driverClassName" value="${jpa.driverClassName}"/>
-        <property name="url" value="${jpa.url}"/>
-        <property name="username" value="${jpa.username}"/>
-        <property name="password" value="${jpa.password}"/>
-    </bean>
-         
-  <bean id="entityManager" class="org.springframework.orm.jpa.support.SharedEntityManagerBean">
-    <property name="entityManagerFactory" ref="entityManagerFactory"/>
-  </bean>
-
-  <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-    <property name="entityManagerFactory" ref="entityManagerFactory"/>
-  </bean>          
-
-    <!-- Support annotation Transactional
-         http://docs.spring.io/spring/docs/3.1.4.RELEASE/spring-framework-reference/htmlsingle/#tx-decl-explained
-     -->
-    <tx:annotation-driven/>
-
-    <!-- Support annotation PersistenceContext
-         http://docs.spring.io/spring/docs/3.1.4.RELEASE/spring-framework-reference/htmlsingle/#orm-jpa-straight
-    -->
-    <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor"/>
-    
-    <!-- Requires updates to unit testing as no JPA exceptions are returned  -->
-    <bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
-
-    <bean id="config" class="org.apache.cxf.fediz.service.idp.service.jpa.ConfigServiceJPA" >
-    	<property name="idpService" ref="idpServiceImpl" />
-    </bean>
-     
-    <bean id="dbLoader" class="org.apache.cxf.fediz.service.idp.service.jpa.DBLoaderImpl" />
-    
-    
-    <bean id="dbListener" class="org.apache.cxf.fediz.service.idp.service.jpa.DBInitApplicationListener" />
-    	
+
+    <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+        <property name="jndiName" value="java:comp/env/jdbc/fedizDataSource" />
+        <property name="defaultObject" ref="localDataSource" />
+    </bean>
+
+    <bean id="localDataSource" class="org.apache.commons.dbcp.BasicDataSource"
+        destroy-method="close">
+        <property name="driverClassName" value="${jpa.driverClassName}" />
+        <property name="url" value="${jpa.url}" />
+        <property name="username" value="${jpa.username}" />
+        <property name="password" value="${jpa.password}" />
+    </bean>
+
+    <bean id="entityManager"
+        class="org.springframework.orm.jpa.support.SharedEntityManagerBean">
+        <property name="entityManagerFactory" ref="entityManagerFactory" />
+    </bean>
+
+    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+        <property name="entityManagerFactory" ref="entityManagerFactory" />
+    </bean>
+
+    <!-- Support annotation Transactional http://docs.spring.io/spring/docs/3.1.4.RELEASE/spring-framework-reference/htmlsingle/#tx-decl-explained -->
+    <tx:annotation-driven />
+
+    <!-- Support annotation PersistenceContext http://docs.spring.io/spring/docs/3.1.4.RELEASE/spring-framework-reference/htmlsingle/#orm-jpa-straight -->
+    <bean
+        class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
+
+    <!-- Requires updates to unit testing as no JPA exceptions are returned -->
+    <bean
+        class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
+
+    <bean id="config"
+        class="org.apache.cxf.fediz.service.idp.service.jpa.ConfigServiceJPA">
+        <property name="idpService" ref="idpServiceImpl" />
+    </bean>
+
+    <bean id="dbLoader"
+        class="org.apache.cxf.fediz.service.idp.service.jpa.DBLoaderImpl" />
+
+    <bean id="dbListener"
+        class="org.apache.cxf.fediz.service.idp.service.jpa.DBInitApplicationListener" />
 
 </beans>
\ No newline at end of file

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/applicationContext.xml Thu Feb  6 21:48:55 2014
@@ -18,9 +18,11 @@
   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:cxf="http://cxf.apache.org/core"
+    xmlns:jaxws="http://cxf.apache.org/jaxws"
     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: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"
     xmlns:jaxrs="http://cxf.apache.org/jaxrs"
@@ -29,7 +31,7 @@
         http://cxf.apache.org/schemas/core.xsd
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-3.1.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
@@ -41,24 +43,24 @@
         http://cxf.apache.org/schemas/configuration/security.xsd
         http://cxf.apache.org/jaxrs
         http://cxf.apache.org/schemas/jaxrs.xsd">
-        
+
     <!-- 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
+        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>
 
     <import resource="classpath:META-INF/cxf/cxf.xml" />
 
     <import resource="security-config.xml" />
     <import resource="${idp-config}" />
     <import resource="classpath:persistenceContext.xml" />
-    
 
     <cxf:bus>
         <cxf:features>
@@ -67,33 +69,36 @@
     </cxf:bus>
 
     <http:conduit name="*.http-conduit">
-        <http:tlsClientParameters disableCNCheck="true">
+        <http:tlsClientParameters
+            disableCNCheck="true">
             <sec:trustManagers>
-                <sec:keyStore type="jks" password="ispass" resource="idp-ssl-trust.jks"/>
+                <sec:keyStore type="jks" password="ispass" resource="idp-ssl-trust.jks" />
             </sec:trustManagers>
         </http:tlsClientParameters>
     </http:conduit>
-    
-    
-      <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider">
-    <property name="depthProperties">
-      <bean id="depthProperties" class="org.apache.cxf.staxutils.DocumentDepthProperties">
-        <property name="innerElementCountThreshold" value="500"/>
-      </bean>
-    </property>
-    <property name="marshallerProperties">
-      <map>
-        <entry key="jaxb.formatted.output">
-          <value type="java.lang.Boolean">true</value>
-        </entry>
-      </map>
-    </property>
-  </bean>
-
-  <bean id="exceptionMapper" class="org.apache.cxf.fediz.service.idp.rest.RestServiceExceptionMapper"/>
-  
-  <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider" />
-    
+
+
+    <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.JAXBElementProvider">
+        <property name="depthProperties">
+            <bean id="depthProperties"
+                class="org.apache.cxf.staxutils.DocumentDepthProperties">
+                <property name="innerElementCountThreshold" value="500" />
+            </bean>
+        </property>
+        <property name="marshallerProperties">
+            <map>
+                <entry key="jaxb.formatted.output">
+                    <value type="java.lang.Boolean">true</value>
+                </entry>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="exceptionMapper"
+        class="org.apache.cxf.fediz.service.idp.rest.RestServiceExceptionMapper" />
+
+    <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider" />
+
     <jaxrs:server id="idpService" address="/rs">
         <jaxrs:serviceBeans>
             <ref bean="idpServiceImpl" />
@@ -102,31 +107,30 @@
             <ref bean="trustedIdpServiceImpl" />
             <ref bean="rootServiceImpl" />
         </jaxrs:serviceBeans>
-        <!-- 
-        <jaxrs:resourceComparator>
-            <bean id="myServiceComparator" class="org.apache.cxf.fediz.service.idp.rest.QueryResourceInfoComparator"/>
-        </jaxrs:resourceComparator>
-        -->    
         <jaxrs:providers>
-      		<ref bean="jaxbProvider"/>
-      		<ref bean="jsonProvider"/>
-      		<ref bean="exceptionMapper"/>
-    	</jaxrs:providers>
-    	<jaxrs:extensionMappings>
-      		<entry key="json" value="application/json;charset=UTF-8"/>
-      		<entry key="xml" value="application/xml;charset=UTF-8"/>
-    	</jaxrs:extensionMappings>
+            <ref bean="jaxbProvider" />
+            <ref bean="jsonProvider" />
+            <ref bean="exceptionMapper" />
+        </jaxrs:providers>
+        <jaxrs:extensionMappings>
+            <entry key="json" value="application/json;charset=UTF-8" />
+            <entry key="xml" value="application/xml;charset=UTF-8" />
+        </jaxrs:extensionMappings>
     </jaxrs:server>
-    
-    <bean id="rootServiceImpl" class="org.apache.cxf.fediz.service.idp.rest.RootServiceImpl" />
-    
+
+    <bean id="rootServiceImpl"
+        class="org.apache.cxf.fediz.service.idp.rest.RootServiceImpl" />
+
     <bean id="idpServiceImpl" class="org.apache.cxf.fediz.service.idp.rest.IdpServiceImpl" />
-    
-    <bean id="claimServiceImpl" class="org.apache.cxf.fediz.service.idp.rest.ClaimServiceImpl" />
-    
-    <bean id="applicationServiceImpl" class="org.apache.cxf.fediz.service.idp.rest.ApplicationServiceImpl" />
-    
-    <bean id="trustedIdpServiceImpl" class="org.apache.cxf.fediz.service.idp.rest.TrustedIdpServiceImpl" />
+
+    <bean id="claimServiceImpl"
+        class="org.apache.cxf.fediz.service.idp.rest.ClaimServiceImpl" />
+
+    <bean id="applicationServiceImpl"
+        class="org.apache.cxf.fediz.service.idp.rest.ApplicationServiceImpl" />
+
+    <bean id="trustedIdpServiceImpl"
+        class="org.apache.cxf.fediz.service.idp.rest.TrustedIdpServiceImpl" />
     
 </beans>
 

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-request.xml Thu Feb  6 21:48:55 2014
@@ -19,8 +19,9 @@
 -->
 <flow xmlns="http://www.springframework.org/schema/webflow"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/webflow
+        http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
     <input name="idpConfig" />
     <input name="wtrealm" />
@@ -33,69 +34,88 @@
     <decision-state id="checkHRDSEnabled">
         <if test="true" then="checkWhrInSigninRequest" else="checkDefaultToThisIDP" />
     </decision-state>
-    
+
     <decision-state id="checkWhrInSigninRequest">
-        <if test="flowScope.whr == null or flowScope.whr.trim().isEmpty()" then="checkHomeRealm" else="checkIsThisIDP" />
+        <if test="flowScope.whr == null or flowScope.whr.trim().isEmpty()"
+            then="checkHomeRealm" else="checkIsThisIDP" />
     </decision-state>
-    
+
     <decision-state id="checkHomeRealm">
-        <if test="homeRealmReminder.readCookie(flowRequestContext) == null" then="processHRDSExpression" else="restoreHomeRealm" />
+        <if test="homeRealmReminder.readCookie(flowRequestContext) == null"
+            then="processHRDSExpression" else="restoreHomeRealm" />
     </decision-state>
 
     <action-state id="restoreHomeRealm">
-        <evaluate expression="homeRealmReminder.readCookie(flowRequestContext).value" result="flowScope.whr" /> 
-        <transition to="checkIsThisIDP"/>
+        <evaluate
+            expression="homeRealmReminder.readCookie(flowRequestContext).value"
+            result="flowScope.whr" />
+        <transition to="checkIsThisIDP" />
     </action-state>
 
     <action-state id="processHRDSExpression">
-<!--     TODO -->
-        <evaluate expression="processHRDSExpressionAction.submit(flowRequestContext)" result="flowScope.whr" /> 
-        <transition on="" to="provideIDPListForUser"/>
+        <!-- TODO -->
+        <evaluate
+            expression="processHRDSExpressionAction.submit(flowRequestContext)"
+            result="flowScope.whr" />
+        <transition on="" to="provideIDPListForUser" />
         <transition to="checkIsThisIDP">
-            <evaluate expression="homeRealmReminder.addCookie(flowRequestContext, flowScope.whr)" />
+            <evaluate
+                expression="homeRealmReminder.addCookie(flowRequestContext, flowScope.whr)" />
         </transition>
     </action-state>
 
     <decision-state id="provideIDPListForUser">
-        <if test="flowScope.idpConfig.trustedIdps == null or idpConfig.trustedIdps.isEmpty()" then="checkDefaultToThisIDP" />
-        <if test="flowScope.idpConfig.isProvideIDPList() == false" then="checkDefaultToThisIDP" else="showIDPList" />
+        <if
+            test="flowScope.idpConfig.trustedIdps == null or idpConfig.trustedIdps.isEmpty()"
+            then="checkDefaultToThisIDP" />
+        <if test="flowScope.idpConfig.isProvideIDPList() == false"
+            then="checkDefaultToThisIDP" else="showIDPList" />
     </decision-state>
 
     <decision-state id="checkDefaultToThisIDP">
-        <if test="flowScope.idpConfig.isUseCurrentIDP()" then="checkWauthTypeSupported" else="viewBadRequest" />
+        <if test="flowScope.idpConfig.isUseCurrentIDP()" then="checkWauthTypeSupported"
+            else="viewBadRequest" />
     </decision-state>
-    
+
     <view-state id="showIDPList" view="idplist" model="trustedIDPSelection">
-        <var name="trustedIDPSelection" class="org.apache.cxf.fediz.service.idp.model.TrustedIDPSelection" />
+        <var name="trustedIDPSelection"
+            class="org.apache.cxf.fediz.service.idp.model.TrustedIDPSelection" />
         <binder>
             <binding property="whr" required="true" />
         </binder>
         <on-entry>
             <set name="requestScope.idPConfig" value="flowScope.idpConfig" />
         </on-entry>
-        <transition on="submit" to="checkIsThisIDP" bind="true" validate="true">
+        <transition on="submit" to="checkIsThisIDP" bind="true"
+            validate="true">
             <set name="flowScope.whr" value="trustedIDPSelection.whr" />
-            <evaluate expression="homeRealmReminder.addCookie(flowRequestContext, flowScope.whr)" />
+            <evaluate
+                expression="homeRealmReminder.addCookie(flowRequestContext, flowScope.whr)" />
         </transition>
-        <transition on="cancel" to="checkDefaultToThisIDP" bind="false" validate="false" />
+        <transition on="cancel" to="checkDefaultToThisIDP"
+            bind="false" validate="false" />
     </view-state>
 
-<!--     Home Realm is known then we can store it in cookie -->
+    <!-- Home Realm is known then we can store it in cookie -->
     <decision-state id="checkIsThisIDP">
-        <if test="flowScope.idpConfig.realm.equals(flowScope.whr)" then="checkWauthTypeSupported" else="checkIdpTokenWhrWauth" />
+        <if test="flowScope.idpConfig.realm.equals(flowScope.whr)"
+            then="checkWauthTypeSupported" else="checkIdpTokenWhrWauth" />
     </decision-state>
-    
-<!-- ============================================================================================================= -->
 
-    <!--  Is 'wresult/RP-IDP token' already received and validated (then stored in session) from requestor IDP ? -->
+    <!-- ============================================================================================================= -->
+
+    <!-- Is 'wresult/RP-IDP token' already received and validated (then stored 
+        in session) from requestor IDP ? -->
     <decision-state id="checkIdpTokenWhrWauth">
-        <if test="externalContext.sessionMap[flowScope.whr] != null" then="wfreshParserRemoteAction" else="redirectToTrustedIDP" />
+        <if test="externalContext.sessionMap[flowScope.whr] != null"
+            then="wfreshParserRemoteAction" else="redirectToTrustedIDP" />
     </decision-state>
-    
+
     <action-state id="wfreshParserRemoteAction">
-        <evaluate expression="wfreshParser.authenticationRequired(flowScope.wfresh, flowScope.whr, flowRequestContext)" />
-        <transition on="yes" to="redirectToTrustedIDP"/>
-        <transition on="no" to="requestRpToken"/>
+        <evaluate
+            expression="wfreshParser.authenticationRequired(flowScope.wfresh, flowScope.whr, flowRequestContext)" />
+        <transition on="yes" to="redirectToTrustedIDP" />
+        <transition on="no" to="requestRpToken" />
         <transition on-exception="java.lang.Throwable" to="viewBadRequest" />
     </action-state>
 
@@ -104,26 +124,32 @@
             <!-- Here, home realm is guaranteed to be THIS realm -->
             <set name="flowScope.whr" value="flowScope.idpConfig.realm" />
         </on-entry>
-        <if test="flowScope.idpConfig.getAuthenticationURIs() == null" then="viewBadRequest" />
-        <if test="flowScope.idpConfig.getAuthenticationURIs().get(flowScope.wauth) != null" then="checkIdpTokenWauth" else="viewBadRequest" />
+        <if test="flowScope.idpConfig.getAuthenticationURIs() == null"
+            then="viewBadRequest" />
+        <if
+            test="flowScope.idpConfig.getAuthenticationURIs().get(flowScope.wauth) != null"
+            then="checkIdpTokenWauth" else="viewBadRequest" />
     </decision-state>
-    
+
     <decision-state id="checkIdpTokenWauth">
-<!--    check presence of cached IDP token for THIS realm -->
-        <if test="externalContext.sessionMap[flowScope.whr] == null" then="cacheTokenForWauth" else="wfreshParserAction" />
+        <!-- check presence of cached IDP token for THIS realm -->
+        <if test="externalContext.sessionMap[flowScope.whr] == null"
+            then="cacheTokenForWauth" else="wfreshParserAction" />
     </decision-state>
-    
-    <!-- parse wfresh parameter, provided by resource RP, overriding ttl from 'IDP_TOKEN' -->
+
+    <!-- parse wfresh parameter, provided by resource RP, overriding ttl 
+        from 'IDP_TOKEN' -->
     <action-state id="wfreshParserAction">
-        <evaluate expression="wfreshParser.authenticationRequired(flowScope.wfresh, flowScope.whr, flowRequestContext)" />
-        <transition on="yes" to="redirectToLocalIDP"/>
-        <transition on="no" to="requestRpToken"/>
+        <evaluate
+            expression="wfreshParser.authenticationRequired(flowScope.wfresh, flowScope.whr, flowRequestContext)" />
+        <transition on="yes" to="redirectToLocalIDP" />
+        <transition on="no" to="requestRpToken" />
         <transition on-exception="java.lang.Throwable" to="viewBadRequest" />
     </action-state>
 
     <end-state id="redirectToLocalIDP">
         <on-entry>
-	        <evaluate expression="logoutAction.submit(flowRequestContext)" />
+            <evaluate expression="logoutAction.submit(flowRequestContext)" />
         </on-entry>
         <output name="wctx" value="flowScope.wctx" />
     </end-state>
@@ -134,7 +160,7 @@
         <transition to="requestRpToken" />
     </action-state>
 
-<!-- ============================================================================================================= -->
+    <!-- ============================================================================================================= -->
 
     <!-- normal exit point -->
     <end-state id="requestRpToken">
@@ -148,7 +174,7 @@
     <!-- redirects to requestor idp -->
     <end-state id="redirectToTrustedIDP">
         <on-entry>
-        	<evaluate expression="signInParamCacheAction.store(flowRequestContext)" />
+            <evaluate expression="signInParamCacheAction.store(flowRequestContext)" />
         </on-entry>
         <output name="whr" value="flowScope.whr" />
         <output name="wctx" value="flowScope.wctx" />

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-response.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-response.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-response.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-signin-response.xml Thu Feb  6 21:48:55 2014
@@ -19,8 +19,9 @@
 -->
 <flow xmlns="http://www.springframework.org/schema/webflow"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/webflow
+        http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
     <input name="idpConfig" />
     <input name="wctx" />
@@ -28,20 +29,22 @@
     <input name="wresult" />
 
     <on-start>
-	<!-- restore 'wreply','wtrealm','whr' for current 'wctx' -->
+        <!-- restore 'wreply','wtrealm','whr' for current 'wctx' -->
         <evaluate expression="signInParamCacheAction.restore(flowRequestContext)" />
     </on-start>
 
     <!-- validate token issued by requestor IDP ('wresult') given its 'whr' -->
     <action-state id="validateToken">
-        <evaluate expression="validateTokenAction.submit(flowRequestContext)" 
-                        result="flowScope.rpIdpToken" 
-                        result-type="org.apache.cxf.ws.security.tokenstore.SecurityToken" /> 
+        <evaluate expression="validateTokenAction.submit(flowRequestContext)"
+            result="flowScope.rpIdpToken" result-type="org.apache.cxf.ws.security.tokenstore.SecurityToken" />
         <transition to="requestRpToken">
             <!-- cache validated token under key = requestor home realm -->
-            <set name="externalContext.sessionMap[flowScope.whr]" value="flowScope.rpIdpToken" />
+            <set name="externalContext.sessionMap[flowScope.whr]"
+                value="flowScope.rpIdpToken" />
         </transition>
-        <transition on-exception="org.apache.cxf.fediz.core.exception.ProcessingException" to="viewBadRequest" />
+        <transition
+            on-exception="org.apache.cxf.fediz.core.exception.ProcessingException"
+            to="viewBadRequest" />
         <transition on-exception="java.lang.Throwable" to="scInternalServerError" />
     </action-state>
 
@@ -57,5 +60,5 @@
 
     <!-- abnormal exit point : Http 500 Internal Server Error -->
     <end-state id="scInternalServerError" />
-   
+
 </flow>

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml Thu Feb  6 21:48:55 2014
@@ -31,17 +31,26 @@
             <set name="flowScope.wfresh" value="requestParameters.wfresh" />
             <set name="flowScope.whr" value="requestParameters.whr" />
             <set name="flowScope.wresult" value="requestParameters.wresult" />
-            <evaluate expression="requestScope.getString('wauth','default')" result="flowScope.wauth" />
-	        <set name="flowScope.idpConfig" value="config.getIDP(null)" />
+            <evaluate expression="requestScope.getString('wauth','default')"
+                result="flowScope.wauth" />
+            <set name="flowScope.idpConfig" value="config.getIDP(null)" />
         </on-entry>
         <if test="requestParameters.wa == null" then="viewBadRequest" />
-        <if test="requestParameters.wa != 'wsignin1.0' and requestParameters.wa != 'wsignout1.0' and requestParameters.wa != 'wsignoutcleanup1.0'" then="viewBadRequest" />
-        <if test="requestParameters.wa == 'wsignout1.0' or requestParameters.wa == 'wsignoutcleanup1.0'" then="invalidateSessionAction" />
-        <if test="requestParameters.wtrealm == null or requestParameters.wtrealm.length() == 0" then="viewBadRequest" else="selectSigninProcess"/>
+        <if
+            test="requestParameters.wa != 'wsignin1.0' and requestParameters.wa != 'wsignout1.0' and requestParameters.wa != 'wsignoutcleanup1.0'"
+            then="viewBadRequest" />
+        <if
+            test="requestParameters.wa == 'wsignout1.0' or requestParameters.wa == 'wsignoutcleanup1.0'"
+            then="invalidateSessionAction" />
+        <if
+            test="requestParameters.wtrealm == null or requestParameters.wtrealm.length() == 0"
+            then="viewBadRequest" else="selectSigninProcess" />
     </decision-state>
 
     <decision-state id="selectSigninProcess">
-        <if test="requestParameters.wresult == null or requestParameters.wresult.isEmpty()" then="signinRequest" else="signinResponse" />
+        <if
+            test="requestParameters.wresult == null or requestParameters.wresult.isEmpty()"
+            then="signinRequest" else="signinResponse" />
     </decision-state>
 
     <subflow-state id="signinRequest" subflow="signinRequest">
@@ -54,23 +63,23 @@
         <input name="whr" value="flowScope.whr" />
 
         <output name="whr" />
-        <output name="wctx" />  
+        <output name="wctx" />
 
         <transition on="requestRpToken" to="requestRpToken">
-        	<set name="flowScope.whr" value="currentEvent.attributes.whr" />
-        	<set name="flowScope.wctx" value="currentEvent.attributes.wctx" />
+            <set name="flowScope.whr" value="currentEvent.attributes.whr" />
+            <set name="flowScope.wctx" value="currentEvent.attributes.wctx" />
         </transition>
-        <transition on="viewBadRequest" to="viewBadRequest"/>
-        <transition on="scInternalServerError" to="scInternalServerError"/>
+        <transition on="viewBadRequest" to="viewBadRequest" />
+        <transition on="scInternalServerError" to="scInternalServerError" />
         <transition on="redirectToTrustedIDP" to="redirectToTrustedIDP">
-        	<set name="flowScope.whr" value="currentEvent.attributes.whr" />
-        	<set name="flowScope.wctx" value="currentEvent.attributes.wctx" />
+            <set name="flowScope.whr" value="currentEvent.attributes.whr" />
+            <set name="flowScope.wctx" value="currentEvent.attributes.wctx" />
         </transition>
         <transition on="redirectToLocalIDP" to="redirectToLocalIDP">
-        	<set name="flowScope.wctx" value="currentEvent.attributes.wctx" />
+            <set name="flowScope.wctx" value="currentEvent.attributes.wctx" />
         </transition>
     </subflow-state>
-        
+
     <subflow-state id="signinResponse" subflow="signinResponse">
         <input name="idpConfig" value="flowScope.idpConfig" />
         <input name="wfresh" value="flowScope.wfresh" />
@@ -78,26 +87,25 @@
         <input name="wauth" value="flowScope.wauth" />
         <input name="wresult" value="flowScope.wresult" />
 
-        <output name="wtrealm" /> 
-        <output name="wreply" /> 
-        <output name="wctx" /> 
-        <output name="whr" /> 
+        <output name="wtrealm" />
+        <output name="wreply" />
+        <output name="wctx" />
+        <output name="whr" />
 
         <transition on="requestRpToken" to="requestRpToken">
-        	<set name="flowScope.whr" value="currentEvent.attributes.whr" />
-        	<set name="flowScope.wctx" value="currentEvent.attributes.wctx" />
-        	<set name="flowScope.wtrealm" value="currentEvent.attributes.wtrealm" />
-        	<set name="flowScope.wreply" value="currentEvent.attributes.wreply" />
+            <set name="flowScope.whr" value="currentEvent.attributes.whr" />
+            <set name="flowScope.wctx" value="currentEvent.attributes.wctx" />
+            <set name="flowScope.wtrealm" value="currentEvent.attributes.wtrealm" />
+            <set name="flowScope.wreply" value="currentEvent.attributes.wreply" />
         </transition>
-        <transition on="viewBadRequest" to="viewBadRequest"/>
-        <transition on="scInternalServerError" to="scInternalServerError"/>
+        <transition on="viewBadRequest" to="viewBadRequest" />
+        <transition on="scInternalServerError" to="scInternalServerError" />
     </subflow-state>
 
     <!-- produce RP security token (as String type) -->
     <action-state id="requestRpToken">
-		<evaluate expression="stsClientForRpAction.submit(flowRequestContext)"
-                    result="flowScope.rpToken" 
-                    result-type="java.lang.String" />
+        <evaluate expression="stsClientForRpAction.submit(flowRequestContext)"
+            result="flowScope.rpToken" result-type="java.lang.String" />
         <transition to="formResponseView" />
         <transition on-exception="java.lang.Throwable" to="scInternalServerError" />
     </action-state>
@@ -116,7 +124,8 @@
     <!-- abnormal exit point : Http 400 Bad Request -->
     <end-state id="viewBadRequest" view="genericerror">
         <on-entry>
-            <evaluate expression="externalContext.nativeResponse.setStatus(400,flowRequestContext.currentTransition.toString())" />
+            <evaluate
+                expression="externalContext.nativeResponse.setStatus(400,flowRequestContext.currentTransition.toString())" />
             <set name="requestScope.reason" value="flowRequestContext.currentTransition" />
         </on-entry>
     </end-state>
@@ -124,23 +133,27 @@
     <!-- abnormal exit point : Http 500 Internal Server Error -->
     <end-state id="scInternalServerError" view="genericerror">
         <on-entry>
-            <evaluate expression="externalContext.nativeResponse.setStatus(500,'IDP is unavailable, please contact the administrator')" />
-            <set name="requestScope.reason" value="'IDP is unavailable, please contact the administrator'" />
+            <evaluate
+                expression="externalContext.nativeResponse.setStatus(500,'IDP is unavailable, please contact the administrator')" />
+            <set name="requestScope.reason"
+                value="'IDP is unavailable, please contact the administrator'" />
         </on-entry>
     </end-state>
 
     <!-- normal exit point for logout -->
     <end-state id="invalidateSessionAction" view="signoutresponse">
-    	<on-entry>
-	        <evaluate expression="homeRealmReminder.removeCookie(flowRequestContext)" />
-	        <evaluate expression="logoutAction.submit(flowRequestContext)" />
-    	</on-entry>
-    </end-state> 
-    
+        <on-entry>
+            <evaluate
+                expression="homeRealmReminder.removeCookie(flowRequestContext)" />
+            <evaluate expression="logoutAction.submit(flowRequestContext)" />
+        </on-entry>
+    </end-state>
+
     <!-- redirect to remote idp -->
     <end-state id="redirectToTrustedIDP" view="externalRedirect:${flowScope.remoteIdpUrl}">
         <on-entry>
-            <set name="flowScope.remoteIdpUrl" value="flowScope.idpConfig.trustedIDPs.get(flowScope.whr).url
+            <set name="flowScope.remoteIdpUrl"
+                value="flowScope.idpConfig.trustedIDPs.get(flowScope.whr).url
                 +'?wa=wsignin1.0'
                 +'&amp;wtrealm='+flowScope.idpConfig.realm
                 +'&amp;wreply='+flowScope.idpConfig.idpUrl
@@ -152,7 +165,8 @@
 
     <end-state id="redirectToLocalIDP" view="externalRedirect:${flowScope.localIdpUrl}">
         <on-entry>
-            <set name="flowScope.localIdpUrl" value="flowScope.idpConfig.idpUrl
+            <set name="flowScope.localIdpUrl"
+                value="flowScope.idpConfig.idpUrl
                 +'?wa=wsignin1.0'
                 +'&amp;wreply='+flowScope.wreply
                 +'&amp;wtrealm='+flowScope.wtrealm
@@ -161,5 +175,5 @@
             </set>
         </on-entry>
     </end-state>
-    
+
 </flow>

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml Thu Feb  6 21:48:55 2014
@@ -18,30 +18,21 @@
   under the License.
 -->
 <beans profile="spring" 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
     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-3.1.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/schemas/jaxws.xsd
-    http://www.springframework.org/schema/util
-    http://www.springframework.org/schema/util/spring-util-2.0.xsd
-    http://cxf.apache.org/transports/http/configuration
-    http://cxf.apache.org/schemas/configuration/http-conf.xsd
-    http://cxf.apache.org/configuration/security
-    http://cxf.apache.org/schemas/configuration/security.xsd">
+        http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/util
+        http://www.springframework.org/schema/util/spring-util-2.0.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">
+    <bean id="config"
+        class="org.apache.cxf.fediz.service.idp.service.ConfigServiceSpring">
         <property name="idpConfigs">
             <util:list>
                 <ref bean="idp-realmA" />
@@ -51,83 +42,104 @@
             <util:list>
                 <ref bean="srv-fedizhelloworld" />
             </util:list>
-        </property>     	
-    </bean>        
-	
+        </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="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>
+                <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" />
+                <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>       
+                <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" />
+                <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" />
     </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" />
+                <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" />
+                <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" />
+                <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" />
+                <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>        		        		        		
+                </bean>
             </util:list>
         </property>
     </bean>

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml Thu Feb  6 21:48:55 2014
@@ -18,30 +18,21 @@
   under the License.
 -->
 <beans profile="spring" 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:util="http://www.springframework.org/schema/util"
     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-3.1.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/schemas/jaxws.xsd
-    http://www.springframework.org/schema/util
-    http://www.springframework.org/schema/util/spring-util-2.0.xsd
-    http://cxf.apache.org/transports/http/configuration
-    http://cxf.apache.org/schemas/configuration/http-conf.xsd
-    http://cxf.apache.org/configuration/security
-    http://cxf.apache.org/schemas/configuration/security.xsd">
+        http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/util
+        http://www.springframework.org/schema/util/spring-util-2.0.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">
+    <bean id="config"
+        class="org.apache.cxf.fediz.service.idp.service.ConfigServiceSpring">
         <property name="idpConfigs">
             <util:list>
                 <ref bean="idp-realmB" />
@@ -51,66 +42,81 @@
             <util:list>
                 <ref bean="idp-realmA" />
             </util:list>
-        </property>    	
+        </property>
     </bean>
-	
+
     <bean id="idp-realmB" class="org.apache.cxf.fediz.service.idp.model.IDPConfig">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-B" />
         <property name="uri" value="realmb" />
-        <!--<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="false" />
         <property name="useCurrentIDP" value="true" />
         <property name="certificate" value="stsKeystoreB.properties" />
         <property name="certificatePassword" value="realmb" />
-        <property name="stsUrl" value="https://localhost:0/fediz-idp-sts/REALMB" />
-        <property name="idpUrl" value="https://localhost:${realmB.port}/fediz-idp-remote/federation" />
+        <property name="stsUrl"
+            value="https://localhost:0/fediz-idp-sts/REALMB" />
+        <property name="idpUrl"
+            value="https://localhost:${realmB.port}/fediz-idp-remote/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>
+                <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:idp:realm-A" value-ref="idp-realmA" />
+                <entry key="urn:org:apache:cxf:fediz:idp:realm-A"
+                    value-ref="idp-realmA" />
             </util:map>
         </property>
         <property name="authenticationURIs">
             <util:map>
                 <entry key="default" value="/login/default" />
-            </util:map>       
+            </util:map>
         </property>
         <property name="serviceDisplayName" value="REALM B" />
         <property name="serviceDescription" value="IDP of Realm B" />
-    </bean>   
-    
+    </bean>
+
     <bean id="idp-realmA" class="org.apache.cxf.fediz.service.idp.model.ServiceConfig">
         <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-A" />
-        <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="serviceDisplayName" value="Resource IDP Realm A" />
         <property name="serviceDescription" value="Resource IDP Realm A" />
         <property name="role" value="SecurityTokenServiceType" />
-        <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" />
+                <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" />
+                <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" />
+                <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" />
+                <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="false" />
-                </bean>        		        		        		
+                </bean>
             </util:list>
         </property>
     </bean>

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/idp-servlet.xml Thu Feb  6 21:48:55 2014
@@ -22,59 +22,74 @@
     xmlns:util="http://www.springframework.org/schema/util" 
     xmlns:webflow="http://www.springframework.org/schema/webflow-config"
     xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:context="http://www.springframework.org/schema/context"   
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-        http://www.springframework.org/schema/util 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
-        http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
-    
-    <context:property-placeholder location="classpath:realm.properties"/>
-      
+    xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/util
+        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
+        http://www.springframework.org/schema/webflow-config
+        http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
+
+    <context:property-placeholder location="classpath:realm.properties" />
+
     <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping"
-        p:flowRegistry-ref="flowRegistry"
-        p:order="2">
+        p:flowRegistry-ref="flowRegistry" p:order="2">
     </bean>
 
     <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerAdapter"
         p:flowExecutor-ref="flowExecutor" />
 
-    <webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry">
+    <webflow:flow-executor id="flowExecutor"
+        flow-registry="flowRegistry">
         <webflow:flow-execution-attributes>
-            <webflow:always-redirect-on-pause value="false" />
+            <webflow:always-redirect-on-pause
+                value="false" />
         </webflow:flow-execution-attributes>
 
-	<webflow:flow-execution-listeners>
-	    <webflow:listener ref="securityFlowExecutionListener" />
-	</webflow:flow-execution-listeners>
+        <webflow:flow-execution-listeners>
+            <webflow:listener ref="securityFlowExecutionListener" />
+        </webflow:flow-execution-listeners>
     </webflow:flow-executor>
 
-    <bean id="securityFlowExecutionListener" class="org.springframework.webflow.security.SecurityFlowExecutionListener">
+    <bean id="securityFlowExecutionListener"
+        class="org.springframework.webflow.security.SecurityFlowExecutionListener">
         <property name="accessDecisionManager" ref="accessDecisionManager" />
     </bean>
 
-    <bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
+    <bean id="accessDecisionManager"
+        class="org.springframework.security.access.vote.AffirmativeBased">
         <property name="decisionVoters">
             <list>
-                <bean class="org.springframework.security.access.vote.RoleVoter">
-                    <property name="rolePrefix" value="ROLE_"/>
+                <bean
+                    class="org.springframework.security.access.vote.RoleVoter">
+                    <property name="rolePrefix" value="ROLE_" />
                 </bean>
-                <bean class="org.springframework.security.access.vote.AuthenticatedVoter"/>
+                <bean
+                    class="org.springframework.security.access.vote.AuthenticatedVoter" />
             </list>
         </property>
     </bean>
 
-    <webflow:flow-registry id="flowRegistry" flow-builder-services="builder">
-        <webflow:flow-location path="/WEB-INF/federation-validate-request.xml" id="federation" />
-        <webflow:flow-location path="/WEB-INF/federation-signin-request.xml" id="signinRequest" />
-        <webflow:flow-location path="/WEB-INF/federation-signin-response.xml" id="signinResponse" />
+    <webflow:flow-registry id="flowRegistry"
+        flow-builder-services="builder">
+        <webflow:flow-location
+            path="/WEB-INF/federation-validate-request.xml" id="federation" />
+        <webflow:flow-location path="/WEB-INF/federation-signin-request.xml"
+            id="signinRequest" />
+        <webflow:flow-location path="/WEB-INF/federation-signin-response.xml"
+            id="signinResponse" />
     </webflow:flow-registry>
 
-    <webflow:flow-builder-services id="builder" view-factory-creator="viewFactoryCreator"
-        expression-parser="expressionParser"/>
+    <webflow:flow-builder-services id="builder"
+        view-factory-creator="viewFactoryCreator" expression-parser="expressionParser" />
 
-    <bean id="expressionParser" class="org.springframework.webflow.expression.WebFlowOgnlExpressionParser" />
+    <bean id="expressionParser"
+        class="org.springframework.webflow.expression.WebFlowOgnlExpressionParser" />
 
-    <bean id="viewFactoryCreator" class="org.springframework.webflow.mvc.builder.MvcViewFactoryCreator">
+    <bean id="viewFactoryCreator"
+        class="org.springframework.webflow.mvc.builder.MvcViewFactoryCreator">
         <property name="viewResolvers">
             <list>
                 <ref local="viewResolver" />
@@ -82,29 +97,38 @@
         </property>
     </bean>
 
-    <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-        <property name="prefix" value="/WEB-INF/"/>
-        <property name="suffix" value=".jsp"/>
-    </bean>
-
-    <bean id="stsClientForRpAction" class="org.apache.cxf.fediz.service.idp.beans.STSClientAction">
-        <property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransport?wsdl"/>
-        <property name="wsdlEndpoint" value="Transport_Port"/>
-        <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"/>
+    <bean id="viewResolver"
+        class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="prefix" value="/WEB-INF/" />
+        <property name="suffix" value=".jsp" />
+    </bean>
+
+    <bean id="stsClientForRpAction"
+        class="org.apache.cxf.fediz.service.idp.beans.STSClientAction">
+        <property name="wsdlLocation"
+            value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransport?wsdl" />
+        <property name="wsdlEndpoint" value="Transport_Port" />
+        <property name="tokenType"
+            value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" />
     </bean>
 
-    <bean id="signInParamCacheAction" class="org.apache.cxf.fediz.service.idp.beans.SigninParametersCacheAction" />
+    <bean id="signInParamCacheAction"
+        class="org.apache.cxf.fediz.service.idp.beans.SigninParametersCacheAction" />
 
     <bean id="logoutAction" class="org.apache.cxf.fediz.service.idp.beans.LogoutAction" />
 
     <bean id="wfreshParser" class="org.apache.cxf.fediz.service.idp.beans.WfreshParser" />
 
-    <bean id="cacheTokenForWauthAction" class="org.apache.cxf.fediz.service.idp.beans.CacheTokenForWauthAction" />
+    <bean id="cacheTokenForWauthAction"
+        class="org.apache.cxf.fediz.service.idp.beans.CacheTokenForWauthAction" />
 
-    <bean id="processHRDSExpressionAction" class="org.apache.cxf.fediz.service.idp.beans.ProcessHRDSExpressionAction" />
+    <bean id="processHRDSExpressionAction"
+        class="org.apache.cxf.fediz.service.idp.beans.ProcessHRDSExpressionAction" />
 
-    <bean id="validateTokenAction" class="org.apache.cxf.fediz.service.idp.beans.ValidateTokenAction" />
+    <bean id="validateTokenAction"
+        class="org.apache.cxf.fediz.service.idp.beans.ValidateTokenAction" />
 
-    <bean id="homeRealmReminder" class="org.apache.cxf.fediz.service.idp.beans.HomeRealmReminder" />
+    <bean id="homeRealmReminder"
+        class="org.apache.cxf.fediz.service.idp.beans.HomeRealmReminder" />
 
 </beans>

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/security-config.xml Thu Feb  6 21:48:55 2014
@@ -22,9 +22,12 @@
     xmlns:security="http://www.springframework.org/schema/security"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
-        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://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.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://www.springframework.org/schema/security
+        http://www.springframework.org/schema/security/spring-security-3.1.xsd">
 
     <context:property-placeholder location="classpath:realm.properties"/>
     

Modified: cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml?rev=1565450&r1=1565449&r2=1565450&view=diff
==============================================================================
--- cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/services/idp/src/main/webapp/WEB-INF/web.xml Thu Feb  6 21:48:55 2014
@@ -1,3 +1,4 @@
+<?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
@@ -18,79 +19,74 @@ under the License.
 
 -->
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-                      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	version="3.0" metadata-complete="true">
-
-	<description>Fediz IDP</description>
-	<display-name>Fediz IDP</display-name>
-
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-	
-	<context-param>
-		<param-name>spring.profiles.active</param-name>
-		<param-value>jpa</param-value>
-	</context-param>
-	
-	<filter>
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    version="3.0" metadata-complete="true">
+
+    <description>Fediz IDP</description>
+    <display-name>Fediz IDP</display-name>
+
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>/WEB-INF/applicationContext.xml</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>spring.profiles.active</param-name>
+        <param-value>jpa</param-value>
+    </context-param>
+
+    <filter>
         <filter-name>springSecurityFilterChain</filter-name>
         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
     </filter>
-    
-    
+
     <filter-mapping>
         <filter-name>springSecurityFilterChain</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-	<servlet>
-		<servlet-name>idp</servlet-name>
-		<servlet-class>
-			org.springframework.web.servlet.DispatcherServlet
-		</servlet-class>
-		<init-param>
-			<param-name>publishContext</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>metadata</servlet-name>
-		<servlet-class>
-			org.apache.cxf.fediz.service.idp.MetadataServlet
-		</servlet-class>
-		<init-param>
-			<param-name>realm</param-name>
-			<param-value>${realm-uri}</param-value>
-		</init-param>
-	</servlet>
-	<servlet>
+    <servlet>
+        <servlet-name>idp</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>publishContext</param-name>
+            <param-value>false</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>metadata</servlet-name>
+        <servlet-class>org.apache.cxf.fediz.service.idp.MetadataServlet</servlet-class>
+        <init-param>
+            <param-name>realm</param-name>
+            <param-value>${realm-uri}</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet>
         <servlet-name>CXFServlet</servlet-name>
         <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    
+
     <servlet-mapping>
         <servlet-name>CXFServlet</servlet-name>
         <url-pattern>/services/*</url-pattern>
     </servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>idp</servlet-name>
-		<url-pattern>/federation</url-pattern>
-	</servlet-mapping>
-	
-	<servlet-mapping>
-		<servlet-name>metadata</servlet-name>
-		<url-pattern>/FederationMetadata/2007-06/FederationMetadata.xml</url-pattern>
-	</servlet-mapping>
-
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
 
+    <servlet-mapping>
+        <servlet-name>idp</servlet-name>
+        <url-pattern>/federation</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>metadata</servlet-name>
+        <url-pattern>/FederationMetadata/2007-06/FederationMetadata.xml</url-pattern>
+    </servlet-mapping>
+
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
 </web-app>



Mime
View raw message