cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [3/3] cxf git commit: Fix failures now that we're back to Jetty9
Date Mon, 09 Feb 2015 16:26:22 GMT
Fix failures now that we're back to Jetty9


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

Branch: refs/heads/master
Commit: f71738d894d4143ed57b956ef1dd68aec5b1b41d
Parents: db92bc6
Author: Daniel Kulp <dkulp@apache.org>
Authored: Mon Feb 9 11:12:13 2015 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon Feb 9 11:12:13 2015 -0500

----------------------------------------------------------------------
 .../apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java    | 1 +
 .../java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f71738d8/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 54bc659..ad21c55 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -349,6 +349,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
             //need an error handler that won't leak information about the exception 
             //back to the client.
             ErrorHandler eh = new ErrorHandler() {
+                @SuppressWarnings("deprecation")
                 public void handle(String target, Request baseRequest, 
                                    HttpServletRequest request, HttpServletResponse response)

                     throws IOException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/f71738d8/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
index c8bdab7..411d1a2 100644
--- a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
+++ b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
@@ -45,6 +45,7 @@ import org.apache.cxf.tools.wsdlto.AbstractCodeGenTest;
 import org.apache.cxf.tools.wsdlto.WSDLToJava;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator;
 import org.apache.cxf.wsdl11.WSDLRuntimeException;
+import org.eclipse.jetty.server.NetworkConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 
@@ -493,7 +494,7 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
         // 'add' it.
         server.setHandler(reshandler);
         server.start();
-        int port = server.getConnectors()[0].getLocalPort();
+        int port = ((NetworkConnector)server.getConnectors()[0]).getLocalPort();
         env.put(ToolConstants.CFG_WSDLURL, "http://localhost:" 
             + port + "/hello_world.wsdl");
         env.put(ToolConstants.CFG_BINDING, "http://localhost:"


Mime
View raw message