You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/02/06 19:30:37 UTC

[1/2] cxf git commit: Fix some compile failures

Repository: cxf
Updated Branches:
  refs/heads/master 2d2affae9 -> fe416234b


Fix some compile failures


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

Branch: refs/heads/master
Commit: fe416234bab8af30f1789c3164ac256af86e3b62
Parents: 3af7c78
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Feb 6 13:30:10 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Feb 6 13:30:26 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/fe416234/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 ad21c55..54bc659 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,7 +349,6 @@ 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/fe416234/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 0046b75..c8bdab7 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
@@ -46,7 +46,6 @@ 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.Server;
-import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 
 import org.junit.Test;
@@ -494,7 +493,7 @@ public class CodeGenBugTest extends AbstractCodeGenTest {
         // 'add' it.
         server.setHandler(reshandler);
         server.start();
-        int port = ((ServerConnector)server.getConnectors()[0]).getLocalPort();
+        int port = server.getConnectors()[0].getLocalPort();
         env.put(ToolConstants.CFG_WSDLURL, "http://localhost:" 
             + port + "/hello_world.wsdl");
         env.put(ToolConstants.CFG_BINDING, "http://localhost:"


[2/2] cxf git commit: Update xmlschema version

Posted by dk...@apache.org.
Update xmlschema version


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

Branch: refs/heads/master
Commit: 3af7c785c642db6ae64276f92fb05450d7f9aba3
Parents: 2d2affa
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Feb 6 10:31:56 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Feb 6 13:30:26 2015 -0500

----------------------------------------------------------------------
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/3af7c785/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3b6dab5..1dd4281 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -150,7 +150,7 @@
         <cxf.wss4j.version>2.0.3-SNAPSHOT</cxf.wss4j.version>
         <cxf.xerces.version>2.11.0</cxf.xerces.version>
         <cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
-        <cxf.xmlschema.version>2.2.0</cxf.xmlschema.version>
+        <cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>
         <cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
         <cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version>
         <cxf.cdi.api.version>1.1</cxf.cdi.api.version>