diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml index 54bfeeb6b3c..c0b74ebf613 100644 --- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml +++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml @@ -1,6 +1,7 @@ - - - 4.0.0 - - org.glassfish.tests.embedded - maven-plugin - 7.0.9-SNAPSHOT - - org.glassfish - scattered - pom - - Maven deploy test - - - - - org.glassfish.embedded - maven-embedded-glassfish-plugin - - src/main/web - - - - install - - runscatteredarchive - - - - - - - - - - org.apache.maven - maven-plugin-api - - - - diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/FilterTest.java b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/FilterTest.java deleted file mode 100755 index eec957ed9a7..00000000000 --- a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/FilterTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test; - -import jakarta.servlet.*; -import jakarta.servlet.http.*; -public class FilterTest implements Filter{ - - private ServletContext context; - - public void destroy() { - System.out.println("[Filter.destroy]"); - } - - public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException { - System.out.println("[Filter.doFilter]"); - - ((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS"); - filterChain.doFilter(request, response); - - } - - - public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException { - System.out.println("[Filter.init]"); - context = filterConfig.getServletContext(); - } - -} diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest.java deleted file mode 100644 index daa80533003..00000000000 --- a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test; - -import java.io.*; -import java.net.*; -import java.util.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; -import org.xml.sax.InputSource; -import org.w3c.dom.Element; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.SAXException; - -// jaxp 1.0.1 imports -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.DocumentBuilder; - -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; - -import javax.naming.*; -import javax.sql.*; -import java.sql.*; - -public class ServletTest extends HttpServlet implements HttpSessionListener { - - private ServletContext context; - - public void init(ServletConfig config) throws ServletException { - super.init(config); - System.out.println("[Servlet.init]"); - context = config.getServletContext(); - System.out.println("[Servlet.init] " + context.getMajorVersion()); - - } - - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("[Servlet.doGet]"); - doPost(request, response); - } - - public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("[Servlet.doPost]"); - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - - request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER")); - request.getSession().setAttribute("FILTER", "FAIL"); - - RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2"); - rd.forward(request, response); - } - - public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) { - System.out.println("[Servlet.sessionCreated]"); - } - - public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) { - System.out.println("[Servlet.sessionDestroyed]"); - System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test")); - } -} - - - diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest2.java b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest2.java deleted file mode 100755 index 00775a60df3..00000000000 --- a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest2.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test; - -import java.io.*; -import java.net.*; -import java.util.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; - -public class ServletTest2 extends HttpServlet implements HttpSessionListener { - - private ServletContext context; - - public void init(ServletConfig config) throws ServletException { - super.init(config); - System.out.println("[Servlet2.init]"); - context = config.getServletContext(); - } - - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("[Servlet2.doGet]"); - doPost(request, response); - } - - public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("[Servlet2.doPost]"); - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - - request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER")); - request.getSession().setAttribute("FILTER", "FAIL"); - - RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3"); - rd.include(request, response); - } - - public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) { - System.out.println("[Servlet.sessionCreated]"); - } - - public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) { - System.out.println("[Servlet.sessionDestroyed]"); - System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test")); - } - -} - - diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest3.java b/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest3.java deleted file mode 100644 index e78fec2a752..00000000000 --- a/appserver/tests/embedded/maven-plugin/scattered/src/main/java/test/ServletTest3.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package test; - -import java.io.*; -import java.net.*; -import java.util.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; -import org.xml.sax.InputSource; -import org.w3c.dom.Element; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.SAXException; - -// jaxp 1.0.1 imports -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.DocumentBuilder; - -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; - -import javax.naming.*; -import javax.sql.*; -import java.sql.*; - -public class ServletTest3 extends HttpServlet{ - - private ServletContext context; - - public void init(ServletConfig config) throws ServletException { - super.init(config); - System.out.println("[Servlet3.init]"); - context = config.getServletContext(); - } - - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("[Servlet3.doGet]"); - doPost(request, response); - } - - public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("[Servlet3.doPost]"); - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - - out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST")); - out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD")); - out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER")); - } - -} - - - diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/sun-web.xml b/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/sun-web.xml deleted file mode 100644 index fd6410d5916..00000000000 --- a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/sun-web.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - -tomcat-test - - - tomcat - tomcat - tomcat - - - - diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/web.xml b/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 1f84ceeee85..00000000000 --- a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - FilterTest - test.FilterTest - - - - FilterTest - /* - REQUEST - INCLUDE - FORWARD - ERROR - - - - ServletTest - ServletTest - test.ServletTest - - - ServletTest2 - ServletTest2 - test.ServletTest2 - - - ServletTest3 - ServletTest3 - test.ServletTest3 - - - - ServletTest - /ServletTest - - - ServletTest2 - /ServletTest2 - - - ServletTest3 - /ServletTest3 - - - - 10 - - - - diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/index.html b/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/index.html deleted file mode 100755 index ab4b311ccbd..00000000000 --- a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/index.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -Hello World! - diff --git a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/index.jsp b/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/index.jsp deleted file mode 100644 index c52acd1b754..00000000000 --- a/appserver/tests/embedded/maven-plugin/scattered/src/main/webapp/index.jsp +++ /dev/null @@ -1,24 +0,0 @@ -<%-- - - Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved. - - This program and the accompanying materials are made available under the - terms of the Eclipse Public License v. 2.0, which is available at - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---%> - - - - -

<% out.print("Hello World!"); %>

- - diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml index be8fb7390d8..09db02be2ab 100644 --- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml +++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml @@ -38,7 +38,7 @@ start - integration-test + pre-integration-test start deploy diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java index daa80533003..6048780f13d 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest.java @@ -17,31 +17,8 @@ package test; import java.io.*; -import java.net.*; -import java.util.*; import jakarta.servlet.*; import jakarta.servlet.http.*; -import org.xml.sax.InputSource; -import org.w3c.dom.Element; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.SAXException; - -// jaxp 1.0.1 imports -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.DocumentBuilder; - -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; - -import javax.naming.*; -import javax.sql.*; -import java.sql.*; public class ServletTest extends HttpServlet implements HttpSessionListener { diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java index e78fec2a752..586f7af0a61 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java +++ b/appserver/tests/embedded/maven-plugin/standalonewar/src/main/java/test/ServletTest3.java @@ -17,31 +17,8 @@ package test; import java.io.*; -import java.net.*; -import java.util.*; import jakarta.servlet.*; import jakarta.servlet.http.*; -import org.xml.sax.InputSource; -import org.w3c.dom.Element; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import org.w3c.dom.Node; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.SAXException; - -// jaxp 1.0.1 imports -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.DocumentBuilder; - -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; - -import javax.naming.*; -import javax.sql.*; -import java.sql.*; public class ServletTest3 extends HttpServlet{ diff --git a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml index 1aa471903ce..3e8eeacffd7 100644 --- a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml @@ -30,31 +30,43 @@ pom Bootstrap all tests to use glassfish-static-shell-jar - - - - org.glassfish.embedded - maven-embedded-glassfish-plugin - - - org.glassfish.main.extras - glassfish-embedded-static-shell - system - ${project.version} - ${env.S1AS_HOME}/lib/embedded/glassfish-embedded-static-shell.jar - - - - - - start - stop - - - - - - + + + run-with-shell-jar + + + build + static-shell + + + + + + + org.glassfish.embedded + maven-embedded-glassfish-plugin + + + org.glassfish.main.extras + glassfish-embedded-static-shell + system + ${project.version} + ${env.S1AS_HOME}/lib/embedded/glassfish-embedded-static-shell.jar + + + + + + start + stop + + + + + + + + diff --git a/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/ChatApplication.java b/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/ChatApplication.java index 3f3f92ef77d..bde190119ad 100644 --- a/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/ChatApplication.java +++ b/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/ChatApplication.java @@ -11,17 +11,13 @@ package com.sun.grizzly.samples.websockets; import java.util.logging.Level; - -import org.glassfish.grizzly.Connection; -import org.glassfish.grizzly.http.HttpRequestPacket;; +import org.glassfish.grizzly.http.HttpRequestPacket; import org.glassfish.grizzly.websockets.DataFrame; -import org.glassfish.grizzly.websockets.NetworkHandler; +import org.glassfish.grizzly.websockets.ProtocolHandler; import org.glassfish.grizzly.websockets.WebSocket; import org.glassfish.grizzly.websockets.WebSocketApplication; import org.glassfish.grizzly.websockets.WebSocketListener; -import java.io.IOException; - public class ChatApplication extends WebSocketApplication { @Override public boolean isApplicationRequest(HttpRequestPacket request) { @@ -29,21 +25,25 @@ public boolean isApplicationRequest(HttpRequestPacket request) { } @Override - public WebSocket createSocket(final Connection connection, WebSocketListener... listeners) { - return new ChatWebSocket(listeners); + public WebSocket createSocket(ProtocolHandler handler, + HttpRequestPacket requestPacket, + WebSocketListener... listeners) { + final ChatWebSocket ws + = new ChatWebSocket(handler, requestPacket, listeners); + return ws; } - public void onMessage(WebSocket socket, DataFrame frame) throws IOException { - final String data = frame.getTextPayload(); + @Override + public void onMessage(WebSocket socket, String data) { if (data.startsWith("login:")) { - login((ChatWebSocket) socket, frame); + login((ChatWebSocket) socket, data); } else { broadcast(((ChatWebSocket) socket).getUser(), data); } } @Override - public void onClose(WebSocket websocket) { + public void onClose(WebSocket websocket, DataFrame frame) { broadcast("system", ((ChatWebSocket)websocket).getUser() + " left the chat"); } @@ -64,10 +64,10 @@ private void broadcast(String user, String text) { } - private void login(ChatWebSocket socket, DataFrame frame) throws IOException { + private void login(ChatWebSocket socket, String data) { if (socket.getUser() == null) { WebSocketsServlet.logger.info("ChatApplication.login"); - socket.setUser(frame.getTextPayload().split(":")[1].trim()); + socket.setUser(data.split(":")[1].trim()); broadcast(socket.getUser(), " has joined the chat."); } } diff --git a/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/ChatWebSocket.java b/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/ChatWebSocket.java index cf97a2d94e9..e9b220692ec 100644 --- a/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/ChatWebSocket.java +++ b/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/ChatWebSocket.java @@ -10,19 +10,19 @@ package com.sun.grizzly.samples.websockets; -import org.glassfish.grizzly.websockets.BaseWebSocket; -import org.glassfish.grizzly.websockets.NetworkHandler; -import org.glassfish.grizzly.websockets.WebSocketListener; +import org.glassfish.grizzly.websockets.DefaultWebSocket; import org.glassfish.grizzly.websockets.WebSocketException; import java.util.logging.Level; -import java.io.IOException; +import org.glassfish.grizzly.http.HttpRequestPacket; +import org.glassfish.grizzly.websockets.ProtocolHandler; +import org.glassfish.grizzly.websockets.WebSocketListener; -public class ChatWebSocket extends BaseWebSocket { +public class ChatWebSocket extends DefaultWebSocket { private volatile String user; - public ChatWebSocket(WebSocketListener... listeners) { - super(listeners); + public ChatWebSocket(ProtocolHandler protocolHandler, HttpRequestPacket request, WebSocketListener... listeners) { + super(protocolHandler, request, listeners); } public String getUser() { diff --git a/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/WebSocketsServlet.java b/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/WebSocketsServlet.java index 26434974573..794af5de02f 100755 --- a/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/WebSocketsServlet.java +++ b/appserver/tests/embedded/maven-plugin/websockets/src/main/java/com/sun/grizzly/samples/websockets/WebSocketsServlet.java @@ -18,7 +18,7 @@ import java.util.logging.Logger; public class WebSocketsServlet extends HttpServlet { - static final Logger logger = Logger.getLogger(WebSocketEngine.WEBSOCKET); + static final Logger logger = Logger.getLogger(WebSocketsServlet.class.getName()); private final ChatApplication app = new ChatApplication(); @Override public void init(ServletConfig config) throws ServletException { diff --git a/appserver/tests/embedded/maven-plugin/websockets/src/main/webapp/index.html b/appserver/tests/embedded/maven-plugin/websockets/src/main/webapp/index.html index 36adfc26661..7ce26c2131a 100755 --- a/appserver/tests/embedded/maven-plugin/websockets/src/main/webapp/index.html +++ b/appserver/tests/embedded/maven-plugin/websockets/src/main/webapp/index.html @@ -57,5 +57,8 @@

Glassfish Chat

+ diff --git a/appserver/tests/embedded/maven-plugin/websockets/src/main/webapp/javascripts/application.js b/appserver/tests/embedded/maven-plugin/websockets/src/main/webapp/javascripts/application.js index 9f1ea20848c..cdf46b6c780 100755 --- a/appserver/tests/embedded/maven-plugin/websockets/src/main/webapp/javascripts/application.js +++ b/appserver/tests/embedded/maven-plugin/websockets/src/main/webapp/javascripts/application.js @@ -21,6 +21,9 @@ var name = null; var url = 'ws://' + document.location.host + document.location.pathname + 'chat'; var app = { + + url: url, + initialize: function() { if ("WebSocket" in window) { $('login-name').focus(); diff --git a/appserver/tests/embedded/maven-plugin/websockets/src/test/java/org/glassfish/tests/standalonewar/WebTest.java b/appserver/tests/embedded/maven-plugin/websockets/src/test/java/org/glassfish/tests/standalonewar/WebTest.java index f7bd9adf06b..b0ac6c58ae5 100644 --- a/appserver/tests/embedded/maven-plugin/websockets/src/test/java/org/glassfish/tests/standalonewar/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/websockets/src/test/java/org/glassfish/tests/standalonewar/WebTest.java @@ -13,7 +13,6 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ - package org.glassfish.tests.standalonewar; import org.junit.Assert; @@ -21,14 +20,11 @@ import org.junit.Test; import java.io.BufferedReader; -import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; import java.net.URL; import java.net.URLConnection; +import org.hamcrest.CoreMatchers; public class WebTest { @@ -47,32 +43,27 @@ public void testWeb() throws Exception { } private static void goGet(String host, int port, - String result, String contextPath) throws Exception { - try { - URL servlet = new URL("http://localhost:8080/test"); - URLConnection yc = servlet.openConnection(); - BufferedReader in = new BufferedReader(new InputStreamReader( - yc.getInputStream())); - String line = null; - int index; - while ((line = in.readLine()) != null) { - index = line.indexOf(result); - if (index != -1) { - index = line.indexOf(":"); - String status = line.substring(index+1); + String result, String contextPath) throws Exception { + URL servlet = new URL("http://localhost:8080/test"); + URLConnection yc = servlet.openConnection(); + BufferedReader in = new BufferedReader(new InputStreamReader( + yc.getInputStream())); + String line = null; + int index; + while ((line = in.readLine()) != null) { + index = line.indexOf(result); + if (index != -1) { + index = line.indexOf(":"); + String status = line.substring(index + 1); - if (status.equalsIgnoreCase("PASS")){ - count++; - } else { - return; - } + if (status.equalsIgnoreCase("PASS")) { + count++; + } else { + break; } } - Assert.assertTrue(count==3); - } catch(Exception e) { - e.printStackTrace(); - throw e; } - } + Assert.assertThat(count, CoreMatchers.is(3)); + } } diff --git a/appserver/tests/embedded/pom.xml b/appserver/tests/embedded/pom.xml index 8dd79ac4ce6..58251228195 100755 --- a/appserver/tests/embedded/pom.xml +++ b/appserver/tests/embedded/pom.xml @@ -40,8 +40,8 @@ glassfish_resources_xml ejb scatteredarchive - + maven-plugin +