Author: owulff
Date: Fri Mar 8 18:41:52 2013
New Revision: 1454490
URL: http://svn.apache.org/r1454490
Log:
Simplified POM dependencies dependencies
Modified:
cxf/fediz/trunk/examples/springWebapp/pom.xml
cxf/fediz/trunk/examples/springWebapp/src/main/webapp/WEB-INF/web.xml
Modified: cxf/fediz/trunk/examples/springWebapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/fediz/trunk/examples/springWebapp/pom.xml?rev=1454490&r1=1454489&r2=1454490&view=diff
==============================================================================
--- cxf/fediz/trunk/examples/springWebapp/pom.xml (original)
+++ cxf/fediz/trunk/examples/springWebapp/pom.xml Fri Mar 8 18:41:52 2013
@@ -68,16 +68,6 @@
<version>${commons.lang.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
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=1454490&r1=1454489&r2=1454490&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 Fri
Mar 8 18:41:52 2013
@@ -3,31 +3,29 @@
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>
+ <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>
+ <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>
-
<filter-class>org.apache.cxf.fediz.cxf.web.FederationFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>springSecurityFilterChain</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter>
+ <filter-name>FederationFilter</filter-name>
+
<filter-class>org.apache.cxf.fediz.cxf.web.FederationFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <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>
+ <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
@@ -49,29 +47,29 @@
<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>
+ <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/user/fedservlet</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>FederationServlet</servlet-name>
- <url-pattern>/secure/manager/fedservlet</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/secure/manager/fedservlet</url-pattern>
+ </servlet-mapping>
</web-app>
