cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Fix some compile issues and an eclipse warning
Date Mon, 10 Mar 2014 18:29:11 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 79fb92a5c -> e5f565792


Fix some compile issues and an eclipse warning


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e5f56579
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e5f56579
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e5f56579

Branch: refs/heads/master
Commit: e5f565792bd61a67db272e2a7e355c3f97f34e87
Parents: 79fb92a
Author: Daniel Kulp <dkulp@apache.org>
Authored: Mon Mar 10 14:28:12 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon Mar 10 14:28:45 2014 -0400

----------------------------------------------------------------------
 .../org/apache/cxf/transport/servlet/CXFNonSpringServlet.java    | 4 ++--
 .../cxf/transport/websocket/jetty/CXFJettyWebSocketServlet.java  | 3 +--
 .../websocket/jetty/CXFNonSpringJettyWebSocketServlet.java       | 3 +--
 .../jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java    | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e5f56579/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
index 6fc8d9f..c224cd7 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
@@ -48,11 +48,11 @@ import org.apache.cxf.transport.http.HTTPTransportFactory;
 import org.apache.cxf.transport.servlet.servicelist.ServiceListGeneratorServlet;
 
 public class CXFNonSpringServlet extends AbstractHTTPServlet {
-
     private static final long serialVersionUID = -2437897227486327166L;
+   
+    protected Bus bus;
     private DestinationRegistry destinationRegistry;
     private boolean globalRegistry;
-    private Bus bus;
     private ServletController controller;
     private ClassLoader loader;
     private boolean loadBus = true;

http://git-wip-us.apache.org/repos/asf/cxf/blob/e5f56579/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFJettyWebSocketServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFJettyWebSocketServlet.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFJettyWebSocketServlet.java
index a3e68df..ed1bd0c 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFJettyWebSocketServlet.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFJettyWebSocketServlet.java
@@ -27,7 +27,6 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.DestinationFactoryManager;
@@ -80,7 +79,7 @@ public class CXFJettyWebSocketServlet extends CXFServlet
     }
     
     @Override
-    protected DestinationRegistry getDestinationRegistryFromBus(Bus bus) {
+    protected DestinationRegistry getDestinationRegistryFromBus() {
         DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
         try {
             DestinationFactory df = dfm

http://git-wip-us.apache.org/repos/asf/cxf/blob/e5f56579/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFNonSpringJettyWebSocketServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFNonSpringJettyWebSocketServlet.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFNonSpringJettyWebSocketServlet.java
index 74dce02..eaa404e 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFNonSpringJettyWebSocketServlet.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/CXFNonSpringJettyWebSocketServlet.java
@@ -27,7 +27,6 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.DestinationFactoryManager;
@@ -88,7 +87,7 @@ public class CXFNonSpringJettyWebSocketServlet extends CXFNonSpringServlet
     }
 
     @Override
-    protected DestinationRegistry getDestinationRegistryFromBus(Bus bus) {
+    protected DestinationRegistry getDestinationRegistryFromBus() {
         DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
         try {
             DestinationFactory df = dfm

http://git-wip-us.apache.org/repos/asf/cxf/blob/e5f56579/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java
index 56e6262..cd41fec 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringTest.java
@@ -32,7 +32,7 @@ public class JAXRSClientServerWebSocketSpringTest extends JAXRSClientServerWebSo
     @BeforeClass
     public static void startServers() throws Exception {
 
-        @SuppressWarnings("unused")
+        @SuppressWarnings({ "unused", "resource" })
         ApplicationContext appctxt = 
             new ClassPathXmlApplicationContext(
                 JAXRSClientServerWebSocketSpringTest.class.getResource(


Mime
View raw message