8000 Merge pull request #311 from alexsm82/master · coder1650/javaee7-samples@a63598d · GitHub
[go: up one dir, main page]
Skip to content

Commit a63598d

Browse files
arun-guptaarun-gupta
committed
Merge pull request javaee-samples#311 from alexsm82/master
Clean up websocket hard coded ports and servlet URLs
2 parents 6d194bc + 4ec30e2 commit a63598d

File tree

8 files changed

+34
-10
lines changed
  • pom.xml
  • servlet
  • websocket
    • websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration
    • websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration
    • websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders
    • websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic
    • websocket-client/src/main/java/org/javaee7/websocket/client

8 files changed

+34
-10
lines changed

‎pom.xml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,32 @@
776776
<groupId>org.jboss.arquillian.container</groupId>
777777
<artifactId>arquillian-wlp-managed-8.5</artifactId>
778778
<version>1.0.0.Beta2</version>
779+
</dependency>
780+
<dependency>
781+
<groupId>org.glassfish.tyrus</groupId>
782+
<artifactId>tyrus-client</artifactId>
783+
<version>1.3</version>
784+
<scope>test</scope>
785+
</dependency>
786+
<dependency>
787+
<groupId>org.glassfish</groupId>
788+
<artifactId>javax.json</artifactId>
789+
<version>1.0.4</version>
790+
<scope>test</scope>
791+
</dependency>
792+
<dependency>
793+
<groupId>org.glassfish.tyrus</groupId>
794+
<artifactId>tyrus-container-grizzly-client</artifactId>
795+
<version>1.3</version>
796+
<scope>test</scope>
779797
</dependency>
780-
</dependencies>
798+
<dependency>
799+
<groupId>org.glassfish.jersey.core</groupId>
800+
<artifactId>jersey-client</artifactId>
801+
<version>2.4</version>
802+
<scope>test</scope>
803+
</dependency>
804+
</dependencies>
781805

782806
<build>
783807
<plugins>

‎servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ public void setup() {
4646

4747
@Test
4848
public void testGet() throws IOException, SAXException {
49-
TextPage page = webClient.getPage(base + "/TestServlet");
49+
TextPage page = webClient.getPage(base + "TestServlet");
5050
assertEquals("my GET", page.getContent());
5151
}
5252

5353
@Test
5454
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);
5656
TextPage page = webClient.getPage(request);
5757
assertEquals("my POST", page.getContent());
5858
}

‎servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ public void setup() {
4444

4545
@Test
4646
public void testGet() throws IOException, SAXException {
47-
TextPage page = webClient.getPage(base + "/SimpleServlet");
47+
TextPage page = webClient.getPage(base + "SimpleServlet");
4848
assertEquals("my GET", page.getContent());
4949
}
5050

5151
@Test
5252
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);
5454
TextPage page = webClient.getPage(request);
5555
assertEquals("my POST", page.getContent());
5656
}

‎websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/TestClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
4242
out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
4343

4444
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
45-
String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
45+
String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
4646
out.println("Connecting to " + uri);
4747
container.connectToServer(MyClient.class, URI.create(uri));
4848
out.println("<br><br>Look in server.log for log messages from message exchange between client/server.");

‎websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/TestClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
4343
out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
4444

4545
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
46-
String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
46+
String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
4747
out.println("Connecting to " + uri);
4848
container.connectToServer(MyClient.class,
4949
ClientEndpointConfig.Builder.create().configurator(new MyConfigurator()).build(),

‎websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/TestClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
5454
decoders.add(MyMessageDecoder.class);
5555

5656
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
57-
String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
57+
String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
5858
out.println("Connecting to " + uri);
5959
container.connectToServer(MyClient.class,
6060
ClientEndpointConfig.Builder.create()

‎websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/TestClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
4343 17A7
out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
4444

4545
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
46-
String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
46+
String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
4747
out.println("Connecting to " + uri);
4848
container.connectToServer(MyClient.class,
4949
null,

‎websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestLocalClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
4242
out.println("<h1>Servlet TestServlet at " + request.getContextPath() + "</h1>");
4343

4444
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
45-
String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket";
45+
String uri = "ws://localhost:" + request.getLocalPort() + request.getContextPath() + "/websocket";
4646
out.println("Connecting to " + uri);
4747
container.connectToServer(MyClient.class, URI.create(uri));
4848
out.println("<br><br>Look in server.log for log messages from message exchange between client/server.");

0 commit comments

Comments
 (0)
0