You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ow...@apache.org on 2014/02/06 22:08:47 UTC
svn commit: r1565436 [1/3] - in /cxf/fediz/trunk:
examples/simpleWebapp/src/main/webapp/WEB-INF/
examples/spring2Webapp/src/main/webapp/WEB-INF/
examples/springPreauthWebapp/src/main/webapp/WEB-INF/
examples/springWebapp/src/main/webapp/WEB-INF/ exampl...
Author: owulff
Date: Thu Feb 6 21:08:46 2014
New Revision: 1565436
URL: http://svn.apache.org/r1565436
Log:
Fixing indention of pom and xml configs
Modified:
cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml
cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml
cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml
cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/web.xml
cxf/fediz/trunk/plugins/core/pom.xml
cxf/fediz/trunk/plugins/cxf/pom.xml
cxf/fediz/trunk/plugins/jetty/pom.xml
cxf/fediz/trunk/plugins/spring/pom.xml
cxf/fediz/trunk/plugins/spring2/pom.xml
cxf/fediz/trunk/plugins/tomcat/pom.xml
cxf/fediz/trunk/plugins/websphere/pom.xml
cxf/fediz/trunk/services/idp/pom.xml
cxf/fediz/trunk/services/idp/src/test/java/org/apache/cxf/fediz/service/idp/integrationtests/RestITTest.java
cxf/fediz/trunk/services/sts/pom.xml
cxf/fediz/trunk/systests/jetty8/pom.xml
cxf/fediz/trunk/systests/spring/pom.xml
cxf/fediz/trunk/systests/spring2Webapp/pom.xml
cxf/fediz/trunk/systests/springPreauthWebapp/pom.xml
cxf/fediz/trunk/systests/springWebapp/pom.xml
cxf/fediz/trunk/systests/tests/pom.xml
cxf/fediz/trunk/systests/tomcat7/pom.xml
Modified: cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/examples/simpleWebapp/src/main/webapp/WEB-INF/web.xml Thu Feb 6 21:08:46 2014
@@ -1,105 +1,104 @@
<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">
+ 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>WS Federation Simple Web Application Example</description>
- <display-name>WS Federation Simple Web Application Example</display-name>
+ <description>WS Federation Simple Web Application Example</description>
+ <display-name>WS Federation Simple Web Application Example</display-name>
<!-- Optional: Cache the security token in Thread Local Storage -->
- <filter>
- <filter-name>FederationFilter</filter-name>
- <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>FederationFilter</filter-name>
- <url-pattern>/secure/*</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>FederationServlet</servlet-name>
- <servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/fedservlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/admin/fedservlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/user/fedservlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/manager/fedservlet</url-pattern>
- </servlet-mapping>
-
- <security-role>
- <role-name>Manager</role-name>
- </security-role>
- <security-role>
- <role-name>User</role-name>
- </security-role>
- <security-role>
- <role-name>Admin</role-name>
- </security-role>
- <security-role>
- <role-name>Authenticated</role-name>
- </security-role>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/secure/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>*</role-name>
- </auth-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Protected Admin Area</web-resource-name>
- <url-pattern>/secure/admin/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Admin</role-name>
- </auth-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Protected Manager Area</web-resource-name>
- <url-pattern>/secure/manager/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>Manager</role-name>
- </auth-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Protected User Area</web-resource-name>
- <url-pattern>/secure/user/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>User</role-name>
- <role-name>Admin</role-name>
- <role-name>Manager</role-name>
- </auth-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>WSFED</auth-method>
- <realm-name>WSFED</realm-name>
- </login-config>
+ <filter>
+ <filter-name>FederationFilter</filter-name>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>FederationFilter</filter-name>
+ <url-pattern>/secure/*</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>FederationServlet</servlet-name>
+ <servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/admin/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/user/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/manager/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <security-role>
+ <role-name>Manager</role-name>
+ </security-role>
+ <security-role>
+ <role-name>User</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Admin</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Authenticated</role-name>
+ </security-role>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/secure/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>*</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected Admin Area</web-resource-name>
+ <url-pattern>/secure/admin/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected Manager Area</web-resource-name>
+ <url-pattern>/secure/manager/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Manager</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected User Area</web-resource-name>
+ <url-pattern>/secure/user/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>User</role-name>
+ <role-name>Admin</role-name>
+ <role-name>Manager</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>WSFED</auth-method>
+ <realm-name>WSFED</realm-name>
+ </login-config>
</web-app>
Modified: cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml (original)
+++ cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml Thu Feb 6 21:08:46 2014
@@ -4,67 +4,47 @@
xmlns:sec="http://www.springframework.org/schema/security"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/security
+ http://www.springframework.org/schema/security/spring-security-2.0.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<sec:http entry-point-ref="federationEntryPoint">
-<!--
- <sec:intercept-url pattern="/" access="permitAll"/>
- <sec:intercept-url pattern="/fediz" access="permitAll"/>
- <sec:intercept-url pattern="/index.html" access="permitAll"/>
- <sec:intercept-url pattern="/secure/fedservlet" access="isAuthenticated()"/>
--->
- <sec:intercept-url pattern="/secure/fedservlet" access="IS_AUTHENTICATED_FULLY"/>
- <sec:intercept-url pattern="/secure/manager/**" access="ROLE_MANAGER"/>
- <sec:intercept-url pattern="/secure/admin/**" access="ROLE_ADMIN"/>
- <sec:intercept-url pattern="/secure/user/**" access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER"/>
- <!--<sec:custom-filter ref="federationFilter" after="BASIC_AUTH_FILTER" />-->
- <!--<sec:session-management session-authentication-strategy-ref="sas"/>-->
+ <sec:intercept-url pattern="/secure/fedservlet"
+ access="IS_AUTHENTICATED_FULLY" />
+ <sec:intercept-url pattern="/secure/manager/**"
+ access="ROLE_MANAGER" />
+ <sec:intercept-url pattern="/secure/admin/**"
+ access="ROLE_ADMIN" />
+ <sec:intercept-url pattern="/secure/user/**"
+ access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER" />
</sec:http>
+ <sec:authentication-manager alias="authManager" />
- <sec:authentication-manager alias="authManager"/>
-
- <bean id="fedizConfig" class="org.apache.cxf.fediz.spring.FederationConfigImpl" init-method="init"
- p:configFile="WEB-INF/fediz_config.xml" p:contextName="/fedizhelloworld" />
+ <bean id="fedizConfig" class="org.apache.cxf.fediz.spring.FederationConfigImpl"
+ init-method="init" p:configFile="WEB-INF/fediz_config.xml"
+ p:contextName="/fedizhelloworld" />
<bean id="federationEntryPoint"
class="org.apache.cxf.fediz.spring.web.FederationAuthenticationEntryPoint"
p:federationConfig-ref="fedizConfig" />
-<!-- Works without org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy as well -->
-<!--
- <bean id="federationFilter"
- class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"
- p:authenticationManager-ref="authManager" p:sessionAuthenticationStrategy-ref="sas">
-
- <property name="authenticationFailureHandler">
- <bean class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" />
- </property>
- </bean>
- -->
-
<bean id="federationFilter"
class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"
p:authenticationManager-ref="authManager" p:defaultTargetUrl="/whatever">
- <sec:custom-filter after="BASIC_PROCESSING_FILTER"/>
- <!--
- <property name="authenticationFailureHandler">
- <bean class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" />
- </property>
- -->
+ <sec:custom-filter after="BASIC_PROCESSING_FILTER" />
</bean>
-
- <bean id="federationAuthProvider" class="org.apache.cxf.fediz.spring.authentication.FederationAuthenticationProvider"
+
+ <bean id="federationAuthProvider"
+ class="org.apache.cxf.fediz.spring.authentication.FederationAuthenticationProvider"
p:federationConfig-ref="fedizConfig">
<sec:custom-authentication-provider />
<property name="authenticationUserDetailsService">
- <bean class="org.apache.cxf.fediz.spring.authentication.GrantedAuthoritiesUserDetailsFederationService"/>
+ <bean
+ class="org.apache.cxf.fediz.spring.authentication.GrantedAuthoritiesUserDetailsFederationService" />
</property>
</bean>
-<!--
- <bean id="sas" class="org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy" />
--->
</beans>
Modified: cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml (original)
+++ cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/fediz_config.xml Thu Feb 6 21:08:46 2014
@@ -5,30 +5,31 @@
In Fediz 1.0, one keystore was used for SSL and the STS public certificate.
-->
<FedizConfig>
- <contextConfig name="/fedizhelloworld">
- <audienceUris>
- <audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
- </audienceUris>
- <certificateStores>
- <trustManager>
- <keyStore file="ststrust.jks" password="storepass" type="JKS" />
- </trustManager>
- </certificateStores>
- <trustedIssuers>
- <issuer certificateValidation="PeerTrust" />
- </trustedIssuers>
- <maximumClockSkew>1000</maximumClockSkew>
- <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="federationProtocolType" version="1.0.0">
- <realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
- <issuer>https://localhost:9443/fediz-idp/federation</issuer>
- <roleDelimiter>,</roleDelimiter>
- <roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
- <reply>/j_spring_fediz_security_check</reply>
- <claimTypesRequested>
- <claimType type="a particular claim type" optional="true" />
- </claimTypesRequested>
- </protocol>
- </contextConfig>
+ <contextConfig name="/fedizhelloworld">
+ <audienceUris>
+ <audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
+ </audienceUris>
+ <certificateStores>
+ <trustManager>
+ <keyStore file="ststrust.jks" password="storepass" type="JKS" />
+ </trustManager>
+ </certificateStores>
+ <trustedIssuers>
+ <issuer certificateValidation="PeerTrust" />
+ </trustedIssuers>
+ <maximumClockSkew>1000</maximumClockSkew>
+ <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:type="federationProtocolType" version="1.0.0">
+ <realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
+ <issuer>https://localhost:9443/fediz-idp/federation</issuer>
+ <roleDelimiter>,</roleDelimiter>
+ <roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
+ <reply>/j_spring_fediz_security_check</reply>
+ <claimTypesRequested>
+ <claimType type="a particular claim type"
+ optional="true" />
+ </claimTypesRequested>
+ </protocol>
+ </contextConfig>
</FedizConfig>
Modified: cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/examples/spring2Webapp/src/main/webapp/WEB-INF/web.xml Thu Feb 6 21:08:46 2014
@@ -1,16 +1,15 @@
<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">
+ 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>WS Federation Spring Example</description>
<display-name>WS Federation Spring Example</display-name>
-
+
<filter>
<filter-name>springSecurityFilterChain</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
-
+
<!-- Optional: Cache the security token in Thread Local Storage -->
<filter>
<filter-name>FederationFilter</filter-name>
@@ -21,33 +20,16 @@
<filter-name>springSecurityFilterChain</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-<!--
- <filter-mapping>
- <filter-name>FederationFilter</filter-name>
- <url-pattern>/secure/*</url-pattern>
- </filter-mapping>
--->
- <!--
- - Location of the XML file that defines the root application context
- - Applied by ContextLoaderListener.
- -->
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>
- /WEB-INF/applicationContext-security.xml
- </param-value>
+ <param-value>/WEB-INF/applicationContext-security.xml</param-value>
</context-param>
- <!--
- - Loads the root application context of this web app at startup.
- - The application context is then available via
- - WebApplicationContextUtils.getWebApplicationContext(servletContext).
- -->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
-
+
<servlet>
<servlet-name>FederationServlet</servlet-name>
<servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
@@ -62,12 +44,12 @@
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/admin/fedservlet</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/user/fedservlet</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/manager/fedservlet</url-pattern>
Modified: cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml (original)
+++ cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml Thu Feb 6 21:08:46 2014
@@ -1,50 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Sample namespace-based configuration
- -
- -->
-
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:sec="http://www.springframework.org/schema/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/security
+ http://www.springframework.org/schema/security/spring-security.xsd">
<bean id="filterChainProxy" class="org.springframework.security.web.FilterChainProxy">
<sec:filter-chain-map path-type="ant">
- <sec:filter-chain pattern="/**" filters="sif,j2eePreAuthFilter,logoutFilter,etf,fsi"/>
+ <sec:filter-chain pattern="/**"
+ filters="sif,j2eePreAuthFilter,logoutFilter,etf,fsi" />
</sec:filter-chain-map>
</bean>
- <bean id="sif" class="org.springframework.security.web.context.SecurityContextPersistenceFilter"/>
+ <bean id="sif"
+ class="org.springframework.security.web.context.SecurityContextPersistenceFilter" />
<sec:authentication-manager alias="authenticationManager">
- <sec:authentication-provider ref='preAuthenticatedAuthenticationProvider'/>
+ <sec:authentication-provider
+ ref='preAuthenticatedAuthenticationProvider' />
</sec:authentication-manager>
- <bean id="preAuthenticatedAuthenticationProvider" class="org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider">
- <property name="preAuthenticatedUserDetailsService" ref="preAuthenticatedUserDetailsService"/>
+ <bean id="preAuthenticatedAuthenticationProvider"
+ class="org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider">
+ <property name="preAuthenticatedUserDetailsService"
+ ref="preAuthenticatedUserDetailsService" />
</bean>
- <!--
- <bean id="preAuthenticatedUserDetailsService"
- class="org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsService"/>
- -->
<bean id="preAuthenticatedUserDetailsService"
- class="org.apache.cxf.fediz.spring.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService"/>
-
- <!--<bean id="j2eePreAuthFilter" class="org.springframework.security.web.authentication.preauth.j2ee.J2eePreAuthenticatedProcessingFilter">-->
- <bean id="j2eePreAuthFilter" class="org.apache.cxf.fediz.spring.preauth.FederationPreAuthenticatedProcessingFilter">
- <property name="authenticationManager" ref="authenticationManager"/>
+ class="org.apache.cxf.fediz.spring.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService" />
+
+ <bean id="j2eePreAuthFilter"
+ class="org.apache.cxf.fediz.spring.preauth.FederationPreAuthenticatedProcessingFilter">
+ <property name="authenticationManager" ref="authenticationManager" />
<property name="authenticationDetailsSource">
- <bean class="org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource">
+ <bean
+ class="org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource">
<property name="mappableRolesRetriever">
- <bean class="org.springframework.security.web.authentication.preauth.j2ee.WebXmlMappableAttributesRetriever" />
+ <bean
+ class="org.springframework.security.web.authentication.preauth.j2ee.WebXmlMappableAttributesRetriever" />
</property>
<property name="userRoles2GrantedAuthoritiesMapper">
- <bean class="org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper">
- <property name="convertAttributeToUpperCase" value="true"/>
+ <bean
+ class="org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper">
+ <property name="convertAttributeToUpperCase"
+ value="true" />
</bean>
</property>
</bean>
@@ -52,47 +55,55 @@
</bean>
<bean id="preAuthenticatedProcessingFilterEntryPoint"
- class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint"/>
+ class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint" />
- <bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
- <constructor-arg value="/"/>
+ <bean id="logoutFilter"
+ class="org.springframework.security.web.authentication.logout.LogoutFilter">
+ <constructor-arg value="/" />
<constructor-arg>
<list>
- <bean class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler"/>
+ <bean
+ class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler" />
</list>
</constructor-arg>
</bean>
- <bean id="servletContext" class="org.springframework.web.context.support.ServletContextFactoryBean"/>
+ <bean id="servletContext"
+ class="org.springframework.web.context.support.ServletContextFactoryBean" />
- <bean id="etf" class="org.springframework.security.web.access.ExceptionTranslationFilter">
- <property name="authenticationEntryPoint" ref="preAuthenticatedProcessingFilterEntryPoint"/>
+ <bean id="etf"
+ class="org.springframework.security.web.access.ExceptionTranslationFilter">
+ <property name="authenticationEntryPoint"
+ ref="preAuthenticatedProcessingFilterEntryPoint" />
</bean>
- <bean id="httpRequestAccessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
- <property name="allowIfAllAbstainDecisions" value="false"/>
+ <bean id="httpRequestAccessDecisionManager"
+ class="org.springframework.security.access.vote.AffirmativeBased">
+ <property name="allowIfAllAbstainDecisions" value="false" />
<property name="decisionVoters">
<list>
- <ref bean="roleVoter"/>
+ <ref bean="roleVoter" />
</list>
</property>
</bean>
- <bean id="fsi" class="org.springframework.security.web.access.intercept.FilterSecurityInterceptor">
- <property name="authenticationManager" ref="authenticationManager"/>
- <property name="accessDecisionManager" ref="httpRequestAccessDecisionManager"/>
+ <bean id="fsi"
+ class="org.springframework.security.web.access.intercept.FilterSecurityInterceptor">
+ <property name="authenticationManager" ref="authenticationManager" />
+ <property name="accessDecisionManager" ref="httpRequestAccessDecisionManager" />
<property name="securityMetadataSource">
<sec:filter-invocation-definition-source>
- <sec:intercept-url pattern="/secure/manager/**" access="ROLE_MANAGER"/>
- <sec:intercept-url pattern="/secure/admin/**" access="ROLE_ADMIN"/>
- <sec:intercept-url pattern="/secure/user/**" access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER"/>
- <sec:intercept-url pattern="/secure/fedservlet" access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER,ROLE_AUTHENTICATED"/>
+ <sec:intercept-url pattern="/secure/manager/**" access="ROLE_MANAGER" />
+ <sec:intercept-url pattern="/secure/admin/**" access="ROLE_ADMIN" />
+ <sec:intercept-url pattern="/secure/user/**" access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER" />
+ <sec:intercept-url pattern="/secure/fedservlet" access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER,ROLE_AUTHENTICATED" />
</sec:filter-invocation-definition-source>
</property>
</bean>
- <bean id="roleVoter" class="org.springframework.security.access.vote.RoleVoter"/>
+ <bean id="roleVoter" class="org.springframework.security.access.vote.RoleVoter" />
- <bean id="securityContextHolderAwareRequestFilter" class="org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter"/>
+ <bean id="securityContextHolderAwareRequestFilter"
+ class="org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter" />
</beans>
Modified: cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/examples/springPreauthWebapp/src/main/webapp/WEB-INF/web.xml Thu Feb 6 21:08:46 2014
@@ -1,24 +1,15 @@
<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>
- WS Federation Spring Example
- </description>
- <display-name>WS Federation Spring Example</display-name>
-
+ 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>WS Federation Spring Example</description>
+ <display-name>WS Federation Spring Example</display-name>
- <!--
- - Location of the XML file that defines the root application context
- - Applied by ContextLoaderListener.
- -->
+ <!-- - Location of the XML file that defines the root application context
+ - Applied by ContextLoaderListener. -->
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>
- /WEB-INF/applicationContext-security.xml
- </param-value>
+ <param-value>/WEB-INF/applicationContext-security.xml</param-value>
</context-param>
<filter>
@@ -27,81 +18,76 @@
</filter>
<!-- Optional: Cache the security token in Thread Local Storage -->
- <filter>
- <filter-name>FederationFilter</filter-name>
- <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
- </filter>
+ <filter>
+ <filter-name>FederationFilter</filter-name>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
+ </filter>
<filter-mapping>
- <filter-name>filterChainProxy</filter-name>
- <url-pattern>/*</url-pattern>
+ <filter-name>filterChainProxy</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>FederationFilter</filter-name>
+ <url-pattern>/*</url-pattern>
</filter-mapping>
- <filter-mapping>
- <filter-name>FederationFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <!--
- - Loads the root application context of this web app at startup.
- - The application context is then available via
- - WebApplicationContextUtils.getWebApplicationContext(servletContext).
- -->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
-
- <servlet>
- <servlet-name>FederationServlet</servlet-name>
- <servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/fedservlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/admin/fedservlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/user/fedservlet</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/manager/fedservlet</url-pattern>
- </servlet-mapping>
-
- <security-role>
- <role-name>Manager</role-name>
- </security-role>
- <security-role>
- <role-name>User</role-name>
- </security-role>
- <security-role>
- <role-name>Admin</role-name>
- </security-role>
- <security-role>
- <role-name>Authenticated</role-name>
- </security-role>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/secure/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>*</role-name>
- </auth-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>WSFED</auth-method>
- <realm-name>WSFED</realm-name>
- </login-config>
+
+ <servlet>
+ <servlet-name>FederationServlet</servlet-name>
+ <servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/admin/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/user/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/manager/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <security-role>
+ <role-name>Manager</role-name>
+ </security-role>
+ <security-role>
+ <role-name>User</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Admin</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Authenticated</role-name>
+ </security-role>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/secure/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>*</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>WSFED</auth-method>
+ <realm-name>WSFED</realm-name>
+ </login-config>
</web-app>
Modified: cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml (original)
+++ cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml Thu Feb 6 21:08:46 2014
@@ -6,24 +6,31 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="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-3.0.xsd
-http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
-http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ xsi:schemaLocation="
+ 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-3.0.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
- <!-- DIABLE in production as it might log confidential information about the user -->
+ <!-- DIABLE in production as it might log confidential information about
+ the user -->
<sec:debug />
- <sec:http entry-point-ref="federationEntryPoint" use-expressions="true">
- <sec:intercept-url pattern="/" access="permitAll"/>
- <sec:intercept-url pattern="/fediz" access="permitAll"/>
- <sec:intercept-url pattern="/index.html" access="permitAll"/>
- <sec:intercept-url pattern="/secure/fedservlet" access="isAuthenticated()"/>
- <sec:intercept-url pattern="/secure/manager/**" access="hasRole('ROLE_MANAGER')"/>
- <sec:intercept-url pattern="/secure/admin/**" access="hasRole('ROLE_ADMIN')"/>
- <sec:intercept-url pattern="/secure/user/**" access="hasAnyRole('ROLE_USER','ROLE_ADMIN','ROLE_MANAGER')"/>
+ <sec:http entry-point-ref="federationEntryPoint"
+ use-expressions="true">
+ <sec:intercept-url pattern="/" access="permitAll" />
+ <sec:intercept-url pattern="/fediz" access="permitAll" />
+ <sec:intercept-url pattern="/index.html" access="permitAll" />
+ <sec:intercept-url pattern="/secure/fedservlet" access="isAuthenticated()" />
+ <sec:intercept-url pattern="/secure/manager/**" access="hasRole('ROLE_MANAGER')" />
+ <sec:intercept-url pattern="/secure/admin/**" access="hasRole('ROLE_ADMIN')" />
+ <sec:intercept-url pattern="/secure/user/**" access="hasAnyRole('ROLE_USER','ROLE_ADMIN','ROLE_MANAGER')" />
<sec:custom-filter ref="federationFilter" after="BASIC_AUTH_FILTER" />
- <sec:session-management session-authentication-strategy-ref="sas"/>
+ <sec:session-management session-authentication-strategy-ref="sas" />
</sec:http>
@@ -31,41 +38,33 @@ http://www.springframework.org/schema/co
<sec:authentication-provider ref="federationAuthProvider" />
</sec:authentication-manager>
- <bean id="fedizConfig" class="org.apache.cxf.fediz.spring.FederationConfigImpl" init-method="init"
- p:configFile="WEB-INF/fediz_config.xml" />
+ <bean id="fedizConfig" class="org.apache.cxf.fediz.spring.FederationConfigImpl"
+ init-method="init" p:configFile="WEB-INF/fediz_config.xml" />
<bean id="federationEntryPoint"
class="org.apache.cxf.fediz.spring.web.FederationAuthenticationEntryPoint"
p:federationConfig-ref="fedizConfig" />
-<!-- Works without org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy as well -->
-<!--
- <bean id="federationFilter"
- class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"
- p:authenticationManager-ref="authManager" p:sessionAuthenticationStrategy-ref="sas">
-
- <property name="authenticationFailureHandler">
- <bean class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" />
- </property>
- </bean>
- -->
-
<bean id="federationFilter"
class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"
p:authenticationManager-ref="authManager">
<property name="authenticationFailureHandler">
- <bean class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" />
+ <bean
+ class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" />
</property>
</bean>
-
- <bean id="federationAuthProvider" class="org.apache.cxf.fediz.spring.authentication.FederationAuthenticationProvider"
+
+ <bean id="federationAuthProvider"
+ class="org.apache.cxf.fediz.spring.authentication.FederationAuthenticationProvider"
p:federationConfig-ref="fedizConfig">
<property name="authenticationUserDetailsService">
- <bean class="org.apache.cxf.fediz.spring.authentication.GrantedAuthoritiesUserDetailsFederationService"/>
+ <bean
+ class="org.apache.cxf.fediz.spring.authentication.GrantedAuthoritiesUserDetailsFederationService" />
</property>
</bean>
- <bean id="sas" class="org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy" />
+ <bean id="sas"
+ class="org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy" />
</beans>
Modified: cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml (original)
+++ cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/fediz_config.xml Thu Feb 6 21:08:46 2014
@@ -5,30 +5,32 @@
In Fediz 1.0, one keystore was used for SSL and the STS public certificate.
-->
<FedizConfig>
- <contextConfig name="/fedizhelloworld">
- <audienceUris>
- <audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
- </audienceUris>
- <certificateStores>
- <trustManager>
- <keyStore file="ststrust.jks" password="storepass" type="JKS" />
- </trustManager>
- </certificateStores>
- <trustedIssuers>
- <issuer certificateValidation="PeerTrust" />
- </trustedIssuers>
- <maximumClockSkew>1000</maximumClockSkew>
- <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:type="federationProtocolType" version="1.0.0">
- <realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
- <issuer>https://localhost:9443/fediz-idp/federation</issuer>
- <roleDelimiter>,</roleDelimiter>
- <roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
- <reply>/j_spring_fediz_security_check</reply>
- <claimTypesRequested>
- <claimType type="a particular claim type" optional="true" />
- </claimTypesRequested>
- </protocol>
- </contextConfig>
+ <contextConfig name="/fedizhelloworld">
+ <audienceUris>
+ <audienceItem>urn:org:apache:cxf:fediz:fedizhelloworld</audienceItem>
+ </audienceUris>
+ <certificateStores>
+ <trustManager>
+ <keyStore file="ststrust.jks" password="storepass"
+ type="JKS" />
+ </trustManager>
+ </certificateStores>
+ <trustedIssuers>
+ <issuer certificateValidation="PeerTrust" />
+ </trustedIssuers>
+ <maximumClockSkew>1000</maximumClockSkew>
+ <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:type="federationProtocolType" version="1.0.0">
+ <realm>urn:org:apache:cxf:fediz:fedizhelloworld</realm>
+ <issuer>https://localhost:9443/fediz-idp/federation</issuer>
+ <roleDelimiter>,</roleDelimiter>
+ <roleURI>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role</roleURI>
+ <reply>/j_spring_fediz_security_check</reply>
+ <claimTypesRequested>
+ <claimType type="a particular claim type"
+ optional="true" />
+ </claimTypesRequested>
+ </protocol>
+ </contextConfig>
</FedizConfig>
Modified: cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml Thu Feb 6 21:08:46 2014
@@ -1,16 +1,15 @@
<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">
+ 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>WS Federation Spring Example</description>
<display-name>WS Federation Spring Example</display-name>
-
+
<filter>
<filter-name>springSecurityFilterChain</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
-
+
<!-- Optional: Cache the security token in Thread Local Storage -->
<filter>
<filter-name>FederationFilter</filter-name>
@@ -21,32 +20,21 @@
<filter-name>springSecurityFilterChain</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<filter-mapping>
<filter-name>FederationFilter</filter-name>
<url-pattern>/secure/*</url-pattern>
</filter-mapping>
- <!--
- - Location of the XML file that defines the root application context
- - Applied by ContextLoaderListener.
- -->
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>
- /WEB-INF/applicationContext-security.xml
- </param-value>
+ <param-value>/WEB-INF/applicationContext-security.xml</param-value>
</context-param>
- <!--
- - Loads the root application context of this web app at startup.
- - The application context is then available via
- - WebApplicationContextUtils.getWebApplicationContext(servletContext).
- -->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
-
+
<servlet>
<servlet-name>FederationServlet</servlet-name>
<servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
@@ -61,12 +49,12 @@
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/admin/fedservlet</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/user/fedservlet</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>FederationServlet</servlet-name>
<url-pattern>/secure/manager/fedservlet</url-pattern>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/pom.xml Thu Feb 6 21:08:46 2014
@@ -18,7 +18,6 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf.fediz.examples</groupId>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/applicationContext.xml Thu Feb 6 21:08:46 2014
@@ -1,86 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:cxf="http://cxf.apache.org/core" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core" xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.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">
- <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
- <context:component-scan base-package="org.apache.cxf.fediz.example" />
- <context:annotation-config />
+ <context:component-scan base-package="org.apache.cxf.fediz.example" />
+ <context:annotation-config />
- <cxf:bus>
- <cxf:features>
- <cxf:logging />
- </cxf:features>
- </cxf:bus>
-
- <bean id="delegationCallbackHandler"
- class="org.apache.cxf.fediz.cxf.web.ThreadLocalCallbackHandler" />
-
- <jaxws:client id="HelloServiceClient" serviceName="svc:GreeterService"
- xmlns:svc="http://apache.org/hello_world_soap_http"
- serviceClass="org.apache.hello_world_soap_http.Greeter"
- address="https://localhost:10443/fedizservice/GreeterService"
- wsdlLocation="WEB-INF/wsdl/hello_world.wsdl">
- <jaxws:properties>
- <entry key="ws-security.sts.client">
- <bean class="org.apache.cxf.ws.security.trust.STSClient">
- <constructor-arg ref="cxf" />
- <property name="wsdlLocation" value="https://localhost:9443/fediz-idp-sts/REALMA/STSServiceTransport?wsdl" />
- <property name="serviceName"
- value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService" />
- <property name="endpointName"
- value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port" />
- <property name="onBehalfOf" ref="delegationCallbackHandler" />
- <property name="enableAppliesTo" value="true" />
- <property name="properties">
- <map>
-
- </map>
- </property>
- </bean>
- </entry>
- <entry key="ws-security.cache.issued.token.in.endpoint" value="false" />
- </jaxws:properties>
- </jaxws:client>
-
-
- <!-- TLS settings for TransportBinding test-case -->
- <http:conduit name="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:trustManagers>
- <sec:keyStore type="jks" password="waspass" resource="webappKeystore.jks" />
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-
- <!-- STS WSDL download -->
- <http:conduit name="https://localhost:9443/.*">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:trustManagers>
- <sec:keyStore type="jks" password="waspass" resource="webappKeystore.jks" />
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-
- <http:conduit
- name="{http://apache.org/hello_world_soap_http}GreeterSoapPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:trustManagers>
- <sec:keyStore type="jks" password="waspass" resource="webappKeystore.jks" />
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging />
+ </cxf:features>
+ </cxf:bus>
+
+ <bean id="delegationCallbackHandler"
+ class="org.apache.cxf.fediz.cxf.web.ThreadLocalCallbackHandler" />
+
+ <jaxws:client id="HelloServiceClient" serviceName="svc:GreeterService"
+ xmlns:svc="http://apache.org/hello_world_soap_http"
+ serviceClass="org.apache.hello_world_soap_http.Greeter"
+ address="https://localhost:10443/fedizservice/GreeterService"
+ wsdlLocation="WEB-INF/wsdl/hello_world.wsdl">
+ <jaxws:properties>
+ <entry key="ws-security.sts.client">
+ <bean class="org.apache.cxf.ws.security.trust.STSClient">
+ <constructor-arg ref="cxf" />
+ <property name="wsdlLocation"
+ value="https://localhost:9443/fediz-idp-sts/REALMA/STSServiceTransport?wsdl" />
+ <property name="serviceName"
+ value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService" />
+ <property name="endpointName"
+ value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port" />
+ <property name="onBehalfOf" ref="delegationCallbackHandler" />
+ <property name="enableAppliesTo" value="true" />
+ <property name="properties">
+ <map>
+
+ </map>
+ </property>
+ </bean>
+ </entry>
+ <entry key="ws-security.cache.issued.token.in.endpoint"
+ value="false" />
+ </jaxws:properties>
+ </jaxws:client>
+
+
+ <!-- TLS settings for TransportBinding test-case -->
+ <http:conduit
+ name="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port.http-conduit">
+ <http:tlsClientParameters
+ disableCNCheck="true">
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="waspass"
+ resource="webappKeystore.jks" />
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+
+ <!-- STS WSDL download -->
+ <http:conduit name="https://localhost:9443/.*">
+ <http:tlsClientParameters
+ disableCNCheck="true">
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="waspass"
+ resource="webappKeystore.jks" />
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+
+ <http:conduit
+ name="{http://apache.org/hello_world_soap_http}GreeterSoapPort.http-conduit">
+ <http:tlsClientParameters
+ disableCNCheck="true">
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="waspass"
+ resource="webappKeystore.jks" />
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
</beans>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webapp/src/main/webapp/WEB-INF/web.xml Thu Feb 6 21:08:46 2014
@@ -3,8 +3,8 @@
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0" metadata-complete="true">
- <description>WS Federation WS-Client Web Application Example</description>
- <display-name>WS Federation WS-Client Web Application Example</display-name>
+ <description>WS Federation WS-Client Web Application Example</description>
+ <display-name>WS Federation WS-Client Web Application Example</display-name>
<context-param>
<param-name>contextConfigLocation</param-name>
@@ -13,55 +13,55 @@
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
-
+
<!-- Required: Cache the security token in Thread Local Storage -->
- <filter>
- <filter-name>FederationFilter</filter-name>
- <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
- </filter>
-
- <!-- now map this filter to a URL-pattern -->
- <filter-mapping>
- <filter-name>FederationFilter</filter-name>
- <url-pattern>/secure/*</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>FederationServlet</servlet-name>
- <servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/fedservlet</url-pattern>
- </servlet-mapping>
-
- <security-role>
- <role-name>Manager</role-name>
- </security-role>
- <security-role>
- <role-name>User</role-name>
- </security-role>
- <security-role>
- <role-name>Admin</role-name>
- </security-role>
- <security-role>
- <role-name>Authenticated</role-name>
- </security-role>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/secure/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>*</role-name>
- </auth-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>WSFED</auth-method>
- <realm-name>WSFED</realm-name>
- </login-config>
+ <filter>
+ <filter-name>FederationFilter</filter-name>
+ <filter-class>org.apache.cxf.fediz.core.servlet.FederationFilter</filter-class>
+ </filter>
+
+ <!-- now map this filter to a URL-pattern -->
+ <filter-mapping>
+ <filter-name>FederationFilter</filter-name>
+ <url-pattern>/secure/*</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>FederationServlet</servlet-name>
+ <servlet-class>org.apache.cxf.fediz.example.FederationServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/fedservlet</url-pattern>
+ </servlet-mapping>
+
+ <security-role>
+ <role-name>Manager</role-name>
+ </security-role>
+ <security-role>
+ <role-name>User</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Admin</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Authenticated</role-name>
+ </security-role>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/secure/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>*</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>WSFED</auth-method>
+ <realm-name>WSFED</realm-name>
+ </login-config>
</web-app>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/common/pom.xml Thu Feb 6 21:08:46 2014
@@ -17,7 +17,6 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/pom.xml Thu Feb 6 21:08:46 2014
@@ -17,7 +17,6 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf.fediz.examples.wsclientWebapp</groupId>
@@ -34,7 +33,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
<configuration>
<webResources>
<resource>
@@ -62,7 +60,6 @@
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/applicationContext.xml Thu Feb 6 21:08:46 2014
@@ -1,33 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- 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.0.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
- <import resource="classpath:META-INF/cxf/cxf.xml" />
-
- <cxf:bus>
- <cxf:features>
- <cxf:logging />
- </cxf:features>
- </cxf:bus>
-
- <!-- GreeterService -->
- <jaxws:endpoint id="GreeterService" implementor="org.apache.cxf.fediz.examples.service.GreeterImpl"
- wsdlLocation="WEB-INF/wsdl/hello_world.wsdl" serviceName="svc:GreeterService"
- xmlns:svc="http://apache.org/hello_world_soap_http" address="/GreeterService">
-
- <jaxws:properties>
- <entry key="ws-security.signature.properties" value="stsTruststore.properties" />
- </jaxws:properties>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ 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.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging />
+ </cxf:features>
+ </cxf:bus>
+
+ <!-- GreeterService -->
+ <jaxws:endpoint id="GreeterService"
+ implementor="org.apache.cxf.fediz.examples.service.GreeterImpl"
+ wsdlLocation="WEB-INF/wsdl/hello_world.wsdl" serviceName="svc:GreeterService"
+ xmlns:svc="http://apache.org/hello_world_soap_http" address="/GreeterService">
+
+ <jaxws:properties>
+ <entry key="ws-security.signature.properties" value="stsTruststore.properties" />
+ </jaxws:properties>
- <jaxws:features>
- </jaxws:features>
+ <jaxws:features>
+ </jaxws:features>
- </jaxws:endpoint>
+ </jaxws:endpoint>
</beans>
Modified: cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/web.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/web.xml (original)
+++ cxf/fediz/trunk/examples/wsclientWebapp/webservice/service/src/main/webapp/WEB-INF/web.xml Thu Feb 6 21:08:46 2014
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>WEB-INF/applicationContext.xml</param-value>
- </context-param>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/applicationContext.xml</param-value>
+ </context-param>
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
- <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>
+ <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>/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
</web-app>
Modified: cxf/fediz/trunk/plugins/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/core/pom.xml (original)
+++ cxf/fediz/trunk/plugins/core/pom.xml Thu Feb 6 21:08:46 2014
@@ -112,7 +112,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: cxf/fediz/trunk/plugins/cxf/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/cxf/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/cxf/pom.xml (original)
+++ cxf/fediz/trunk/plugins/cxf/pom.xml Thu Feb 6 21:08:46 2014
@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>zip-file</id>
@@ -75,7 +74,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: cxf/fediz/trunk/plugins/jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/jetty/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/jetty/pom.xml (original)
+++ cxf/fediz/trunk/plugins/jetty/pom.xml Thu Feb 6 21:08:46 2014
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf.fediz</groupId>
@@ -87,40 +88,12 @@
<version>${jericho.version}</version>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.2.1-b03</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>jsp-impl</artifactId>
- <version>2.2.2-b06</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.ext.tomcat</groupId>
- <artifactId>jasper-el</artifactId>
- <version>7.0.19.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2_1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
- </dependency>
- -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>zip-file</id>
@@ -139,16 +112,17 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Implementation-Title>Apache CXF Fediz</Implementation-Title>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor>The Apache Software
+ Foundation</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
<Implementation-Version>${project.version}</Implementation-Version>
<Specification-Title>Apache CXF Fediz</Specification-Title>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Vendor>The Apache Software
+ Foundation</Specification-Vendor>
<Specification-Version>${project.version}</Specification-Version>
<Export-Package>
org.apache.cxf.fediz.jetty.*;version="${project.version}"
@@ -165,7 +139,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<id>copy-idp-sts</id>
Modified: cxf/fediz/trunk/plugins/spring/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/spring/pom.xml (original)
+++ cxf/fediz/trunk/plugins/spring/pom.xml Thu Feb 6 21:08:46 2014
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf.fediz</groupId>
@@ -41,7 +42,7 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>${spring.security.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -65,7 +66,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -77,7 +78,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>zip-file</id>
@@ -96,7 +96,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: cxf/fediz/trunk/plugins/spring2/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/spring2/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/spring2/pom.xml (original)
+++ cxf/fediz/trunk/plugins/spring2/pom.xml Thu Feb 6 21:08:46 2014
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf.fediz</groupId>
@@ -33,7 +34,6 @@
<spring.security.version>2.0.8.RELEASE</spring.security.version>
<spring.version>2.5.6</spring.version>
</properties>
-
<dependencies>
<dependency>
<groupId>org.springframework.security</groupId>
@@ -70,14 +70,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>zip-file</id>
@@ -96,7 +95,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: cxf/fediz/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/tomcat/pom.xml?rev=1565436&r1=1565435&r2=1565436&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/tomcat/pom.xml (original)
+++ cxf/fediz/trunk/plugins/tomcat/pom.xml Thu Feb 6 21:08:46 2014
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cxf.fediz</groupId>
@@ -36,8 +37,6 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
- <!-- <artifactId>catalina</artifactId>
- <version>6.0.35</version>-->
<scope>provided</scope>
</dependency>
<dependency>
@@ -59,7 +58,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
<executions>
<execution>
<id>zip-file</id>
@@ -75,26 +73,6 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
</plugins>
</build>
</project>