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 2017/03/06 20:57:58 UTC
[1/2] cxf git commit: Tika-parser brings in an old version of
cxf-rt-rs-client, make sure we grab the latest
Repository: cxf
Updated Branches:
refs/heads/master 8dadf3def -> 09fb22b25
Tika-parser brings in an old version of cxf-rt-rs-client, make sure we grab the latest
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/821d8c75
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/821d8c75
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/821d8c75
Branch: refs/heads/master
Commit: 821d8c75b1b7dccb39ea8f53fa2e04870e3567d5
Parents: 8dadf3d
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 6 15:47:38 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 6 15:47:38 2017 -0500
----------------------------------------------------------------------
rt/rs/extensions/search/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/821d8c75/rt/rs/extensions/search/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml
index 109454b..77224b5 100644
--- a/rt/rs/extensions/search/pom.xml
+++ b/rt/rs/extensions/search/pom.xml
@@ -52,6 +52,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>${cxf.geronimo.jpa.version}</version>
[2/2] cxf git commit: Start working on trying to support Jetty 9.3.15+
Posted by dk...@apache.org.
Start working on trying to support Jetty 9.3.15+
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/09fb22b2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/09fb22b2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/09fb22b2
Branch: refs/heads/master
Commit: 09fb22b25333c66514f06652ceaf7fc11bde51cc
Parents: 821d8c7
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 6 15:53:42 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 6 15:57:40 2017 -0500
----------------------------------------------------------------------
.../jetty9/Jetty9WebSocketDestination.java | 26 ++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/09fb22b2/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
index 106525c..1b49d95 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
@@ -23,6 +23,8 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.net.URL;
import java.nio.ByteBuffer;
import java.security.Principal;
@@ -43,6 +45,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.cxf.Bus;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
@@ -56,8 +59,10 @@ import org.apache.cxf.transport.websocket.jetty.WebSocketVirtualServletRequest;
import org.apache.cxf.transport.websocket.jetty.WebSocketVirtualServletResponse;
import org.apache.cxf.workqueue.WorkQueueManager;
import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.WebSocketAdapter;
+import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
@@ -88,7 +93,16 @@ public class Jetty9WebSocketDestination extends JettyHTTPDestination implements
WebSocketServletFactory.class).newInstance();
} catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
- throw new RuntimeException(e);
+ try {
+ //jetty >9.3.14 - yes.. they change API's in a patch release
+ Method m = ReflectionUtil.getDeclaredMethod(WebSocketServletFactory.Loader.class, "load",
+ ServletContext.class, WebSocketPolicy.class);
+ ReflectionUtil.setAccessible(m);
+ webSocketFactory = (WebSocketServletFactory)m.invoke(null, new ContextHandler.StaticContext(), null);
+ } catch (NoSuchMethodException | IllegalAccessException
+ | IllegalArgumentException | InvocationTargetException e2) {
+ throw new RuntimeException(e);
+ }
}
webSocketFactory.setCreator(new Creator());
@@ -138,7 +152,15 @@ public class Jetty9WebSocketDestination extends JettyHTTPDestination implements
@Override
public void shutdown() {
try {
- webSocketFactory.cleanup();
+ Method m;
+ try {
+ //jetty <9.3.14
+ m = ReflectionUtil.getDeclaredMethod(webSocketFactory.getClass(), "cleanup");
+ } catch (Throwable t) {
+ //jetty >= 9.3.14
+ m = ReflectionUtil.getDeclaredMethod(webSocketFactory.getClass(), "stop");
+ }
+ m.invoke(webSocketFactory);
} catch (Exception e) {
// ignore
} finally {