Return-Path: 
 <commits-return-36663-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E92AE188CB
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri,  8 May 2015 10:27:05 +0000 (UTC)
Received: (qmail 7410 invoked by uid 500); 8 May 2015 10:27:05 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 7354 invoked by uid 500); 8 May 2015 10:27:05 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 7345 invoked by uid 99); 8 May 2015 10:27:05 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 May 2015 10:27:05 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 9BFB1DFC3C; Fri,  8 May 2015 10:27:05 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jbernhardt@apache.org
To: commits@cxf.apache.org
Message-Id: <9c165248910e48c0bcceefcb083ceb6e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: cxf-fediz git commit: [FEDIZ-120] Making SignInResponse encoding
 configurable
Date: Fri,  8 May 2015 10:27:05 +0000 (UTC)

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes d002fc04f -> da034b522


[FEDIZ-120] Making SignInResponse encoding configurable

Conflicts:
	services/idp/src/main/webapp/WEB-INF/web.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/da034b52
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/da034b52
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/da034b52

Branch: refs/heads/1.2.x-fixes
Commit: da034b522eea84f99a8f6acd9426039bcd396b37
Parents: d002fc0
Author: Jan Bernhardt <jbernhardt@talend.com>
Authored: Fri May 8 10:47:26 2015 +0200
Committer: Jan Bernhardt <jbernhardt@talend.com>
Committed: Fri May 8 12:17:44 2015 +0200

----------------------------------------------------------------------
 services/idp/src/main/webapp/WEB-INF/web.xml | 56 ++++++++++++-----------
 1 file changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/da034b52/services/idp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/web.xml b/services/idp/src/main/webapp/WEB-INF/web.xml
index b22a0db..b7ec9ec 100644
--- a/services/idp/src/main/webapp/WEB-INF/web.xml
+++ b/services/idp/src/main/webapp/WEB-INF/web.xml
@@ -36,10 +36,26 @@ under the License.
     </context-param>
 
     <filter>
+		<filter-name>encodingFilter</filter-name>
+		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+		<init-param>
+			<param-name>encoding</param-name>
+			<param-value>UTF-8</param-value>
+		</init-param>
+		<init-param>
+			<param-name>forceEncoding</param-name>
+			<param-value>true</param-value>
+		</init-param>
+	</filter>
+	<filter-mapping>
+		<filter-name>encodingFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<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>
@@ -54,6 +70,14 @@ under the License.
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
+	<servlet-mapping>
+		<servlet-name>idp</servlet-name>
+		<url-pattern>/</url-pattern>
+		<url-pattern>/federation</url-pattern>
+		<url-pattern>/federation/up</url-pattern>
+		<url-pattern>/federation/krb</url-pattern>
+		<url-pattern>/federation/clientcert</url-pattern>
+	</servlet-mapping>
 
     <servlet>
         <servlet-name>metadata</servlet-name>
@@ -63,43 +87,21 @@ under the License.
             <param-value>${realm-uri}</param-value>
         </init-param>
     </servlet>
+	<servlet-mapping>
+		<servlet-name>metadata</servlet-name>
+		<url-pattern>/FederationMetadata/2007-06/FederationMetadata.xml</url-pattern>
+	</servlet-mapping>
 
     <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>idp</servlet-name>
-        <url-pattern>/federation/up</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>idp</servlet-name>
-        <url-pattern>/federation/krb</url-pattern>
-    </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>idp</servlet-name>
-        <url-pattern>/federation/clientcert</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>