You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/02/09 21:26:26 UTC
[1/3] cxf git commit: Fix build problem
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes eae586680 -> 7889d0389
Fix build problem
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c5a3196f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5a3196f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5a3196f
Branch: refs/heads/3.0.x-fixes
Commit: c5a3196f706d633161a382baaeab7cc8cce281ab
Parents: eae5866
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 15:04:53 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 15:26:08 2015 -0500
----------------------------------------------------------------------
.../cxf/jaxws/interceptors/WrapperClassOutInterceptor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c5a3196f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
index 7a06181..0afd9a1 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
@@ -86,9 +86,8 @@ public class WrapperClassOutInterceptor extends AbstractPhaseInterceptor<Message
try {
MessageContentsList newObjs = new MessageContentsList();
if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, message)
- && helper instanceof AbstractWrapperHelper) { {
- ((AbstractWrapperHelper)helper).setValidate(true);
- }
+ && helper instanceof AbstractWrapperHelper) {
+ ((AbstractWrapperHelper)helper).setValidate(true);
}
Object o2 = helper.createWrapperObject(objs);
newObjs.put(firstMessagePart, o2);
[2/3] cxf git commit: [CXF-6236] Use the appropriate auth supplier
Posted by dk...@apache.org.
[CXF-6236] Use the appropriate auth supplier
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/89a05912
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/89a05912
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/89a05912
Branch: refs/heads/3.0.x-fixes
Commit: 89a05912347f960cd8473c4fa33279b763f9c762
Parents: c5a3196
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 15:05:24 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 15:26:11 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/89a05912/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 050c609..4b9adc1 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -779,7 +779,7 @@ public abstract class HTTPConduit
headers.setAuthorization(authString);
}
- String proxyAuthString = authSupplier.getAuthorization(proxyAuthorizationPolicy,
+ String proxyAuthString = proxyAuthSupplier.getAuthorization(proxyAuthorizationPolicy,
currentURI, message, null);
if (proxyAuthString != null) {
headers.setProxyAuthorization(proxyAuthString);
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
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/7889d038
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7889d038
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7889d038
Branch: refs/heads/3.0.x-fixes
Commit: 7889d0389421a6359fb68ce3c1e193021fa9c2a8
Parents: 89a0591
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 15:26:11 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 15:26:11 2015 -0500
----------------------------------------------------------------------
.gitmergeinfo | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7889d038/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f0dbb21..59a5e66 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -25,6 +25,7 @@ B 1824d9cae26c3b141d873d0d01036602ac339c37
B 1a8fd7c02bc6a620e276086b665d430217116767
B 1b3f01b4f640beea1f1247416ad9891e615f816c
B 1d29dfaa8e686570c1b2ec2da4c31ba380e0b9b0
+B 1d9e79ef36bf14e25d7cd2cccb0d804a048aef64
B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f
B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2
B 2004b1021ce0d0975eb49cae36416863bd8c59bb
@@ -34,6 +35,7 @@ B 28e185b27e8c80cd773cac46d1b9b19529c4fab0
B 29f0620a9a025afcd2057cdf97c7d93caf6c179f
B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
B 2ba77327488a8446e6a92af137f644eaf3b06e2e
+B 2cb99eed19d1a8f097c4ae54967c6e45a7c03d67
B 2f0b3e38212674883d610cfcfbd76b901bd3d997
B 30853113b4c4d47200bcf5305e5e88735f32cc8f
B 350b51632f4c5dbd4891636261909c73136981c6
@@ -89,6 +91,8 @@ B 71ced4709dedf62264a4bb630aaf4780cb94ce48
B 7456089088a21620ec75dc83fbb4b89ebdfd290e
B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94
B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
+B 799c5389f754eb588f023b646b8983b50dde00be
+B 7cd4cf67ba5b8a0ddc36c8008bf096b469408f48
B 7d1f30f76d95f9eddf0bed995120c71bf1a393b3
B 7e318c4fbfae35680965082a491ca842a23ffd8c
B 7e95279dd1170f5878687d7eea27f7d7f03a434b
@@ -141,6 +145,7 @@ B ba00202288bce9ba80692f151c2d73b101400c50
B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
+B bd94b4c8778e360d538d5acb3f6a3710af92e6f1
B bea22d764138e365513856c23be760a7719530a0
B bf6bba1082d030298df9b9f1c354da5f92833eae
B bfbc0a25c377e43395fb1f7beee045e4412c4d8d
@@ -149,6 +154,7 @@ B c1c9562bb13eeacdd9dae5a46c513e9e03625698
B c5609a479c87ea75e016b61daeafe0021f693332
B cb19d05174a3bd078b391c4f6c151ee6e34e2956
B cd809b8526fc5620c481d4ee5a8534ccf6babae4
+B d021b9041e00518099947274455b2027326a3c7c
B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
B d391d9371d8505c7774308c4fbbb9bc57ffd34a6
B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c
@@ -159,6 +165,7 @@ B d8a6bdbd2c84b3fa0187de935e294d5f66974e46
B d9f624e2eca8affa20243583ace087a8cbba3ac8
B df947cb1ca2b9e375f99e199ec65b1afece1c963
B e242307ad8bbe53788f3e03e9e2f0ca977d01340
+B e8b8e2bc1b5afa4ad93294ebe1bd723a5a4a8f64
B ea778c4f38f882dc97d23bd200683fd9d48b4718
B eba07e615684e475772a7a2d23d7e93a0b099485
B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0