You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2014/04/04 09:58:03 UTC
[1/4] git commit: CXF-5610 clean up the code
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 44ce31d6a -> 9c20cb35a
refs/heads/2.7.x-fixes 983e083a0 -> af593943e
refs/heads/master 1ef40fca2 -> 7f7be98e9
CXF-5610 clean up the code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/af593943
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/af593943
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/af593943
Branch: refs/heads/2.7.x-fixes
Commit: af593943ee1ef43c22512ca29c7128ea1223b039
Parents: 983e083
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 4 15:20:45 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 4 15:23:35 2014 +0800
----------------------------------------------------------------------
.../transport/http_jetty/JettyHTTPServerEngine.java | 9 +--------
.../http_jetty/JettyHTTPServerEngineTest.java | 15 ---------------
2 files changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/af593943/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 8c40149..073805b 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
@@ -277,16 +277,9 @@ public class JettyHTTPServerEngine
protected void checkRegistedContext(URL url) {
String path = url.getPath();
for (String registedPath : registedPaths) {
- if (path.equals(registedPath)) {
- //|| HttpUrlUtil.checkContextPath(registedPath, path)) {
- // Throw the address is already used exception
+ if (path.equals(registedPath)) {
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/af593943/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 5132379..94aa022 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,21 +199,6 @@ 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");
- } catch (Exception ex) {
- assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello/test/test") > 0);
- }
-
- try {
- engine.addServant(new URL("http://localhost:" + PORT1 + "/hello"), handler2);
- fail("We don't support to publish the two service at the same context path");
- } catch (Exception ex) {
- assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello") > 0);
- }
- */
engine.addServant(new URL(urlStr2), handler2);
[3/4] git commit: CXF-5610 clean up the code
Posted by ni...@apache.org.
CXF-5610 clean up the code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f7be98e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f7be98e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f7be98e
Branch: refs/heads/master
Commit: 7f7be98e97e15015bc5303caa4db66615c0b4e81
Parents: c542198
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 4 15:20:45 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 4 15:53:16 2014 +0800
----------------------------------------------------------------------
.../transport/http_jetty/JettyHTTPServerEngine.java | 9 +--------
.../http_jetty/JettyHTTPServerEngineTest.java | 15 ---------------
2 files changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f7be98e/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 8c40149..073805b 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
@@ -277,16 +277,9 @@ public class JettyHTTPServerEngine
protected void checkRegistedContext(URL url) {
String path = url.getPath();
for (String registedPath : registedPaths) {
- if (path.equals(registedPath)) {
- //|| HttpUrlUtil.checkContextPath(registedPath, path)) {
- // Throw the address is already used exception
+ if (path.equals(registedPath)) {
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/7f7be98e/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 5132379..94aa022 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,21 +199,6 @@ 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");
- } catch (Exception ex) {
- assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello/test/test") > 0);
- }
-
- try {
- engine.addServant(new URL("http://localhost:" + PORT1 + "/hello"), handler2);
- fail("We don't support to publish the two service at the same context path");
- } catch (Exception ex) {
- assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello") > 0);
- }
- */
engine.addServant(new URL(urlStr2), handler2);
[4/4] git commit: CXF-5610 clean up the code
Posted by ni...@apache.org.
CXF-5610 clean up the code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c20cb35
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c20cb35
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c20cb35
Branch: refs/heads/2.6.x-fixes
Commit: 9c20cb35a81d773ad40e48a33885e081462fb34d
Parents: 44ce31d
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 4 15:20:45 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 4 15:54:55 2014 +0800
----------------------------------------------------------------------
.../transport/http_jetty/JettyHTTPServerEngine.java | 9 +--------
.../http_jetty/JettyHTTPServerEngineTest.java | 15 ---------------
2 files changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9c20cb35/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 071c1b2..003024a 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
@@ -278,16 +278,9 @@ public class JettyHTTPServerEngine
protected void checkRegistedContext(URL url) {
String path = url.getPath();
for (String registedPath : registedPaths) {
- if (path.equals(registedPath)) {
- //|| HttpUrlUtil.checkContextPath(registedPath, path)) {
- // Throw the address is already used exception
+ if (path.equals(registedPath)) {
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/9c20cb35/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 4fbf1aa..2876a36 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,21 +199,6 @@ 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");
- } catch (Exception ex) {
- assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello/test/test") > 0);
- }
-
- try {
- engine.addServant(new URL("http://localhost:" + PORT1 + "/hello"), handler2);
- fail("We don't support to publish the two service at the same context path");
- } catch (Exception ex) {
- assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello") > 0);
- }
- */
engine.addServant(new URL(urlStr2), handler2);
[2/4] git commit: CXF-5616 clean up the code
Posted by ni...@apache.org.
CXF-5616 clean up the code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c5421983
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5421983
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5421983
Branch: refs/heads/master
Commit: c5421983e06778b38dfdcca0dbe27c08060197b6
Parents: 1ef40fc
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Apr 4 15:52:25 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Apr 4 15:52:25 2014 +0800
----------------------------------------------------------------------
.../http/netty/server/NettyHttpServerEngine.java | 7 +------
.../http/netty/server/NettyHttpServerEngineTest.java | 14 --------------
2 files changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c5421983/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
index 17fa9da..ee77148 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
@@ -34,7 +34,6 @@ import org.apache.cxf.common.logging.LogUtils;
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 io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelOption;
@@ -184,14 +183,10 @@ public class NettyHttpServerEngine implements ServerEngine {
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)) {
// 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/c5421983/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
index aba3908..1c82680 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
@@ -98,20 +98,6 @@ public class NettyHttpServerEngineTest extends Assert {
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");
- } catch (Exception ex) {
- assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello/test/test") > 0);
- }
-
- try {
- engine.addServant(new URL("http://localhost:" + PORT1 + "/hello"), handler2);
- fail("We don't support to publish the two service at the same context path");
- } catch (Exception ex) {
- assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello") > 0);
- }
-
engine.addServant(new URL(urlStr2), handler2);
engine.removeServant(new URL(urlStr));