Merge pull request #311 from alexsm82/master

arun-gupta · arun-gupta · commit a63598d3b56e · 2015-06-23T22:43:20.000-04:00
Clean up websocket hard coded ports and servlet URLs
diff --git a/pom.xml b/pom.xml
@@ -776,8 +776,32 @@
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-wlp-managed-8.5</artifactId>
                     <version>1.0.0.Beta2</version>
+                </dependency>		
+				<dependency>
+                    <groupId>org.glassfish.tyrus</groupId>
+                    <artifactId>tyrus-client</artifactId>
+                    <version>1.3</version>
+                    <scope>test</scope>
+                </dependency>		
+				<dependency>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>javax.json</artifactId>
+                    <version>1.0.4</version>
+                    <scope>test</scope>
+                </dependency>			
+                <dependency>
+                    <groupId>org.glassfish.tyrus</groupId>
+                    <artifactId>tyrus-container-grizzly-client</artifactId>
+                    <version>1.3</version>
+                    <scope>test</scope>
                 </dependency>
-            </dependencies>
+                <dependency>
+                    <groupId>org.glassfish.jersey.core</groupId>
+                    <artifactId>jersey-client</artifactId>
+                    <version>2.4</version>
+                    <scope>test</scope>
+                </dependency>
+			</dependencies>
             
              <build>
                 <plugins>
diff --git a/servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java b/servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java
@@ -46,13 +46,13 @@ public void setup() {
 
     @Test
     public void testGet() throws IOException, SAXException {
-        TextPage page = webClient.getPage(base + "/TestServlet");
+        TextPage page = webClient.getPage(base + "TestServlet");
         assertEquals("my GET", page.getContent());
     }
 
     @Test
     public void testPost() throws IOException, SAXException {
-        WebRequest request = new WebRequest(new URL(base + "/TestServlet"), HttpMethod.POST);
+        WebRequest request = new WebRequest(new URL(base + "TestServlet"), HttpMethod.POST);
         TextPage page = webClient.getPage(request);
         assertEquals("my POST", page.getContent());
     }
diff --git a/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java b/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java
@@ -44,13 +44,13 @@ public void setup() {
 
     @Test
     public void testGet() throws IOException, SAXException {
-        TextPage page = webClient.getPage(base + "/SimpleServlet");
+        TextPage page = webClient.getPage(base + "SimpleServlet");
         assertEquals("my GET", page.getContent());
     }
 
     @Test
     public void testPost() throws IOException, SAXException {
-        WebRequest request = new WebRequest(new URL(base + "/SimpleServlet"), HttpMethod.POST);
+        WebRequest request = new WebRequest(new URL(base + "SimpleServlet"), HttpMethod.POST);
         TextPage page = webClient.getPage(request);
         assertEquals("my POST", page.getContent());
     }
diff --git a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/TestClient.java b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/TestClient.java
@@ -42,7 +42,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
 
             WebSocketContainer container = ContainerProvider.getWebSocketContainer();
-            String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
+            String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
             out.println("Connecting to " + uri);
             container.connectToServer(MyClient.class, URI.create(uri));
             out.println("<br><br>Look in server.log for log messages from message exchange between client/server.");
diff --git a/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/TestClient.java b/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/TestClient.java
@@ -43,7 +43,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
 
             WebSocketContainer container = ContainerProvider.getWebSocketContainer();
-            String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
+            String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
             out.println("Connecting to " + uri);
             container.connectToServer(MyClient.class,
                 ClientEndpointConfig.Builder.create().configurator(new MyConfigurator()).build(),
diff --git a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/TestClient.java b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/TestClient.java
@@ -54,7 +54,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             decoders.add(MyMessageDecoder.class);
 
             WebSocketContainer container = ContainerProvider.getWebSocketContainer();
-            String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
+            String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
             out.println("Connecting to " + uri);
             container.connectToServer(MyClient.class,
                 ClientEndpointConfig.Builder.create()
diff --git a/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/TestClient.java b/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/TestClient.java
@@ -43,7 +43,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
 
             WebSocketContainer container = ContainerProvider.getWebSocketContainer();
-            String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
+            String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
             out.println("Connecting to " + uri);
             container.connectToServer(MyClient.class,
                 null,
diff --git a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestLocalClient.java b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestLocalClient.java
@@ -42,7 +42,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
 
             WebSocketContainer container = ContainerProvider.getWebSocketContainer();
-            String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
+            String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
             out.println("Connecting to " + uri);
             container.connectToServer(MyClient.class, URI.create(uri));
             out.println("<br><br>Look in server.log for log messages from message exchange between client/server.");

Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,13 @@ public void setup() {`
`46`	`46`
`47`	`47`	`@Test`
`48`	`48`	`public void testGet() throws IOException, SAXException {`
`49`		`- TextPage page = webClient.getPage(base + "/TestServlet");`
	`49`	`+ TextPage page = webClient.getPage(base + "TestServlet");`
`50`	`50`	`assertEquals("my GET", page.getContent());`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Test`
`54`	`54`	`public void testPost() throws IOException, SAXException {`
`55`		`- WebRequest request = new WebRequest(new URL(base + "/TestServlet"), HttpMethod.POST);`
	`55`	`+ WebRequest request = new WebRequest(new URL(base + "TestServlet"), HttpMethod.POST);`
`56`	`56`	`TextPage page = webClient.getPage(request);`
`57`	`57`	`assertEquals("my POST", page.getContent());`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ public void setup() {`
`44`	`44`
`45`	`45`	`@Test`
`46`	`46`	`public void testGet() throws IOException, SAXException {`
`47`		`- TextPage page = webClient.getPage(base + "/SimpleServlet");`
	`47`	`+ TextPage page = webClient.getPage(base + "SimpleServlet");`
`48`	`48`	`assertEquals("my GET", page.getContent());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Test`
`52`	`52`	`public void testPost() throws IOException, SAXException {`
`53`		`- WebRequest request = new WebRequest(new URL(base + "/SimpleServlet"), HttpMethod.POST);`
	`53`	`+ WebRequest request = new WebRequest(new URL(base + "SimpleServlet"), HttpMethod.POST);`
`54`	`54`	`TextPage page = webClient.getPage(request);`
`55`	`55`	`assertEquals("my POST", page.getContent());`
`56`	`56`	`}`