Repository: cxf-fediz Updated Branches: refs/heads/1.2.x-fixes b92617938 -> 9dbb03746
[FEDIZ-117] - Race condition in CXF plugin related to request restoration after redirect Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9dbb0374 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9dbb0374 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9dbb0374 Branch: refs/heads/1.2.x-fixes Commit: 9dbb037469c67a2d0f90251bc4bb46015218f0e0 Parents: b926179 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Oct 5 16:12:07 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Oct 5 16:12:58 2015 +0100 ---------------------------------------------------------------------- .../federation/FederationTest.java | 8 +------ .../org/apache/cxf/fediz/example/Service.java | 16 +++++++++++++ .../cxfWebapp/src/main/webapp/secure/test.html | 25 -------------------- 3 files changed, 17 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9dbb0374/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java ---------------------------------------------------------------------- diff --git a/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java b/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java index 40dac1f..5404e49 100644 --- a/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java +++ b/systests/cxf/src/test/java/org/apache/cxf/fediz/integrationtests/federation/FederationTest.java @@ -28,7 +28,6 @@ import org.apache.cxf.fediz.integrationtests.AbstractTests; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Ignore; /** * A test for WS-Federation using the CXF plugin (deployed in Tomcat). @@ -172,10 +171,5 @@ public class FederationTest extends AbstractTests { public String getServletContextName() { return "fedizhelloworld"; } - - @Ignore("This tests is currently failing on CXF") - @Override - public void testConcurrentRequests() throws Exception { - // super.testConcurrentRequests(); - } + } http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9dbb0374/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java ---------------------------------------------------------------------- diff --git a/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java b/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java index d91f8ba..a82a8a4 100644 --- a/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java +++ b/systests/webapps/cxfWebapp/src/main/java/org/apache/cxf/fediz/example/Service.java @@ -71,6 +71,22 @@ public class Service { return doGet(uriInfo); } + // Just used for testing purposes... + @Path("/test.html") + @RolesAllowed({ "User", "Admin", "Manager", "Authenticated" }) + @GET + @Produces("text/html") + public String doGetTest(@Context UriInfo uriInfo) throws Exception { + StringBuilder out = new StringBuilder(); + out.append("<html>\n"); + out.append("<head><title>WS Federation Systests Examples</title></head>\n"); + out.append("<body>\n"); + out.append("<P><H3>Secure Test</H3><P></P>"); + out.append("</body>\n"); + + return out.toString(); + } + private String doGet(@Context UriInfo uriInfo) throws Exception { StringBuilder out = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9dbb0374/systests/webapps/cxfWebapp/src/main/webapp/secure/test.html ---------------------------------------------------------------------- diff --git a/systests/webapps/cxfWebapp/src/main/webapp/secure/test.html b/systests/webapps/cxfWebapp/src/main/webapp/secure/test.html deleted file mode 100644 index 9cf7366..0000000 --- a/systests/webapps/cxfWebapp/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>
