You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/03/17 15:48:12 UTC
[1/2] git commit: [CXF-5610] Revert part of the commit so the WS-N
tests will pass
Repository: cxf
Updated Branches:
refs/heads/master 3cd24f083 -> 5786063da
[CXF-5610] Revert part of the commit so the WS-N tests will pass
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/962f67f6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/962f67f6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/962f67f6
Branch: refs/heads/master
Commit: 962f67f6380a17a5d2001604868e5322ef7a16c3
Parents: 3cd24f0
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 17 10:43:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 17 10:44:11 2014 -0400
----------------------------------------------------------------------
.../cxf/transport/http_jetty/JettyHTTPServerEngine.java | 8 ++++----
.../cxf/transport/http_jetty/JettyHTTPServerEngineTest.java | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/962f67f6/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 4b6070b..6d92073 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -36,7 +36,6 @@ import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.transport.HttpUriMapper;
-import org.apache.cxf.transport.http.HttpUrlUtil;
import org.apache.cxf.transport.https_jetty.JettySslConnectorFactory;
import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.server.AbstractConnector;
@@ -279,16 +278,17 @@ public class JettyHTTPServerEngine
protected void checkRegistedContext(URL url) {
String path = url.getPath();
for (String registedPath : registedPaths) {
- if (path.equals(registedPath)
- || HttpUrlUtil.checkContextPath(registedPath, path)) {
+ if (path.equals(registedPath)) {
+ //|| HttpUrlUtil.checkContextPath(registedPath, path)) {
// Throw the address is already used exception
throw new Fault(new Message("ADD_HANDLER_CONTEXT_IS_USED_MSG", LOG, url, registedPath));
}
+ /*
if (HttpUrlUtil.checkContextPath(path, registedPath)) {
throw new Fault(new Message("ADD_HANDLER_CONTEXT_CONFILICT_MSG", LOG, url, registedPath));
}
+ */
}
-
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/962f67f6/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
index b5ab2a6..5132379 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
@@ -199,7 +199,7 @@ public class JettyHTTPServerEngineTest extends Assert {
} catch (Exception ex) {
assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello/test") > 0);
}
-
+ /*
try {
engine.addServant(new URL(urlStr + "/test"), handler2);
fail("We don't support to publish the two service at the same context path");
@@ -213,6 +213,7 @@ public class JettyHTTPServerEngineTest extends Assert {
} catch (Exception ex) {
assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello") > 0);
}
+ */
engine.addServant(new URL(urlStr2), handler2);
[2/2] git commit: Drop support for Jetty 7.4..... too ancient to
worry about
Posted by dk...@apache.org.
Drop support for Jetty 7.4..... too ancient to worry about
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5786063d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5786063d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5786063d
Branch: refs/heads/master
Commit: 5786063da57f8e148fc27f16c6f9b284311ffa66
Parents: 962f67f
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 17 10:45:12 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 17 10:45:12 2014 -0400
----------------------------------------------------------------------
.../http_jetty/JettyHTTPServerEngine.java | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5786063d/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 6d92073..8c40149 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -42,7 +42,6 @@ import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.SessionIdManager;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -420,21 +419,7 @@ public class JettyHTTPServerEngine
if (sessionManager == null) {
sessionManager = new HashSessionManager();
HashSessionIdManager idManager = new HashSessionIdManager();
-
- try {
- //for JETTY 7.5
- sessionManager.getClass().getMethod("setSessionIdManager", SessionIdManager.class)
- .invoke(sessionManager, idManager);
- } catch (Exception e) {
- //for JETTY <=7.4.x
- try {
- sessionManager.getClass().getMethod("setIdManager", SessionIdManager.class)
- .invoke(sessionManager, idManager);
- } catch (Exception e1) {
- throw new Fault(new Message("START_UP_SERVER_FAILED_MSG", LOG,
- e.getMessage(), port), e);
- }
- }
+ sessionManager.setSessionIdManager(idManager);
}
SessionHandler sessionHandler = new SessionHandler(sessionManager);
if (securityHandler != null) {