cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbernha...@apache.org
Subject cxf-fediz git commit: [FEDIZ-120] Making SignInResponse encoding configurable
Date Fri, 08 May 2015 09:34:28 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master b2cb7efa5 -> 3f7a2c54a


[FEDIZ-120] Making SignInResponse encoding configurable


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

Branch: refs/heads/master
Commit: 3f7a2c54a503a9df5b681e39ac52826f55c21419
Parents: b2cb7ef
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 10:47:26 2015 +0200

----------------------------------------------------------------------
 services/idp/src/main/webapp/WEB-INF/web.xml | 157 ++++++++++++----------
 1 file changed, 85 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3f7a2c54/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 f96bf3a..a5200a6 100644
--- a/services/idp/src/main/webapp/WEB-INF/web.xml
+++ b/services/idp/src/main/webapp/WEB-INF/web.xml
@@ -22,80 +22,93 @@ under the License.
     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-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>
+	<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>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>
+	</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-mapping>
+		<servlet-name>idp</servlet-name>
 		<url-pattern>/</url-pattern>
-        <url-pattern>/federation</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-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>
-
-    <!-- Uncomment this when using JNDI DataSource -->
-    <!-- The property jpa.platform must be updated in persistence.properties even you
use JNDI Datasource -->
-    <!-- 
+		<url-pattern>/federation/krb</url-pattern>
+		<url-pattern>/federation/clientcert</url-pattern>
+	</servlet-mapping>
+
+	<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-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>
+
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<!-- Uncomment this when using JNDI DataSource -->
+	<!-- The property jpa.platform must be updated in persistence.properties even you use
JNDI Datasource -->
+	<!-- 
     <resource-ref>
         <res-ref-name>jdbc/fedizDataSource</res-ref-name>
         <res-type>javax.sql.DataSource</res-type>


Mime
View raw message