This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 32458f1 CXF-7889: ensure all samples from CXF kit can work with JDK11
OOTB. Fixing jax_rs/tracing_opentracing_osgi and updating jax_rs/minimal_osgi
32458f1 is described below
commit 32458f15e4d2c82b8f3cd800318793c01db05b74
Author: reta <[email protected]>
AuthorDate: Thu Dec 27 19:55:29 2018 -0500
CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing
jax_rs/tracing_opentracing_osgi and updating jax_rs/minimal_osgi
---
.../release/samples/jax_rs/minimal_osgi/README.txt | 60 ++++++++++++++++++++++
.../release/samples/jax_rs/minimal_osgi/pom.xml | 4 +-
.../jax_rs/tracing_opentracing_osgi/README.txt | 5 +-
.../jax_rs/tracing_opentracing_osgi/pom.xml | 5 --
.../tracing/server/CatalogSenderConfiguration.java | 31 +++++++++++
.../services/io.jaegertracing.spi.SenderFactory | 1 -
.../main/resources/OSGI-INF/blueprint/context.xml | 2 +-
7 files changed, 96 insertions(+), 12 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
b/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
index 9d1b625..cba3733 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
@@ -84,3 +84,63 @@ If you visit the following URL in your favorite browser on
the machine, you shou
http://localhost:8080/
+Bundles
+------------------
+
+ ID|State |Level|Name
+ 0|Active | 0|OSGi System Bundle
(3.13.0.v20180226-1711)|3.13.0.v20180226-1711
+ 1|Active | 4|Apache Felix File Install (3.6.4)|3.6.4
+ 2|Active | 4|org.osgi:org.osgi.service.cm
(1.6.0.201802012106)|1.6.0.201802012106
+ 3|Active | 4|org.osgi:org.osgi.service.event
(1.4.0.201802012106)|1.4.0.201802012106
+ 8|Active | 1|Jetty :: Websocket :: Client
(9.2.6.v20141205)|9.2.6.v20141205
+ 9|Active | 1|javax.annotation API (1.3.1)|1.3.1
+ 10|Active | 1|jcl-over-slf4j (1.7.25)|1.7.25
+ 11|Active | 1|Apache Felix Http Bridge (2.3.2)|2.3.2
+ 12|Active | 1|Old JAXB Runtime (2.3.0)|2.3.0
+ 13|Active | 1|Jetty :: Websocket :: API
(9.2.6.v20141205)|9.2.6.v20141205
+ 14|Active | 1|Apache CXF Runtime HTTP Transport
(3.3.0.SNAPSHOT)|3.3.0.SNAPSHOT
+ 15|Active | 1|Apache Felix Http Base (2.3.2)|2.3.2
+ 16|Active | 1|Apache Felix Http Jetty (3.0.0)|3.0.0
+ 18|Active | 1|Jetty :: Websocket :: Servlet Interface
(9.2.6.v20141205)|9.2.6.v20141205
+ 19|Active | 1|JavaBeans Activation Framework (1.2.0)|1.2.0
+ 20|Active | 1|Old JAXB XJC (2.3.0)|2.3.0
+ 21|Active | 1|Woodstox (5.0.3)|5.0.3
+ 22|Active | 1|javax.xml.soap API (1.4.0)|1.4.0
+ 23|Active | 1|Web Services Metadata 2.0 (1.1.3)|1.1.3
+ 24|Active | 1|Activation 1.1 (1.1.0)|1.1.0
+ 25|Active | 1|Jetty :: Http Utility
(9.4.12.v20180830)|9.4.12.v20180830
+ 26|Active | 1|Jetty :: Websocket :: Common
(9.2.6.v20141205)|9.2.6.v20141205
+ 27|Active | 1|jaxb-api (2.3.0)|2.3.0
+ 28|Active | 1|Jetty :: Utilities (9.4.12.v20180830)|9.4.12.v20180830
+ 29|Active | 1|Apache ServiceMix :: Specs :: JAX-RS API 2.1
(2.9.1)|2.9.1
+ 30|Active | 1|Apache Felix Http Bundle (3.0.0)|3.0.0
+ 31|Active | 1|Apache ServiceMix :: Specs :: SAAJ API 1.3
(2.9.0)|2.9.0
+ 32|Active | 1|Stax2 API (3.1.4)|3.1.4
+ 33|Active | 1|Extended StAX API (1.7.8)|1.7.8
+ 34|Active | 1|Jetty :: Webapp Application Support
(9.4.12.v20180830)|9.4.12.v20180830
+ 35|Active | 1|Apache ServiceMix :: Specs :: Stax API 1.0
(2.9.0)|2.9.0
+ 36|Active | 1|Apache ServiceMix :: Specs :: JAXWS API 2.2
(2.9.0)|2.9.0
+ 37|Active | 1|Jetty :: XML utilities
(9.4.12.v20180830)|9.4.12.v20180830
+ 38|Active | 1|Jetty :: Websocket :: Server
(9.2.6.v20141205)|9.2.6.v20141205
+ 39|Active | 1|Jetty :: Server Core
(9.4.12.v20180830)|9.4.12.v20180830
+ 40|Active | 1|Jetty :: Security (9.4.12.v20180830)|9.4.12.v20180830
+ 41|Active | 1|Apache Felix Http Api (2.3.2)|2.3.2
+ 42|Active | 1|Jetty :: IO Utility (9.4.12.v20180830)|9.4.12.v20180830
+ 43|Active | 1|Old JAXB Core (2.3.0)|2.3.0
+ 44|Active | 1|Apache CXF Core (3.3.0.SNAPSHOT)|3.3.0.SNAPSHOT
+ 45|Active | 1|Jetty :: JMX Management
(9.4.12.v20180830)|9.4.12.v20180830
+ 46|Active | 1|Apache CXF Advanced Logging Feature
(3.3.0.SNAPSHOT)|3.3.0.SNAPSHOT
+ 47|Active | 1|JavaBeans Activation Framework API jar (1.2.0)|1.2.0
+ 48|Active | 1|Java Servlet API (3.1.0)|3.1.0
+ 49|Active | 1|XmlSchema Core (2.2.4)|2.2.4
+ 50|Active | 1|MIME streaming extension (1.9.7)|1.9.7
+ 51|Active | 1|Apache CXF Runtime JAX-RS Frontend
(3.3.0.SNAPSHOT)|3.3.0.SNAPSHOT
+ 52|Active | 1|Apache CXF Runtime Security functionality
(3.3.0.SNAPSHOT)|3.3.0.SNAPSHOT
+ 53|Active | 1|Apache Felix Http Whiteboard (2.3.2)|2.3.2
+ 54|Active | 1|Jetty :: Servlet Handling
(9.4.12.v20180830)|9.4.12.v20180830
+ 55|Active | 1|geronimo-stax-api_1.0_spec (1.0.1)|1.0.1
+ 56|Active | 1|Apache ServiceMix :: Specs :: JAXB API 2.2
(2.9.0)|2.9.0
+ 57|Active | 1|slf4j-api (1.7.25)|1.7.25
+ 58|Active | 1|geronimo-jta_1.1_spec (1.1.1)|1.1.1
+ 59|Active | 1|SAAJ 1.3 (1.1.0)|1.1.0
+ 60|Active | 1|minimalosgi (0.0.0)|0.0.0
\ No newline at end of file
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index 9276910..945642b 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -91,12 +91,10 @@
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
- <version>5.0.3</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/README.txt
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/README.txt
index d74137c..b102ac7 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/README.txt
+++
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/README.txt
@@ -57,12 +57,13 @@ for this demo bundle.
Install the distributed tracer compatible with OpenTracing API, as in this
example
we are using Uber Jaeger:
+ install -s
mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2
install -s wrap:mvn:com.squareup.okio/okio/1.13.0
install -s wrap:mvn:com.squareup.okhttp3/okhttp/3.9.0
install -s wrap:mvn:org.apache.thrift/libthrift/0.11.0
+ install -s wrap:mvn:io.jaegertracing/jaeger-core/0.30.3
install -s wrap:mvn:io.jaegertracing/jaeger-thrift/0.30.3
- install -s wrap:mvn:io.jaegertracing/jaeger-core/0.30.3
-
+
Install this demo bundle (using the appropriate bundle version number)
install -s mvn:org.apache.cxf.samples/jax_rs_tracing_opentracing_osgi/3.n.m
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/pom.xml
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/pom.xml
index e942670..c9af900 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/pom.xml
@@ -36,23 +36,19 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.0-SNAPSHOT</version>
</dependency>
<!-- This dependency is needed if you're using the Jetty container -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -62,7 +58,6 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogSenderConfiguration.java
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogSenderConfiguration.java
new file mode 100644
index 0000000..8b93016
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogSenderConfiguration.java
@@ -0,0 +1,31 @@
+/**
+ * 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 demo.jaxrs.tracing.server;
+
+import io.jaegertracing.Configuration.SenderConfiguration;
+import io.jaegertracing.spi.Sender;
+import io.jaegertracing.thrift.internal.senders.ThriftSenderFactory;
+
+public class CatalogSenderConfiguration extends SenderConfiguration {
+ @Override
+ public Sender getSender() {
+ return new ThriftSenderFactory().getSender(this);
+ }
+}
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/META-INF/services/io.jaegertracing.spi.SenderFactory
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/META-INF/services/io.jaegertracing.spi.SenderFactory
deleted file mode 100644
index d726e4d..0000000
---
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/META-INF/services/io.jaegertracing.spi.SenderFactory
+++ /dev/null
@@ -1 +0,0 @@
-io.jaegertracing.thrift.internal.senders.ThriftSenderFactory
\ No newline at end of file
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
index 896a285..6a3b9a2 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
+++
b/distribution/src/main/release/samples/jax_rs/tracing_opentracing_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
@@ -50,7 +50,7 @@
</argument>
</bean>
- <bean id="senderBuilder"
class="io.jaegertracing.Configuration.SenderConfiguration" />
+ <bean id="senderBuilder"
class="demo.jaxrs.tracing.server.CatalogSenderConfiguration" />
<bean id="sender" factory-ref="senderBuilder"
factory-method="withEndpoint">
<argument index="0" value="http://localhost:14268/api/traces"/>
