Skip to content
Permalink
Browse files
FEDIZ-231 - Upgrade to Tomcat 9
  • Loading branch information
coheigea committed Oct 4, 2018
1 parent 4198cb3 commit f4038ac6412b7856f21dbfea849638b3460ee8f1
Showing 54 changed files with 91 additions and 90 deletions.
@@ -38,8 +38,8 @@ Source Directory structure

+ plugins contains the sources of the Federation plugin
+ core the core module contains the majority of functionality which is Servlet container agnostic
+ tomcat8 the Tomcat 8 module is the bridge of the core to the
Tomcat 8 specific security engine (container managed)
+ tomcat the Tomcat module is the bridge of the core to the
Tomcat 8/9 specific security engine (container managed)
+ jetty9 the Jetty 9 module is the bridge of the core to the
Jetty 9 specific security engine (container managed)
+ cxf the CXF module is the bridge of the core to the
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-tomcat8</artifactId>
<artifactId>fediz-tomcat</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -124,7 +124,7 @@
<scope>runtime</scope>
</dependencySet>
<dependencySet>
<outputDirectory>apache-fediz-${project.version}/plugins/tomcat8/lib</outputDirectory>
<outputDirectory>apache-fediz-${project.version}/plugins/tomcat/lib</outputDirectory>
<unpack>false</unpack>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
@@ -146,7 +146,7 @@
<exclude>org.apache.cxf.fediz:fediz-idp</exclude>
<exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude>
<exclude>org.apache.cxf.fediz:fediz-oidc</exclude>
<exclude>org.apache.cxf.fediz:fediz-tomcat8</exclude>
<exclude>org.apache.cxf.fediz:fediz-tomcat</exclude>
<exclude>org.apache.cxf.fediz:fediz-cxf</exclude>
<exclude>org.apache.cxf.fediz:fediz-spring</exclude>
<exclude>org.apache.cxf.fediz:fediz-spring3</exclude>
@@ -161,7 +161,7 @@
<exclude>org.apache.cxf.fediz:fediz-idp</exclude>
<exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude>
<exclude>org.apache.cxf.fediz:fediz-oidc</exclude>
<exclude>org.apache.cxf.fediz:fediz-tomcat8</exclude>
<exclude>org.apache.cxf.fediz:fediz-tomcat</exclude>
<exclude>org.apache.cxf.fediz:fediz-jetty9</exclude>
<exclude>org.apache.cxf.fediz:fediz-cxf</exclude>
<exclude>org.apache.cxf.fediz:fediz-spring3:jar</exclude>
@@ -176,7 +176,7 @@
<exclude>org.apache.cxf.fediz:fediz-idp</exclude>
<exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude>
<exclude>org.apache.cxf.fediz:fediz-oidc</exclude>
<exclude>org.apache.cxf.fediz:fediz-tomcat8</exclude>
<exclude>org.apache.cxf.fediz:fediz-tomcat</exclude>
<exclude>org.apache.cxf.fediz:fediz-jetty9</exclude>
<exclude>org.apache.cxf.fediz:fediz-cxf</exclude>
<exclude>org.apache.cxf.fediz:fediz-spring:jar</exclude>
@@ -191,7 +191,7 @@
<exclude>org.apache.cxf.fediz:fediz-idp</exclude>
<exclude>org.apache.cxf.fediz:fediz-idp-sts</exclude>
<exclude>org.apache.cxf.fediz:fediz-oidc</exclude>
<exclude>org.apache.cxf.fediz:fediz-tomcat8</exclude>
<exclude>org.apache.cxf.fediz:fediz-tomcat</exclude>
<exclude>org.apache.cxf.fediz:fediz-jetty9</exclude>
<exclude>org.apache.cxf.fediz:fediz-spring</exclude>
<exclude>org.apache.cxf.fediz:fediz-spring3</exclude>
@@ -18,5 +18,5 @@
under the License.
-->
<Context>
<Valve className="org.apache.cxf.fediz.tomcat8.FederationAuthenticator" configFile="conf/fediz_config.xml" />
<Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator" configFile="conf/fediz_config.xml" />
</Context>
@@ -18,5 +18,5 @@
under the License.
-->
<Context>
<Valve className="org.apache.cxf.fediz.tomcat8.FederationAuthenticator" configFile="conf/fediz_config.xml" />
<Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator" configFile="conf/fediz_config.xml" />
</Context>
@@ -18,5 +18,5 @@
under the License.
-->
<Context>
<Valve className="org.apache.cxf.fediz.tomcat8.FederationAuthenticator" configFile="conf/fediz_config.xml" />
<Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator" configFile="conf/fediz_config.xml" />
</Context>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
<!-- Required to cast Principal to FedizPrincipal -->
@@ -18,5 +18,5 @@
under the License.
-->
<Context>
<Valve className="org.apache.cxf.fediz.tomcat8.FederationAuthenticator" configFile="conf/fediz_config.xml" />
<Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator" configFile="conf/fediz_config.xml" />
</Context>
@@ -32,7 +32,7 @@

<modules>
<module>core</module>
<module>tomcat8</module>
<module>tomcat</module>
<module>jetty9</module>
<module>spring</module>
<module>spring3</module>
File renamed without changes.
@@ -25,8 +25,8 @@
<version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>fediz-tomcat8</artifactId>
<name>Apache Fediz Plugin for Tomcat 8</name>
<artifactId>fediz-tomcat</artifactId>
<name>Apache Fediz Plugin for Tomcat 8/9</name>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.cxf.fediz.tomcat8;
package org.apache.cxf.fediz.tomcat;

import java.io.File;
import java.io.IOException;
@@ -53,8 +53,8 @@
import org.apache.cxf.fediz.core.processor.FedizProcessorFactory;
import org.apache.cxf.fediz.core.processor.FedizResponse;
import org.apache.cxf.fediz.core.processor.RedirectionResponse;
import org.apache.cxf.fediz.tomcat8.handler.TomcatLogoutHandler;
import org.apache.cxf.fediz.tomcat8.handler.TomcatSigninHandler;
import org.apache.cxf.fediz.tomcat.handler.TomcatLogoutHandler;
import org.apache.cxf.fediz.tomcat.handler.TomcatSigninHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.cxf.fediz.tomcat8;
package org.apache.cxf.fediz.tomcat;

import java.util.Collections;
import java.util.List;
@@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.cxf.fediz.tomcat8.handler;
package org.apache.cxf.fediz.tomcat.handler;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -26,7 +26,7 @@
import org.apache.catalina.connector.Request;
import org.apache.cxf.fediz.core.config.FedizContext;
import org.apache.cxf.fediz.core.handler.LogoutHandler;
import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
import org.apache.cxf.fediz.tomcat.FederationAuthenticator;

public class TomcatLogoutHandler extends LogoutHandler {
private final Request request;
@@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.cxf.fediz.tomcat8.handler;
package org.apache.cxf.fediz.tomcat.handler;

import java.util.ArrayList;
import java.util.Collections;
@@ -33,8 +33,8 @@
import org.apache.cxf.fediz.core.config.FedizContext;
import org.apache.cxf.fediz.core.handler.SigninHandler;
import org.apache.cxf.fediz.core.processor.FedizResponse;
import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
import org.apache.cxf.fediz.tomcat8.FederationPrincipalImpl;
import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.apache.cxf.fediz.tomcat.FederationPrincipalImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -63,7 +63,7 @@
<slf4j.version>1.7.25</slf4j.version>
<spring.version>4.3.18.RELEASE</spring.version>
<spring.security.version>4.2.7.RELEASE</spring.security.version>
<tomcat8.version>8.5.34</tomcat8.version>
<tomcat.version>9.0.12</tomcat.version>
<wss4j.version>2.2.2</wss4j.version>

<tomcat.url>http://localhost:8080/manager/text</tomcat.url>
@@ -18,5 +18,5 @@
under the License.
-->
<Context>
<Valve className="org.apache.cxf.fediz.tomcat8.FederationAuthenticator" configFile="conf/fediz_config.xml" />
<Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator" configFile="conf/fediz_config.xml" />
</Context>
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-tomcat8</artifactId>
<artifactId>fediz-tomcat</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -41,7 +41,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.cxf.fediz.core.ClaimTypes;
import org.apache.cxf.fediz.systests.common.HTTPTestUtils;
import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.wss4j.dom.engine.WSSConfig;
@@ -91,13 +91,13 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-tomcat8</artifactId>
<artifactId>fediz-tomcat</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-tomcat8</artifactId>
<artifactId>fediz-tomcat</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -40,7 +40,7 @@
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.cxf.fediz.core.ClaimTypes;
import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.junit.AfterClass;
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-tomcat8</artifactId>
<artifactId>fediz-tomcat</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -45,7 +45,7 @@
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.cxf.fediz.core.ClaimTypes;
import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.junit.AfterClass;
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>${tomcat8.version}</version>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-tomcat8</artifactId>
<artifactId>fediz-tomcat</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -32,6 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<tomcat8.version>8.5.34</tomcat8.version>
</properties>
<dependencies>
<dependency>

0 comments on commit f4038ac

Please sign in to comment.