cxf git commit: [CXF-6993] Moving the cek auto-generation into where it should be in ContentEncryptionProvider, and optionally controlling if a cek should be generated once

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 4fbb05ce3 -> 6b7631060


[CXF-6993] Moving the cek auto-generation into where it should be in 
ContentEncryptionProvider, and optionally controlling if a cek should be 
generated once


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

Branch: refs/heads/3.1.x-fixes
Commit: 6b7631060e263852af694c3bb307db19a3d68c19
Parents: 4fbb05c
Author: Sergey Beryozkin 
Authored: Wed Mar 22 22:41:32 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 22:54:01 2017 +

--
 .../jwe/AbstractContentEncryptionAlgorithm.java | 27 ---
 .../jose/jwe/AbstractJweEncryption.java | 16 ---
 .../jose/jwe/AesCbcHmacJweEncryption.java   | 28 
 .../jwe/AesGcmContentEncryptionAlgorithm.java   |  6 -
 .../security/jose/jwe/JweJsonConsumerTest.java  |  8 +++---
 .../jaxrs/security/jose/jwejws/server.xml   |  2 +-
 6 files changed, 49 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6b763106/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
index 3e08de2..af25eac 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.jose.jwe;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.cxf.rs.security.jose.jwa.AlgorithmUtils;
 import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
 import org.apache.cxf.rt.security.crypto.CryptoUtils;
 
@@ -30,9 +31,13 @@ public abstract class AbstractContentEncryptionAlgorithm 
extends AbstractContent
 private byte[] cek;
 private byte[] iv;
 private AtomicInteger providedIvUsageCount;
+private boolean generateCekOnce;
 
-
-protected AbstractContentEncryptionAlgorithm(byte[] cek, byte[] iv, 
ContentAlgorithm algo) { 
+protected AbstractContentEncryptionAlgorithm(ContentAlgorithm algo, 
boolean generateCekOnce) {
+super(algo);
+this.generateCekOnce = generateCekOnce;
+}
+protected AbstractContentEncryptionAlgorithm(byte[] cek, byte[] iv, 
ContentAlgorithm algo) {
 super(algo);
 this.cek = cek;
 this.iv = iv;
@@ -42,7 +47,18 @@ public abstract class AbstractContentEncryptionAlgorithm 
extends AbstractContent
 }
 
 public byte[] getContentEncryptionKey(JweHeaders headers) {
-return cek;
+byte[] theCek = null;
+if (cek == null) {
+String algoJava = getAlgorithm().getJavaName();
+theCek = 
CryptoUtils.getSecretKey(AlgorithmUtils.stripAlgoProperties(algoJava),
+  getContentEncryptionKeySize(headers)).getEncoded();
+if (generateCekOnce) {
+cek = theCek;
+}
+} else {
+theCek = cek;
+}
+return theCek;
 }
 public byte[] getInitVector() {
 if (iv == null) {
@@ -54,7 +70,10 @@ public abstract class AbstractContentEncryptionAlgorithm 
extends AbstractContent
 return iv;
 }
 }
-protected int getIvSize() { 
+protected int getContentEncryptionKeySize(JweHeaders headers) {
+return getAlgorithm().getKeySizeBits();
+}
+protected int getIvSize() {
 return DEFAULT_IV_SIZE;
 }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/6b763106/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index a72b24a..1660671 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java

cxf git commit: Moving the cek auto-generation into where it should be in ContentEncryptionProvider, and optionally controlling if a cek should be generated once

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 162282359 -> 64070aa91


Moving the cek auto-generation into where it should be in 
ContentEncryptionProvider, and optionally controlling if a cek should be 
generated once


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

Branch: refs/heads/master
Commit: 64070aa91b4b56155faf7703520a5142fa7a6e36
Parents: 1622823
Author: Sergey Beryozkin 
Authored: Wed Mar 22 22:41:32 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 22:41:32 2017 +

--
 .../jwe/AbstractContentEncryptionAlgorithm.java | 25 +---
 .../jose/jwe/AbstractJweEncryption.java | 16 -
 .../jose/jwe/AesCbcHmacJweEncryption.java   | 22 ++---
 .../jwe/AesGcmContentEncryptionAlgorithm.java   |  6 -
 .../security/jose/jwe/JweJsonConsumerTest.java  |  4 +---
 .../jaxrs/security/jose/jwejws/server.xml   |  2 +-
 6 files changed, 43 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/64070aa9/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
index 1ea2e1a..6e27289 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
@@ -20,6 +20,7 @@ package org.apache.cxf.rs.security.jose.jwe;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.cxf.rs.security.jose.jwa.AlgorithmUtils;
 import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
 import org.apache.cxf.rt.security.crypto.CryptoUtils;
 
@@ -30,8 +31,12 @@ public abstract class AbstractContentEncryptionAlgorithm 
extends AbstractContent
 private byte[] cek;
 private byte[] iv;
 private AtomicInteger providedIvUsageCount;
-
-
+private boolean generateCekOnce;
+
+protected AbstractContentEncryptionAlgorithm(ContentAlgorithm algo, 
boolean generateCekOnce) {
+super(algo);
+this.generateCekOnce = generateCekOnce;
+}
 protected AbstractContentEncryptionAlgorithm(byte[] cek, byte[] iv, 
ContentAlgorithm algo) {
 super(algo);
 this.cek = cek;
@@ -42,7 +47,18 @@ public abstract class AbstractContentEncryptionAlgorithm 
extends AbstractContent
 }
 
 public byte[] getContentEncryptionKey(JweHeaders headers) {
-return cek;
+byte[] theCek = null;
+if (cek == null) {
+String algoJava = getAlgorithm().getJavaName();
+theCek = 
CryptoUtils.getSecretKey(AlgorithmUtils.stripAlgoProperties(algoJava),
+  getContentEncryptionKeySize(headers)).getEncoded();
+if (generateCekOnce) {
+cek = theCek;
+}
+} else {
+theCek = cek;
+}
+return theCek;
 }
 public byte[] getInitVector() {
 if (iv == null) {
@@ -54,6 +70,9 @@ public abstract class AbstractContentEncryptionAlgorithm 
extends AbstractContent
 return iv;
 }
 }
+protected int getContentEncryptionKeySize(JweHeaders headers) {
+return getAlgorithm().getKeySizeBits();
+}
 protected int getIvSize() {
 return DEFAULT_IV_SIZE;
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/64070aa9/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index acdc067..39057ed 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -29,7 +29,6 @@ import javax.crypto.SecretKey;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
 import 

[7/7] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: 4fbb05ce31ccfee730d144f328b90f300a64693b
Parents: 12e3611
Author: Daniel Kulp 
Authored: Wed Mar 22 16:15:30 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 16:15:30 2017 -0400

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4fbb05ce/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1277369..978df9d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -335,6 +335,7 @@ M 11e18bf5622cafdb10723cee895885d676b35a7b
 M 13d33c9ed261e06e44706cffa1671d67d31096a7
 M 146b00d1947058705c873dffe2ba78ad35c8b03c
 M 156b166b093aa92c1fc400e0f1f7440ded701169
+M 1622823593e1a9a836e0e354ad37ea1cc56c3fb8
 M 177579cad9c1a41b9b7c68ad69ed84de9fa08561
 M 19a4d72a32f1e18bec621af403ecdf21d97453af
 M 19c72e2049bf4cd98bd9e3e09a21e555226f1e60

[2/7] cxf git commit: Add documentation, remove unused LogEventMapper interface

[dkulp]

Add documentation, remove unused LogEventMapper interface

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

Branch: refs/heads/3.1.x-fixes
Commit: b1227d6ae33cc3e33a6685933f4c7ec51da3bd95
Parents: 61c7800
Author: Christian Schneider 
Authored: Tue Mar 21 15:25:16 2017 +0100
Committer: Daniel Kulp 
Committed: Wed Mar 22 15:20:56 2017 -0400

--
 .../logging/event/DefaultLogEventMapper.java|  2 +-
 .../cxf/ext/logging/event/LogEventMapper.java   | 25 
 .../ext/logging/event/LogMessageFormatter.java  |  2 +-
 .../ext/logging/event/PrettyLoggingFilter.java  |  4 
 4 files changed, 6 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b1227d6a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
--
diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 78bbc7b..0934c2c 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -45,7 +45,7 @@ import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.ContextUtils;
 
-public class DefaultLogEventMapper implements LogEventMapper {
+public class DefaultLogEventMapper {
 private static final Set BINARY_CONTENT_MEDIA_TYPES;
 static {
 BINARY_CONTENT_MEDIA_TYPES = new HashSet();

http://git-wip-us.apache.org/repos/asf/cxf/blob/b1227d6a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEventMapper.java
--
diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEventMapper.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEventMapper.java
deleted file mode 100644
index c187e3c..000
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEventMapper.java
+++ /dev/null
@@ -1,25 +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.ext.logging.event;
-
-import org.apache.cxf.message.Message;
-
-public interface LogEventMapper {
-LogEvent map(Message message);
-}

http://git-wip-us.apache.org/repos/asf/cxf/blob/b1227d6a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
--
diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
index 0c628f7..fe872d2 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogMessageFormatter.java
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.common.util.StringUtils;
 
 /**
- *
+ * Formats a log message showing the most important meta data
  */
 public final class LogMessageFormatter {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b1227d6a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
--
diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
index a3bc909..ccadc2f 100644
--- 

[4/7] cxf git commit: [CXF-6852] Some work on auto-cleanup of classloader for dynamic client

[dkulp]

[CXF-6852] Some work on auto-cleanup of classloader for dynamic client

# Conflicts:
#   
rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java


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

Branch: refs/heads/3.1.x-fixes
Commit: a4fad996752b933f0926a46dd0664c10bd1cfed2
Parents: b1227d6
Author: Daniel Kulp 
Authored: Wed Mar 22 14:32:31 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 15:21:56 2017 -0400

--
 .../endpoint/dynamic/DynamicClientFactory.java  | 27 +---
 1 file changed, 23 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a4fad996/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 2def391..d770095 100644
--- 
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ 
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -283,6 +283,25 @@ public class DynamicClientFactory {
List bindingFiles) {
 return createClient(wsdlUrl.toString(), service, classLoader, port, 
bindingFiles);
 }
+
+static class DynamicClientImpl extends ClientImpl implements AutoCloseable 
{
+final ClassLoader cl;
+final ClassLoader orig;
+DynamicClientImpl(Bus bus, Service svc, QName port, 
+  EndpointImplFactory endpointImplFactory,
+  ClassLoader l) {
+super(bus, svc, port, endpointImplFactory);
+cl = l;
+orig = Thread.currentThread().getContextClassLoader();
+}
+@Override
+public void close() throws Exception {
+destroy();
+if (Thread.currentThread().getContextClassLoader() == cl) {
+Thread.currentThread().setContextClassLoader(orig);
+}
+}
+}
 
 public Client createClient(String wsdlUrl, QName service,
ClassLoader classLoader, QName port,
@@ -298,9 +317,6 @@ public class DynamicClientFactory {
 sf.setAllowElementRefs(allowRefs);
 Service svc = sf.create();
 
-ClientImpl client = new ClientImpl(bus, svc, port,
-   getEndpointImplFactory());
-
 //all SI's should have the same schemas
 SchemaCollection schemas = 
svc.getServiceInfos().get(0).getXmlSchemaCollection();
 
@@ -378,7 +394,7 @@ public class DynamicClientFactory {
 throw new IllegalStateException("Internal error; a directory 
returns a malformed URL: "
 + mue.getMessage(), mue);
 }
-ClassLoader cl = ClassLoaderUtils.getURLClassLoader(urls, classLoader);
+final ClassLoader cl = ClassLoaderUtils.getURLClassLoader(urls, 
classLoader);
 
 JAXBContext context;
 Map contextProperties = jaxbContextProperties;
@@ -402,6 +418,9 @@ public class DynamicClientFactory {
 databinding.setContext(context);
 svc.setDataBinding(databinding);
 
+ClientImpl client = new DynamicClientImpl(bus, svc, port,
+  getEndpointImplFactory(), 
cl);
+
 ServiceInfo svcfo = 
client.getEndpoint().getEndpointInfo().getService();
 
 // Setup the new classloader!

[3/7] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: 21a7f538c3e91d2f5b0c1250c866ea43405bcb42
Parents: a4fad99
Author: Daniel Kulp 
Authored: Wed Mar 22 15:21:56 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 15:21:56 2017 -0400

--
 .gitmergeinfo | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/21a7f538/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 244809a..1277369 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -20,6 +20,7 @@ B 0af65a4ab3ef2c31b9e88d34ddfbb05c79f0f50c
 B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
 B 0d5577ab87f324205565c4534b59e69049505356
 B 0dfaf8d72574511ad9027c663707f9e30b945fbc
+B 0e1d4826cab2975b437219f740381574536d4ff3
 B 0f74af5ed7561838e1950c758a7a05e588badd10
 B 101e9a0a43f2d819057d995adbb6e6776d5c7f40
 B 1116dff4ec9f06e2e69b040f5aa03779c0424c23
@@ -72,8 +73,10 @@ B 3ce7f00461d9c868301003b5c16138c491a9ac0b
 B 3f259221fa1dd9227397400ed9653374cb4fdc39
 B 3fbedf1397714824b9700cd4d49569087936fe1a
 B 3fc02937bd8ba0bb500a2cdfd8afa863b9cf6aec
+B 3fe8e92229ba50dbc6758e6420b44ac16751281e
 B 40380d8e57cdea0d909f3a9ee207628831c202fa
 B 40dd6d61c5e6e276df9437e5f000e103ee6101d6
+B 41262ee0264445ad7fe288c0f0bf640c8b9dbbc5
 B 4149e50e39a8d4ffb71924d42def376b634ef64a
 B 428bbe90e4189e70df9a6a450a10320c8be6d42f
 B 4301392fae084db72886290091ea5745144d97f5
@@ -192,6 +195,7 @@ B a2c912b418831967b49f59b2c8bf33a9eb53e281
 B a38da9e8f15fb158bf0982c61750ef48e5814792
 B a4167fb84baa1834bbe86be8a749c385f1af8c82
 B a4b794b55b1ea258e9168a58f05794f37aeeb049
+B a4b98454d147437ff71b92355d60e8bd48d56448
 B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
 B a81534d6655e046e7d316e6de38095fe3f4949cb
 B a93cbfd994c34000f27911c5aab6638b60d61ff7
@@ -333,7 +337,9 @@ M 146b00d1947058705c873dffe2ba78ad35c8b03c
 M 156b166b093aa92c1fc400e0f1f7440ded701169
 M 177579cad9c1a41b9b7c68ad69ed84de9fa08561
 M 19a4d72a32f1e18bec621af403ecdf21d97453af
+M 19c72e2049bf4cd98bd9e3e09a21e555226f1e60
 M 19d8da7f0672b86dbf88a08b54a72297d0ca2d20
+M 1a7411c270810507626a15d4a4cdc574d6ff62c3
 M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
 M 1e57d379863d01b9330fff797c14d81a56b0b0f2
 M 20d0a2811c15cb65a402eb063e1359236d7014ea
@@ -348,9 +354,11 @@ M 3088952a6e3385ee628cf8c91340908ed3a67aa3
 M 315a6dc119f7bf0ad1f8f8ee74093327852dc365
 M 34fd320f91d933233aeb364120456f4fa0f220ac
 M 366a556210a1a7b047c4b4dd8da4fc74af6bd301
+M 3833280c67c489a7e83b8540361df4154f4aeccf
 M 386805560479b35276d88605c5acf805e3004aa5
 M 39c772a0764b323f98ab58e00345f4fca924c425
 M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
+M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
 M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
 M 3e30d8892a723adcf04268efd7d407e164607065
 M 437c7daa3345c8482deab4a4da9b164e68fd417a
@@ -371,6 +379,7 @@ M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
 M 6242c682dfce4a2ba4869978c28b14f1472484c1
 M 63a1088a9253da0452497440e900d35a5415c3c9
 M 65c1204abcef8720d4eb985d58e3f865e39a1da3
+M 6613e46662317ea151f72e26e5deb4f50148a148
 M 66e97c77eaa43ab3a2cd95f0edc6a27e7445e8ce
 M 6becb31c62ef0845a5078f4ec2124fe7bc264e58
 M 6d7985f39b83d28b0ca3e485be8de8f986d6f6c1
@@ -411,6 +420,7 @@ M 9b2bda583c09861c693122ab631c4bffa2187ddd
 M 9b816a21d8b85cc051be59a8ab6e968c5d0d
 M 9cd3116cbdbbfb139f40ad2d9e49cec1adf08a08
 M 9d3c46e0cfe87700d7105ee131c3e3e33f228e06
+M 9d64bcedb508732cdc377312f0fb433ee1dc630e
 M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
 M a034e5853484a7ef0a9f0ad1ae6582178f622f31
 M a1710bdd783afcd667d9e72ccb031480d3806850
@@ -423,6 +433,7 @@ M a9fe8470ce9522f08c298e58f76636c48d57b7a4
 M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
 M ad18f5aef28eb82d613b3f4226b2ddae19b6415f
 M ad200706d0ea914987930a64d2f5c14336a0c641
+M ae3ae2a25109375cc82114d15078f04e8c5353c5
 M b0a79aa7b48da6acdc6da1169abd690ecf914ca8
 M b1c6125f50b294b0e2ebc927671e2ff53b5001bf
 M b2b6f0137cd9f1bafff5d487e8383453692a2ff0
@@ -444,11 +455,13 @@ M cf806d5cba74e47c6e5ba3231df4228cbaad3e90
 M cf8ac102e728b8745da265ec969f7b5160829fdb
 M d0821bce5faa119c882a9000dbe03a124df5b033
 M d187ef6f3906d867a8c30a991d9074d170bca487
+M d3bf494ef4987debad986cae87cfe5f095b79090
 M d46818bd3043d211774de9bc531849f54bb2989f
 M db1e5146e6312a4be35b0ca2644a691cb1d41a0f
 M dba09f00804cc05d943fd95d34882d6368c28edb
 M ded06c40ba057981e003903faa93beb94cbe11fa
 M df3854cefae5d2da71f8d222a86218e81df7bd05
+M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
 M e578ea946aa13177adef98727e3e4606652ffc76
 M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa
 M 

[5/7] cxf git commit: [CXF-5096] Fix onerror call. Patch from Florian Vielhauer applied

[dkulp]

[CXF-5096] Fix onerror call.
Patch from Florian Vielhauer applied


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

Branch: refs/heads/3.1.x-fixes
Commit: 4cae317ee165144f4f3cc1ce41bc6ab261f59c7e
Parents: 21a7f53
Author: Daniel Kulp 
Authored: Wed Mar 22 15:25:47 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 16:14:13 2017 -0400

--
 .../src/main/resources/org/apache/cxf/javascript/cxf-utils.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/4cae317e/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
--
diff --git 
a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
 
b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
index 8c9f451..00b0c41 100644
--- 
a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
+++ 
b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
@@ -914,7 +914,7 @@ function org_apache_cxf_client_onReadyState() {
this.utils
.trace("onreadystatechange DONE ERROR 
retrieving status (connection error?)");
if (this.onerror != null) {
-   this.onerror(e);
+   this.onerror(this);
}
return;
 

[6/7] cxf git commit: [CXF-5782] Move logged class names to FINE

[dkulp]

[CXF-5782] Move logged class names to FINE

# Conflicts:
#   core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 12e3611ad50deb4df9f6b5e820d20e63c710ac84
Parents: 4cae317
Author: Daniel Kulp 
Authored: Wed Mar 22 15:39:28 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 16:15:30 2017 -0400

--
 core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/12e3611a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java 
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index 9ff8800..be86175 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -740,7 +740,7 @@ public final class JAXBUtils {
 }
 
 public static void logGeneratedClassNames(Logger logger, JCodeModel 
codeModel) {
-if (!logger.isLoggable(Level.INFO)) {
+if (!logger.isLoggable(Level.FINE)) {
 return;
 }
 
@@ -759,7 +759,7 @@ public final class JAXBUtils {
 }
 }
 
-logger.log(Level.INFO, "Created classes: " + sb.toString());
+logger.log(Level.FINE, "Created classes: " + sb.toString());
 }
 
 public static List getGeneratedClassNames(JCodeModel codeModel) {

[2/2] cxf git commit: [CXF-5782] Move logged class names to FINE

[dkulp]

[CXF-5782] Move logged class names to FINE


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

Branch: refs/heads/master
Commit: 1622823593e1a9a836e0e354ad37ea1cc56c3fb8
Parents: f186ffe
Author: Daniel Kulp 
Authored: Wed Mar 22 15:39:28 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 15:39:28 2017 -0400

--
 core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/16228235/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java 
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index 8527851..24d749a 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -739,7 +739,7 @@ public final class JAXBUtils {
 }
 
 public static void logGeneratedClassNames(Logger logger, JCodeModel 
codeModel) {
-if (!logger.isLoggable(Level.INFO)) {
+if (!logger.isLoggable(Level.FINE)) {
 return;
 }
 
@@ -758,7 +758,7 @@ public final class JAXBUtils {
 }
 }
 
-logger.log(Level.INFO, "Created classes: " + sb.toString());
+logger.log(Level.FINE, "Created classes: " + sb.toString());
 }
 
 public static List getGeneratedClassNames(JCodeModel codeModel) {

[1/2] cxf git commit: [CXF-5096] Fix onerror call. Patch from Florian Vielhauer applied

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master e4cb2ea43 -> 162282359


[CXF-5096] Fix onerror call.
Patch from Florian Vielhauer applied


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

Branch: refs/heads/master
Commit: f186ffe0e4aa3d911a5837fc6f0b9258b5e6dc96
Parents: e4cb2ea
Author: Daniel Kulp 
Authored: Wed Mar 22 15:25:47 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 15:25:47 2017 -0400

--
 .../src/main/resources/org/apache/cxf/javascript/cxf-utils.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f186ffe0/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
--
diff --git 
a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
 
b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
index 8c9f451..00b0c41 100644
--- 
a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
+++ 
b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
@@ -914,7 +914,7 @@ function org_apache_cxf_client_onReadyState() {
this.utils
.trace("onreadystatechange DONE ERROR 
retrieving status (connection error?)");
if (this.onerror != null) {
-   this.onerror(e);
+   this.onerror(this);
}
return;
 

cxf git commit: [CXF-6852] Some work on auto-cleanup of classloader for dynamic client

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 013e6c800 -> e4cb2ea43


[CXF-6852] Some work on auto-cleanup of classloader for dynamic client


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

Branch: refs/heads/master
Commit: e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
Parents: 013e6c8
Author: Daniel Kulp 
Authored: Wed Mar 22 14:32:31 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 15:19:07 2017 -0400

--
 .../endpoint/dynamic/DynamicClientFactory.java  | 27 +---
 1 file changed, 23 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e4cb2ea4/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
--
diff --git 
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 600a2f8..1640cfc 100644
--- 
a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ 
b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -284,6 +284,25 @@ public class DynamicClientFactory {
 return createClient(wsdlUrl.toString(), service, classLoader, port, 
bindingFiles);
 }
 
+static class DynamicClientImpl extends ClientImpl implements AutoCloseable 
{
+final ClassLoader cl;
+final ClassLoader orig;
+DynamicClientImpl(Bus bus, Service svc, QName port, 
+  EndpointImplFactory endpointImplFactory,
+  ClassLoader l) {
+super(bus, svc, port, endpointImplFactory);
+cl = l;
+orig = Thread.currentThread().getContextClassLoader();
+}
+@Override
+public void close() throws Exception {
+destroy();
+if (Thread.currentThread().getContextClassLoader() == cl) {
+Thread.currentThread().setContextClassLoader(orig);
+}
+}
+}
+
 public Client createClient(String wsdlUrl, QName service,
ClassLoader classLoader, QName port,
List bindingFiles) {
@@ -298,9 +317,6 @@ public class DynamicClientFactory {
 sf.setAllowElementRefs(allowRefs);
 Service svc = sf.create();
 
-ClientImpl client = new ClientImpl(bus, svc, port,
-   getEndpointImplFactory());
-
 //all SI's should have the same schemas
 SchemaCollection schemas = 
svc.getServiceInfos().get(0).getXmlSchemaCollection();
 
@@ -378,7 +394,7 @@ public class DynamicClientFactory {
 throw new IllegalStateException("Internal error; a directory 
returns a malformed URL: "
 + mue.getMessage(), mue);
 }
-ClassLoader cl = ClassLoaderUtils.getURLClassLoader(urls, classLoader);
+final ClassLoader cl = ClassLoaderUtils.getURLClassLoader(urls, 
classLoader);
 
 JAXBContext context;
 Map contextProperties = jaxbContextProperties;
@@ -402,6 +418,9 @@ public class DynamicClientFactory {
 databinding.setContext(context);
 svc.setDataBinding(databinding);
 
+ClientImpl client = new DynamicClientImpl(bus, svc, port,
+  getEndpointImplFactory(), 
cl);
+
 ServiceInfo svcfo = 
client.getEndpoint().getEndpointInfo().getService();
 
 // Setup the new classloader!

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c8ebd4d31 -> f8c4dfa89


Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: f8c4dfa89e48e4193f082eca08788d5e0b45a83f
Parents: c8ebd4d
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 19:17:57 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 19:17:57 2017 +

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f8c4dfa8/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7b92494..3ae4d64 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1345,6 +1345,7 @@ B d9ddf02246f49511d29cda8e6458e5d28c4f861d
 B d9f624e2eca8affa20243583ace087a8cbba3ac8
 B da40221a626a1df88dc1260fa8e58b869bb99cf0
 B da47bede91c824542bef91ea59e39f77c6e1fb2d
+B da4846fee6ada4adb48a5b78c44319a0c301b698
 B da4ccb008fcad909025cab0a00c56c00728c195b
 B da53162f385fa73957626446cbd63ea269c1ee26
 B da7b9bf9b0e0799ccf066e340035ece672ac2b07

cxf git commit: Typo

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 53bb83326 -> da4846fee


Typo


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

Branch: refs/heads/3.1.x-fixes
Commit: da4846fee6ada4adb48a5b78c44319a0c301b698
Parents: 53bb833
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 19:15:14 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 19:17:37 2017 +

--
 .../org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/da4846fe/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index 8050e38..a632060 100644
--- 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -326,7 +326,7 @@ public final class TLSParameterJaxBUtils {
 }
 
 /**
- * This method converts the JAXB KeyManagersType into a list of
+ * This method converts the JAXB TrustManagersType into a list of
  * JSSE TrustManagers.
  */
 public static TrustManager[] getTrustManagers(TrustManagersType tmc)

cxf git commit: Typo

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 20951aeac -> 013e6c800


Typo


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

Branch: refs/heads/master
Commit: 013e6c800b2e9ec2e44f0521145cbf88c33f0a05
Parents: 20951ae
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 19:15:14 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 19:15:23 2017 +

--
 .../org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/013e6c80/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index ee6bf58..b826542 100644
--- 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -326,7 +326,7 @@ public final class TLSParameterJaxBUtils {
 }
 
 /**
- * This method converts the JAXB KeyManagersType into a list of
+ * This method converts the JAXB TrustManagersType into a list of
  * JSSE TrustManagers.
  */
 public static TrustManager[] getTrustManagers(TrustManagersType tmc)

cxf git commit: Fix checkstyle issues

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master db5c2ef07 -> 20951aeac


Fix checkstyle issues


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

Branch: refs/heads/master
Commit: 20951aeac115e7ae95f4d4cc04da288d2f47e4b2
Parents: db5c2ef
Author: Daniel Kulp 
Authored: Wed Mar 22 13:38:52 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 13:38:52 2017 -0400

--
 .../sample/rs/service/SampleRestApplicationTest.java |  9 +
 .../sample/rs/service/SampleRestApplicationTest.java |  9 +
 .../java/sample/ws/service/SampleWsApplicationTest.java  | 11 ++-
 3 files changed, 16 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/20951aea/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
index 70d5e1c..d85654a 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -19,15 +19,16 @@
 package sample.rs.service;
 
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.springframework.boot.context.embedded.LocalServerPort;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SampleRestApplication.class, webEnvironment = 
WebEnvironment.RANDOM_PORT)

http://git-wip-us.apache.org/repos/asf/cxf/blob/20951aea/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
index 70d5e1c..d85654a 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -19,15 +19,16 @@
 package sample.rs.service;
 
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.springframework.boot.context.embedded.LocalServerPort;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SampleRestApplication.class, webEnvironment = 
WebEnvironment.RANDOM_PORT)

http://git-wip-us.apache.org/repos/asf/cxf/blob/20951aea/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
index 13e68eb..53f7277 100644
--- 

cxf git commit: Ading slf4j dep back to the jaxrs spring demos

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b81dd0934 -> 53bb83326


Ading slf4j dep back to the jaxrs spring demos


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

Branch: refs/heads/3.1.x-fixes
Commit: 53bb8332632ca0ec386f0cf312fccef63458fc18
Parents: b81dd09
Author: Sergey Beryozkin 
Authored: Wed Mar 22 16:30:55 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 16:38:48 2017 +

--
 .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 4 
 .../release/samples/jax_rs/spring_boot_scan/application/pom.xml | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/53bb8332/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index e868b91..33dce7e 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -43,6 +43,10 @@
 spring-boot-starter-test
 test
 
+
+org.slf4j
+slf4j-jdk14
+
 
 
 ${project.artifactId}

http://git-wip-us.apache.org/repos/asf/cxf/blob/53bb8332/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index e2a5995..5c8295d 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -63,7 +63,10 @@
 spring-boot-starter-test
 test
 
-
+
+org.slf4j
+slf4j-jdk14
+
 
 
 

cxf git commit: Ading slf4j dep back to the jaxrs spring demos

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 19c72e204 -> db5c2ef07


Ading slf4j dep back to the jaxrs spring demos


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

Branch: refs/heads/master
Commit: db5c2ef0754e64175d0bbaaabfe256a7cf3204c5
Parents: 19c72e2
Author: Sergey Beryozkin 
Authored: Wed Mar 22 16:30:55 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 16:30:55 2017 +

--
 .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 4 
 .../release/samples/jax_rs/spring_boot_scan/application/pom.xml | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/db5c2ef0/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index f8d8562..1235abb 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -44,6 +44,10 @@
 spring-boot-starter-test
 test
 
+
+org.slf4j
+slf4j-jdk14
+
 
 
 ${project.artifactId}

http://git-wip-us.apache.org/repos/asf/cxf/blob/db5c2ef0/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 0e7fdde..224791b 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -64,7 +64,10 @@
 spring-boot-starter-test
 test
 
-
+
+org.slf4j
+slf4j-jdk14
+
 
 
 

cxf git commit: Update jaxws_spring_boot sample client to make a call to the service and print result

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d69a9c8cc -> b81dd0934


Update jaxws_spring_boot sample client to make a call to the service and print 
result


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

Branch: refs/heads/3.1.x-fixes
Commit: b81dd0934986a17a46da8efdd4d3faee02e1d82c
Parents: d69a9c8
Author: Daniel Kulp 
Authored: Wed Mar 22 12:18:48 2017 -0400
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 16:35:35 2017 +

--
 .../sample/ws/SampleWsApplicationClient.java| 32 
 1 file changed, 19 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b81dd093/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
--
diff --git 
a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
index 15ea971..e234fd2 100644
--- 
a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
+++ 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
@@ -19,30 +19,36 @@
 package sample.ws;
 
 import java.io.StringReader;
+import java.net.URL;
 
-import javax.xml.transform.stream.StreamResult;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+
+import org.apache.cxf.staxutils.StaxUtils;
 
 
 //CHECKSTYLE:OFF
 public class SampleWsApplicationClient {
- 
-public static void main(String[] args) {
+
+public static void main(String[] args) throws Exception {
 String address = "http://localhost:8080/Service/Hello;;
-// final String request =
-// "http://service.ws.sample\;>Elan";
 String request = "http://service.ws.sample/\;>Elan";
 
 StreamSource source = new StreamSource(new StringReader(request));
-StreamResult result = new StreamResult(System.out);
-
-//assertThat(this.output.toString(),
-//   containsString(""
-//  + "http://service.ws.sample/\;>"
-//  + "Hello, Welcome to CXF Spring 
boot Elan!!!"
-//  + ""));
+Service service = Service.create(new URL(address + "?wsdl"), 
+ new QName("http://service.ws.sample/; 
, "HelloService"));
+Dispatch disp = service.createDispatch(new 
QName("http://service.ws.sample/; , "HelloPort"),
+   Source.class, 
Mode.PAYLOAD);
+
+Source result = disp.invoke(source);
+String resultAsString = StaxUtils.toString(result);
+System.out.println(resultAsString);
+   
 }
-
 }
 //CHECKSTYLE:ON
 

cxf git commit: Update jaxws_spring_boot sample client to make a call to the service and print result

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master cbbf90575 -> 19c72e204


Update jaxws_spring_boot sample client to make a call to the service and print 
result


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

Branch: refs/heads/master
Commit: 19c72e2049bf4cd98bd9e3e09a21e555226f1e60
Parents: cbbf905
Author: Daniel Kulp 
Authored: Wed Mar 22 12:18:48 2017 -0400
Committer: Daniel Kulp 
Committed: Wed Mar 22 12:18:48 2017 -0400

--
 .../release/samples/jaxws_spring_boot/pom.xml   |  4 +++
 .../sample/ws/SampleWsApplicationClient.java| 30 
 2 files changed, 22 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/19c72e20/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml 
b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index 000f336..88feb93 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -25,6 +25,10 @@
 
 
 
+org.slf4j
+slf4j-jdk14
+
+
 org.apache.cxf
 cxf-spring-boot-starter-jaxws
 ${project.version}

http://git-wip-us.apache.org/repos/asf/cxf/blob/19c72e20/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
--
diff --git 
a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
index 361b067..e234fd2 100644
--- 
a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
+++ 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
@@ -19,30 +19,36 @@
 package sample.ws;
 
 import java.io.StringReader;
+import java.net.URL;
 
-import javax.xml.transform.stream.StreamResult;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+
+import org.apache.cxf.staxutils.StaxUtils;
 
 
 //CHECKSTYLE:OFF
 public class SampleWsApplicationClient {
 
-public static void main(String[] args) {
+public static void main(String[] args) throws Exception {
 String address = "http://localhost:8080/Service/Hello;;
-// final String request =
-// "http://service.ws.sample\;>Elan";
 String request = "http://service.ws.sample/\;>Elan";
 
 StreamSource source = new StreamSource(new StringReader(request));
-StreamResult result = new StreamResult(System.out);
-
-//assertThat(this.output.toString(),
-//   containsString(""
-//  + "http://service.ws.sample/\;>"
-//  + "Hello, Welcome to CXF Spring 
boot Elan!!!"
-//  + ""));
+Service service = Service.create(new URL(address + "?wsdl"), 
+ new QName("http://service.ws.sample/; 
, "HelloService"));
+Dispatch disp = service.createDispatch(new 
QName("http://service.ws.sample/; , "HelloPort"),
+   Source.class, 
Mode.PAYLOAD);
+
+Source result = disp.invoke(source);
+String resultAsString = StaxUtils.toString(result);
+System.out.println(resultAsString);
+   
 }
-
 }
 //CHECKSTYLE:ON
 

cxf git commit: Adding the test to the spring_boot_scan/application

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 27398c0ed -> d69a9c8cc


Adding the test to the spring_boot_scan/application


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

Branch: refs/heads/3.1.x-fixes
Commit: d69a9c8cc8309cf58d132aa65a5b7bf5e0e2432a
Parents: 27398c0
Author: Sergey Beryozkin 
Authored: Wed Mar 22 14:11:23 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 14:13:04 2017 +

--
 .../jax_rs/spring_boot_scan/application/pom.xml |  4 --
 .../rs/service/SampleRestApplicationTest.java   | 57 
 2 files changed, 57 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d69a9c8c/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index fb011f2..e2a5995 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -59,10 +59,6 @@
 metrics-core
 
 
-org.slf4j
-slf4j-jdk14
-test
-
 org.springframework.boot
 spring-boot-starter-test
 test

http://git-wip-us.apache.org/repos/asf/cxf/blob/d69a9c8c/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
new file mode 100644
index 000..70d5e1c
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -0,0 +1,57 @@
+/**
+ * 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 sample.rs.service;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SampleRestApplication.class, webEnvironment = 
WebEnvironment.RANDOM_PORT)
+public class SampleRestApplicationTest {
+
+@LocalServerPort
+private int port;
+@Test
+public void testHelloRequest() throws Exception {
+WebClient wc = WebClient.create("http://localhost:; + port + 
"/services/helloservice");
+wc.accept("text/plain");
+
+// HelloServiceImpl1
+wc.path("sayHello").path("ApacheCxfUser");
+String greeting = wc.get(String.class);
+Assert.assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!", greeting); 
+ 
+// Reverse to the starting URI
+wc.back(true);
+
+// HelloServiceImpl2
+wc.path("sayHello2").path("ApacheCxfUser");
+greeting = wc.get(String.class);
+Assert.assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!", greeting); 
+}
+
+}

[2/2] cxf git commit: Adding the test to the spring_boot_scan/application

[sergeyb]

Adding the test to the spring_boot_scan/application


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

Branch: refs/heads/master
Commit: cbbf9057502bdac19a84509fcb6ac677c5fb5c4f
Parents: 7a4d6c9
Author: Sergey Beryozkin 
Authored: Wed Mar 22 14:11:23 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 14:11:23 2017 +

--
 .../jax_rs/spring_boot_scan/application/pom.xml |  4 --
 .../rs/service/SampleRestApplicationTest.java   | 57 
 2 files changed, 57 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cbbf9057/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index a784ebe..0e7fdde 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -60,10 +60,6 @@
 metrics-core
 
 
-org.slf4j
-slf4j-jdk14
-test
-
 org.springframework.boot
 spring-boot-starter-test
 test

http://git-wip-us.apache.org/repos/asf/cxf/blob/cbbf9057/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
new file mode 100644
index 000..70d5e1c
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -0,0 +1,57 @@
+/**
+ * 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 sample.rs.service;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SampleRestApplication.class, webEnvironment = 
WebEnvironment.RANDOM_PORT)
+public class SampleRestApplicationTest {
+
+@LocalServerPort
+private int port;
+@Test
+public void testHelloRequest() throws Exception {
+WebClient wc = WebClient.create("http://localhost:; + port + 
"/services/helloservice");
+wc.accept("text/plain");
+
+// HelloServiceImpl1
+wc.path("sayHello").path("ApacheCxfUser");
+String greeting = wc.get(String.class);
+Assert.assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!", greeting); 
+ 
+// Reverse to the starting URI
+wc.back(true);
+
+// HelloServiceImpl2
+wc.path("sayHello2").path("ApacheCxfUser");
+greeting = wc.get(String.class);
+Assert.assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!", greeting); 
+}
+
+}

[1/2] cxf git commit: Removing slf4j test dep, spring-boot-starter-test one is enough

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 061fe2270 -> cbbf90575


Removing slf4j test dep, spring-boot-starter-test one is enough


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

Branch: refs/heads/master
Commit: 7a4d6c9c28d869cedb4e38676632bd19f1d7397c
Parents: 061fe22
Author: Sergey Beryozkin 
Authored: Wed Mar 22 14:09:16 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 14:09:16 2017 +

--
 .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 5 -
 .../release/samples/jax_rs/spring_boot_scan/application/pom.xml | 5 +
 distribution/src/main/release/samples/jaxws_spring_boot/pom.xml | 5 -
 3 files changed, 5 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7a4d6c9c/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index 19213bc..f8d8562 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -40,11 +40,6 @@
 ${project.version}
 
 
-org.slf4j
-slf4j-jdk14
-test
-
-
 org.springframework.boot
 spring-boot-starter-test
 test

http://git-wip-us.apache.org/repos/asf/cxf/blob/7a4d6c9c/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 4b90d47..a784ebe 100644
--- 
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -63,7 +63,12 @@
 org.slf4j
 slf4j-jdk14
 test
+
+org.springframework.boot
+spring-boot-starter-test
+test
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/7a4d6c9c/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml 
b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index f74aaec..000f336 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -39,11 +39,6 @@
 spring-boot-starter-web-services
 test
 
-
-org.slf4j
-slf4j-jdk14
-test
-
 
 
 

cxf git commit: Minor test update

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 0a8ce71c2 -> e0dd6d974


Minor test update


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

Branch: refs/heads/3.1.x-fixes
Commit: e0dd6d9741e21f5f1cf494b106d7ffdfa9ddbe93
Parents: 0a8ce71
Author: Sergey Beryozkin 
Authored: Wed Mar 22 14:01:18 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 14:03:13 2017 +

--
 .../apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e0dd6d97/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
 
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
index e762f3f..f3472ed 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
@@ -25,6 +25,8 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
 @Entity
 public class TestingUserSubject extends UserSubject {
 
+private static final long serialVersionUID = 1336647038197837075L;
+
 public TestingUserSubject() {
 super();
 }

cxf git commit: Minor test update

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master d3bf494ef -> 061fe2270


Minor test update


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

Branch: refs/heads/master
Commit: 061fe22709422ac1089ec4155d422d77e9794975
Parents: d3bf494
Author: Sergey Beryozkin 
Authored: Wed Mar 22 14:01:18 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 14:01:18 2017 +

--
 .../apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/061fe227/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
 
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
index e762f3f..f3472ed 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/TestingUserSubject.java
@@ -25,6 +25,8 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
 @Entity
 public class TestingUserSubject extends UserSubject {
 
+private static final long serialVersionUID = 1336647038197837075L;
+
 public TestingUserSubject() {
 super();
 }

cxf git commit: Making sure jaxws_spring_boot test runs again

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 71ed0cb16 -> 0a8ce71c2


Making sure jaxws_spring_boot test runs again


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

Branch: refs/heads/3.1.x-fixes
Commit: 0a8ce71c2adfe44ff9903a25ff0b3f758d5be7fc
Parents: 71ed0cb
Author: Sergey Beryozkin 
Authored: Wed Mar 22 13:41:27 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 13:52:43 2017 +

--
 .../release/samples/jaxws_spring_boot/pom.xml   | 14 ++--
 .../ws/service/SampleWsApplicationTest.java | 81 +++
 .../ws/service/SampleWsApplicationTests.java| 82 
 3 files changed, 89 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0a8ce71c/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml 
b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index 008f6e0..8dadee0 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -24,17 +24,19 @@
 
 
 
-org.springframework.boot
-spring-boot-starter-test
+org.apache.cxf
+cxf-spring-boot-starter-jaxws
+${project.version}
 
 
 org.springframework.boot
-spring-boot-starter-ws
+spring-boot-starter-test
+test
 
 
-org.apache.cxf
-cxf-spring-boot-starter-jaxws
-${project.version}
+org.springframework.boot
+spring-boot-starter-web-services
+test
 
 
 org.slf4j

http://git-wip-us.apache.org/repos/asf/cxf/blob/0a8ce71c/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
new file mode 100644
index 000..13e68eb
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
@@ -0,0 +1,81 @@
+/**
+ * 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 sample.ws.service;
+
+import static org.hamcrest.Matchers.containsString;
+
+import java.io.StringReader;
+
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.ws.client.core.WebServiceTemplate;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertThat;
+
+import sample.ws.SampleWsApplication;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SampleWsApplication.class, webEnvironment = 
WebEnvironment.RANDOM_PORT)
+public class SampleWsApplicationTest {
+
+//CHECKSTYLE:OFF
+@Rule
+public OutputCapture output = new OutputCapture(); // SUPPRESS CHECKSTYLE
+//CHECKSTYLE:ON
+
+private WebServiceTemplate webServiceTemplate = new WebServiceTemplate();
+
+@LocalServerPort
+private int port;
+
+@Before
+public 

cxf git commit: Adding jaxrs/spring_boot demo test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 8f4ca20d8 -> 71ed0cb16


Adding jaxrs/spring_boot demo test


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

Branch: refs/heads/3.1.x-fixes
Commit: 71ed0cb1616e523260c5a4e5964dbaeb40279df3
Parents: 8f4ca20
Author: Sergey Beryozkin 
Authored: Wed Mar 22 13:33:24 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 13:43:00 2017 +

--
 .../release/samples/jax_rs/spring_boot/pom.xml  |  5 ++
 .../rs/service/SampleRestApplicationTest.java   | 57 
 2 files changed, 62 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/71ed0cb1/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index 534844d..10a90f4 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -43,6 +43,11 @@
 slf4j-jdk14
 test
 
+
+org.springframework.boot
+spring-boot-starter-test
+test
+
 
 
 ${project.artifactId}

http://git-wip-us.apache.org/repos/asf/cxf/blob/71ed0cb1/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
new file mode 100644
index 000..70d5e1c
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -0,0 +1,57 @@
+/**
+ * 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 sample.rs.service;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SampleRestApplication.class, webEnvironment = 
WebEnvironment.RANDOM_PORT)
+public class SampleRestApplicationTest {
+
+@LocalServerPort
+private int port;
+@Test
+public void testHelloRequest() throws Exception {
+WebClient wc = WebClient.create("http://localhost:; + port + 
"/services/helloservice");
+wc.accept("text/plain");
+
+// HelloServiceImpl1
+wc.path("sayHello").path("ApacheCxfUser");
+String greeting = wc.get(String.class);
+Assert.assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!", greeting); 
+ 
+// Reverse to the starting URI
+wc.back(true);
+
+// HelloServiceImpl2
+wc.path("sayHello2").path("ApacheCxfUser");
+greeting = wc.get(String.class);
+Assert.assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!", greeting); 
+}
+
+}

cxf git commit: Making sure jaxws_spring_boot test runs again

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master d72b3d27a -> d3bf494ef


Making sure jaxws_spring_boot test runs again


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

Branch: refs/heads/master
Commit: d3bf494ef4987debad986cae87cfe5f095b79090
Parents: d72b3d2
Author: Sergey Beryozkin 
Authored: Wed Mar 22 13:41:27 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 13:41:27 2017 +

--
 .../release/samples/jaxws_spring_boot/pom.xml   | 14 ++--
 .../ws/service/SampleWsApplicationTest.java | 81 
 .../ws/service/SampleWsApplicationTests.java| 80 ---
 3 files changed, 87 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d3bf494e/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml 
b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index 5bda72c..f74aaec 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -25,21 +25,19 @@
 
 
 
-org.springframework.boot
-spring-boot-starter-test
+org.apache.cxf
+cxf-spring-boot-starter-jaxws
+${project.version}
 
 
 org.springframework.boot
-spring-boot-test
+spring-boot-starter-test
+test
 
 
 org.springframework.boot
 spring-boot-starter-web-services
-
-
-org.apache.cxf
-cxf-spring-boot-starter-jaxws
-${project.version}
+test
 
 
 org.slf4j

http://git-wip-us.apache.org/repos/asf/cxf/blob/d3bf494e/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
new file mode 100644
index 000..13e68eb
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
@@ -0,0 +1,81 @@
+/**
+ * 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 sample.ws.service;
+
+import static org.hamcrest.Matchers.containsString;
+
+import java.io.StringReader;
+
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.ws.client.core.WebServiceTemplate;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertThat;
+
+import sample.ws.SampleWsApplication;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SampleWsApplication.class, webEnvironment = 
WebEnvironment.RANDOM_PORT)
+public class SampleWsApplicationTest {
+
+//CHECKSTYLE:OFF
+@Rule
+public OutputCapture output = new OutputCapture(); // SUPPRESS CHECKSTYLE
+//CHECKSTYLE:ON
+
+private WebServiceTemplate webServiceTemplate = new WebServiceTemplate();
+
+@LocalServerPort
+private int port;
+
+@Before
+

cxf git commit: Adding jaxrs/spring_boot demo test

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master a2efc18ef -> d72b3d27a


Adding jaxrs/spring_boot demo test


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

Branch: refs/heads/master
Commit: d72b3d27a172748b1d1479a0a7bfaafbf92f5149
Parents: a2efc18
Author: Sergey Beryozkin 
Authored: Wed Mar 22 13:33:24 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 13:33:24 2017 +

--
 .../release/samples/jax_rs/spring_boot/pom.xml  |  5 ++
 .../rs/service/SampleRestApplicationTest.java   | 57 
 2 files changed, 62 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d72b3d27/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml 
b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index f241ee5..19213bc 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -44,6 +44,11 @@
 slf4j-jdk14
 test
 
+
+org.springframework.boot
+spring-boot-starter-test
+test
+
 
 
 ${project.artifactId}

http://git-wip-us.apache.org/repos/asf/cxf/blob/d72b3d27/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
--
diff --git 
a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
new file mode 100644
index 000..70d5e1c
--- /dev/null
+++ 
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -0,0 +1,57 @@
+/**
+ * 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 sample.rs.service;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SampleRestApplication.class, webEnvironment = 
WebEnvironment.RANDOM_PORT)
+public class SampleRestApplicationTest {
+
+@LocalServerPort
+private int port;
+@Test
+public void testHelloRequest() throws Exception {
+WebClient wc = WebClient.create("http://localhost:; + port + 
"/services/helloservice");
+wc.accept("text/plain");
+
+// HelloServiceImpl1
+wc.path("sayHello").path("ApacheCxfUser");
+String greeting = wc.get(String.class);
+Assert.assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!", greeting); 
+ 
+// Reverse to the starting URI
+wc.back(true);
+
+// HelloServiceImpl2
+wc.path("sayHello2").path("ApacheCxfUser");
+greeting = wc.get(String.class);
+Assert.assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring 
Boot World!!!", greeting); 
+}
+
+}

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 3f4f378c3 -> c8ebd4d31


Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: c8ebd4d31f3d62acab5e6c0b07477558403c36a1
Parents: 3f4f378
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 13:13:26 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 13:13:26 2017 +

--
 .gitmergeinfo | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c8ebd4d3/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index eb7407c..7b92494 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -57,6 +57,7 @@ B 0a39148c8324e4772ecfa2607f663cb1ae835b2d
 B 0aaa2b5742a53bf31704939e4bc21906100bbc54
 B 0ab9416fda31298e485f2a6864c263447e4b32de
 B 0ac5dde071c9c2731fca757a2108f5dd698f8af5
+B 0afa064ee3b92a6b3e5fd8c5205a287d7884353b
 B 0b40c84e1440601a9b8779b93812b1c41cddd138
 B 0b7e0e914328aa7a78a2eab00bb1040c703e9b63
 B 0b9097fbd1cddbb4a183e9448576bde2a6eb2589
@@ -770,6 +771,7 @@ B 7d06130d4801e9dc5a01ac830de9bfa5ad8aabc6
 B 7d1f30f76d95f9eddf0bed995120c71bf1a393b3
 B 7d36340898ae91ba91f605313f9b4cbdf3218310
 B 7d51f38def4160e441ec293c7b924efaaecda91f
+B 7d810eef57861e0ea2381803d31ef0673b980f27
 B 7d90172a6c034f585122385daa36db33fa29e07a
 B 7ddbd926b7a02c84a3718dd37ee418115c6337e6
 B 7e185b710e55d13f03c0cf9be5390f4ad0545120
@@ -876,6 +878,7 @@ B 8eeef8c9f10795c856ce81d98557d81bf853b6df
 B 8f138f5a57736de2c78044bc6c01eed5e3725c68
 B 8f226d9ed11a582b2e3eaf9147fa14bb932844e8
 B 8f3d9d0b2af457dbc67e11ac800b53003ba81262
+B 8f4ca20d84de9e232122813b2a1b991d124955fc
 B 8f967643447ceec89e58b079d8d8fc00cf232a02
 B 8fc16041a43d53965bc0ed794cc8ac13580f429f
 B 8fd8c552f4c2a980a5138de19a2b74104776a4ba
@@ -1230,6 +1233,7 @@ B c5a787f45fc5b139a318f0e3fb9c23cb6ebb2ff1
 B c5ad99ec8045110063dbec77873782eb5451a6c4
 B c5c21d5b61fbd57e79f0bf39fa56ef9814c417fd
 B c5da4140da8fe63c4a10845b95258bbda9ab2058
+B c627cb12f1f32de46a8a7345c4f306b41baaf805
 B c64bf7af40e4018f2fe35d7165c420025137ee7f
 B c6b6381a28e0145a088c49f4dee90493d0a546d0
 B c70b431fa52dc571a8177a06d802d56c841278a9
@@ -1402,6 +1406,7 @@ B e4bfc1647e12b39b25bc363bdb9fe8beb2372a3b
 B e4c50b5299adeec3052d1ba5db8c862d64b8b44f
 B e4cab6471a5dafedcd5b69418266f03235adf5d6
 B e4f53e1ddb11dd6b64cfdfb5820aa330bb2fc5ae
+B e51e27dd7fbda0db649621b87a498f7075fc67bf
 B e51e9006d8a6312f21bd782c908190fc27c3640b
 B e545379cdc71ba79bd6c60b4ee788d11db678d24
 B e548a02fa04313fd1b6ec5d9ac78c774e8ad935a

[2/3] cxf git commit: CXF-7294 - Incorrect header parameter for Jose ECDH KA public key

[coheigea]

CXF-7294 - Incorrect header parameter for Jose ECDH KA public key

# Conflicts:
#   
rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 7d810eef57861e0ea2381803d31ef0673b980f27
Parents: c627cb1
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 13:10:27 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 13:11:23 2017 +

--
 .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java   | 2 +-
 .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java   | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7d810eef/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
index 85485e0..13a0107 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
@@ -34,7 +34,7 @@ public class EcdhDirectKeyJweDecryption extends JweDecryption 
{
 protected static byte[] 
getDecryptedContentEncryptionKeyFromHeaders(JweHeaders headers,
 
ECPrivateKey privateKey) {
 ContentAlgorithm jwtAlgo = headers.getContentEncryptionAlgorithm();
-JsonWebKey publicJwk = headers.getJsonWebKey("epv");
+JsonWebKey publicJwk = headers.getJsonWebKey("epk");
 String apuHeader = (String)headers.getHeader("apu");
 byte[] apuBytes = apuHeader == null ? null : 
JoseUtils.decode(apuHeader);
 String apvHeader = (String)headers.getHeader("apv");

http://git-wip-us.apache.org/repos/asf/cxf/blob/7d810eef/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
index 39b6928..ad7eb02 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
@@ -95,9 +95,15 @@ public class EcdhDirectKeyJweEncryption extends 
JweEncryption {
 
 headers.setHeader("apu", Base64UrlUtility.encode(apuBytes));
 headers.setHeader("apv", Base64UrlUtility.encode(apvBytes));
+<<< HEAD
 headers.setJsonWebKey("epv", JwkUtils.fromECPublicKey(publicKey, 
ecurve));
 
 return JweUtils.getECDHKey(privateKey, peerPublicKey, apuBytes, 
apvBytes, 
+===
+headers.setJsonWebKey("epk", JwkUtils.fromECPublicKey(publicKey, 
ecurve));
+
+return JweUtils.getECDHKey(privateKey, peerPublicKey, apuBytes, 
apvBytes,
+>>> a2efc18... CXF-7294 - Incorrect header parameter for Jose ECDH KA 
public key
jwtAlgo.getJwaName(), 
jwtAlgo.getKeySizeBits());
 
 }

[1/3] cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c627cb12f -> 8f4ca20d8


Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: 0afa064ee3b92a6b3e5fd8c5205a287d7884353b
Parents: 7d810ee
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 13:11:23 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 13:11:23 2017 +

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0afa064e/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c198694..244809a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -415,6 +415,7 @@ M 9ecea375930d1a217f35da65e0d6073f7a80bf7d
 M a034e5853484a7ef0a9f0ad1ae6582178f622f31
 M a1710bdd783afcd667d9e72ccb031480d3806850
 M a2cbe758286d00b5c5d9c5fbe6be4cc9d7ecf225
+M a2efc18eff09700eded186478a7c2ae8fa543eef
 M a644c5d06c0bae321e2c669efa0cecf3abdd944d
 M a89ca98653b95bcd2ab5cadbe9a419a4cec4893a
 M a93f0d9ad891865cc635a961cb890c2031177e5b

[3/3] cxf git commit: Fixing merge

[coheigea]

Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: 8f4ca20d84de9e232122813b2a1b991d124955fc
Parents: 0afa064
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 13:12:08 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 13:12:08 2017 +

--
 .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java   | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8f4ca20d/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
index ad7eb02..8b807bd 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
@@ -95,15 +95,9 @@ public class EcdhDirectKeyJweEncryption extends 
JweEncryption {
 
 headers.setHeader("apu", Base64UrlUtility.encode(apuBytes));
 headers.setHeader("apv", Base64UrlUtility.encode(apvBytes));
-<<< HEAD
-headers.setJsonWebKey("epv", JwkUtils.fromECPublicKey(publicKey, 
ecurve));
-
-return JweUtils.getECDHKey(privateKey, peerPublicKey, apuBytes, 
apvBytes, 
-===
 headers.setJsonWebKey("epk", JwkUtils.fromECPublicKey(publicKey, 
ecurve));
 
 return JweUtils.getECDHKey(privateKey, peerPublicKey, apuBytes, 
apvBytes,
->>> a2efc18... CXF-7294 - Incorrect header parameter for Jose ECDH KA 
public key
jwtAlgo.getJwaName(), 
jwtAlgo.getKeySizeBits());
 
 }

cxf git commit: CXF-7294 - Incorrect header parameter for Jose ECDH KA public key

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 137485de3 -> a2efc18ef


CXF-7294 - Incorrect header parameter for Jose ECDH KA public key


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

Branch: refs/heads/master
Commit: a2efc18eff09700eded186478a7c2ae8fa543eef
Parents: 137485d
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 13:10:27 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 13:10:43 2017 +

--
 .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java   | 2 +-
 .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a2efc18e/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
index 804532d..c802b11 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java
@@ -34,7 +34,7 @@ public class EcdhDirectKeyJweDecryption extends JweDecryption 
{
 protected static byte[] 
getDecryptedContentEncryptionKeyFromHeaders(JweHeaders headers,
 
ECPrivateKey privateKey) {
 ContentAlgorithm jwtAlgo = headers.getContentEncryptionAlgorithm();
-JsonWebKey publicJwk = headers.getJsonWebKey("epv");
+JsonWebKey publicJwk = headers.getJsonWebKey("epk");
 String apuHeader = (String)headers.getHeader("apu");
 byte[] apuBytes = apuHeader == null ? null : 
JoseUtils.decode(apuHeader);
 String apvHeader = (String)headers.getHeader("apv");

http://git-wip-us.apache.org/repos/asf/cxf/blob/a2efc18e/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
index 77b3fd2..c2a8126 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java
@@ -95,7 +95,7 @@ public class EcdhDirectKeyJweEncryption extends JweEncryption 
{
 
 headers.setHeader("apu", Base64UrlUtility.encode(apuBytes));
 headers.setHeader("apv", Base64UrlUtility.encode(apvBytes));
-headers.setJsonWebKey("epv", JwkUtils.fromECPublicKey(publicKey, 
ecurve));
+headers.setJsonWebKey("epk", JwkUtils.fromECPublicKey(publicKey, 
ecurve));
 
 return JweUtils.getECDHKey(privateKey, peerPublicKey, apuBytes, 
apvBytes,
jwtAlgo.getJwaName(), 
jwtAlgo.getKeySizeBits());

cxf git commit: Fixing few checkstyle issues

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master 06588cac6 -> 137485de3


Fixing few checkstyle issues


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

Branch: refs/heads/master
Commit: 137485de37b3bf81e305e616a5af81741620f547
Parents: 06588ca
Author: Sergey Beryozkin 
Authored: Wed Mar 22 12:19:05 2017 +
Committer: Sergey Beryozkin 
Committed: Wed Mar 22 12:19:05 2017 +

--
 .../main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java | 3 ++-
 .../org/apache/cxf/jaxrs/sse/SseUnboundedSubscription.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/137485de/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java
--
diff --git 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java
index 06fb8e3..8a24369 100644
--- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java
+++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java
@@ -56,7 +56,8 @@ public class SseBroadcasterImpl implements SseBroadcaster {
 
 @Override
 public void broadcast(OutboundSseEvent event) {
-for (Map.Entry entry: subscribers.entrySet()) {
+for (Map.Entry entry 
+: subscribers.entrySet()) {
 try {
 entry.getValue().send(event);
 } catch (final Exception ex) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/137485de/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseUnboundedSubscription.java
--
diff --git 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseUnboundedSubscription.java
 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseUnboundedSubscription.java
index 7c0cb60..92f24ab 100644
--- 
a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseUnboundedSubscription.java
+++ 
b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseUnboundedSubscription.java
@@ -27,13 +27,13 @@ import javax.ws.rs.sse.OutboundSseEvent;
 
 class SseUnboundedSubscription implements Subscription {
 // Has subscription been cancelled or not?
-private boolean cancelled = false;
+private boolean cancelled;
 // Current demand: what has been requested but not yet delivered
-private long demand = 0;
+private long demand;
 private final BlockingQueue buffer = new 
LinkedBlockingQueue<>(); 
 private final Flow.Subscriber subscriber;
 
-public SseUnboundedSubscription(Flow.Subscriber 
subscriber) {
+SseUnboundedSubscription(Flow.Subscriber 
subscriber) {
 this.subscriber = subscriber;
 }
 

cxf-fediz git commit: Updating to WSS4J SNAPSHOT to keep things consistent with CXF SNAPSHOT

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 3844b0046 -> 4fee9ae12


Updating to WSS4J SNAPSHOT to keep things consistent with CXF SNAPSHOT


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

Branch: refs/heads/master
Commit: 4fee9ae12a9318b9ec9566927bfc51a575f54fc0
Parents: 3844b00
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 09:03:10 2017 -0230
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 09:03:10 2017 -0230

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


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4fee9ae1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7445020..b6a029c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
 3.2.10.RELEASE
 7.0.75
 8.0.41
-2.1.8
+2.1.9-SNAPSHOT
 
 http://localhost:8080/manager/text
 UTF-8

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes ae1d427f6 -> c627cb12f


Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.1.x-fixes
Commit: c627cb12f1f32de46a8a7345c4f306b41baaf805
Parents: ae1d427
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 08:44:28 2017 -0230
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 08:44:28 2017 -0230

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c627cb12/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4848e1a..c198694 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -11,6 +11,7 @@ B 04d072e8494cb223c8f7b288776640dea68339d6
 B 04d160cad1a27bb4cc694077125c6ea742647d3d
 B 052582d56a99d96773dffcc8d83e96c26030e7c3
 B 057b2a6d5d85285446ff762bd3451a0e3e945d7a
+B 06588cac671464bb900453919cad18b3e47a8d4b
 B 06bfa1334e86ebcf8e19974708d4aa165296edb9
 B 08e8316aa5c575d6117d20c4054405e1ea0e2887
 B 09893c1747d823b3456a28fc49468ed91e456f2d

[1/2] cxf git commit: Finished Java 8 DateTime work

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master a4b98454d -> 06588cac6


http://git-wip-us.apache.org/repos/asf/cxf/blob/06588cac/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
--
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
index 951ab1f..0fa3827 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.cxf.sts.token.renewer;
 
+import java.time.Instant;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -273,13 +273,14 @@ public class SAMLTokenRenewerRealmTest extends 
org.junit.Assert {
 providerParameters.getTokenRequirements().setRenewing(renewing);
 
 if (ttlMs != 0) {
-ZonedDateTime creationTime = ZonedDateTime.now(ZoneOffset.UTC);
-ZonedDateTime expirationTime = creationTime.plusNanos(ttlMs * 
100L);
-
 Lifetime lifetime = new Lifetime();
-
lifetime.setCreated(DateUtil.getDateTimeFormatter(true).format(creationTime));
-
lifetime.setExpires(DateUtil.getDateTimeFormatter(true).format(expirationTime));
+
+Instant creationTime = Instant.now();
+Instant expirationTime = creationTime.plusNanos(ttlMs * 100L);
 
+
lifetime.setCreated(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
+
lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
+
 providerParameters.getTokenRequirements().setLifetime(lifetime);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/06588cac/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
--
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
index 359ea76..77b772b 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.cxf.sts.token.renewer;
 
+import java.time.Instant;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.Properties;
 
 import javax.security.auth.callback.CallbackHandler;
@@ -577,12 +577,13 @@ public class SAMLTokenRenewerTest extends 
org.junit.Assert {
 providerParameters.getTokenRequirements().setRenewing(renewing);
 
 if (ttlMs != 0) {
-ZonedDateTime creationTime = ZonedDateTime.now(ZoneOffset.UTC);
-ZonedDateTime expirationTime = creationTime.plusNanos(ttlMs * 
100L);
-
 Lifetime lifetime = new Lifetime();
-
lifetime.setCreated(DateUtil.getDateTimeFormatter(true).format(creationTime));
-
lifetime.setExpires(DateUtil.getDateTimeFormatter(true).format(expirationTime));
+
+Instant creationTime = Instant.now();
+Instant expirationTime = creationTime.plusNanos(ttlMs * 100L);
+
+
lifetime.setCreated(creationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
+
lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true)));
 
 providerParameters.getTokenRequirements().setLifetime(lifetime);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/06588cac/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
--
diff --git 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
index 7d396f7..0d5af95 100644
--- 
a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
+++ 
b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorTest.java
@@ -21,8 +21,8 @@ package org.apache.cxf.sts.token.validator;
 import java.io.IOException;
 import java.net.URI;
 import java.security.Principal;
+import java.time.Instant;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 

[2/2] cxf git commit: Finished Java 8 DateTime work

[coheigea]

Finished Java 8 DateTime work


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

Branch: refs/heads/master
Commit: 06588cac671464bb900453919cad18b3e47a8d4b
Parents: a4b9845
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 10:50:48 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 10:50:48 2017 +

--
 .../cxf/rs/security/jose/jwt/JwtUtils.java  | 38 +++---
 .../filters/AccessTokenIntrospectionClient.java |  5 +-
 .../oauth2/filters/JwtAccessTokenValidator.java |  5 +-
 ...AbstractRequestAssertionConsumerHandler.java |  9 ++--
 .../security/saml/sso/AbstractSSOSpHandler.java | 14 ++---
 .../saml/sso/SAMLSSOResponseValidator.java  | 22 
 .../security/saml/sso/SSOValidatorResponse.java | 14 ++---
 .../policy/interceptors/STSInvoker.java | 11 ++--
 .../SecureConversationInInterceptor.java|  9 ++--
 .../SpnegoContextTokenInInterceptor.java|  9 ++--
 .../security/tokenstore/MemoryTokenStore.java   |  8 ++-
 .../ws/security/tokenstore/SecurityToken.java   |  9 ++--
 .../ws/security/trust/AbstractSTSClient.java| 10 ++--
 .../cxf/ws/security/wss4j/WSS4JUtils.java   |  9 ++--
 .../policyhandlers/AbstractBindingBuilder.java  | 19 ---
 .../AsymmetricBindingHandler.java   |  9 ++--
 .../StaxSymmetricBindingHandler.java|  9 ++--
 .../policyhandlers/SymmetricBindingHandler.java | 29 +--
 .../policyhandlers/TransportBindingHandler.java | 11 ++--
 .../tokenstore/MemoryTokenStoreTest.java|  7 ++-
 .../cxf/sts/cache/HazelCastTokenStore.java  |  8 ++-
 .../cxf/sts/operation/AbstractOperation.java| 21 
 .../provider/DefaultConditionsProvider.java | 12 ++---
 .../cxf/sts/token/provider/SCTProvider.java | 13 +++--
 .../provider/jwt/DefaultJWTClaimsProvider.java  | 20 
 .../apache/cxf/sts/operation/IssueUnitTest.java | 10 ++--
 .../cxf/sts/operation/RenewSamlUnitTest.java| 10 ++--
 .../token/provider/JWTProviderLifetimeTest.java | 54 ++--
 .../provider/SAMLProviderLifetimeTest.java  | 54 ++--
 .../renewer/SAMLTokenRenewerLifetimeTest.java   | 42 +++
 .../token/renewer/SAMLTokenRenewerPOPTest.java  | 13 ++---
 .../renewer/SAMLTokenRenewerRealmTest.java  | 13 ++---
 .../sts/token/renewer/SAMLTokenRenewerTest.java | 13 ++---
 .../token/validator/SAMLTokenValidatorTest.java | 12 ++---
 .../systest/sts/batch/SimpleBatchSTSClient.java | 10 ++--
 .../cxf/systest/sts/caching/CachingTest.java|  5 +-
 .../stsclient/STSTokenOutInterceptorTest.java   |  5 +-
 .../sts/stsclient/STSTokenRetrieverTest.java|  5 +-
 .../cxf/xkms/x509/validator/DateValidator.java  |  7 ++-
 .../security/jose/jwt/JWTAlgorithmTest.java | 36 ++---
 .../security/jose/jwt/JWTAuthnAuthzTest.java| 12 ++---
 .../security/oauth2/common/OAuth2TestUtils.java |  9 ++--
 .../grants/AuthorizationGrantNegativeTest.java  |  9 ++--
 .../security/oidc/IdTokenProviderImpl.java  |  9 ++--
 .../jaxrs/security/oidc/OIDCFlowTest.java   |  6 +--
 .../jaxrs/security/oidc/OIDCNegativeTest.java   |  6 +--
 46 files changed, 329 insertions(+), 341 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/06588cac/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
--
diff --git 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
index 844c229..9ea3904 100644
--- 
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
+++ 
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
@@ -18,7 +18,7 @@
  */
 package org.apache.cxf.rs.security.jose.jwt;
 
-import java.util.Date;
+import java.time.Instant;
 
 import org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
 import org.apache.cxf.message.Message;
@@ -49,12 +49,12 @@ public final class JwtUtils {
 }
 return;
 }
-Date rightNow = new Date();
-Date expiresDate = new Date(expiryTime * 1000L);
+Instant now = Instant.now();
+Instant expires = Instant.ofEpochMilli(expiryTime * 1000L);
 if (clockOffset != 0) {
-expiresDate.setTime(expiresDate.getTime() + (long)clockOffset * 
1000L);
+expires = expires.plusSeconds(clockOffset);
 }
-if (expiresDate.before(rightNow)) {
+if