buildbot failure in on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/13175 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
cxf git commit: CXF-7164: Support tracing using OpenZipkin Brave. Refactored JAX-RS BraveFeature to depend on JAX-RS API only.
Repository: cxf
Updated Branches:
refs/heads/master b6b987218 -> c8ee5ae67
CXF-7164: Support tracing using OpenZipkin Brave. Refactored JAX-RS
BraveFeature to depend on JAX-RS API only.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c8ee5ae6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c8ee5ae6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c8ee5ae6
Branch: refs/heads/master
Commit: c8ee5ae674f6e59b26d7b549481627d21103f7c1
Parents: b6b9872
Author: reta
Authored: Thu Dec 29 19:27:42 2016 -0500
Committer: reta
Committed: Thu Dec 29 19:27:42 2016 -0500
--
.../cxf/tracing/brave/jaxrs/BraveFeature.java | 25 +++-
.../jaxrs/tracing/brave/BraveTracingTest.java | 2 +-
2 files changed, 9 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c8ee5ae6/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
--
diff --git
a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
index b654fb6..f3e4468 100644
---
a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
+++
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
@@ -18,16 +18,12 @@
*/
package org.apache.cxf.tracing.brave.jaxrs;
-import java.util.Arrays;
+import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.FeatureContext;
import com.github.kristofa.brave.Brave;
-import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.feature.AbstractFeature;
-import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
-
-public class BraveFeature extends AbstractFeature {
+public class BraveFeature implements Feature {
private final Brave brave;
public BraveFeature() {
@@ -41,16 +37,11 @@ public class BraveFeature extends AbstractFeature {
public BraveFeature(final Brave brave) {
this.brave = brave;
}
-
+
@Override
-public void initialize(final Server server, final Bus bus) {
-final ServerProviderFactory providerFactory =
(ServerProviderFactory)server
-.getEndpoint()
-.get(ServerProviderFactory.class.getName());
-
-if (providerFactory != null) {
-providerFactory.setUserProviders(Arrays.asList(new
BraveProvider(brave),
-new BraveContextProvider(brave)));
-}
+public boolean configure(FeatureContext context) {
+context.register(new BraveProvider(brave));
+context.register(new BraveContextProvider(brave));
+return true;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/c8ee5ae6/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
--
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
index f1f1ab7..1b40bad 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java
@@ -73,7 +73,7 @@ public class BraveTracingTest extends
AbstractBusClientServerTestBase {
sf.setResourceProvider(BookStore.class, new
SingletonResourceProvider(new BookStore()));
sf.setAddress("http://localhost:"; + PORT);
sf.setProvider(new JacksonJsonProvider());
-sf.setFeatures(Arrays.asList(new BraveFeature(brave)));
+sf.setProvider(new BraveFeature(brave));
sf.create();
}
}
cxf git commit: [CXF-6993] Adding a disabled test
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes feaececcc -> d83a99912
[CXF-6993] Adding a disabled test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d83a9991
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d83a9991
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d83a9991
Branch: refs/heads/3.1.x-fixes
Commit: d83a99912eda32fe6545bc01aaf30a0dd54797a7
Parents: feaecec
Author: Sergey Beryozkin
Authored: Thu Dec 29 15:42:43 2016 +
Committer: Sergey Beryozkin
Committed: Thu Dec 29 15:44:54 2016 +
--
.../security/jose/jwe/JweJsonConsumerTest.java | 48 +++-
1 file changed, 47 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d83a9991/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
--
diff --git
a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
index f8c3026..1d073c6 100644
---
a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
+++
b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
@@ -20,11 +20,14 @@ package org.apache.cxf.rs.security.jose.jwe;
import java.security.Security;
import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import org.apache.cxf.common.util.Base64UrlUtility;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.rs.security.jose.jwa.AlgorithmUtils;
import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
@@ -34,6 +37,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
public class JweJsonConsumerTest extends Assert {
@@ -131,13 +135,55 @@ public class JweJsonConsumerTest extends Assert {
@Test
public void testMultipleRecipients() {
+
doTestMultipleRecipients(JweJsonProducerTest.MULTIPLE_RECIPIENTS_OUTPUT);
+}
+@Test
+@Ignore
+public void testMultipleRecipientsAutogeneratedCek() {
+final String text = "The true sign of intelligence is not knowledge
but imagination.";
+SecretKey wrapperKey1 =
CryptoUtils.createSecretKeySpec(JweJsonProducerTest.WRAPPER_BYTES1, "AES");
+SecretKey wrapperKey2 =
CryptoUtils.createSecretKeySpec(JweJsonProducerTest.WRAPPER_BYTES2, "AES");
+
+JweHeaders protectedHeaders = new JweHeaders(ContentAlgorithm.A128GCM);
+JweHeaders sharedUnprotectedHeaders = new JweHeaders();
+
sharedUnprotectedHeaders.setJsonWebKeysUrl("https://server.example.com/keys.jwks";);
+
sharedUnprotectedHeaders.setKeyEncryptionAlgorithm(KeyAlgorithm.A128KW);
+
+List jweProviders = new
LinkedList();
+
+KeyEncryptionProvider keyEncryption1 =
+JweUtils.getSecretKeyEncryptionAlgorithm(wrapperKey1,
KeyAlgorithm.A128KW);
+ContentEncryptionProvider contentEncryption =
+new AesGcmContentEncryptionAlgorithm(ContentAlgorithm.A128GCM);
+
+JweEncryptionProvider jwe1 = new JweEncryption(keyEncryption1,
contentEncryption);
+KeyEncryptionProvider keyEncryption2 =
+JweUtils.getSecretKeyEncryptionAlgorithm(wrapperKey2,
KeyAlgorithm.A128KW);
+JweEncryptionProvider jwe2 = new JweEncryption(keyEncryption2,
contentEncryption);
+jweProviders.add(jwe1);
+jweProviders.add(jwe2);
+
+List perRecipientHeades = new LinkedList();
+perRecipientHeades.add(new JweHeaders("key1"));
+perRecipientHeades.add(new JweHeaders("key2"));
+
+JweJsonProducer p = new JweJsonProducer(protectedHeaders,
+sharedUnprotectedHeaders,
+StringUtils.toBytesUTF8(text),
+
StringUtils.toBytesUTF8(JweJsonProducerTest.EXTRA_AAD_SOURCE),
+false);
+
+String jweJson = p.encryptWith(jweProviders, perRecipientHeades);
+doTestMultipleRecipients(jweJson);
+}
+private void doTestMultipleRecipients(String jweJson) {
final String text = "The true sign of intelligence is not knowledge
but imagination.";
Secret
[1/2] cxf git commit: [CXF-6993] Adding a disabled test
Repository: cxf
Updated Branches:
refs/heads/master 04720d55a -> b6b987218
[CXF-6993] Adding a disabled test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/74d79901
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/74d79901
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/74d79901
Branch: refs/heads/master
Commit: 74d79901f145c6f25419fbbf326058522aca2fd3
Parents: aa5cb3f
Author: Sergey Beryozkin
Authored: Thu Dec 29 15:42:43 2016 +
Committer: Sergey Beryozkin
Committed: Thu Dec 29 15:42:43 2016 +
--
.../security/jose/jwe/JweJsonConsumerTest.java | 48 +++-
1 file changed, 47 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/74d79901/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
--
diff --git
a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
index 38c610d..1c0c78c 100644
---
a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
+++
b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
@@ -20,11 +20,14 @@ package org.apache.cxf.rs.security.jose.jwe;
import java.security.Security;
import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import org.apache.cxf.common.util.Base64UrlUtility;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.rs.security.jose.jwa.AlgorithmUtils;
import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
@@ -34,6 +37,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
public class JweJsonConsumerTest extends Assert {
@@ -131,13 +135,55 @@ public class JweJsonConsumerTest extends Assert {
@Test
public void testMultipleRecipients() {
+
doTestMultipleRecipients(JweJsonProducerTest.MULTIPLE_RECIPIENTS_OUTPUT);
+}
+@Test
+@Ignore
+public void testMultipleRecipientsAutogeneratedCek() {
+final String text = "The true sign of intelligence is not knowledge
but imagination.";
+SecretKey wrapperKey1 =
CryptoUtils.createSecretKeySpec(JweJsonProducerTest.WRAPPER_BYTES1, "AES");
+SecretKey wrapperKey2 =
CryptoUtils.createSecretKeySpec(JweJsonProducerTest.WRAPPER_BYTES2, "AES");
+
+JweHeaders protectedHeaders = new JweHeaders(ContentAlgorithm.A128GCM);
+JweHeaders sharedUnprotectedHeaders = new JweHeaders();
+
sharedUnprotectedHeaders.setJsonWebKeysUrl("https://server.example.com/keys.jwks";);
+
sharedUnprotectedHeaders.setKeyEncryptionAlgorithm(KeyAlgorithm.A128KW);
+
+List jweProviders = new
LinkedList();
+
+KeyEncryptionProvider keyEncryption1 =
+JweUtils.getSecretKeyEncryptionAlgorithm(wrapperKey1,
KeyAlgorithm.A128KW);
+ContentEncryptionProvider contentEncryption =
+new AesGcmContentEncryptionAlgorithm(ContentAlgorithm.A128GCM);
+
+JweEncryptionProvider jwe1 = new JweEncryption(keyEncryption1,
contentEncryption);
+KeyEncryptionProvider keyEncryption2 =
+JweUtils.getSecretKeyEncryptionAlgorithm(wrapperKey2,
KeyAlgorithm.A128KW);
+JweEncryptionProvider jwe2 = new JweEncryption(keyEncryption2,
contentEncryption);
+jweProviders.add(jwe1);
+jweProviders.add(jwe2);
+
+List perRecipientHeades = new LinkedList();
+perRecipientHeades.add(new JweHeaders("key1"));
+perRecipientHeades.add(new JweHeaders("key2"));
+
+JweJsonProducer p = new JweJsonProducer(protectedHeaders,
+sharedUnprotectedHeaders,
+StringUtils.toBytesUTF8(text),
+
StringUtils.toBytesUTF8(JweJsonProducerTest.EXTRA_AAD_SOURCE),
+false);
+
+String jweJson = p.encryptWith(jweProviders, perRecipientHeades);
+doTestMultipleRecipients(jweJson);
+}
+private void doTestMultipleRecipients(String jweJson) {
final String text = "The true sign of intelligence is not knowledge
but imagination.";
SecretKey wrappe
[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/b6b98721 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b6b98721 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b6b98721 Branch: refs/heads/master Commit: b6b9872181c119b2dfb6516400ad02eb897ee33f Parents: 74d7990 04720d5 Author: Sergey Beryozkin Authored: Thu Dec 29 15:43:15 2016 + Committer: Sergey Beryozkin Committed: Thu Dec 29 15:43:15 2016 + -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[1/2] cxf git commit: Upgrading swagger-core to 1.5.12
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 4295775d2 -> feaececcc refs/heads/master aa5cb3f48 -> 04720d55a Upgrading swagger-core to 1.5.12 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/feaececc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/feaececc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/feaececc Branch: refs/heads/3.1.x-fixes Commit: feaececcc19cf13b42d2c20d8f8a6e5c465cda93 Parents: 4295775 Author: Francesco Chicchiriccò Authored: Thu Dec 29 15:27:38 2016 +0100 Committer: Francesco Chicchiriccò Committed: Thu Dec 29 15:27:38 2016 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/feaececc/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 980ec15..e39c7e5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -151,7 +151,7 @@ 2.2.0.RELEASE spring-test 1.3.13 -1.5.11 +1.5.12 1.7 4.4.1 3.1.4
[2/2] cxf git commit: Upgrading swagger-core to 1.5.12
Upgrading swagger-core to 1.5.12 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/04720d55 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/04720d55 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/04720d55 Branch: refs/heads/master Commit: 04720d55a297aa4778a8194a766d9159ba662d33 Parents: aa5cb3f Author: Francesco Chicchiriccò Authored: Thu Dec 29 15:27:38 2016 +0100 Committer: Francesco Chicchiriccò Committed: Thu Dec 29 15:27:52 2016 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/04720d55/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 85f8338..8b3bfe9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -150,7 +150,7 @@ 2.2.0.RELEASE spring-test 1.3.13 -1.5.11 +1.5.12 1.7 5.0.3 3.1.4
cxf git commit: [CXF-7198] Fixing spring_boot demos
Repository: cxf Updated Branches: refs/heads/master 970d918a6 -> aa5cb3f48 [CXF-7198] Fixing spring_boot demos Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aa5cb3f4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aa5cb3f4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aa5cb3f4 Branch: refs/heads/master Commit: aa5cb3f487fce03a0c069ae4bd33fae82be1e8b3 Parents: 970d918 Author: Sergey Beryozkin Authored: Thu Dec 29 12:54:49 2016 + Committer: Sergey Beryozkin Committed: Thu Dec 29 12:54:49 2016 + -- distribution/src/main/release/samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/aa5cb3f4/distribution/src/main/release/samples/pom.xml -- diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 4930929..45746a0 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -30,7 +30,7 @@ true UTF-8 -1.3.6.RELEASE +1.4.3.RELEASE 1.1.3.RELEASE
cxf git commit: [CXF-7195] Updating rt/rs/extensions/providers pom
Repository: cxf
Updated Branches:
refs/heads/master 1e49510ea -> 970d918a6
[CXF-7195] Updating rt/rs/extensions/providers pom
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/970d918a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/970d918a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/970d918a
Branch: refs/heads/master
Commit: 970d918a69efe5f8a601f20bb575a23f95a472c5
Parents: 1e49510
Author: Sergey Beryozkin
Authored: Thu Dec 29 12:03:48 2016 +
Committer: Sergey Beryozkin
Committed: Thu Dec 29 12:03:48 2016 +
--
rt/rs/extensions/providers/pom.xml | 23 +--
1 file changed, 1 insertion(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/970d918a/rt/rs/extensions/providers/pom.xml
--
diff --git a/rt/rs/extensions/providers/pom.xml
b/rt/rs/extensions/providers/pom.xml
index 068026a..b474e8c 100644
--- a/rt/rs/extensions/providers/pom.xml
+++ b/rt/rs/extensions/providers/pom.xml
@@ -147,26 +147,5 @@
test
-
-
-
-org.codehaus.mojo
-xmlbeans-maven-plugin
-
-
-
-xmlbeans-test
-
-
-
-
-src/test/xsd/xmlbeans
-
${project.build.directory}/generated/src/test/java
-
${project.build.directory}/generated/src/test/resources
-
-1.5
-
-
-
-
+
cxf git commit: [CXF-7196] Removing SDO test code in rt/rs/extensions/providers
Repository: cxf
Updated Branches:
refs/heads/master 3be1cef6d -> 1e49510ea
[CXF-7196] Removing SDO test code in rt/rs/extensions/providers
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1e49510e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1e49510e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1e49510e
Branch: refs/heads/master
Commit: 1e49510ea71551e543b22f6693307b1436e81db0
Parents: 3be1cef
Author: Sergey Beryozkin
Authored: Thu Dec 29 12:00:38 2016 +
Committer: Sergey Beryozkin
Committed: Thu Dec 29 12:00:38 2016 +
--
rt/rs/extensions/providers/pom.xml | 6 -
.../cxf/jaxrs/resources/sdo/SdoFactory.java | 30 --
.../cxf/jaxrs/resources/sdo/Structure.java | 59 ---
.../resources/sdo/impl/SdoFactoryImpl.java | 154 --
.../jaxrs/resources/sdo/impl/StructureImpl.java | 510 ---
.../cxf/jaxrs/resources/sdo/structure.xsd | 29 --
6 files changed, 788 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1e49510e/rt/rs/extensions/providers/pom.xml
--
diff --git a/rt/rs/extensions/providers/pom.xml
b/rt/rs/extensions/providers/pom.xml
index a698681..068026a 100644
--- a/rt/rs/extensions/providers/pom.xml
+++ b/rt/rs/extensions/providers/pom.xml
@@ -132,12 +132,6 @@
test
-org.apache.cxf
-cxf-rt-databinding-sdo
-${project.version}
-test
-
-
org.springframework
spring-core
test
http://git-wip-us.apache.org/repos/asf/cxf/blob/1e49510e/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java
--
diff --git
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java
deleted file mode 100644
index df53a79..000
---
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/SdoFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.jaxrs.resources.sdo;
-
-import commonj.sdo.helper.HelperContext;
-
-public interface SdoFactory {
-
-SdoFactory INSTANCE =
org.apache.cxf.jaxrs.resources.sdo.impl.SdoFactoryImpl.init();
-Structure createStructure();
-
-void register(HelperContext scope);
-}
-
http://git-wip-us.apache.org/repos/asf/cxf/blob/1e49510e/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java
--
diff --git
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java
deleted file mode 100644
index aa0e27f..000
---
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/resources/sdo/Structure.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 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.
- */
-/**
- * Licensed to the Apache Software Foundation (
cxf git commit: [CXF-7164] Moving BraveFeature into a brave package
Repository: cxf
Updated Branches:
refs/heads/master 73d1f886a -> 3be1cef6d
[CXF-7164] Moving BraveFeature into a brave package
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3be1cef6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3be1cef6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3be1cef6
Branch: refs/heads/master
Commit: 3be1cef6d16405b7e046c822c27dc7223f24
Parents: 73d1f88
Author: Sergey Beryozkin
Authored: Thu Dec 29 11:00:11 2016 +
Committer: Sergey Beryozkin
Committed: Thu Dec 29 11:00:11 2016 +
--
integration/tracing/tracing-brave/pom.xml | 2 +-
.../apache/cxf/tracing/brave/BraveFeature.java | 51 +++
.../cxf/tracing/brave/jaxws/BraveFeature.java | 53
.../cxf/tracing/brave/BraveTraceTest.java | 2 +-
4 files changed, 53 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3be1cef6/integration/tracing/tracing-brave/pom.xml
--
diff --git a/integration/tracing/tracing-brave/pom.xml
b/integration/tracing/tracing-brave/pom.xml
index b105b47..74363bd 100644
--- a/integration/tracing/tracing-brave/pom.xml
+++ b/integration/tracing/tracing-brave/pom.xml
@@ -58,7 +58,7 @@
org.apache.cxf
cxf-rt-frontend-jaxws
${project.version}
-true
+test
org.apache.cxf
http://git-wip-us.apache.org/repos/asf/cxf/blob/3be1cef6/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
--
diff --git
a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
new file mode 100644
index 000..7b352bf
--- /dev/null
+++
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
@@ -0,0 +1,51 @@
+/**
+ * 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 com.github.kristofa.brave.Brave;
+import com.github.kristofa.brave.http.DefaultSpanNameProvider;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.annotations.Provider;
+import org.apache.cxf.annotations.Provider.Type;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.interceptor.InterceptorProvider;
+
+@NoJSR250Annotations
+@Provider(value = Type.Feature)
+public class BraveFeature extends AbstractFeature {
+private BraveStartInterceptor in;
+private BraveStopInterceptor out;
+
+public BraveFeature(Brave brave) {
+DefaultSpanNameProvider nameProvider = new DefaultSpanNameProvider();
+in = new BraveStartInterceptor(brave, nameProvider);
+out = new BraveStopInterceptor(brave, nameProvider);
+}
+
+@Override
+protected void initializeProvider(InterceptorProvider provider, Bus bus) {
+provider.getInInterceptors().add(in);
+provider.getInFaultInterceptors().add(in);
+
+provider.getOutInterceptors().add(out);
+provider.getOutFaultInterceptors().add(out);
+}
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/3be1cef6/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
deleted file mode 100644
index 876d026..000
---
a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxws/BraveFeature.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or mor
