You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/02/27 17:41:56 UTC
git commit: [CXF-5339] Adding a unique path segment for
BookStorewebsocket
Repository: cxf
Updated Branches:
refs/heads/master e3d15f85f -> 249c25bdd
[CXF-5339] Adding a unique path segment for BookStorewebsocket
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/249c25bd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/249c25bd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/249c25bd
Branch: refs/heads/master
Commit: 249c25bddbe08ba346f67dcc34d65dd2598d5c72
Parents: e3d15f8
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Thu Feb 27 16:41:41 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Thu Feb 27 16:41:41 2014 +0000
----------------------------------------------------------------------
.../cxf/systest/jaxrs/websocket/BookStoreWebSocket.java | 2 +-
.../jaxrs/websocket/JAXRSClientServerWebSocketTest.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/249c25bd/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java
index 8a36e84..f3eb0fb 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/BookStoreWebSocket.java
@@ -34,7 +34,7 @@ import javax.ws.rs.core.StreamingOutput;
import org.apache.cxf.systest.jaxrs.Book;
-@Path("/bookstore")
+@Path("/web/bookstore")
public class BookStoreWebSocket {
@GET
http://git-wip-us.apache.org/repos/asf/cxf/blob/249c25bd/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
index b7b8884..9b3b69e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
@@ -44,13 +44,13 @@ public class JAXRSClientServerWebSocketTest extends AbstractBusClientServerTestB
@Test
public void testBookWithWebSocket() throws Exception {
- String address = "ws://localhost:" + PORT + "/bookstore";
+ String address = "ws://localhost:" + PORT + "/web/bookstore";
WebSocketTestClient wsclient = new WebSocketTestClient(address, 1);
wsclient.connect();
try {
// call the GET service
- wsclient.sendMessage("GET /bookstore/booknames".getBytes());
+ wsclient.sendMessage("GET /web/bookstore/booknames".getBytes());
assertTrue("one book must be returned", wsclient.await(3));
List<byte[]> received = wsclient.getReceivedBytes();
assertEquals(1, received.size());
@@ -59,7 +59,7 @@ public class JAXRSClientServerWebSocketTest extends AbstractBusClientServerTestB
// call another GET service
wsclient.reset(1);
- wsclient.sendMessage("GET /bookstore/books/123".getBytes());
+ wsclient.sendMessage("GET /web/bookstore/books/123".getBytes());
assertTrue("response expected", wsclient.await(3));
received = wsclient.getReceivedBytes();
value = new String(received.get(0));
@@ -67,12 +67,12 @@ public class JAXRSClientServerWebSocketTest extends AbstractBusClientServerTestB
// call the GET service using POST
wsclient.reset(1);
- wsclient.sendMessage("POST /bookstore/booknames\r\n\r\n123".getBytes());
+ wsclient.sendMessage("POST /web/bookstore/booknames\r\n\r\n123".getBytes());
assertFalse("wrong method, no response expected", wsclient.await(3));
// call the POST service
wsclient.reset(1);
- wsclient.sendMessage("POST /bookstore/booksplain\r\nContent-Type: text/plain\r\n\r\n123".getBytes());
+ wsclient.sendMessage("POST /web/bookstore/booksplain\r\nContent-Type: text/plain\r\n\r\n123".getBytes());
assertTrue("response expected", wsclient.await(3));
received = wsclient.getReceivedBytes();
value = new String(received.get(0));
@@ -80,7 +80,7 @@ public class JAXRSClientServerWebSocketTest extends AbstractBusClientServerTestB
// call the GET service returning a continous stream output
wsclient.reset(6);
- wsclient.sendMessage("GET /bookstore/bookbought".getBytes());
+ wsclient.sendMessage("GET /web/bookstore/bookbought".getBytes());
assertTrue("wrong method, no response expected", wsclient.await(5));
received = wsclient.getReceivedBytes();
assertEquals(6, received.size());