cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] cxf git commit: CXF-7085: Introduce support for Server Sent Events (Client). Restructured SSE test cases to have separate modules for Tomcat and Jetty
Date Sat, 24 Jun 2017 17:13:26 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 12577809d -> 76877054e


http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
deleted file mode 100644
index a47c0c3..0000000
--- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/AbstractJettyServer.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.sse.jetty;
-
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
-import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
-import org.apache.cxf.systest.jaxrs.sse.BookStore;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.apache.cxf.transport.sse.SseHttpTransportFactory;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.DefaultHandler;
-import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-public abstract class AbstractJettyServer extends AbstractBusTestServerBase {
-
-    private org.eclipse.jetty.server.Server server;
-    private final String resourcePath;
-    private final String contextPath;
-    private final int port;
-
-    protected AbstractJettyServer(final String contextPath, int portNumber) {
-        this(null, contextPath, portNumber);
-    }
-
-    protected AbstractJettyServer(final String resourcePath, final String contextPath, int
portNumber) {
-        this.resourcePath = resourcePath;
-        this.contextPath = contextPath;
-        this.port = portNumber;
-    }
-
-    protected void run() {
-        server = new Server(port);
-
-        try {
-            if (resourcePath == null) {
-                // Register and map the dispatcher servlet
-                final ServletHolder holder = new ServletHolder(new CXFNonSpringJaxrsServlet());
-                holder.setInitParameter(CXFNonSpringJaxrsServlet.TRANSPORT_ID, SseHttpTransportFactory.TRANSPORT_ID);
-                holder.setInitParameter("jaxrs.serviceClasses", BookStore.class.getName());
-                holder.setInitParameter("jaxrs.providers", JacksonJsonProvider.class.getName());
-                final ServletContextHandler context = new ServletContextHandler();
-                context.setContextPath(contextPath);
-                context.addServlet(holder, "/rest/*");
-                server.setHandler(context);
-            } else {
-                final WebAppContext context = new WebAppContext();
-                context.setContextPath(contextPath);
-                context.setWar(getClass().getResource(resourcePath).toURI().getPath());
-
-                HandlerCollection handlers = new HandlerCollection();
-                handlers.setHandlers(new Handler[] {context, new DefaultHandler()});
-                server.setHandler(handlers);
-            }
-
-            configureServer(server);
-            server.start();
-        } catch (final Exception ex) {
-            ex.printStackTrace();
-            fail(ex.getMessage());
-        }
-    }
-
-    protected void configureServer(org.eclipse.jetty.server.Server theserver) throws Exception
{
-
-    }
-
-    public void tearDown() throws Exception {
-        super.tearDown();
-
-        if (server != null) {
-            server.stop();
-            server.destroy();
-            server = null;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyBroadcasterTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyBroadcasterTest.java
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyBroadcasterTest.java
deleted file mode 100644
index 44c4a31..0000000
--- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyBroadcasterTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.sse.jetty;
-
-import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systest.jaxrs.sse.AbstractBroadcasterSseTest;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-
-public class JettyBroadcasterTest extends AbstractBroadcasterSseTest {
-    @Ignore
-    public static class EmbeddedJettyServer extends AbstractJettyServer {
-        public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
-
-        public EmbeddedJettyServer() {
-            super("/", PORT);
-        }
-    }
-
-    @BeforeClass
-    public static void startServers() throws Exception {
-        AbstractResourceInfo.clearAllMaps();
-        //keep out of process due to stack traces testing failures
-        assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class,
true));
-        createStaticBus();
-    }
-
-    @Override
-    protected int getPort() {
-        return EmbeddedJettyServer.PORT;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java
deleted file mode 100644
index cafdeec..0000000
--- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyEmbeddedTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.sse.jetty;
-
-import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-
-public class JettyEmbeddedTest extends AbstractSseTest {
-    @Ignore
-    public static class EmbeddedJettyServer extends AbstractJettyServer {
-        public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
-
-        public EmbeddedJettyServer() {
-            super("/", PORT);
-        }
-    }
-
-    @BeforeClass
-    public static void startServers() throws Exception {
-        AbstractResourceInfo.clearAllMaps();
-        //keep out of process due to stack traces testing failures
-        assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class,
true));
-        createStaticBus();
-    }
-
-    @Override
-    protected int getPort() {
-        return EmbeddedJettyServer.PORT;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
deleted file mode 100644
index 10f435b..0000000
--- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.sse.jetty;
-
-import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-
-public class JettyWarTest extends AbstractSseTest {
-    @Ignore
-    public static class EmbeddedJettyServer extends AbstractJettyServer {
-        public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
-
-        public EmbeddedJettyServer() {
-            super("/jaxrs_sse", "/", PORT);
-        }
-    }
-
-    @BeforeClass
-    public static void startServers() throws Exception {
-        AbstractResourceInfo.clearAllMaps();
-        assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class,
true));
-        createStaticBus();
-    }
-
-    @Override
-    protected int getPort() {
-        return EmbeddedJettyServer.PORT;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
deleted file mode 100644
index ded2a64..0000000
--- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/AbstractTomcatServer.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.sse.tomcat;
-
-import java.io.File;
-import java.io.IOException;
-
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.Wrapper;
-import org.apache.catalina.startup.Tomcat;
-import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
-import org.apache.cxf.systest.jaxrs.sse.BookStore;
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.apache.cxf.transport.sse.SseHttpTransportFactory;
-
-public abstract class AbstractTomcatServer extends AbstractBusTestServerBase {
-
-    private Tomcat server;
-    private final String resourcePath;
-    private final String contextPath;
-    private final int port;
-
-    protected AbstractTomcatServer(final String contextPath, int portNumber) {
-        this(null, contextPath, portNumber);
-    }
-
-    protected AbstractTomcatServer(final String resourcePath, final String contextPath, int
portNumber) {
-        this.resourcePath = resourcePath;
-        this.contextPath = contextPath;
-        this.port = portNumber;
-    }
-
-    protected void run() {
-        server = new Tomcat();
-        server.setPort(port);
-
-        try {
-            final File base = createTemporaryDirectory();
-            server.setBaseDir(base.getAbsolutePath());
-
-            if (resourcePath == null) {
-                final Context context = server.addContext("/", base.getAbsolutePath());
-                final Wrapper cxfServlet = Tomcat.addServlet(context, "cxfServlet", new CXFNonSpringJaxrsServlet());
-                cxfServlet.addInitParameter(CXFNonSpringJaxrsServlet.TRANSPORT_ID,
-                    SseHttpTransportFactory.TRANSPORT_ID);
-                cxfServlet.addInitParameter("jaxrs.serviceClasses", BookStore.class.getName());
-                cxfServlet.addInitParameter("jaxrs.providers", JacksonJsonProvider.class.getName());
-                cxfServlet.setAsyncSupported(true);
-                context.addServletMapping("/rest/*", "cxfServlet");
-            } else {
-                server.getHost().setAppBase(base.getAbsolutePath());
-                server.getHost().setAutoDeploy(true);
-                server.getHost().setDeployOnStartup(true);
-                server.addWebapp(contextPath, getClass().getResource(resourcePath).toURI().getPath().toString());
-            }
-
-            server.start();
-        } catch (final Exception ex) {
-            ex.printStackTrace();
-            fail(ex.getMessage());
-        }
-    }
-
-    protected void configureServer(org.eclipse.jetty.server.Server theserver) throws Exception
{
-
-    }
-
-    private static File createTemporaryDirectory() throws IOException {
-        final File base = File.createTempFile("tmp-", "");
-
-        if (!base.delete()) {
-            throw new IOException("Cannot (re)create base folder: " + base.getAbsolutePath());
-        }
-
-        if (!base.mkdir()) {
-            throw new IOException("Cannot create base folder: " + base.getAbsolutePath());
-        }
-
-        base.deleteOnExit();
-        return base;
-    }
-
-    public void tearDown() throws Exception {
-        super.tearDown();
-
-        if (server != null) {
-            server.stop();
-            server.destroy();
-            server = null;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatBroadcasterTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatBroadcasterTest.java
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatBroadcasterTest.java
deleted file mode 100644
index 1b88067..0000000
--- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatBroadcasterTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.sse.tomcat;
-
-import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systest.jaxrs.sse.AbstractBroadcasterSseTest;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Ignore;
-import org.junit.runners.MethodSorters;
-
-@FixMethodOrder(MethodSorters.JVM)
-public class TomcatBroadcasterTest extends AbstractBroadcasterSseTest {
-    @Ignore
-    public static class EmbeddedTomcatServer extends AbstractTomcatServer {
-        public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class);
-
-        public EmbeddedTomcatServer() {
-            super("/", PORT);
-        }
-    }
-
-    @BeforeClass
-    public static void startServers() throws Exception {
-        AbstractResourceInfo.clearAllMaps();
-        assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatServer.class,
true));
-        createStaticBus();
-    }
-
-    @Override
-    protected int getPort() {
-        return EmbeddedTomcatServer.PORT;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java
deleted file mode 100644
index b96cc28..0000000
--- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatEmbeddedTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.sse.tomcat;
-
-import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-
-public class TomcatEmbeddedTest extends AbstractSseTest {
-    @Ignore
-    public static class EmbeddedTomcatServer extends AbstractTomcatServer {
-        public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class);
-
-        public EmbeddedTomcatServer() {
-            super("/", PORT);
-        }
-    }
-
-    @BeforeClass
-    public static void startServers() throws Exception {
-        AbstractResourceInfo.clearAllMaps();
-        assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatServer.class,
true));
-        createStaticBus();
-    }
-
-    @Override
-    protected int getPort() {
-        return EmbeddedTomcatServer.PORT;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
b/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
deleted file mode 100644
index 102c1d1..0000000
--- a/systests/rs-sse/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.systest.jaxrs.sse.tomcat;
-
-import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systest.jaxrs.sse.AbstractSseTest;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-
-public class TomcatWarTest extends AbstractSseTest {
-    @Ignore
-    public static class EmbeddedTomcatServer extends AbstractTomcatServer {
-        public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class);
-
-        public EmbeddedTomcatServer() {
-            super("/jaxrs_sse", "/", PORT);
-        }
-    }
-
-    @BeforeClass
-    public static void startServers() throws Exception {
-        AbstractResourceInfo.clearAllMaps();
-        assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatServer.class,
true));
-        createStaticBus();
-    }
-
-    @Override
-    protected int getPort() {
-        return EmbeddedTomcatServer.PORT;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/resources/META-INF/cxf/org.apache.cxf.Logger
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/resources/META-INF/cxf/org.apache.cxf.Logger b/systests/rs-sse/src/test/resources/META-INF/cxf/org.apache.cxf.Logger
deleted file mode 100644
index 27dd788..0000000
--- a/systests/rs-sse/src/test/resources/META-INF/cxf/org.apache.cxf.Logger
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.cxf.common.logging.Slf4jLogger
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf/blob/76877054/systests/rs-sse/src/test/resources/jaxrs_sse/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/resources/jaxrs_sse/WEB-INF/web.xml b/systests/rs-sse/src/test/resources/jaxrs_sse/WEB-INF/web.xml
deleted file mode 100644
index 64746acb..0000000
--- a/systests/rs-sse/src/test/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/76877054/systests/rs-sse/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/systests/rs-sse/src/test/resources/logback.xml b/systests/rs-sse/src/test/resources/logback.xml
deleted file mode 100644
index 430aa64..0000000
--- a/systests/rs-sse/src/test/resources/logback.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="5 seconds">
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>[%level] %d{yyyy-MM-dd HH:mm:ss.SSS} %logger{36} - [%X] %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<root level="INFO">
-		<appender-ref ref="STDOUT" />
-	</root>
-</configuration>


Mime
View raw message