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 2016/11/14 17:08:22 UTC
cxf-fediz git commit: Updating OIDC to use Tomcat8 by default
Repository: cxf-fediz
Updated Branches:
refs/heads/master ee3f69576 -> 64431ac5b
Updating OIDC to use Tomcat8 by default
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/64431ac5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/64431ac5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/64431ac5
Branch: refs/heads/master
Commit: 64431ac5bdc4adcf89539d9f68f751b6a9e6ffd5
Parents: ee3f695
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 14 17:08:10 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 14 17:08:10 2016 +0000
----------------------------------------------------------------------
services/oidc/src/main/webapp/META-INF/context.xml | 2 +-
systests/oidc/pom.xml | 8 ++++----
.../java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/64431ac5/services/oidc/src/main/webapp/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/META-INF/context.xml b/services/oidc/src/main/webapp/META-INF/context.xml
index a136a5d..7a4ddb1 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.tomcat7.FederationAuthenticator" configFile="conf/fediz_config.xml" />
+ <Valve className="org.apache.cxf.fediz.tomcat8.FederationAuthenticator" configFile="conf/fediz_config.xml" />
</Context>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/64431ac5/systests/oidc/pom.xml
----------------------------------------------------------------------
diff --git a/systests/oidc/pom.xml b/systests/oidc/pom.xml
index fe257f5..f59be64 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>${tomcat7.version}</version>
+ <version>${tomcat8.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat7.version}</version>
+ <version>${tomcat8.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -60,7 +60,7 @@
<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>
@@ -71,7 +71,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>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/64431ac5/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
----------------------------------------------------------------------
diff --git a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index 627e44e..c805467 100644
--- a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++ b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -63,7 +63,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.tomcat7.FederationAuthenticator;
+import org.apache.cxf.fediz.tomcat8.FederationAuthenticator;
import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
import org.apache.cxf.rs.security.jose.jwt.JwtConstants;