cxf git commit: [CXF-7199]drop jetty 8 support for CXF 3.2
Repository: cxf
Updated Branches:
refs/heads/master 03cdee74d -> 73d1f886a
[CXF-7199]drop jetty 8 support for CXF 3.2
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/73d1f886
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/73d1f886
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/73d1f886
Branch: refs/heads/master
Commit: 73d1f886ae5265131e8664ee952ffd1cdc82f71a
Parents: 03cdee7
Author: Freeman Fang
Authored: Thu Dec 29 13:10:28 2016 +0800
Committer: Freeman Fang
Committed: Thu Dec 29 13:10:28 2016 +0800
--
parent/pom.xml | 7 -
.../http_jetty/JettyHTTPDestination.java| 27 +-
.../http_jetty/JettyHTTPServerEngine.java | 189 +++-
.../JettyHTTPServerEngineFactory.java | 7 +-
rt/transports/websocket/pom.xml | 14 -
.../websocket/WebSocketDestinationFactory.java | 18 +-
.../jetty/JettyWebSocketDestination.java| 435 ---
.../websocket/jetty/JettyWebSocketHandler.java | 6 +-
.../jetty/JettyWebSocketDestinationTest.java| 3 +-
systests/jaxrs/pom.xml | 20 -
systests/jaxws/pom.xml | 6 +-
11 files changed, 80 insertions(+), 652 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ebe7983..85f8338 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -114,7 +114,6 @@
2.9.4
1.0
1.3.8
-8.1.19.v20160209
9.3.5.v20151012
${cxf.jetty9.version}
[8.1,10)
@@ -1973,12 +1972,6 @@
-jetty8
-
-${cxf.jetty8.version}
-
-
-
eclipse.moxy
http://git-wip-us.apache.org/repos/asf/cxf/blob/73d1f886/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
index 16eb0e9..ed64932 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
@@ -23,7 +23,6 @@ import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.GeneralSecurityException;
@@ -51,6 +50,8 @@ import
org.apache.cxf.transport.http_jetty.continuations.JettyContinuationProvid
import org.apache.cxf.transport.https.CertConstraintsJaxBUtils;
import org.apache.cxf.transport.servlet.ServletDestination;
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
+import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.HttpOutput;
import org.eclipse.jetty.server.Request;
@@ -282,12 +283,7 @@ public class JettyHTTPDestination extends
ServletDestination {
private boolean sendContent(Class type, InputStream c) throws
IOException {
try {
-out.getClass().getMethod("sendContent", type).invoke(out, c);
-} catch (InvocationTargetException ioe) {
-if (ioe.getTargetException() instanceof IOException) {
-throw (IOException)ioe.getTargetException();
-}
-return false;
+out.sendContent(c);
} catch (Exception e) {
return false;
}
@@ -378,19 +374,10 @@ public class JettyHTTPDestination extends
ServletDestination {
private Request getCurrentRequest() {
try {
-//Jetty 8
-Object con =
ClassLoaderUtils.loadClass("org.eclipse.jetty.server.AbstractHttpConnection",
-
getClass()).getMethod("getCurrentConnection").invoke(null);
-return (Request)con.getClass().getMethod("getRequest").invoke(con);
-} catch (Throwable t) {
-//
-}
-try {
-//Jetty 9
-Object con =
ClassLoaderUtils.loadClass("org.eclipse.jetty.server.HttpConnection",
-
getClass()).getMethod("getCurrentConnection").invoke(null);
-
cxf git commit: [CXF-7198]upgrade to spring-boot 1.4.3
Repository: cxf
Updated Branches:
refs/heads/master 6d3afd7d3 -> 03cdee74d
[CXF-7198]upgrade to spring-boot 1.4.3
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/03cdee74
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/03cdee74
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/03cdee74
Branch: refs/heads/master
Commit: 03cdee74d8f41079bf0a1e06eecc6a993109fba4
Parents: 6d3afd7
Author: Freeman Fang
Authored: Thu Dec 29 10:22:40 2016 +0800
Committer: Freeman Fang
Committed: Thu Dec 29 10:22:40 2016 +0800
--
integration/spring-boot/autoconfigure/pom.xml | 7 +++
.../cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java | 2 +-
.../spring/boot/autoconfigure/CxfAutoConfigurationTests.java | 2 +-
parent/pom.xml| 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/03cdee74/integration/spring-boot/autoconfigure/pom.xml
--
diff --git a/integration/spring-boot/autoconfigure/pom.xml
b/integration/spring-boot/autoconfigure/pom.xml
index cd904ff..89fea7b 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -37,6 +37,13 @@
spring-boot-autoconfigure
+
+org.springframework.boot
+spring-boot-test
+${cxf.spring.boot.version}
+test
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/03cdee74/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
--
diff --git
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
index 4460c7e..22d0b74 100644
---
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
+++
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
@@ -32,8 +32,8 @@ import
org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import
org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
http://git-wip-us.apache.org/repos/asf/cxf/blob/03cdee74/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
--
diff --git
a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
index b10091a..bfc72fc 100644
---
a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
+++
b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
@@ -23,8 +23,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
import org.springframework.boot.test.EnvironmentTestUtils;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.mock.web.MockServletContext;
import org.springframework.test.util.ReflectionTestUtils;
import
org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
http://git-wip-us.apache.org/repos/asf/cxf/blob/03cdee74/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4633e39..ebe7983 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -145,7 +145,7 @@
1.7.21
1.2
[1/2] cxf git commit: [CXF-7191]more clean up for cxf features.xml
Repository: cxf
Updated Branches:
refs/heads/master 7c191d4d5 -> 6d3afd7d3
[CXF-7191]more clean up for cxf features.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dc072a67
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dc072a67
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dc072a67
Branch: refs/heads/master
Commit: dc072a6768932dfd64c8f52f3b297f296e1134e7
Parents: c194254
Author: Freeman Fang
Authored: Thu Dec 29 10:18:08 2016 +0800
Committer: Freeman Fang
Committed: Thu Dec 29 10:18:08 2016 +0800
--
osgi/karaf/features/src/main/resources/features.xml | 7 ---
1 file changed, 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/dc072a67/osgi/karaf/features/src/main/resources/features.xml
--
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index b73b921..d8a1491 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -323,11 +323,6 @@
cxf-core
mvn:org.apache.cxf/cxf-rt-bindings-coloc/${project.version}
-
-cxf-core
-cxf-transports-local
-mvn:org.apache.cxf/cxf-rt-bindings-object/${project.version}
-
cxf-core
mvn:org.apache.cxf/cxf-rt-transports-local/${project.version}
@@ -404,10 +399,8 @@
cxf-jaxrs
cxf-databinding-jaxb
cxf-databinding-aegis
-cxf-databinding-xmlbeans
cxf-bindings-corba
cxf-bindings-coloc
-cxf-bindings-object
cxf-http-provider
cxf-transports-local
cxf-transports-jms
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6d3afd7d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6d3afd7d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6d3afd7d Branch: refs/heads/master Commit: 6d3afd7d39e3e0f9f7ab4de7827fc5b8953f902a Parents: dc072a6 7c191d4 Author: Freeman Fang Authored: Thu Dec 29 10:19:07 2016 +0800 Committer: Freeman Fang Committed: Thu Dec 29 10:19:07 2016 +0800 -- .../samples/jax_rs/description_swagger2/pom.xml | 4 + .../jax_rs/description_swagger2_spring/pom.xml | 4 + .../jax_rs/description_swagger2_web/README.txt | 2 +- .../jax_rs/description_swagger2_web/pom.xml | 33 ++-- integration/tracing/tracing-brave/pom.xml | 12 ++ .../tracing/brave/AbstractBraveInterceptor.java | 179 +++ .../tracing/brave/BraveStartInterceptor.java| 49 + .../cxf/tracing/brave/BraveStopInterceptor.java | 48 + .../cxf/tracing/brave/jaxrs/BraveFeature.java | 6 +- .../cxf/tracing/brave/jaxws/BraveFeature.java | 53 ++ .../cxf/tracing/brave/BraveTraceTest.java | 99 ++ .../tracing/brave/LoggingSpanNameProvider.java | 31 .../org/apache/cxf/tracing/brave/MyService.java | 26 +++ .../apache/cxf/tracing/brave/MyServiceImpl.java | 28 +++ parent/pom.xml | 2 +- rt/features/pom.xml | 1 - rt/features/tracing-brave/pom.xml | 87 - .../cxf/tracing/brave/CxfClientRequest.java | 49 - .../cxf/tracing/brave/CxfServerRequest.java | 48 - .../cxf/tracing/brave/HttpResponse200.java | 28 --- .../apache/cxf/tracing/brave/ParsedMessage.java | 121 - .../apache/cxf/tracing/brave/TraceFeature.java | 50 -- .../cxf/tracing/brave/TraceInInterceptor.java | 58 -- .../cxf/tracing/brave/TraceOutInterceptor.java | 57 -- .../cxf/tracing/brave/BraveTraceTest.java | 99 -- .../tracing/brave/LoggingSpanNameProvider.java | 31 .../org/apache/cxf/tracing/brave/MyService.java | 26 --- .../apache/cxf/tracing/brave/MyServiceImpl.java | 28 --- .../cxf/jaxrs/swagger/JaxRs2Extension.java | 13 +- 29 files changed, 562 insertions(+), 710 deletions(-) --
cxf git commit: CXF-7164: Support tracing using OpenZipkin Brave. Refactored JAX-WS support in the tracing-brave module.
Repository: cxf
Updated Branches:
refs/heads/master c9da051de -> 7c191d4d5
CXF-7164: Support tracing using OpenZipkin Brave. Refactored JAX-WS support in
the tracing-brave module.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7c191d4d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7c191d4d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7c191d4d
Branch: refs/heads/master
Commit: 7c191d4d590a5ef621a0dd5adfff59512c91daf3
Parents: c9da051
Author: reta
Authored: Wed Dec 28 19:43:01 2016 -0500
Committer: reta
Committed: Wed Dec 28 19:43:01 2016 -0500
--
.../tracing/brave/AbstractBraveInterceptor.java | 179 +++
.../tracing/brave/BraveStartInterceptor.java| 49 +
.../cxf/tracing/brave/BraveStopInterceptor.java | 48 +
.../cxf/tracing/brave/jaxrs/BraveFeature.java | 6 +-
.../cxf/tracing/brave/jaxws/BraveFeature.java | 11 +-
.../tracing/brave/jaxws/BraveInInterceptor.java | 58 --
.../brave/jaxws/BraveOutInterceptor.java| 57 --
.../tracing/brave/jaxws/CxfClientRequest.java | 49 -
.../tracing/brave/jaxws/CxfServerRequest.java | 48 -
.../tracing/brave/jaxws/HttpResponse200.java| 28 ---
.../cxf/tracing/brave/jaxws/ParsedMessage.java | 121 -
.../cxf/tracing/brave/BraveTraceTest.java | 99 ++
.../tracing/brave/LoggingSpanNameProvider.java | 31
.../org/apache/cxf/tracing/brave/MyService.java | 26 +++
.../apache/cxf/tracing/brave/MyServiceImpl.java | 28 +++
.../cxf/tracing/brave/jaxws/BraveTraceTest.java | 98 --
.../brave/jaxws/LoggingSpanNameProvider.java| 31
.../cxf/tracing/brave/jaxws/MyService.java | 26 ---
.../cxf/tracing/brave/jaxws/MyServiceImpl.java | 28 ---
19 files changed, 472 insertions(+), 549 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/7c191d4d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
--
diff --git
a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
new file mode 100644
index 000..32e2560
--- /dev/null
+++
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
@@ -0,0 +1,179 @@
+/**
+ * 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.tracing.brave;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.github.kristofa.brave.Brave;
+import com.github.kristofa.brave.http.HttpClientRequest;
+import com.github.kristofa.brave.http.HttpServerRequest;
+import com.github.kristofa.brave.http.SpanNameProvider;
+
+import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+
+public abstract class AbstractBraveInterceptor extends
AbstractPhaseInterceptor {
+protected final Brave brave;
+protected final SpanNameProvider spanNameProvider;
+
+private static class ParsedMessage {
+private Message message;
+
+ParsedMessage(Message message) {
+this.message = message;
+}
+
+String safeGet(String key) {
+if (!message.containsKey(key)) {
+return null;
+}
+Object value = message.get(key);
+return (value instanceof String) ? value.toString() : null;
+}
+
+public String getUriSt() {
+String uri = safeGet(Message.REQUEST_URL);
+if (uri == null) {
+String address = safeGet(Message.ENDPOINT_ADDRESS);
+uri = safeGet(Message.REQUEST_URI);
+if (uri !=
cxf git commit: CXF-7164: Support tracing using OpenZipkin Brave. Moved existing JAX-WS support into tracing-brave module (jaxws package).
Repository: cxf
Updated Branches:
refs/heads/master dd723f846 -> c9da051de
CXF-7164: Support tracing using OpenZipkin Brave. Moved existing JAX-WS support
into tracing-brave module (jaxws package).
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c9da051d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c9da051d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c9da051d
Branch: refs/heads/master
Commit: c9da051de80efd513e2a3e20c0b5c6ff942291a1
Parents: dd723f8
Author: reta
Authored: Wed Dec 28 07:51:32 2016 -0500
Committer: reta
Committed: Wed Dec 28 07:51:32 2016 -0500
--
integration/tracing/tracing-brave/pom.xml | 12 ++
.../cxf/tracing/brave/jaxws/BraveFeature.java | 50
.../tracing/brave/jaxws/BraveInInterceptor.java | 58 +
.../brave/jaxws/BraveOutInterceptor.java| 57 +
.../tracing/brave/jaxws/CxfClientRequest.java | 49
.../tracing/brave/jaxws/CxfServerRequest.java | 48
.../tracing/brave/jaxws/HttpResponse200.java| 28 +
.../cxf/tracing/brave/jaxws/ParsedMessage.java | 121 +++
.../cxf/tracing/brave/jaxws/BraveTraceTest.java | 98 +++
.../brave/jaxws/LoggingSpanNameProvider.java| 31 +
.../cxf/tracing/brave/jaxws/MyService.java | 26
.../cxf/tracing/brave/jaxws/MyServiceImpl.java | 28 +
rt/features/pom.xml | 1 -
rt/features/tracing-brave/pom.xml | 87 -
.../cxf/tracing/brave/CxfClientRequest.java | 49
.../cxf/tracing/brave/CxfServerRequest.java | 48
.../cxf/tracing/brave/HttpResponse200.java | 28 -
.../apache/cxf/tracing/brave/ParsedMessage.java | 121 ---
.../apache/cxf/tracing/brave/TraceFeature.java | 50
.../cxf/tracing/brave/TraceInInterceptor.java | 58 -
.../cxf/tracing/brave/TraceOutInterceptor.java | 57 -
.../cxf/tracing/brave/BraveTraceTest.java | 99 ---
.../tracing/brave/LoggingSpanNameProvider.java | 31 -
.../org/apache/cxf/tracing/brave/MyService.java | 26
.../apache/cxf/tracing/brave/MyServiceImpl.java | 28 -
25 files changed, 606 insertions(+), 683 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c9da051d/integration/tracing/tracing-brave/pom.xml
--
diff --git a/integration/tracing/tracing-brave/pom.xml
b/integration/tracing/tracing-brave/pom.xml
index b1ad664..b105b47 100644
--- a/integration/tracing/tracing-brave/pom.xml
+++ b/integration/tracing/tracing-brave/pom.xml
@@ -56,6 +56,12 @@
org.apache.cxf
+cxf-rt-frontend-jaxws
+${project.version}
+true
+
+
+org.apache.cxf
cxf-rt-management
${project.version}
@@ -68,5 +74,11 @@
slf4j-jdk14
test
+
+org.apache.cxf
+cxf-rt-transports-http-jetty
+${project.version}
+test
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/c9da051d/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
--
diff --git
a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
new file mode 100644
index 000..a349d89
--- /dev/null
+++
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
@@ -0,0 +1,50 @@
+/**
+ * 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.tracing.brave.jaxws;
+
+import com.github.kristofa.brave.Brave;
+import com.github.kristofa.brave.http.DefaultSpanNameProvider;
+import org.apache.cxf.Bus;
+import
cxf git commit: Fixing description_swagger2_web demo on the trunk
Repository: cxf
Updated Branches:
refs/heads/master 5ed63d63c -> dd723f846
Fixing description_swagger2_web demo on the trunk
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dd723f84
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dd723f84
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dd723f84
Branch: refs/heads/master
Commit: dd723f846949d66e24ab103c2efde426ea9fb141
Parents: 5ed63d6
Author: Sergey Beryozkin
Authored: Wed Dec 28 11:48:39 2016 +
Committer: Sergey Beryozkin
Committed: Wed Dec 28 11:49:10 2016 +
--
.../jax_rs/description_swagger2_web/README.txt | 2 +-
.../jax_rs/description_swagger2_web/pom.xml | 28
2 files changed, 12 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/dd723f84/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
index 32f7f4a..3ff529b 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt
@@ -14,7 +14,7 @@ located), the Maven pom.xml file can be used to build and run
the demo.
Using either UNIX or Windows:
mvn install
- mvn package tomcat7:run
+ mvn jetty:run-war
Two JAX-RS endpoints are availbale after the service has started.
http://git-wip-us.apache.org/repos/asf/cxf/blob/dd723f84/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
index 64c1347..f404b29 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml
@@ -37,25 +37,15 @@ under the License.
-org.apache.tomcat.maven
-tomcat7-maven-plugin
-2.1
+org.eclipse.jetty
+jetty-maven-plugin
+9.4.0.v20161208
-
${project.build.directory}/${project.artifactId}-${project.version}
-9000
-/
+/
+
+ 9000
+
-
-
-run-tomcat
-
-true
-
-
-run
-
-
-
@@ -98,5 +88,9 @@ under the License.
org.springframework
spring-web
+
+javax.validation
+validation-api
+
cxf git commit: Updating all Swagger2 demos with a Jackson dep
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 11e1a869c -> 4295775d2 Updating all Swagger2 demos with a Jackson dep Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4295775d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4295775d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4295775d Branch: refs/heads/3.1.x-fixes Commit: 4295775d2828fa50709806e6fb3acaaacf0cd571 Parents: 11e1a86 Author: Sergey Beryozkin Authored: Wed Dec 28 10:52:52 2016 + Committer: Sergey Beryozkin Committed: Wed Dec 28 10:54:00 2016 + -- .../main/release/samples/jax_rs/description_swagger2/pom.xml| 1 - .../release/samples/jax_rs/description_swagger2_spring/pom.xml | 4 .../release/samples/jax_rs/description_swagger2_web/pom.xml | 5 - 3 files changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4295775d/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml index 18ac55f..bce6a21 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml @@ -84,7 +84,6 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.6.6 org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/cxf/blob/4295775d/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml index 280b7fb..5ed2207 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml @@ -90,6 +90,10 @@ javax.ws.rs javax.ws.rs-api + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + org.springframework http://git-wip-us.apache.org/repos/asf/cxf/blob/4295775d/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml index e4acd1f..25ee326 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml @@ -85,7 +85,10 @@ under the License. javax.ws.rs javax.ws.rs-api - + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + org.springframework
cxf git commit: Updating all Swagger2 demos with a Jackson dep
Repository: cxf Updated Branches: refs/heads/master 11637433d -> 5ed63d63c Updating all Swagger2 demos with a Jackson dep Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5ed63d63 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5ed63d63 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5ed63d63 Branch: refs/heads/master Commit: 5ed63d63cf5cde6bd9389a1c92097432fdd87d33 Parents: 1163743 Author: Sergey Beryozkin Authored: Wed Dec 28 10:52:52 2016 + Committer: Sergey Beryozkin Committed: Wed Dec 28 10:52:52 2016 + -- .../main/release/samples/jax_rs/description_swagger2/pom.xml| 1 - .../release/samples/jax_rs/description_swagger2_spring/pom.xml | 4 .../release/samples/jax_rs/description_swagger2_web/pom.xml | 5 - 3 files changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/5ed63d63/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml index 040f2e3..a8b3223 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml @@ -84,7 +84,6 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.6.6 org.eclipse.jetty http://git-wip-us.apache.org/repos/asf/cxf/blob/5ed63d63/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml index 5e6d90a3..648e50d0 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml @@ -90,6 +90,10 @@ javax.ws.rs javax.ws.rs-api + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + org.springframework http://git-wip-us.apache.org/repos/asf/cxf/blob/5ed63d63/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml index 81bd566..64c1347 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml @@ -85,7 +85,10 @@ under the License. javax.ws.rs javax.ws.rs-api - + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + org.springframework
[1/2] cxf git commit: Make Swagger2 sample work again
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 47d32e633 -> 11e1a869c refs/heads/master 939a75d9d -> 11637433d Make Swagger2 sample work again Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/11e1a869 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/11e1a869 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/11e1a869 Branch: refs/heads/3.1.x-fixes Commit: 11e1a869c20da768d15ea16b1651f29a897f09df Parents: 47d32e6 Author: Francesco Chicchiriccò Authored: Wed Dec 28 09:00:15 2016 +0100 Committer: Francesco Chicchiriccò Committed: Wed Dec 28 09:00:15 2016 +0100 -- .../main/release/samples/jax_rs/description_swagger2/pom.xml| 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/11e1a869/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml index 9a9ab91..18ac55f 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml @@ -82,6 +82,11 @@ 3.1.10-SNAPSHOT + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.6.6 + + org.eclipse.jetty jetty-webapp
[2/2] cxf git commit: Make Swagger2 sample work again
Make Swagger2 sample work again Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/11637433 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/11637433 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/11637433 Branch: refs/heads/master Commit: 11637433df089a638e173d1ef57441e7456cf2ea Parents: 939a75d Author: Francesco Chicchiriccò Authored: Wed Dec 28 09:00:15 2016 +0100 Committer: Francesco Chicchiriccò Committed: Wed Dec 28 09:00:30 2016 +0100 -- .../main/release/samples/jax_rs/description_swagger2/pom.xml| 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/11637433/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml index 5d203ac..040f2e3 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml @@ -82,6 +82,11 @@ 3.2.0-SNAPSHOT + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.6.6 + + org.eclipse.jetty jetty-webapp
