Repository: cxf Updated Branches: refs/heads/master 0b0ea5039 -> fada97326
CXF-7085: Introduce support for Server Sent Events (Client). Restructured SSE test cases to have separate modules for Tomcat and Jetty Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fada9732 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fada9732 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fada9732 Branch: refs/heads/master Commit: fada97326c967a947f1940237319902c1406eb78 Parents: 0b0ea50 Author: reta <[email protected]> Authored: Sat Jun 24 21:08:03 2017 -0400 Committer: reta <[email protected]> Committed: Sat Jun 24 21:08:03 2017 -0400 ---------------------------------------------------------------------- .../cxf/systest/jaxrs/sse/AbstractSseTest.java | 4 +-- .../main/resources/jaxrs_sse/WEB-INF/web.xml | 28 -------------------- .../test/resources/jaxrs_sse/WEB-INF/web.xml | 28 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/fada9732/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java index 053bcb7..db4cf78 100644 --- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java +++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java @@ -52,7 +52,7 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest { eventSource.register(collect(books), System.out::println); eventSource.open(); // Give the SSE stream some time to collect all events - awaitEvents(3000, books, 4); + awaitEvents(5000, books, 4); } // Easing the test verification here, it does not work well for Atm + Jetty @@ -75,7 +75,7 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest { eventSource.register(collect(books), System.out::println); eventSource.open(); // Give the SSE stream some time to collect all events - awaitEvents(3000, books, 4); + awaitEvents(5000, books, 4); } assertThat(books, http://git-wip-us.apache.org/repos/asf/cxf/blob/fada9732/systests/rs-sse/rs-sse-base/src/main/resources/jaxrs_sse/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/systests/rs-sse/rs-sse-base/src/main/resources/jaxrs_sse/WEB-INF/web.xml b/systests/rs-sse/rs-sse-base/src/main/resources/jaxrs_sse/WEB-INF/web.xml deleted file mode 100644 index 64746acb..0000000 --- a/systests/rs-sse/rs-sse-base/src/main/resources/jaxrs_sse/WEB-INF/web.xml +++ /dev/null @@ -1,28 +0,0 @@ -<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - - <servlet> - <servlet-name>CXFServlet</servlet-name> - <display-name>CXF Servlet</display-name> - <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class> - <load-on-startup>1</load-on-startup> - <async-supported>true</async-supported> - <init-param> - <param-name>transportId</param-name> - <param-value>http://cxf.apache.org/transports/http/sse</param-value> - </init-param> - <init-param> - <param-name>javax.ws.rs.Application</param-name> - <param-value>org.apache.cxf.systest.jaxrs.sse.SseApplication</param-value> - </init-param> - <init-param> - <param-name>jaxrs.scope</param-name> - <param-value>singleton</param-value> - </init-param> - </servlet> - - <servlet-mapping> - <servlet-name>CXFServlet</servlet-name> - <url-pattern>/rest/*</url-pattern> - </servlet-mapping> -</web-app> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/fada9732/systests/rs-sse/rs-sse-jetty/src/test/resources/jaxrs_sse/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/systests/rs-sse/rs-sse-jetty/src/test/resources/jaxrs_sse/WEB-INF/web.xml b/systests/rs-sse/rs-sse-jetty/src/test/resources/jaxrs_sse/WEB-INF/web.xml new file mode 100644 index 0000000..64746acb --- /dev/null +++ b/systests/rs-sse/rs-sse-jetty/src/test/resources/jaxrs_sse/WEB-INF/web.xml @@ -0,0 +1,28 @@ +<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + + <servlet> + <servlet-name>CXFServlet</servlet-name> + <display-name>CXF Servlet</display-name> + <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class> + <load-on-startup>1</load-on-startup> + <async-supported>true</async-supported> + <init-param> + <param-name>transportId</param-name> + <param-value>http://cxf.apache.org/transports/http/sse</param-value> + </init-param> + <init-param> + <param-name>javax.ws.rs.Application</param-name> + <param-value>org.apache.cxf.systest.jaxrs.sse.SseApplication</param-value> + </init-param> + <init-param> + <param-name>jaxrs.scope</param-name> + <param-value>singleton</param-value> + </init-param> + </servlet> + + <servlet-mapping> + <servlet-name>CXFServlet</servlet-name> + <url-pattern>/rest/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file
