cxf git commit: [CXF-7240]JAX-WS Dispatch incorrectly asserts that Message mode with XML/HTTP binding is invalid when using instances of DataSource

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes eb8f4f666 -> 34594803a


[CXF-7240]JAX-WS Dispatch incorrectly asserts that Message mode with XML/HTTP 
binding is invalid when using instances of DataSource

(cherry picked from commit 9596758ebbaa4e703307394a19bb6d2a411647b9)

Conflicts:
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java

(cherry picked from commit 4073189347b32df3195579a0c296b2c19b71d8bb)


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

Branch: refs/heads/3.0.x-fixes
Commit: 34594803a080d9250ed0d346523d83c9290ecbdb
Parents: eb8f4f6
Author: Freeman Fang 
Authored: Fri Feb 17 12:27:55 2017 +0800
Committer: Freeman Fang 
Committed: Fri Feb 17 12:41:55 2017 +0800

--
 .../java/org/apache/cxf/jaxws/DispatchImpl.java |  8 +---
 .../handlers/DispatchHandlerInvocationTest.java | 20 +---
 2 files changed, 6 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/34594803/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
index f194548..41ce868 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
@@ -148,13 +148,7 @@ public class DispatchImpl implements Dispatch, 
BindingProvider, Closeable
 "SOAPMessage",
 m,
 "SOAP/HTTP");
-} else if (DataSource.class.isAssignableFrom(clazz)
-&& binding instanceof HTTPBinding) {
-error = new Message("DISPATCH_OBJECT_NOT_SUPPORTED", LOG,
-"DataSource",
-m,
-"XML/HTTP");
-}
+} 
 }
 
 DispatchImpl(Client cl, Service.Mode m, Class clazz) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/34594803/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
index 10964a2..7b25afd 100644
--- 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
+++ 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
@@ -49,9 +49,9 @@ import javax.xml.ws.handler.LogicalMessageContext;
 import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.http.HTTPException;
 import javax.xml.ws.soap.SOAPFaultException;
 
+
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.handlers.AddNumbersService;
@@ -305,12 +305,8 @@ public class DispatchHandlerInvocationTest extends 
AbstractBusClientServerTestBa
 URL is = 
getClass().getResource("/messages/XML_GreetMeDocLiteralReq.xml");
 DataSource ds = new URLDataSource(is);
 
-try {
-disp.invoke(ds);
-fail("Did not get expected exception");
-} catch (HTTPException e) {
-//expected
-}
+DataSource resp = disp.invoke(ds);
+assertNotNull(resp);
 }
 
 @Test
@@ -329,14 +325,8 @@ public class DispatchHandlerInvocationTest extends 
AbstractBusClientServerTestBa
 
 URL is = 
getClass().getResource("/messages/XML_GreetMeDocLiteralReq.xml");
 DataSource ds = new URLDataSource(is);
-
-try {
-disp.invoke(ds);
-fail("Did not get expected exception");
-} catch (HTTPException e) {
-assertEquals(e.getCause().getMessage(),
- "DataSource is not valid in PAYLOAD mode with 
XML/HTTP binding.");
-}
+DataSource resp = disp.invoke(ds);
+assertNotNull(resp);
 }
 
 @Test

cxf git commit: [CXF-7240]JAX-WS Dispatch incorrectly asserts that Message mode with XML/HTTP binding is invalid when using instances of DataSource

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes c4709d14f -> 407318934


[CXF-7240]JAX-WS Dispatch incorrectly asserts that Message mode with XML/HTTP 
binding is invalid when using instances of DataSource

(cherry picked from commit 9596758ebbaa4e703307394a19bb6d2a411647b9)

Conflicts:
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 4073189347b32df3195579a0c296b2c19b71d8bb
Parents: c4709d1
Author: Freeman Fang 
Authored: Fri Feb 17 12:27:55 2017 +0800
Committer: Freeman Fang 
Committed: Fri Feb 17 12:40:37 2017 +0800

--
 .../java/org/apache/cxf/jaxws/DispatchImpl.java |  8 +---
 .../handlers/DispatchHandlerInvocationTest.java | 20 +---
 2 files changed, 6 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/40731893/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
index 0446546..843bfa3 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
@@ -148,13 +148,7 @@ public class DispatchImpl implements Dispatch, 
BindingProvider, Closeable
 "SOAPMessage",
 m,
 "SOAP/HTTP");
-} else if (DataSource.class.isAssignableFrom(clazz)
-&& binding instanceof HTTPBinding) {
-error = new Message("DISPATCH_OBJECT_NOT_SUPPORTED", LOG,
-"DataSource",
-m,
-"XML/HTTP");
-}
+} 
 }
 
 DispatchImpl(Client cl, Service.Mode m, Class clazz) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/40731893/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
index 10964a2..7b25afd 100644
--- 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
+++ 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
@@ -49,9 +49,9 @@ import javax.xml.ws.handler.LogicalMessageContext;
 import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.http.HTTPException;
 import javax.xml.ws.soap.SOAPFaultException;
 
+
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.handlers.AddNumbersService;
@@ -305,12 +305,8 @@ public class DispatchHandlerInvocationTest extends 
AbstractBusClientServerTestBa
 URL is = 
getClass().getResource("/messages/XML_GreetMeDocLiteralReq.xml");
 DataSource ds = new URLDataSource(is);
 
-try {
-disp.invoke(ds);
-fail("Did not get expected exception");
-} catch (HTTPException e) {
-//expected
-}
+DataSource resp = disp.invoke(ds);
+assertNotNull(resp);
 }
 
 @Test
@@ -329,14 +325,8 @@ public class DispatchHandlerInvocationTest extends 
AbstractBusClientServerTestBa
 
 URL is = 
getClass().getResource("/messages/XML_GreetMeDocLiteralReq.xml");
 DataSource ds = new URLDataSource(is);
-
-try {
-disp.invoke(ds);
-fail("Did not get expected exception");
-} catch (HTTPException e) {
-assertEquals(e.getCause().getMessage(),
- "DataSource is not valid in PAYLOAD mode with 
XML/HTTP binding.");
-}
+DataSource resp = disp.invoke(ds);
+assertNotNull(resp);
 }
 
 @Test

cxf git commit: [CXF-7240]JAX-WS Dispatch incorrectly asserts that Message mode with XML/HTTP binding is invalid when using instances of DataSource

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/master 146b00d19 -> 9596758eb


[CXF-7240]JAX-WS Dispatch incorrectly asserts that Message mode with XML/HTTP 
binding is invalid when using instances of DataSource


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

Branch: refs/heads/master
Commit: 9596758ebbaa4e703307394a19bb6d2a411647b9
Parents: 146b00d
Author: Freeman Fang 
Authored: Fri Feb 17 12:27:55 2017 +0800
Committer: Freeman Fang 
Committed: Fri Feb 17 12:27:55 2017 +0800

--
 .../java/org/apache/cxf/jaxws/DispatchImpl.java |  8 +---
 .../handlers/DispatchHandlerInvocationTest.java | 20 +---
 2 files changed, 6 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9596758e/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
--
diff --git 
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java 
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
index da2fa16..2e36c08 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
@@ -148,13 +148,7 @@ public class DispatchImpl implements Dispatch, 
BindingProvider, Closeable
 "SOAPMessage",
 m,
 "SOAP/HTTP");
-} else if (DataSource.class.isAssignableFrom(clazz)
-&& binding instanceof HTTPBinding) {
-error = new Message("DISPATCH_OBJECT_NOT_SUPPORTED", LOG,
-"DataSource",
-m,
-"XML/HTTP");
-}
+} 
 }
 
 DispatchImpl(Client cl, Service.Mode m, Class clazz) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/9596758e/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
--
diff --git 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
index a6df9a0..19e93c1 100644
--- 
a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
+++ 
b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
@@ -49,9 +49,9 @@ import javax.xml.ws.handler.LogicalMessageContext;
 import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.http.HTTPException;
 import javax.xml.ws.soap.SOAPFaultException;
 
+
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.handlers.AddNumbersService;
@@ -305,12 +305,8 @@ public class DispatchHandlerInvocationTest extends 
AbstractBusClientServerTestBa
 URL is = 
getClass().getResource("/messages/XML_GreetMeDocLiteralReq.xml");
 DataSource ds = new URLDataSource(is);
 
-try {
-disp.invoke(ds);
-fail("Did not get expected exception");
-} catch (HTTPException e) {
-//expected
-}
+DataSource resp = disp.invoke(ds);
+assertNotNull(resp);
 }
 
 @Test
@@ -329,14 +325,8 @@ public class DispatchHandlerInvocationTest extends 
AbstractBusClientServerTestBa
 
 URL is = 
getClass().getResource("/messages/XML_GreetMeDocLiteralReq.xml");
 DataSource ds = new URLDataSource(is);
-
-try {
-disp.invoke(ds);
-fail("Did not get expected exception");
-} catch (HTTPException e) {
-assertEquals(e.getCause().getMessage(),
- "DataSource is not valid in PAYLOAD mode with 
XML/HTTP binding.");
-}
+DataSource resp = disp.invoke(ds);
+assertNotNull(resp);
 }
 
 @Test

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

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 868f24864 -> c4709d14f


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/c4709d14
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c4709d14
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c4709d14

Branch: refs/heads/3.1.x-fixes
Commit: c4709d14fda1cb3510c1b6f3670bbaa678f81d8f
Parents: 8c1459e
Author: Daniel Kulp 
Authored: Thu Feb 16 17:12:21 2017 -0500
Committer: Daniel Kulp 
Committed: Thu Feb 16 17:12:21 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/c4709d14/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f8e4fe0..fd5abf5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -32,6 +32,7 @@ B 189756a8ff668d39d59cb7ff1658ed40d70ec12b
 B 189b6643d30eab4d79a0f7722c9277e76e92a1fd
 B 1ae4d6dee70587b048c0dcded9cd0b2855c2e225
 B 1b2a3d0d2e1a4c8f13368fd7c3e0e1cbfabd2b32
+B 1b8064f475b09323c5c11d9e8a4e1440879cae26
 B 1c3085ea94a902e6bf4a49b50c121e778efd28c2
 B 1d2ff721ef4d63b86035238516afdf1a82855bd9
 B 1e49510ea71551e543b22f6693307b1436e81db0
@@ -55,11 +56,13 @@ B 32d044afbe9c6bf4fd4ef829a71af3d1d949315e
 B 333632ee013b26b6ed15d05818971d83927bd43d
 B 337742ff1215b34643c8c35d8a1a9c4d5238d743
 B 343d06d94838cd26f682f7afbcea0e422aa1597d
+B 3450d3854e97dbd67eeaa862d09d39cce9846de9
 B 38919f57bfb2b880691950fc5f992b5649ea579e
 B 39851b83af116611ce0efe70c4b9a32ee8491523
 B 39a5690d7d50d8481739c290f49128be4d55f8ad
 B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8
 B 3be1cef6d16405b7e046c822c27dc7223f24
+B 3bebf6b49283d9a9c36365c030533a3508f836c7
 B 3f259221fa1dd9227397400ed9653374cb4fdc39
 B 3fbedf1397714824b9700cd4d49569087936fe1a
 B 40380d8e57cdea0d909f3a9ee207628831c202fa
@@ -77,6 +80,7 @@ B 45bc2219b761e671973acf297e0f37a1b8934c6c
 B 46438c487115889c4cadd86f70fd4109a0daa2b8
 B 4786e832573f1fcc07ed190ab21fdb2820348e4d
 B 47a431412dbd7669d89a70d6fed49053e70dfed1
+B 4a30203a08ea11f96b52b454220ed5ce9419e3be
 B 4a72362668b14f92f1a0252b723436fc86b681bf
 B 4b37844e9c15812d1855d0babded79880d2cd6fb
 B 4bf780105271e91451446a2d96032249486b32de
@@ -121,6 +125,7 @@ B 6d82b75eb982f13f5f071178aeef66e55b0e3fd4
 B 6df5deab24016d07e4099712b07535688d164d94
 B 6e7b79f6a8b6523b2248937275d92918e5682aa2
 B 6fcdc7e9eec2414a40bd3161cf237ef182e313a6
+B 702389744199001e6c35e602ffb197ebaaf84838
 B 707fa4f3c3f3aa40979e57468a9ac3eb3102a71f
 B 73d1f886ae5265131e8664ee952ffd1cdc82f71a
 B 741c9e349e7e48d3fe278ba8d8f17dd6bf4c4370
@@ -146,6 +151,8 @@ B 8b92fe57dd9a661dab382da7d556b1972f513a93
 B 8cea7c879658e83d7a4f54f6d4e8dfa0e449c67d
 B 8e7d8e18e820dcaef748c2cab6091f884fe647a4
 B 8f98be8e72d4dbe18347a7efab91f4b008d8385f
+B 90a74fc75af41898ee50359c13f298eb483a3d01
+B 9323b68565ef79717e9d3e60744dd1bf63c1a5d8
 B 938217b05928747f7ef0d2a8899cbc297926a4e6
 B 94b837228a1d9c706aa235bfe23b827eb04da63c
 B 9505a3c7c82691da2bad94459702a665b14420fa
@@ -156,6 +163,7 @@ B 970d918a69efe5f8a601f20bb575a23f95a472c5
 B 996d0745469b044cc8a29168add803f22706c443
 B 99f5296bfed5278b60d6fa4065e1537fd59fcf64
 B 9b816a21d8b85cc051be59a8ab6e968c5d0d
+B 9bb1148e093b5293454cd978673f5526443d1f55
 B 9bcde744c2ad59a67c278d155f2ba22e35bacb7d
 B 9c7ccd5cc10b1d4a6f1817a6c37c99b8f19d15a1
 B 9f39272a5f92c8bc27a8d3adc4da89f0eb30a54b
@@ -180,6 +188,7 @@ B b8132e5962e326355b699bca445afe9274d0f91d
 B bacef091c2152d51ebdefbe20244e73d1c26b39d
 B bbb04acb7c09d28ae8f662f1cbedd8c5f4d1bf1a
 B bbda68b6d7948d098ee598d248266f4ce81c820a
+B bcacbef8c3aa0e40e2cf560c6d0922edb4b641fb
 B bcb96eb5cbdfcd473da2ef64709ec0dc541d3609
 B bceee342b32f3704ca75176d06067f90c6d3fbdc
 B bd24e7efd7f8f4258e8fde99eb63e007378048f0
@@ -195,14 +204,17 @@ B c2daeb5b45b758e9f54ce73dc4567a69c47d9170
 B c3a1392d1656c41a9bbdb24698eb27fbc757628b
 B c63f06f3782148373912c1e4dc86de0d0c312229
 B c6d4592a8a5d31429333c0e539ae56f517c2523f
+B c783e60a8bcea76b9fecb75364b120d39c8ea28a
 B c8e788eee8f7b5ce3a2161dfe727f3153ded607b
 B c8ee5ae674f6e59b26d7b549481627d21103f7c1
+B c903d27ec726f059a2b5e9ee1485202d2aa4d76c
 B c92875b6da5934aded09170a30a46d4015cbfa29
 B c978ca0274c06abd6ebf67adf2a839c4624b4906
 B c9da051de80efd513e2a3e20c0b5c6ff942291a1
 B ca2f8e81168b5b4ca72fa6c3c4529109c7d7c5d0
 B cb405d4275a5cf30187c4fbf957dbbb70a9eeacf
 B ce274c7b4450279f2c0d4deae5bc5c3952af5c42
+B ce6cdcff2bee46194baa3e3b63b93616fcaea9c8
 B ced98c6e937bd93f92dac9043fa0406c696bfd84
 B cf3f537d210c979dc3b3f49e08ebad5f0c02993c
 B cf9ab27a843df4532d9bd78209aebcafee2c
@@ -222,6 +234,7 @@ B de675431040a434c2bd1ef7472fb4a49a9ab
 B dfc84b0fac84e001069800b32f01529d50339cdb
 B e14d803ff84be7c59dd7c2321f1090231967d45c
 B 

[2/2] cxf git commit: Revert some of the changes to logging feature and fix the issues using existing concepts

[dkulp]

Revert some of the changes to logging feature and fix the issues using existing 
concepts

# Conflicts:
#   
rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
#   
rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
#   rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java


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

Branch: refs/heads/3.1.x-fixes
Commit: 8c1459e3399647467ae01f9f2d04b9a9e8853ea0
Parents: 868f248
Author: Daniel Kulp 
Authored: Thu Feb 16 16:24:05 2017 -0500
Committer: Daniel Kulp 
Committed: Thu Feb 16 17:12:21 2017 -0500

--
 .../apache/cxf/ext/logging/LoggingFeature.java  |   6 -
 .../cxf/ext/logging/LoggingInInterceptor.java   | 172 ++-
 .../org/apache/cxf/ext/logging/WireTapIn.java   |  10 +-
 .../java/org/apache/cxf/jaxws/ServiceImpl.java  |   3 +-
 .../ws/addr_fromjava/WSAFromJavaTest.java   |   4 +-
 5 files changed, 67 insertions(+), 128 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8c1459e3/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
--
diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
index 1e34887..6d383ee 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
@@ -49,21 +49,17 @@ public class LoggingFeature extends AbstractFeature {
 private LogEventSender sender;
 private LoggingInInterceptor in;
 private LoggingOutInterceptor out;
-private WireTapIn wireTapIn;
 private PrettyLoggingFilter prettyFilter;
 
 public LoggingFeature() {
 this.sender = new Slf4jEventSender();
 prettyFilter = new PrettyLoggingFilter(sender);
-wireTapIn = new WireTapIn();
 in = new LoggingInInterceptor(prettyFilter);
 out = new LoggingOutInterceptor(prettyFilter);
 }
 
 @Override
 protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-
-provider.getInInterceptors().add(wireTapIn);
 provider.getInInterceptors().add(in);
 provider.getInFaultInterceptors().add(in);
 
@@ -74,13 +70,11 @@ public class LoggingFeature extends AbstractFeature {
 public void setLimit(int limit) {
 in.setLimit(limit);
 out.setLimit(limit);
-wireTapIn.setLimit(limit);
 }
 
 public void setInMemThreshold(long inMemThreshold) {
 in.setInMemThreshold(inMemThreshold);
 out.setInMemThreshold(inMemThreshold);
-wireTapIn.setThreshold(inMemThreshold);
 }
 
 public void setSender(LogEventSender sender) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/8c1459e3/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
--
diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
index 0643bc2..da2afa1 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
@@ -18,25 +18,22 @@
  */
 package org.apache.cxf.ext.logging;
 
-import java.io.InputStream;
+import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.SequenceInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.ext.logging.event.DefaultLogEventMapper;
-import org.apache.cxf.ext.logging.event.EventType;
 import org.apache.cxf.ext.logging.event.LogEvent;
 import org.apache.cxf.ext.logging.event.LogEventSender;
 import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
 import org.apache.cxf.ext.logging.slf4j.Slf4jEventSender;
-import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.io.CachedWriter;
-import org.apache.cxf.io.DelegatingInputStream;
 import org.apache.cxf.message.Message;
 import 

cxf git commit: Revert some of the changes to logging feature and fix the issues using existing concepts

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master 265ac6e07 -> 146b00d19


Revert some of the changes to logging feature and fix the issues using existing 
concepts


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

Branch: refs/heads/master
Commit: 146b00d1947058705c873dffe2ba78ad35c8b03c
Parents: 265ac6e
Author: Daniel Kulp 
Authored: Thu Feb 16 16:24:05 2017 -0500
Committer: Daniel Kulp 
Committed: Thu Feb 16 16:24:05 2017 -0500

--
 .../apache/cxf/ext/logging/LoggingFeature.java  |   5 -
 .../cxf/ext/logging/LoggingInInterceptor.java   | 172 ++-
 .../org/apache/cxf/ext/logging/WireTapIn.java   |  10 +-
 .../java/org/apache/cxf/jaxws/ServiceImpl.java  |   2 +-
 .../ws/addr_fromjava/WSAFromJavaTest.java   |   4 +-
 5 files changed, 68 insertions(+), 125 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/146b00d1/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
--
diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
index 77287df..473dbe7 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
@@ -49,13 +49,11 @@ public class LoggingFeature extends AbstractFeature {
 private LogEventSender sender;
 private LoggingInInterceptor in;
 private LoggingOutInterceptor out;
-private WireTapIn wireTapIn;
 private PrettyLoggingFilter prettyFilter;
 
 public LoggingFeature() {
 this.sender = new Slf4jEventSender();
 prettyFilter = new PrettyLoggingFilter(sender);
-wireTapIn = new WireTapIn();
 in = new LoggingInInterceptor(prettyFilter);
 out = new LoggingOutInterceptor(prettyFilter);
 }
@@ -63,7 +61,6 @@ public class LoggingFeature extends AbstractFeature {
 @Override
 protected void initializeProvider(InterceptorProvider provider, Bus bus) {
 
-provider.getInInterceptors().add(wireTapIn);
 provider.getInInterceptors().add(in);
 provider.getInFaultInterceptors().add(in);
 
@@ -74,13 +71,11 @@ public class LoggingFeature extends AbstractFeature {
 public void setLimit(int limit) {
 in.setLimit(limit);
 out.setLimit(limit);
-wireTapIn.setLimit(limit);
 }
 
 public void setInMemThreshold(long inMemThreshold) {
 in.setInMemThreshold(inMemThreshold);
 out.setInMemThreshold(inMemThreshold);
-wireTapIn.setThreshold(inMemThreshold);
 }
 
 public void setSender(LogEventSender sender) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/146b00d1/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
--
diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
index a3f3ee4..da2afa1 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
@@ -18,171 +18,111 @@
  */
 package org.apache.cxf.ext.logging;
 
-import java.io.InputStream;
+import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.SequenceInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.ext.logging.event.DefaultLogEventMapper;
-import org.apache.cxf.ext.logging.event.EventType;
 import org.apache.cxf.ext.logging.event.LogEvent;
 import org.apache.cxf.ext.logging.event.LogEventSender;
 import org.apache.cxf.ext.logging.event.PrintWriterEventSender;
 import org.apache.cxf.ext.logging.slf4j.Slf4jEventSender;
-import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.io.CachedWriter;
-import org.apache.cxf.io.DelegatingInputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.phase.PhaseInterceptor;
 
 /**
- *
+ * 
  */
 

cxf git commit: [CXF-7251] Checking for Integer when dealing with the Long property types

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d89780f55 -> eb8f4f666


[CXF-7251] Checking for Integer when dealing with the Long property types


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

Branch: refs/heads/3.0.x-fixes
Commit: eb8f4f666e0e370ed82b679ea796af5d48d6fca9
Parents: d89780f
Author: Sergey Beryozkin 
Authored: Thu Feb 16 14:49:28 2017 +
Committer: Sergey Beryozkin 
Committed: Thu Feb 16 14:54:38 2017 +

--
 .../main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/eb8f4f66/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index d674b00..5c9de1e 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -546,7 +546,9 @@ public class ClientImpl implements Client {
 }
 }
 private static Long getLongValue(Object o) {
-return o instanceof Long ? (Long)o : o instanceof String ? 
Long.valueOf(o.toString()) : null;
+return o instanceof Long ? (Long)o 
+: o instanceof String ? Long.valueOf(o.toString()) 
+: o instanceof Integer ? ((Integer)o).longValue() : null;
 }
 private static Integer getIntValue(Object o) {
 return o instanceof Integer ? (Integer)o : o instanceof String ? 
Integer.valueOf(o.toString()) : null;

cxf git commit: [CXF-7251] Checking for Integer when dealing with the Long property types

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 20b7a7d61 -> 868f24864


[CXF-7251] Checking for Integer when dealing with the Long property types


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

Branch: refs/heads/3.1.x-fixes
Commit: 868f24864cd941c591084c1b1318f5f958c154cb
Parents: 20b7a7d
Author: Sergey Beryozkin 
Authored: Thu Feb 16 14:49:28 2017 +
Committer: Sergey Beryozkin 
Committed: Thu Feb 16 14:52:03 2017 +

--
 .../main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/868f2486/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index a976a7e..2e15927 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -552,7 +552,9 @@ public class ClientImpl implements Client {
 }
 }
 private static Long getLongValue(Object o) {
-return o instanceof Long ? (Long)o : o instanceof String ? 
Long.valueOf(o.toString()) : null;
+return o instanceof Long ? (Long)o 
+: o instanceof String ? Long.valueOf(o.toString()) 
+: o instanceof Integer ? ((Integer)o).longValue() : null;
 }
 private static Integer getIntValue(Object o) {
 return o instanceof Integer ? (Integer)o : o instanceof String ? 
Integer.valueOf(o.toString()) : null;

cxf git commit: [CXF-7251] Checking for Integer when dealing with the Long property types

[sergeyb]

Repository: cxf
Updated Branches:
  refs/heads/master cf3f537d2 -> 265ac6e07


[CXF-7251] Checking for Integer when dealing with the Long property types


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

Branch: refs/heads/master
Commit: 265ac6e07cb17c02310b1931c09f03c48b6ca8c7
Parents: cf3f537
Author: Sergey Beryozkin 
Authored: Thu Feb 16 14:49:28 2017 +
Committer: Sergey Beryozkin 
Committed: Thu Feb 16 14:49:28 2017 +

--
 .../main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/265ac6e0/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index 13d3cb6..e88a76f 100644
--- 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -552,7 +552,9 @@ public class ClientImpl implements Client {
 }
 }
 private static Long getLongValue(Object o) {
-return o instanceof Long ? (Long)o : o instanceof String ? 
Long.valueOf(o.toString()) : null;
+return o instanceof Long ? (Long)o 
+: o instanceof String ? Long.valueOf(o.toString()) 
+: o instanceof Integer ? ((Integer)o).longValue() : null;
 }
 private static Integer getIntValue(Object o) {
 return o instanceof Integer ? (Integer)o : o instanceof String ? 
Integer.valueOf(o.toString()) : null;

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 204fac343 -> 20b7a7d61


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/20b7a7d6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20b7a7d6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20b7a7d6

Branch: refs/heads/3.1.x-fixes
Commit: 20b7a7d610a00493b03c79c6f4767158ce495d45
Parents: 204fac3
Author: Colm O hEigeartaigh 
Authored: Thu Feb 16 11:39:11 2017 +
Committer: Colm O hEigeartaigh 
Committed: Thu Feb 16 11:39:11 2017 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/20b7a7d6/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d12b9f7..f8e4fe0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -45,6 +45,7 @@ B 269e96752b11aeb3e911da76bd3074d768860968
 B 26f43025348e101e981e3f64ecc3ddf483ad7fb3
 B 27bba67eb336ac27eb1dbf75e6fdcff03320687f
 B 2d1da35c001514fd37bd74180c1fdaa11e2e7b00
+B 2e06ad9a423af0b51905ab87184097a7c7c936bd
 B 2e6e9debe0449fdffaa33142185ed712ebec6a22
 B 2fb1ccf60f1ba4e9d70f8c2a6329fa1a65e6a352
 B 304c62a11b8dbe000cdfb5de857619703bca79f7
@@ -203,6 +204,7 @@ B ca2f8e81168b5b4ca72fa6c3c4529109c7d7c5d0
 B cb405d4275a5cf30187c4fbf957dbbb70a9eeacf
 B ce274c7b4450279f2c0d4deae5bc5c3952af5c42
 B ced98c6e937bd93f92dac9043fa0406c696bfd84
+B cf3f537d210c979dc3b3f49e08ebad5f0c02993c
 B cf9ab27a843df4532d9bd78209aebcafee2c
 B d15130de948dea0539d5077354c988db80fb
 B d226c07d4db15fa9244a2f011df801839a880f68

cxf git commit: Final whitespace fix

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 2e06ad9a4 -> cf3f537d2


Final whitespace fix


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

Branch: refs/heads/master
Commit: cf3f537d210c979dc3b3f49e08ebad5f0c02993c
Parents: 2e06ad9
Author: Colm O hEigeartaigh 
Authored: Thu Feb 16 11:38:51 2017 +
Committer: Colm O hEigeartaigh 
Committed: Thu Feb 16 11:38:51 2017 +

--
 .../org/apache/cxf/performance/basic_type/client/Client.java | 4 ++--
 .../apache/cxf/performance/complex_type/client/Client.java   | 2 +-
 .../apache/cxf/common/annotation/AnnotationProcessor.java| 2 +-
 .../main/java/org/apache/cxf/common/util/PackageUtils.java   | 2 +-
 .../spring/AbstractFactoryBeanDefinitionParser.java  | 2 +-
 .../java/org/apache/cxf/helpers/MapNamespaceContext.java | 2 +-
 core/src/main/java/org/apache/cxf/helpers/NSDecl.java| 2 +-
 .../org/apache/cxf/interceptor/AnnotationInterceptors.java   | 2 +-
 core/src/main/java/org/apache/cxf/interceptor/Fault.java | 2 +-
 .../cxf/interceptor/transform/TransformOutInterceptor.java   | 2 +-
 core/src/main/java/org/apache/cxf/io/CachedOutputStream.java | 2 +-
 core/src/main/java/org/apache/cxf/io/CachedWriter.java   | 2 +-
 .../apache/cxf/service/factory/SimpleMethodDispatcher.java   | 2 +-
 .../apache/cxf/service/model/AbstractMessageContainer.java   | 2 +-
 .../org/apache/cxf/bus/extension/ExtensionManagerTest.java   | 2 +-
 core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java | 2 +-
 .../test/java/org/apache/cxf/helpers/ServiceUtilsTest.java   | 2 +-
 .../src/main/java/demo/jms_greeter/client/Client.java| 2 +-
 .../java/org/apache/cxf/jca/inbound/MDBActivationWork.java   | 2 +-
 .../cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java | 2 +-
 .../maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java| 2 +-
 .../maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java| 2 +-
 .../main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java   | 4 ++--
 .../main/java/org/apache/cxf/binding/coloc/ColocUtil.java| 2 +-
 .../apache/cxf/binding/coloc/ColocOutInterceptorTest.java| 2 +-
 .../org/apache/cxf/binding/corba/CorbaDestinationTest.java   | 2 +-
 .../org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java | 2 +-
 .../java/org/apache/cxf/aegis/type/DefaultTypeMapping.java   | 2 +-
 .../main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java | 4 ++--
 .../org/apache/cxf/jaxrs/provider/DataSourceProvider.java| 2 +-
 .../src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java | 2 +-
 .../src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java  | 2 +-
 .../java/org/apache/cxf/jaxws/MessageReplayObserver.java | 2 +-
 .../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java  | 2 +-
 .../src/main/java/org/apache/cxf/jaxrs/client/Client.java| 2 +-
 .../java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java| 2 +-
 .../org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java  | 2 +-
 .../java/org/apache/cxf/jaxrs/ext/search/SearchUtils.java| 2 +-
 .../cxf/transport/https/httpclient/InetAddressUtils.java | 2 +-
 .../apache/cxf/ws/addressing/impl/InternalContextUtils.java  | 2 +-
 .../cxf/ws/eventing/backend/database/SubscriptionTicket.java | 2 +-
 .../ws/eventing/backend/manager/SubscriptionManagerImpl.java | 2 +-
 .../main/java/org/apache/cxf/ws/rm/InternalContextUtils.java | 2 +-
 rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java   | 2 +-
 .../java/org/apache/cxf/ws/rm/persistence/RMMessage.java | 2 +-
 .../org/apache/cxf/ws/rm/persistence/RMStoreException.java   | 2 +-
 .../rm/src/test/java/org/apache/cxf/ws/rm/RMManagerTest.java | 2 +-
 .../cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java  | 2 +-
 .../fragment/language/FragmentDialectLanguageXPath10.java| 2 +-
 .../cxf/ws/transfer/integration/FragmentPutReplaceTest.java  | 8 
 .../cxf/systest/dispatch/DispatchClientServerTest.java   | 2 +-
 .../apache/cxf/systest/dispatch/HugeResponseInterceptor.java | 4 ++--
 .../cxf/systest/provider/datasource/AbstractProvider.java| 2 +-
 .../java/org/apache/cxf/systest/jms/JMSClientServerTest.java | 4 ++--
 .../apache/cxf/systest/jms/shared/JMSSharedQueueTest.java| 2 +-
 .../systest/local_transport/DirectDispatchClientTest.java| 2 +-
 .../java/org/apache/cxf/systest/servlet/CXFFilterTest.java   | 2 +-
 .../cxf/systest/servlet/ExternalServicesServletTest.java | 2 +-
 .../cxf/systest/factory_pattern/HttpNumberFactoryImpl.java   | 2 +-
 .../factory_pattern/ManualHttpMulitplexClientServerTest.java | 2 +-
 .../MultiplexHttpAddressClientServerTest.java| 2 +-
 .../systest/nested_callback/CallbackClientServerTest.java| 2 +-
 

cxf-fediz git commit: Minor tidy-up

[coheigea]

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 2681a2643 -> 0dabf1562


Minor tidy-up


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

Branch: refs/heads/master
Commit: 0dabf1562f6ed6994c8e943460ef1107299203c0
Parents: 2681a26
Author: Colm O hEigeartaigh 
Authored: Thu Feb 16 10:27:22 2017 +
Committer: Colm O hEigeartaigh 
Committed: Thu Feb 16 10:27:22 2017 +

--
 .../main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java | 2 +-
 .../main/java/org/apache/cxf/fediz/service/idp/STSUserDetails.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/0dabf156/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
--
diff --git 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
index 4e72863..2ffcad3 100644
--- 
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
+++ 
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
@@ -200,7 +200,7 @@ public class LogoutHandler implements 
RequestHandler {
 }
 responseOutputStream.flush();
 } catch (IOException e) {
-LOG.error("Could  not send logout image: {}", e.getMessage());
+LOG.error("Could not send logout image: {}", e.getMessage());
 } finally {
 try {
 inputStream.close();

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/0dabf156/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSUserDetails.java
--
diff --git 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSUserDetails.java
 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSUserDetails.java
index 4178b07..dfab9e5 100644
--- 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSUserDetails.java
+++ 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/STSUserDetails.java
@@ -54,7 +54,7 @@ public class STSUserDetails extends User {
 
 if (token != null && !token.equals(((STSUserDetails)object).token)) {
 return false;
-} else  if (token == null && ((STSUserDetails)object).token != null) {
+} else if (token == null && ((STSUserDetails)object).token != null) {
 return false;
 }
 

cxf git commit: More cleanup

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 802d168d4 -> 2e06ad9a4


More cleanup


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

Branch: refs/heads/master
Commit: 2e06ad9a423af0b51905ab87184097a7c7c936bd
Parents: 802d168
Author: Colm O hEigeartaigh 
Authored: Wed Feb 15 18:34:31 2017 +
Committer: Colm O hEigeartaigh 
Committed: Thu Feb 16 09:20:36 2017 +

--
 .../configuration/blueprint/AbstractBPBeanDefinitionParser.java| 2 +-
 .../cxf/configuration/spring/AbstractBeanDefinitionParser.java | 2 +-
 .../main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java | 2 +-
 .../transport/http/netty/server/NettyHttpServerEngineFactory.java  | 2 +-
 .../src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
 
b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
index 5de387c..17bb768 100644
--- 
a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
+++ 
b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
@@ -210,7 +210,7 @@ public abstract class AbstractBPBeanDefinitionParser {
 }
 
 protected boolean isAttribute(String pre, String name) {
-return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
+return !"xmlns".equals(name) && (pre == null || !"xmlns".equals(pre))
 && !"abstract".equals(name) && !"lazy-init".equals(name)
 && !"id".equals(name);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
 
b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
index 431a72a..0423472 100644
--- 
a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
+++ 
b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
@@ -475,7 +475,7 @@ public abstract class AbstractBeanDefinitionParser
 }
 
 protected boolean isAttribute(String pre, String name) {
-return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
+return !"xmlns".equals(name) && (pre == null || !"xmlns".equals(pre))
 && !"abstract".equals(name) && !"lazy-init".equals(name) && 
!"id".equals(name);
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
--
diff --git 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
index b8a34ee..e387d92 100644
--- 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
+++ 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
@@ -68,7 +68,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
 
 if (e != null) {
 String ignore = DOMUtils.getAttributeValueEmptyNull(e, "ignore");
-if (ignore != null && ignore.equals("true")) {
+if ("true".equals(ignore)) {
 return;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
--
diff --git 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
 
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
index 5df9767..9fd1700 100644
--- 
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
+++ 

cxf git commit: [CXF-7250]NPE in HTTPTransportActivator stop if DISABLE_DEFAULT_HTTP_TRANSPORT is true

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 551e83863 -> 204fac343


[CXF-7250]NPE in HTTPTransportActivator stop if DISABLE_DEFAULT_HTTP_TRANSPORT 
is true

(cherry picked from commit 802d168d4c772bd97a0c69a0f6c7dc639598f2ea)


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

Branch: refs/heads/3.1.x-fixes
Commit: 204fac343576d897ae5fda233395426e31266d64
Parents: 551e838
Author: Freeman Fang 
Authored: Thu Feb 16 16:04:17 2017 +0800
Committer: Freeman Fang 
Committed: Thu Feb 16 16:04:47 2017 +0800

--
 .../apache/cxf/transport/http/osgi/HTTPTransportActivator.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/204fac34/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
index 3d95161..da2aa38 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
@@ -85,6 +85,8 @@ public class HTTPTransportActivator implements 
BundleActivator {
 }
 
 public void stop(BundleContext context) throws Exception {
-httpServiceTracker.close();
+if (httpServiceTracker != null) {
+httpServiceTracker.close();
+}
 }
 }

cxf git commit: [CXF-7250]NPE in HTTPTransportActivator stop if DISABLE_DEFAULT_HTTP_TRANSPORT is true

[ffang]

Repository: cxf
Updated Branches:
  refs/heads/master 1b8064f47 -> 802d168d4


[CXF-7250]NPE in HTTPTransportActivator stop if DISABLE_DEFAULT_HTTP_TRANSPORT 
is true


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

Branch: refs/heads/master
Commit: 802d168d4c772bd97a0c69a0f6c7dc639598f2ea
Parents: 1b8064f
Author: Freeman Fang 
Authored: Thu Feb 16 16:04:17 2017 +0800
Committer: Freeman Fang 
Committed: Thu Feb 16 16:04:17 2017 +0800

--
 .../apache/cxf/transport/http/osgi/HTTPTransportActivator.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/802d168d/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
index 606150e..d39812b 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
@@ -85,6 +85,8 @@ public class HTTPTransportActivator implements 
BundleActivator {
 }
 
 public void stop(BundleContext context) throws Exception {
-httpServiceTracker.close();
+if (httpServiceTracker != null) {
+httpServiceTracker.close();
+}
 }
 }