http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e392e637/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 4d3bbc4..0000000 --- a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?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 - - 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. ---> -<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> - - <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.core.servlet.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> - - - <!-- - - 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> - </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> - </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> - -</web-app>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e392e637/systests/webapps/spring2Webapp/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/systests/webapps/spring2Webapp/src/main/webapp/index.html b/systests/webapps/spring2Webapp/src/main/webapp/index.html deleted file mode 100644 index a9dbdaa..0000000 --- a/systests/webapps/spring2Webapp/src/main/webapp/index.html +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - 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. ---> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<HTML><HEAD><TITLE>WS Federation Tomcat Examples</TITLE> -<META http-equiv=Content-Type content="text/html"> -</HEAD> -<BODY> -<P> -<H3>Hello World</H3> -<P></P> -</BODY></HTML> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e392e637/systests/webapps/spring2Webapp/src/main/webapp/secure/test.html ---------------------------------------------------------------------- diff --git a/systests/webapps/spring2Webapp/src/main/webapp/secure/test.html b/systests/webapps/spring2Webapp/src/main/webapp/secure/test.html deleted file mode 100644 index 9cf7366..0000000 --- a/systests/webapps/spring2Webapp/src/main/webapp/secure/test.html +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - 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. ---> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<HTML><HEAD><TITLE>WS Federation Tomcat Examples</TITLE> -<META http-equiv=Content-Type content="text/html"> -</HEAD> -<BODY> -<P> -<H3>Secure Test</H3> -<P></P> -</BODY></HTML> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e392e637/systests/websphere/pom.xml ---------------------------------------------------------------------- diff --git a/systests/websphere/pom.xml b/systests/websphere/pom.xml index d579975..c3e31c2 100644 --- a/systests/websphere/pom.xml +++ b/systests/websphere/pom.xml @@ -40,25 +40,13 @@ <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> - <version>${tomcat7.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-logging-juli</artifactId> - <version>${tomcat7.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jdt.core.compiler</groupId> - <artifactId>ecj</artifactId> - <version>${ecj.version}</version> + <version>${tomcat8.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-jasper</artifactId> - <version>${tomcat7.version}</version> + <version>${tomcat8.version}</version> <scope>test</scope> </dependency> <dependency> @@ -69,7 +57,7 @@ </dependency> <dependency> <groupId>org.apache.cxf.fediz</groupId> - <artifactId>fediz-tomcat7</artifactId> + <artifactId>fediz-tomcat8</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency>
