You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/04 11:24:32 UTC
[cxf-fediz] branch master updated: FEDIZ-231 - Upgrade to Tomcat 9
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new f4038ac FEDIZ-231 - Upgrade to Tomcat 9
f4038ac is described below
commit f4038ac6412b7856f21dbfea849638b3460ee8f1
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Oct 4 12:23:53 2018 +0100
FEDIZ-231 - Upgrade to Tomcat 9
---
BUILDING.txt | 4 ++--
apache-fediz/pom.xml | 2 +-
apache-fediz/src/assembly/bin.xml | 10 +++++-----
examples/simpleWebapp/src/main/webapp/META-INF/context.xml | 2 +-
.../src/main/webapp/META-INF/context.xml | 2 +-
.../websphereWebapp/src/main/webapp/META-INF/context.xml | 2 +-
examples/wsclientWebapp/webapp/pom.xml | 2 +-
.../webapp/src/main/webapp/META-INF/context.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/{tomcat8 => tomcat}/README.txt | 0
plugins/{tomcat8 => tomcat}/pom.xml | 6 +++---
plugins/{tomcat8 => tomcat}/src/main/assembly/assembly.xml | 0
.../apache/cxf/fediz/tomcat}/FederationAuthenticator.java | 6 +++---
.../apache/cxf/fediz/tomcat}/FederationPrincipalImpl.java | 2 +-
.../cxf/fediz/tomcat}/handler/TomcatLogoutHandler.java | 4 ++--
.../cxf/fediz/tomcat}/handler/TomcatSigninHandler.java | 6 +++---
.../src/test/resources/logging.properties | 0
pom.xml | 2 +-
services/oidc/src/main/webapp/META-INF/context.xml | 2 +-
systests/custom/pom.xml | 6 +++---
.../cxf/fediz/systests/custom/CustomParametersTest.java | 2 +-
systests/cxf/pom.xml | 4 ++--
systests/federation/samlsso/pom.xml | 6 +++---
systests/federation/unknown-subject/pom.xml | 6 +++---
.../cxf/fediz/systests/federation/unknown/WSFedTest.java | 2 +-
systests/federation/wsfed/pom.xml | 6 +++---
.../cxf/fediz/systests/federation/wsfed/WSFedTest.java | 2 +-
systests/idp/pom.xml | 6 +++---
systests/jetty9/pom.xml | 1 +
systests/kerberos/pom.xml | 6 +++---
.../apache/cxf/fediz/systests/kerberos/KerberosTest.java | 2 +-
systests/ldap/pom.xml | 6 +++---
.../java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java | 2 +-
systests/oidc/pom.xml | 6 +++---
.../org/apache/cxf/fediz/systests/oidc/OIDCTomcatTest.java | 2 +-
systests/pom.xml | 2 +-
systests/samlsso/pom.xml | 6 +++---
.../cxf/fediz/systests/samlsso/Tomcat8PluginTest.java | 2 +-
systests/spring/pom.xml | 4 ++--
systests/{tomcat8 => tomcat}/pom.xml | 6 +++---
.../cxf/fediz/systests/tomcat}/AudienceRestrictionTest.java | 4 ++--
.../cxf/fediz/systests/tomcat}/ClientCertificateTest.java | 4 ++--
.../cxf/fediz/systests/tomcat}/HOKCallbackHandler.java | 2 +-
.../apache/cxf/fediz/systests/tomcat}/HolderOfKeyTest.java | 4 ++--
.../cxf/fediz/systests/tomcat}/TestCallbackHandler.java | 2 +-
.../apache/cxf/fediz/systests/tomcat}/TokenExpiryTest.java | 4 ++--
.../org/apache/cxf/fediz/systests/tomcat}/TomcatTest.java | 4 ++--
.../org/apache/cxf/fediz/systests/tomcat}/WReqTest.java | 4 ++--
systests/{tomcat8 => tomcat}/src/test/resources/alice.cer | Bin
.../{tomcat8 => tomcat}/src/test/resources/fediz_config.xml | 6 +++---
.../src/test/resources/logging.properties | 0
.../src/test/resources/realma/entities-realma.xml | 0
.../src/test/resources/realma/fediz-sts.xml | 0
systests/websphere/pom.xml | 6 +++---
54 files changed, 91 insertions(+), 90 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index d6b3c82..2b43639 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -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
diff --git a/apache-fediz/pom.xml b/apache-fediz/pom.xml
index 45d1166..28b2b97 100644
--- a/apache-fediz/pom.xml
+++ b/apache-fediz/pom.xml
@@ -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>
diff --git a/apache-fediz/src/assembly/bin.xml b/apache-fediz/src/assembly/bin.xml
index 2f5f40c..589e35d 100644
--- a/apache-fediz/src/assembly/bin.xml
+++ b/apache-fediz/src/assembly/bin.xml
@@ -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>
diff --git a/examples/simpleWebapp/src/main/webapp/META-INF/context.xml b/examples/simpleWebapp/src/main/webapp/META-INF/context.xml
index 5610256..838f156 100644
--- a/examples/simpleWebapp/src/main/webapp/META-INF/context.xml
+++ b/examples/simpleWebapp/src/main/webapp/META-INF/context.xml
@@ -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>
diff --git a/examples/springPreauthWebapp/src/main/webapp/META-INF/context.xml b/examples/springPreauthWebapp/src/main/webapp/META-INF/context.xml
index 5610256..838f156 100644
--- a/examples/springPreauthWebapp/src/main/webapp/META-INF/context.xml
+++ b/examples/springPreauthWebapp/src/main/webapp/META-INF/context.xml
@@ -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>
diff --git a/examples/websphereWebapp/src/main/webapp/META-INF/context.xml b/examples/websphereWebapp/src/main/webapp/META-INF/context.xml
index 5610256..838f156 100644
--- a/examples/websphereWebapp/src/main/webapp/META-INF/context.xml
+++ b/examples/websphereWebapp/src/main/webapp/META-INF/context.xml
@@ -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>
diff --git a/examples/wsclientWebapp/webapp/pom.xml b/examples/wsclientWebapp/webapp/pom.xml
index 944a7b3..c1b63ab 100644
--- a/examples/wsclientWebapp/webapp/pom.xml
+++ b/examples/wsclientWebapp/webapp/pom.xml
@@ -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 -->
diff --git a/examples/wsclientWebapp/webapp/src/main/webapp/META-INF/context.xml b/examples/wsclientWebapp/webapp/src/main/webapp/META-INF/context.xml
index a469960..f13d93e 100644
--- a/examples/wsclientWebapp/webapp/src/main/webapp/META-INF/context.xml
+++ b/examples/wsclientWebapp/webapp/src/main/webapp/META-INF/context.xml
@@ -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>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 62bc7f6..66f0ce7 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -32,7 +32,7 @@
<modules>
<module>core</module>
- <module>tomcat8</module>
+ <module>tomcat</module>
<module>jetty9</module>
<module>spring</module>
<module>spring3</module>
diff --git a/plugins/tomcat8/README.txt b/plugins/tomcat/README.txt
similarity index 100%
rename from plugins/tomcat8/README.txt
rename to plugins/tomcat/README.txt
diff --git a/plugins/tomcat8/pom.xml b/plugins/tomcat/pom.xml
similarity index 95%
rename from plugins/tomcat8/pom.xml
rename to plugins/tomcat/pom.xml
index 46a5c97..2abc37f 100644
--- a/plugins/tomcat8/pom.xml
+++ b/plugins/tomcat/pom.xml
@@ -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>
diff --git a/plugins/tomcat8/src/main/assembly/assembly.xml b/plugins/tomcat/src/main/assembly/assembly.xml
similarity index 100%
rename from plugins/tomcat8/src/main/assembly/assembly.xml
rename to plugins/tomcat/src/main/assembly/assembly.xml
diff --git a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
similarity index 99%
rename from plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
rename to plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
index 656f3f9..e2b87b5 100644
--- a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationAuthenticator.java
+++ b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
@@ -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.FedizProcessor;
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;
diff --git a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationPrincipalImpl.java
similarity index 98%
rename from plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
rename to plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationPrincipalImpl.java
index 4e019a8..b299abd 100644
--- a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
+++ b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationPrincipalImpl.java
@@ -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;
diff --git a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/handler/TomcatLogoutHandler.java b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/handler/TomcatLogoutHandler.java
similarity index 95%
rename from plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/handler/TomcatLogoutHandler.java
rename to plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/handler/TomcatLogoutHandler.java
index d8ffb2f..5d3db07 100644
--- a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/handler/TomcatLogoutHandler.java
+++ b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/handler/TomcatLogoutHandler.java
@@ -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.Session;
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;
diff --git a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/handler/TomcatSigninHandler.java b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/handler/TomcatSigninHandler.java
similarity index 94%
rename from plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/handler/TomcatSigninHandler.java
rename to plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/handler/TomcatSigninHandler.java
index b9b9101..52f7231 100644
--- a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/handler/TomcatSigninHandler.java
+++ b/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/handler/TomcatSigninHandler.java
@@ -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.FedizPrincipal;
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;
diff --git a/plugins/tomcat8/src/test/resources/logging.properties b/plugins/tomcat/src/test/resources/logging.properties
similarity index 100%
rename from plugins/tomcat8/src/test/resources/logging.properties
rename to plugins/tomcat/src/test/resources/logging.properties
diff --git a/pom.xml b/pom.xml
index 5f42372..e25a668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/services/oidc/src/main/webapp/META-INF/context.xml b/services/oidc/src/main/webapp/META-INF/context.xml
index 7a4ddb1..d063422 100644
--- a/services/oidc/src/main/webapp/META-INF/context.xml
+++ b/services/oidc/src/main/webapp/META-INF/context.xml
@@ -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>
diff --git a/systests/custom/pom.xml b/systests/custom/pom.xml
index 5d6ad52..084ec82 100644
--- a/systests/custom/pom.xml
+++ b/systests/custom/pom.xml
@@ -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>
diff --git a/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java b/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
index 8b54d47..a713d76 100644
--- a/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
+++ b/systests/custom/src/test/java/org/apache/cxf/fediz/systests/custom/CustomParametersTest.java
@@ -41,7 +41,7 @@ import org.apache.catalina.startup.Tomcat;
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;
diff --git a/systests/cxf/pom.xml b/systests/cxf/pom.xml
index 4a98317..45d520d 100644
--- a/systests/cxf/pom.xml
+++ b/systests/cxf/pom.xml
@@ -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>
diff --git a/systests/federation/samlsso/pom.xml b/systests/federation/samlsso/pom.xml
index 822dc90..7b10bac 100644
--- a/systests/federation/samlsso/pom.xml
+++ b/systests/federation/samlsso/pom.xml
@@ -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>
diff --git a/systests/federation/unknown-subject/pom.xml b/systests/federation/unknown-subject/pom.xml
index 93cb15b..a31e9b5 100644
--- a/systests/federation/unknown-subject/pom.xml
+++ b/systests/federation/unknown-subject/pom.xml
@@ -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>
diff --git a/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java b/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java
index 536f5ca..9e67988 100644
--- a/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java
+++ b/systests/federation/unknown-subject/src/test/java/org/apache/cxf/fediz/systests/federation/unknown/WSFedTest.java
@@ -40,7 +40,7 @@ import org.apache.catalina.LifecycleState;
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;
diff --git a/systests/federation/wsfed/pom.xml b/systests/federation/wsfed/pom.xml
index f5d54ba..28c1e27 100644
--- a/systests/federation/wsfed/pom.xml
+++ b/systests/federation/wsfed/pom.xml
@@ -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>
diff --git a/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java b/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java
index 4cd5d84..8148624 100644
--- a/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java
+++ b/systests/federation/wsfed/src/test/java/org/apache/cxf/fediz/systests/federation/wsfed/WSFedTest.java
@@ -45,7 +45,7 @@ import org.apache.catalina.LifecycleState;
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;
diff --git a/systests/idp/pom.xml b/systests/idp/pom.xml
index 2929ecc..9ec766f 100644
--- a/systests/idp/pom.xml
+++ b/systests/idp/pom.xml
@@ -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>
diff --git a/systests/jetty9/pom.xml b/systests/jetty9/pom.xml
index 666031a..96c822e 100644
--- a/systests/jetty9/pom.xml
+++ b/systests/jetty9/pom.xml
@@ -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>
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index 5b1c6f4..bfa942d 100644
--- a/systests/kerberos/pom.xml
+++ b/systests/kerberos/pom.xml
@@ -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>
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java b/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java
index 47f6e62..3f894be 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/fediz/systests/kerberos/KerberosTest.java
@@ -40,7 +40,7 @@ import org.apache.catalina.LifecycleState;
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.kerby.kerberos.kerb.server.SimpleKdcServer;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.ietf.jgss.GSSContext;
diff --git a/systests/ldap/pom.xml b/systests/ldap/pom.xml
index 2ba5fe1..4414675 100644
--- a/systests/ldap/pom.xml
+++ b/systests/ldap/pom.xml
@@ -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>
diff --git a/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java b/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
index 9f4deb8..264598e 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/fediz/systests/ldap/LDAPTest.java
@@ -35,7 +35,7 @@ import org.apache.catalina.startup.Tomcat;
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.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
diff --git a/systests/oidc/pom.xml b/systests/oidc/pom.xml
index 29355ce..7e79ed5 100644
--- a/systests/oidc/pom.xml
+++ b/systests/oidc/pom.xml
@@ -42,13 +42,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>
@@ -59,7 +59,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>
diff --git a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTomcatTest.java b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTomcatTest.java
index 062d5d2..0737c99 100644
--- a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTomcatTest.java
+++ b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTomcatTest.java
@@ -32,7 +32,7 @@ import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
-import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
+import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/systests/pom.xml b/systests/pom.xml
index 3c4329e..e98ffef 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -36,7 +36,7 @@
<module>webapps</module>
<module>custom</module>
<module>jetty9</module>
- <module>tomcat8</module>
+ <module>tomcat</module>
<module>spring</module>
<module>cxf</module>
<module>federation</module>
diff --git a/systests/samlsso/pom.xml b/systests/samlsso/pom.xml
index ea9ca07..45a0c2e 100644
--- a/systests/samlsso/pom.xml
+++ b/systests/samlsso/pom.xml
@@ -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>
diff --git a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/Tomcat8PluginTest.java b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/Tomcat8PluginTest.java
index 82a488a..af4605b 100644
--- a/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/Tomcat8PluginTest.java
+++ b/systests/samlsso/src/test/java/org/apache/cxf/fediz/systests/samlsso/Tomcat8PluginTest.java
@@ -37,7 +37,7 @@ import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
import org.apache.cxf.common.util.Base64Utility;
import org.apache.cxf.fediz.systests.common.AbstractTests;
-import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
+import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
diff --git a/systests/spring/pom.xml b/systests/spring/pom.xml
index 3acb460..5a34948 100644
--- a/systests/spring/pom.xml
+++ b/systests/spring/pom.xml
@@ -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>
diff --git a/systests/tomcat8/pom.xml b/systests/tomcat/pom.xml
similarity index 98%
rename from systests/tomcat8/pom.xml
rename to systests/tomcat/pom.xml
index 3b2341b..91da055 100644
--- a/systests/tomcat8/pom.xml
+++ b/systests/tomcat/pom.xml
@@ -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>
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/AudienceRestrictionTest.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/AudienceRestrictionTest.java
similarity index 98%
rename from systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/AudienceRestrictionTest.java
rename to systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/AudienceRestrictionTest.java
index 4bacf31..af94947 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/AudienceRestrictionTest.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/AudienceRestrictionTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.systests.tomcat8;
+package org.apache.cxf.fediz.systests.tomcat;
import java.io.File;
@@ -39,7 +39,7 @@ import org.apache.catalina.LifecycleState;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
-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;
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/ClientCertificateTest.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/ClientCertificateTest.java
similarity index 98%
rename from systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/ClientCertificateTest.java
rename to systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/ClientCertificateTest.java
index 3345b26..1b94d46 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/ClientCertificateTest.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/ClientCertificateTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.systests.tomcat8;
+package org.apache.cxf.fediz.systests.tomcat;
import java.io.File;
import java.io.FileInputStream;
@@ -33,7 +33,7 @@ import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
import org.apache.cxf.fediz.systests.common.AbstractClientCertTests;
-import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
+import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HOKCallbackHandler.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/HOKCallbackHandler.java
similarity index 97%
rename from systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HOKCallbackHandler.java
rename to systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/HOKCallbackHandler.java
index d413dd1..7aa0922 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HOKCallbackHandler.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/HOKCallbackHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.systests.tomcat8;
+package org.apache.cxf.fediz.systests.tomcat;
import java.io.IOException;
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HolderOfKeyTest.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/HolderOfKeyTest.java
similarity index 98%
rename from systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HolderOfKeyTest.java
rename to systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/HolderOfKeyTest.java
index d056f13..d5b5fc8 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/HolderOfKeyTest.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/HolderOfKeyTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.systests.tomcat8;
+package org.apache.cxf.fediz.systests.tomcat;
import java.io.File;
import java.io.FileInputStream;
@@ -40,7 +40,7 @@ import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
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;
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TestCallbackHandler.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TestCallbackHandler.java
similarity index 97%
rename from systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TestCallbackHandler.java
rename to systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TestCallbackHandler.java
index b104d66..ae8a2d8 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TestCallbackHandler.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TestCallbackHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.systests.tomcat8;
+package org.apache.cxf.fediz.systests.tomcat;
import java.io.IOException;
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TokenExpiryTest.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TokenExpiryTest.java
similarity index 98%
rename from systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TokenExpiryTest.java
rename to systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TokenExpiryTest.java
index fb573a3..c1199fc 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TokenExpiryTest.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TokenExpiryTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.systests.tomcat8;
+package org.apache.cxf.fediz.systests.tomcat;
import java.io.File;
@@ -34,7 +34,7 @@ import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
import org.apache.cxf.fediz.systests.common.AbstractExpiryTests;
-import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
+import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TomcatTest.java
similarity index 98%
rename from systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java
rename to systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TomcatTest.java
index 194f060..659f672 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/TomcatTest.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/TomcatTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.systests.tomcat8;
+package org.apache.cxf.fediz.systests.tomcat;
import java.io.File;
@@ -34,7 +34,7 @@ import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
import org.apache.cxf.fediz.systests.common.AbstractTests;
-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;
diff --git a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/WReqTest.java b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/WReqTest.java
similarity index 98%
rename from systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/WReqTest.java
rename to systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/WReqTest.java
index 936e90a..b2752cd 100644
--- a/systests/tomcat8/src/test/java/org/apache/cxf/fediz/systests/tomcat8/WReqTest.java
+++ b/systests/tomcat/src/test/java/org/apache/cxf/fediz/systests/tomcat/WReqTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.fediz.systests.tomcat8;
+package org.apache.cxf.fediz.systests.tomcat;
import java.io.File;
@@ -41,7 +41,7 @@ import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.IOUtils;
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;
diff --git a/systests/tomcat8/src/test/resources/alice.cer b/systests/tomcat/src/test/resources/alice.cer
similarity index 100%
rename from systests/tomcat8/src/test/resources/alice.cer
rename to systests/tomcat/src/test/resources/alice.cer
diff --git a/systests/tomcat8/src/test/resources/fediz_config.xml b/systests/tomcat/src/test/resources/fediz_config.xml
similarity index 99%
rename from systests/tomcat8/src/test/resources/fediz_config.xml
rename to systests/tomcat/src/test/resources/fediz_config.xml
index e0c9dbb..f4dca81 100644
--- a/systests/tomcat8/src/test/resources/fediz_config.xml
+++ b/systests/tomcat/src/test/resources/fediz_config.xml
@@ -83,7 +83,7 @@
<claimType type="a particular claim type"
optional="true" />
</claimTypesRequested>
- <request type="Class">org.apache.cxf.fediz.systests.tomcat8.TestCallbackHandler</request>
+ <request type="Class">org.apache.cxf.fediz.systests.tomcat.TestCallbackHandler</request>
</protocol>
<logoutURL>/secure/logout</logoutURL>
<logoutRedirectTo>/index.html</logoutRedirectTo>
@@ -114,7 +114,7 @@
<claimType type="a particular claim type"
optional="true" />
</claimTypesRequested>
- <request type="Class">org.apache.cxf.fediz.systests.tomcat8.HOKCallbackHandler</request>
+ <request type="Class">org.apache.cxf.fediz.systests.tomcat.HOKCallbackHandler</request>
</protocol>
<logoutURL>/secure/logout</logoutURL>
<logoutRedirectTo>/index.html</logoutRedirectTo>
@@ -151,7 +151,7 @@
<claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
<authenticationType>http://docs.oasis-open.org/wsfed/authorization/200706/authntypes/Ssl</authenticationType>
- <request type="Class">org.apache.cxf.fediz.systests.tomcat8.HOKCallbackHandler</request>
+ <request type="Class">org.apache.cxf.fediz.systests.tomcat.HOKCallbackHandler</request>
</protocol>
<logoutURL>/secure/logout</logoutURL>
<logoutRedirectTo>/index.html</logoutRedirectTo>
diff --git a/systests/tomcat8/src/test/resources/logging.properties b/systests/tomcat/src/test/resources/logging.properties
similarity index 100%
rename from systests/tomcat8/src/test/resources/logging.properties
rename to systests/tomcat/src/test/resources/logging.properties
diff --git a/systests/tomcat8/src/test/resources/realma/entities-realma.xml b/systests/tomcat/src/test/resources/realma/entities-realma.xml
similarity index 100%
rename from systests/tomcat8/src/test/resources/realma/entities-realma.xml
rename to systests/tomcat/src/test/resources/realma/entities-realma.xml
diff --git a/systests/tomcat8/src/test/resources/realma/fediz-sts.xml b/systests/tomcat/src/test/resources/realma/fediz-sts.xml
similarity index 100%
rename from systests/tomcat8/src/test/resources/realma/fediz-sts.xml
rename to systests/tomcat/src/test/resources/realma/fediz-sts.xml
diff --git a/systests/websphere/pom.xml b/systests/websphere/pom.xml
index 0b05632..3b7d0a7 100644
--- a/systests/websphere/pom.xml
+++ b/systests/websphere/pom.xml
@@ -40,13 +40,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>
@@ -57,7 +57,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>