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 2016/07/25 15:30:35 UTC
[01/14] cxf git commit: Update cxf-utils.js to throw the onerror
handler on timeout This closes #126
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 8bfa04d6d -> f86fa5bbb
Update cxf-utils.js to throw the onerror handler on timeout
This closes #126
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ff07f49a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ff07f49a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ff07f49a
Branch: refs/heads/3.0.x-fixes
Commit: ff07f49a22db975e1f00a751b54b395b1fec4408
Parents: 8bfa04d
Author: Jeroen van der Last <jl...@users.noreply.github.com>
Authored: Tue Apr 5 16:30:58 2016 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:11:57 2016 -0400
----------------------------------------------------------------------
.../src/main/resources/org/apache/cxf/javascript/cxf-utils.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff07f49a/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 a084d05..8c9f451 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
@@ -745,6 +745,9 @@ function org_apache_cxf_client_request(url, requestXML, method, sync, headers)
this.req.onreadystatechange = function() {
requester.onReadyState();
}
+ this.req.onerror = function() {
+ requester.onReadyState();
+ }
// NOTE: we do not call the onerror callback for a synchronous error
// at request time. We let the request object throw as it will.
@@ -929,7 +932,7 @@ function org_apache_cxf_client_onReadyState() {
return;
}
if (this.onerror != null) {
- this.onerror("Could not handle content of response.");
+ this.onerror(this, "Could not handle content of response.");
return;
}
}
[09/14] cxf git commit: Support @Policy annotation on impl methods.
Fixes the Policy annotation test Colm added
Posted by dk...@apache.org.
Support @Policy annotation on impl methods. Fixes the Policy annotation test Colm added
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cc929d44
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cc929d44
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cc929d44
Branch: refs/heads/3.0.x-fixes
Commit: cc929d442fde164932a0e25571689accbad72015
Parents: 35b808c
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue May 24 13:30:21 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:23:47 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java | 5 ++---
.../cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java | 4 +++-
.../cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java | 4 +++-
.../test/java/org/apache/cxf/systest/ws/fault/FaultTest.java | 2 --
4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/cc929d44/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
index b35295e..c9e2e32 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
@@ -91,9 +91,8 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
if (ep.getEndpointInfo().getInterface() != null) {
addPolicies(factory, ep, cls);
- // this will allow us to support annotations in Implementations, but only for
- // class level annotations. Method level annotations are not currently supported
- // for implementations. The call has been moved here so that the ServiceInfo
+ // this will allow us to support annotations in Implementations.
+ // The call has been moved here so that the ServiceInfo
// policy stuff is loaded before jaxws factory calls the PolicyEngineImpl
addEndpointImplPolicies(factory, ep, implCls);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/cc929d44/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index e93d790..872076e 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -84,6 +84,7 @@ import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.ServiceModelSchemaValidator;
+import org.apache.cxf.service.factory.FactoryBeanListener;
import org.apache.cxf.service.factory.FactoryBeanListener.Event;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.factory.SimpleMethodDispatcher;
@@ -355,7 +356,8 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
}
public void updateBindingOperation(BindingOperationInfo boi) {
- //nothing
+ Method m = getMethodDispatcher().getMethod(boi);
+ sendEvent(FactoryBeanListener.Event.BINDING_OPERATION_CREATED, boi.getBinding(), boi, m);
}
public Endpoint createEndpoint(EndpointInfo ei) throws EndpointException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/cc929d44/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
index 0d3d6a7..fbbf957 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/DoubleItPortTypeImplJavaFirst.java
@@ -30,7 +30,9 @@ import org.example.contract.doubleit.DoubleItFault;
import org.example.contract.doubleit.DoubleItPortType;
@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
- serviceName = "DoubleItService",
+ serviceName = "DoubleItService",
+ portName = "DoubleItSoap11NoPolicyBinding",
+ name = "DoubleItSoap11NoPolicyBinding",
endpointInterface = "org.example.contract.doubleit.DoubleItPortType")
@Features(features = "org.apache.cxf.feature.LoggingFeature")
// @Policy(uri = "classpath:/org/apache/cxf/systest/ws/fault/SymmetricUTPolicy.xml")
http://git-wip-us.apache.org/repos/asf/cxf/blob/cc929d44/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index 81f8242..f81f452 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -261,10 +261,8 @@ public class FaultTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // TODO - There seems to be a bug when a security policy is applied to a method as opposed to the class
// See DoubleItPortTypeImplJavaFirst
@org.junit.Test
- @org.junit.Ignore
public void testJavaFirst() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
[14/14] cxf git commit: Fix compile failures after merge
Posted by dk...@apache.org.
Fix compile failures after merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f86fa5bb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f86fa5bb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f86fa5bb
Branch: refs/heads/3.0.x-fixes
Commit: f86fa5bbb23690695f518c61ce236aa32b2d2198
Parents: 47dc676
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jul 25 10:39:39 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 11:30:23 2016 -0400
----------------------------------------------------------------------
.../interceptor/AbstractMessageResponseTimeInterceptor.java | 3 ++-
.../interceptor/AbstractMessageResponseTestBase.java | 3 ++-
.../cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java | 3 ---
.../test/java/org/apache/cxf/systest/ws/fault/FaultTest.java | 7 ++++---
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f86fa5bb/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
index 76bb5e9..c421cb1 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
@@ -38,6 +38,7 @@ import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPhaseInterceptor<Message> {
@@ -172,7 +173,7 @@ public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPha
}
protected ObjectName getOperationCounterName(Exchange ex, ObjectName sericeCounterName) {
- BindingOperationInfo bop = ex.getBindingOperationInfo();
+ BindingOperationInfo bop = ex.get(BindingOperationInfo.class);
OperationInfo opInfo = bop == null ? null : bop.getOperationInfo();
if (opInfo != null) {
ObjectName o = opInfo.getProperty("javax.management.ObjectName", ObjectName.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/f86fa5bb/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
----------------------------------------------------------------------
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
index 15ffa71..f31a0cc 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
@@ -30,6 +30,7 @@ import org.apache.cxf.management.counters.MessageHandlingTimeRecorder;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.easymock.EasyMock;
@@ -133,7 +134,7 @@ public class AbstractMessageResponseTestBase extends Assert {
protected void setupOperationForMessage() {
OperationInfo op = EasyMock.createMock(OperationInfo.class);
BindingOperationInfo bop = EasyMock.createMock(BindingOperationInfo.class);
- EasyMock.expect(exchange.getBindingOperationInfo()).andReturn(bop);
+ EasyMock.expect(exchange.get(BindingOperationInfo.class)).andReturn(bop);
EasyMock.expect(bop.getOperationInfo()).andReturn(op);
EasyMock.expect(op.getName()).andReturn(OPERATION_NAME);
EasyMock.expect(op.getProperty("javax.management.ObjectName", ObjectName.class)).andReturn(null).anyTimes();
http://git-wip-us.apache.org/repos/asf/cxf/blob/f86fa5bb/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
index 879ec0d..71e7bb3 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
@@ -27,8 +27,6 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
-import javax.xml.soap.SOAPMessage;
-
import org.w3c.dom.Document;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
@@ -39,7 +37,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
http://git-wip-us.apache.org/repos/asf/cxf/blob/f86fa5bb/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index f81f452..6615a12 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -263,6 +263,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
// See DoubleItPortTypeImplJavaFirst
@org.junit.Test
+ @org.junit.Ignore
public void testJavaFirst() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
@@ -280,12 +281,12 @@ public class FaultTest extends AbstractBusClientServerTestBase {
updateAddressPort(utPort, PORT);
// Make a successful invocation
- ((BindingProvider)utPort).getRequestContext().put("security.username", "alice");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.username", "alice");
utPort.doubleIt(25);
/*
// Now make an invocation using another username
- ((BindingProvider)utPort).getRequestContext().put("security.username", "bob");
- ((BindingProvider)utPort).getRequestContext().put("security.password", "password");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.username", "bob");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.password", "password");
try {
utPort.doubleIt(25);
fail("Expected failure on bob");
[02/14] 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/807d2ac9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/807d2ac9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/807d2ac9
Branch: refs/heads/3.0.x-fixes
Commit: 807d2ac923b6e7d0797a96ae40ba6b9dbc796e60
Parents: ff07f49
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jul 25 10:15:29 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:16:26 2016 -0400
----------------------------------------------------------------------
.gitmergeinfo | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/807d2ac9/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 135b556..844fc5f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -54,6 +54,7 @@ B 0ff6a3c8609507351d29903d04198fd71b650ae5
B 10ee2d5b3f76f020d0463fb5fbe7194b43965d22
B 11243052a6e1656657776bc3a0c586cba962c49f
B 11ea395d0fa226c040f4ca3c4c6114a90ce34e06
+B 11f3e36e1af5d979a84040f79a8e9cb0f6840d9d
B 1214338f24a3a7973f2bd72ca01fc57644bcc45a
B 12206c314d34f2e210f7292fcb7a3e894fafd4e7
B 12225d4f560c30839fd8f2ecb6657663d7559a27
@@ -64,6 +65,7 @@ B 1308529e8b6a325143fea8256c98e37f79016170
B 1319cddeeca993b6c6f67a392a4807fc46e2e329
B 131c1febfce98364435a3dc5567be89188ee1bda
B 131c3fdba9c4825b739adc3d149d0297175b8a86
+B 13303df9a7dbdd3954599ddc56ce757b61e31404
B 13b9b012a31fdf1a7e35757a336fecc3c688848e
B 13dfe0f9fcaa0aee4c603072436d85861a0ab734
B 13e01e23ea87ea5b06953f18bef4b173fca55b4d
@@ -91,6 +93,7 @@ B 1960703149a11052490cf16ec3682408470298f9
B 19cbe748cf0753671e50a643d845a5700c53777b
B 1a5708e21708a9ed96991cd56ff89b3fd4eac15a
B 1a8fd7c02bc6a620e276086b665d430217116767
+B 1b30b3c83db2ae9a236d4c91285bae161fcc6f4f
B 1b3f01b4f640beea1f1247416ad9891e615f816c
B 1b7d4d1488db897ac7c824288556bed2df851309
B 1c17a94b0adf40fd6193b9fcf2a87ce9a686a131
@@ -173,6 +176,7 @@ B 2ec875978a50cd34d07bd7d3bbfc8583fd30250b
B 2f0b3e38212674883d610cfcfbd76b901bd3d997
B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f
B 2f5f034b8e8361aed103de5bd7fa7526847ac690
+B 2f881786004132611d6b0d52969828899c0f9ca9
B 2fccfdcdbcd3a8bb8ea740eda499b48b74dbaf65
B 2fd8103535c1246a3a243e0fd7bcea86947e6b14
B 2fe88ec153b6193a8c80f7c1226db19600e0839a
@@ -190,6 +194,7 @@ B 32c0aca5fa2a6473dc3e3257fcaaef6efea66874
B 33083c0682d2bdf2f42df7f4021d18bd7ccc34a4
B 3309231e467225b18b24d90d77153a0c572a17e0
B 33c7781f4f847431a7bbdc9335657d3281cd525e
+B 340a1305bfeb84d9ce8248b2e6efea5327bbe615
B 34425010f5c6e50255bcc188db5bd6dd5bed3b97
B 34e083dd1c4cccf4bda941dace30134dad546ab0
B 3506302369c0a28647056c1da469bd9844e45826
@@ -198,8 +203,10 @@ B 354ac95b70a98b4f2e8f9f33c534b3e885e9a935
B 358589c33f44d747f5a924f0b1cdedfcb7018a22
B 35c7bb64928cf92da260c588b6d4ea9d60ccb2f3
B 35da295262a43a59717b6f17e739335a04d197ca
+B 35f01c94841870afa8331e0591aec8a3bc4ca94d
B 362437e222ea79e92078323d865fb0b2d7195610
B 3634fd60f85ae12f9de68c69cb2d15a38dac772c
+B 36d2bf61511d1921a38d065eb474be802f2f949e
B 36dc41e1b2bddd02def5dafbafd4a86443ab5e30
B 36ebac7b230f8b48d098c580b6774a91f1844854
B 36fcf426a4946f57b051ce7a388c7190fc97aebd
@@ -226,16 +233,19 @@ B 3aaf7d75c873c990d8e86d27e37f03c47e074175
B 3aec3e286e4732918589c239ea1b8f7e1d3a9836
B 3af4374ddb16ccf86195d64cb2a39fd4d65d43f1
B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
+B 3b2ce76de26f35cf782f2607ca65f715a2caae50
B 3c2092b369f06d4f71134397240092a659bcbca1
B 3c9806ce95374d7e0879b735e8c5f9d640a53efe
B 3ca7722d98bf22f47aab57a3856edfb83074bab8
B 3cf195384c2175085c7840dc4469837a347c7d0a
B 3d373ea991a8415f6161468f36947143411e2cf1
+B 3d6ecbda539fa23d9239b7d3ea291590b8a8331f
B 3d747fa0847db2798f6662a2540d4f3a79d83edd
B 3e393ef377af21a0385cb0943aae248a22d1fc1f
B 3ea1c784f248e29dcda46b16b82ad0e923c4b6e1
B 3ec5957b01821138129cc29acb88430fa278d28e
B 3ee69e9404d3ffed74e84b223d7d284c081f7fb4
+B 3f90fa6a7adb9c3311663424950fa352d7d5bdbb
B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97
B 40e31a9f14bb9e494c9240463e17ed232e201876
B 411dff107d089001ffa836bc196f91ab873f76cf
@@ -285,6 +295,7 @@ B 494ff7640d78b1667547c8aacfc1d517fff00ef8
B 49829a180d3924f3dfc8ecf41ac904e8da020ba1
B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
B 4a749e745ee64b3d9ee09eb9e7a35039127d6f40
+B 4b15b8a49c1ea75c346ea4a53e3110db7edbd127
B 4b44512d8c3fe76620dbac37d220038435c75ba5
B 4b4a5151c83113bb53d65e0304b8c9fee524d28a
B 4b577dc98cc61e4aead2f0bdff6d017c8a7679df
@@ -297,11 +308,13 @@ B 4cccc2361582ab5e785d5ae616af9e58a40c9828
B 4d0c6df1e561f5e6d118430349a09360c9dd754f
B 4d49814ba85310599ee76e41742208383f3f6450
B 4da4d2300433e7e115f095becb1149b22ceb31ca
+B 4db1a9e0dafe99d147727431bc3cb8450501fd95
B 4def8e9dbf56b0bab43afcb6b805ee945c31b03c
B 4e4e3994af68ead60c226f89891412d8aca0ac85
B 4e5ef7d769e67d5bd6e6d8c85b2bf01f09d7aca0
B 4e60f32c9c370b99d9574fa54d546badf647db53
B 4e68076d7c9cf5f1be0e03d570a50f80756a82cc
+B 4edaad797a57d6968f5ba293b100b856a72c52ab
B 4eec754b1bbd46e0142412cd37dbaf189c47f905
B 4efd6b4c188c7e7c94feb6afc943df831da43180
B 4f61ca801deed173c648b2d424ac231663acd704
@@ -314,6 +327,7 @@ B 50daa4883dc8078a018ebc985e5c7bd58c6c5ff1
B 512e9e900f3c840e1b0ab4c2fb4c3950bffc84ad
B 51f433d54a1d11eac25c32b0dd69f12fef62c060
B 52c3b6a90314086ece3b7f6df63465434879b2cd
+B 534b329c57bb5226e7dc17e72687e85b46ed0a47
B 53790b4670bc17af3fd101b01aff7b62d52fac03
B 54508131155cc71099f6f54c5ee531e159d79ca2
B 54723262aa1cc6f33a9b158e92694c454c3904d6
@@ -325,6 +339,7 @@ B 55829d69db9c132f72eab41baff6b6da6d1869e5
B 55bda33699ea1c2e84a125253edd594cc2a32ea3
B 55e9924dd0694f09ef8b3343b566699dfd2f266f
B 560c72ef7ad2fef318c0fd65412a39bb9507cf09
+B 563ad5b3905ad93d7cff22f8472abbd634234c7d
B 564e9a6926f7b41982350e796d55bf8c371b912d
B 5669ebf9b7f3ed1293458d5f3ff3e3e84fde21ef
B 56dda74f468372c471ee28bf84686d4e1038b7b4
@@ -354,6 +369,7 @@ B 5bc8c0c41e3cef645ee6c7a1587d19e844fc7e4c
B 5bf7ea849a7de8ec2335f6172b4e05848480fb4a
B 5c541cd9c16ed2d982085410cb801f2f21dbc82d
B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0
+B 5ce682771ae91eab61e25eaa90ef416168eb4402
B 5d0ac9e12b9658fbfea8c7c952783973462eabac
B 5d387616bc1787f3ae50dbe2a185c6abb0e9955b
B 5e06ba0c4970700477484bd2409a226aa9ec7f0a
@@ -375,6 +391,7 @@ B 6359c930bb27b0ea589c7c2d7ed552babe4897ed
B 6400b3cd1d87e52723fac2641b34a5f0289b908c
B 646ec10d153d037cdaf813fc0e64bd9d9bc4d31b
B 647502029b2d82e5e95afcee786ac64d831c782a
+B 649a034266ac0584d4d988a6ca0cb5c61f190e84
B 64eee11a907d724373f80e38db24b7474ede7164
B 64f232307444269286b7f14fc3838b07187d4c03
B 64fd0cc1bc2b2260deea1b2127f861f3e47cfb72
@@ -409,6 +426,7 @@ B 6bdc9257b691e140f435a567e0b4f566c71be6cf
B 6c58f0c8861c9e9a922d337da4ea8282c75255c1
B 6c67f878e2c210e7f03c4aea52b2ba2eec7d611a
B 6c77d135c835946eacda132e46c4b2207a2f0355
+B 6c8d2ba818713be47a26541a22a67470235daf96
B 6c9b9b922827a627ea5d4e1041c08a5ff7bceef9
B 6c9fb62220345bce0b19561d95b38d5507f75e71
B 6cb69808178c00e9c935372cd5cf107af8e480e1
@@ -446,6 +464,7 @@ B 74aea1227832d3000f2f9fe61d7cc3bcb8a60a79
B 75115ee15740b33c5cc09b1f4b79fc4a54e4611c
B 753368bb25f851d858c39b9f2ece764f81e14c2a
B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
+B 75edfe9d21fd654d844e24038a72206b4e15457d
B 770ea4c9b218ba34526fce5903feae6959c3366c
B 772ca96b6c3e2ee569b538e8aebdb80777c900d7
B 7737225402d3a7b2e669ee8ecf54de10af686f20
@@ -470,6 +489,7 @@ B 7d51f38def4160e441ec293c7b924efaaecda91f
B 7d90172a6c034f585122385daa36db33fa29e07a
B 7e318c4fbfae35680965082a491ca842a23ffd8c
B 7e4eb471fd6b19d73b2e91748a736f6205fc393f
+B 7e5efb29ad3e00eb42eb46836d7c3f00d3071d7b
B 7e82d2f10a1ca14a939d2c63ca4e620f8870e256
B 7e8d0b4b1cd868272380ca5779e67a15e46cf799
B 7e95279dd1170f5878687d7eea27f7d7f03a434b
@@ -517,6 +537,7 @@ B 88d513e3a47cc52335e9419da00319cf147eb66c
B 88fe618069a5d4f6fe328a76b3fd3e164c7fc564
B 894eef1d106f702f19485a8c6b0147d8d2484677
B 895f9b0ff0b43f775309bfc5d064ca22ec7b2df4
+B 897d81dc292eb6159aab96390cb3fbfed1c34a6b
B 89b7bb172804ebaffaa69c9207065e50eb5a5d36
B 8a82bbfb59141801864e74ebe92f499f117ba6ef
B 8a9f6cdafc87a22314c805e995fc5d286fe8beed
@@ -542,7 +563,9 @@ B 8f967643447ceec89e58b079d8d8fc00cf232a02
B 8fc16041a43d53965bc0ed794cc8ac13580f429f
B 8fd8c552f4c2a980a5138de19a2b74104776a4ba
B 90312bc48f6e564bcafdaaebc3cd596c966ee674
+B 90c1207801de16e68d5d40fe78a0fbf6873c0414
B 90cbb21a4068a3b9859a3c67f34896eaa38caa09
+B 91197fdb2cfc52c62f63aae1113b387423c8c387
B 91c7b09005e8d32187283828ac348235b725e3e3
B 91d6630c53f222544e4bb512fb5c918d68518138
B 9240e620875e3e4a6e77e914a2e68818259fc5b1
@@ -600,12 +623,15 @@ B 9f0d1b3236b6b7fdb67c812360c03bda19700cc5
B 9f20e99ffb13906a83c6a39bb16ceb3708c36f46
B 9f457003d766950abc6a22d87d7045d3cf6aee44
B 9f808d2f250b0323c99c215b18054ffecbdde813
+B 9fb9b883d21a4e47017b141a5f21a4fd58203d16
B 9fc26998d89a9f7d04d3a57a97b4c09c745b076b
B 9fce658c4611f790983a3d5cef7312eec8771461
B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9
B a04a1e06f7fffc5f145e33c6832f31b04782516b
B a0ab1ae5797eace72c563d0e2ae15d15e20d4d1f
+B a0bb3cc1ba2303ea13ba52da28c9edde22408398
B a0f0667ad6ef136ed32707d361732617bc152c2e
+B a108a6e56e8e5a112d5c9224c9f278b799ce4d3d
B a1487f2cd460028608a693ee6136d62803a633c6
B a16abff276542979aef91f7e56cd8e67a695db14
B a1bd8bd7f0f3877c63c9491fe4c423f43bc58720
@@ -623,12 +649,15 @@ B a4222c930f7d69608f826c14e4bc7bc9f670097c
B a4315cb442fa31960cbd47f11e95e81b4a71441d
B a493fc41c1bdd5d282dac7fec57db9d01987af21
B a4fb98497605dea0aef4712a32146e6564b514f8
+B a529d270668dabd1cfa6b040769cb25af97973db
B a564aea127fa0a385c06b1c7f9f391b68d0f9c50
B a58edd7df323217534197cf35aca734948d8da1b
+B a5a03eab9dcc7323c422b882c63a6692ed78845c
B a5aff3e7a43274b3d47cda706aaf8108bd7a9b07
B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5
B a602c9df3e2e09855410f0e75af9b108620b7794
B a613996359845cfdb9a62b5e25d30a5c08406bee
+B a61d946fcfaa4132a1aa2c45e04245cf58044902
B a64b75033db4d4f07052288b9b5c5c54b3d7f4a6
B a67a0a69214717c7c92baa27f74000d5af895c83
B a75df553a2bb0cee94b96fababa723d7d0f45d90
@@ -662,6 +691,7 @@ B ad1822e1bdcd842c8f9fdb2f5833e73202455086
B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6
B ad577419dd39b1414080e6b34ed75db64254a150
B ad700a5f6471f55680821f6d04b182f5d3a6054e
+B adb0ce53862e37ccd2f16029c7b13b4fa0cb0ac9
B ade622bf89a6d72d1aca4ab3a82dc4450cd5a603
B af100a919178b0938fcc04d9c8d1dd1269e351b9
B afd70f562f769c1f1ed26a275cbb3763b24cba43
@@ -694,6 +724,7 @@ B b4a17ce9970cd124cec61eaed04061a529e2398f
B b4a1e352028e992ce6ff8f71666467ea4f96d7f8
B b4bfa886ee80b681b09eb578c69a03a43ea964e2
B b4e7dffbaeae4fdf1a20d70cef51e2e44e8960bc
+B b52157a330d9ef4daab8d2826579cb68ca171c69
B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48
B b5fc90f09c6b039a54564e0825a264310453c550
B b6018a47e19bf98ad405baf51e363eae9972f4dd
@@ -702,13 +733,16 @@ B b63c63ffeb1f8d4e747ba2e9233be6aa635c00db
B b6577a8fa68235fb8bb0103681906289bcf5e069
B b67537dbace0896073b55b375b8ccdc4cce83365
B b6b48c1bca784fd0e84c6e74223f0d535f4c7ec6
+B b6dca932548fc130bef28610646699bfafd80798
B b6fd55076af90b68853c5b5db8fb8cb54174dd4c
B b7389c130daac93a96fb781155fcd24d01836d51
B b7562ded6c0b54d02615298c975c54585aebf298
+B b75705c1510b13df2dd387e69d52da3efa50cfc9
B b7657a47aca211d46df04998bf79a9e2ca76a545
B b79272c09949cea80572fb86bc170cb344a9b731
B b7ce0bf1e5106b7913269c1aa24c4ab3aa5631ee
B b7d89466ab1c0ef68156cef6deb5a911fbf511f2
+B b86d467cd18b5fe91300185a8c62e66d2b20375b
B b8fe59b5d696e31b607efca1dc32f2521e99884a
B ba00202288bce9ba80692f151c2d73b101400c50
B ba17570e53cec4386f7c6fd40f075c6fbc1c3981
@@ -717,7 +751,9 @@ B ba2d7b85d44970cb4abd8cd18ac24178394ef404
B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
B bb0a94734f583e5b6b1e42303aa6ba7a49958f18
B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
+B bb76ab10ec11ae28ad85972afe32a79d0df7d3da
B bb9b5d2e15c0e30d12a6dea3db1a6f720aaf07ad
+B bbba1ad5ec756a273c9c57eeb4bc2c9e66b82326
B bbe5e870579720272af49b9cea65b8293d5b1f3c
B bbfe35e464e2f4a6a4783420104d0d90c287fff7
B bc025f0fe4acf7191430230080318346272543e1
@@ -745,6 +781,8 @@ B c04c27200226b564108b4fe58b8ac70ca5ec7638
B c04c68c93c75d4ce78d3354f143ba5fa1e7f8c1f
B c0526a6e55a1eef931bc9257cdd419b64818ea41
B c083d093ceb2c9c8fbcc5a05910b04d221225f5f
+B c0cd1f4464954deff337ede117c32ee5fd2b59c6
+B c0f105cfcbf3b0e618eedb6ea44bfa108e3a7e96
B c0fd11fa058c0422d84e67b9e45233010cc55f7f
B c129ebc7306e29c6010cc544ce4b8e723dbbd504
B c1c9562bb13eeacdd9dae5a46c513e9e03625698
@@ -752,6 +790,7 @@ B c27dc582c203d01fa8f63f500def10f0ae57d1e4
B c2b70fd462955b714f0211ff52e1f99399666d44
B c3399966e4060837fd17511d604a26c8d12dad7c
B c3cca2d5d92576235e27692806d0c8233a8ce9b1
+B c4a6faf0b8ba43143cdb96c8258a4b335f794b2d
B c4c03e06de3ec8eb8b3e3b35a8c27d1615fd5931
B c4c969042edcbcd439faa0fc95c1f5130cf06c71
B c4ce1dd672146fa49f7d6b0aabc563843828fe93
@@ -759,6 +798,7 @@ B c5609a479c87ea75e016b61daeafe0021f693332
B c5ad99ec8045110063dbec77873782eb5451a6c4
B c5c21d5b61fbd57e79f0bf39fa56ef9814c417fd
B c5da4140da8fe63c4a10845b95258bbda9ab2058
+B c7234f41345c6e051213a83460ba210e677389da
B c750e54452bfa4cb9b0db018dad135b298847095
B c77ce1ad3415a6df49acbbf5159ad670cf481d74
B c79bb840febf402e498c9cec611ae7c3da27cd2f
@@ -789,6 +829,7 @@ B cd9d69a3c92e2c23b85e44bfbfe973c029870e78
B cdafd372c60b7e19229d7e6a91fc69b9c5dbc69c
B ce81b3829764996aa8d6c006ec2dd5c784e98433
B cec8828bd220abd0d49457df707b9261b50e1a8e
+B cef68665303f783fa25ae1ac974a3cb94732e228
B cf9d2131bb78b0c04248454b3ddc5fe5c6387674
B cff8364b9c3aeef1fc0cc5fccb1d0fe4c40776ea
B d016544ffa6ddb63d9ff55c22c375461ff5323e2
@@ -796,11 +837,14 @@ B d021b9041e00518099947274455b2027326a3c7c
B d04f83cecea57d92052f3bf1f4eea7f4adfac6c6
B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
B d0e42861b5df45cf24985d956372f75bf04800f3
+B d1687e70dc8b0e8571cc7dfebbd173ec1ccb1c32
B d1bb6c14ce0e9431adedc324bcf069209d9fe4d8
B d1c7f1f6be4ce14bd0e99ec9672d9c1957515f35
+B d2179fbe499b8d32118b420c8f19bb3c348f1234
B d2ed88ccb247d4105de34a5b675c0fc198795209
B d2ee79c9371fa23ecd8e2a3a0d907c3256466f28
B d391d9371d8505c7774308c4fbbb9bc57ffd34a6
+B d3a97b35ace8c2510b2842180f92fe0196eb583b
B d3baa23e3cbac2364498f81ab293aeb61902caa7
B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c
B d3ea067659eb3f765df0bee6ce7b4abb55f76ab5
@@ -811,6 +855,7 @@ B d4f3d88802137d285cc3290884c2683ba5e74d33
B d4f9674baa811936429271cbf64c4a558282c764
B d50ffd09c30e606524fb6ed92119d85ccfa13491
B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac
+B d54b8750a256a4ea6baf6470928bd28cb8f7c9d4
B d55039341b000375256c5db9e79cfad5f8b4c3fb
B d58695e24fa0cc7f951ba4894f0dc946fdfb27f6
B d5b502a60d2934a42e32cb6225224ff75c66aa37
@@ -834,6 +879,7 @@ B da53162f385fa73957626446cbd63ea269c1ee26
B daf19cc33f77e2b4ddd2e2b583926be189b84abb
B db18a965fb238b8515ab74eb63d13c863c279476
B db51e1a99ab886f179c677579ba798b450069287
+B db8fca38f64cae8cdfc846774db6625cec5d387c
B dbe659d16f536944afaee85d76715558761936c6
B dbf8d58d565ba7f3a8c43b917f7e9182cabe5efa
B dbfaf2b5aea3c4b09a825c82cae88c9d5f777aac
@@ -842,7 +888,9 @@ B dc986e411b2f7449d6cd92481431cfebe18689bd
B dd3c8f9d05b549d7aeb3804476bdc3fb344cf2d8
B dd598c4985d8f61fd3d4fa7754d936cc6651bcee
B dd8025a1695ac207e8b28e3cff38bb7df6369361
+B de3464abe2f6e0a9de6532c3831f558907e6a193
B de88ed19bd937440fa891a852582a2d9ea971e3b
+B de9b7936156d622c284df7f055acac80b920b7d0
B deea740143ef9b2d85c5dc2139f6918ae10ca548
B df39a9e14be1f3ff1fdd32e93e4f95c7fab96b00
B df947cb1ca2b9e375f99e199ec65b1afece1c963
@@ -861,6 +909,7 @@ B e28d258049dc8501f6d2bc4d33ef21914d5a38bb
B e2bc8d8f31f6e3c6c6103dcf22e26726756bb39c
B e2ec3644381789e0cabf40262139940aa33bc7c1
B e32ce07bc632380664d70d5b4c44afafbc2bed33
+B e3b96547d7760ea1d9b9b64e3ea1cb10e8687cef
B e3cf81814730be1b2a1b35a7a5d62ac4da061ab8
B e3edee617edfef541385cd0043ca88ab2e6456d7
B e41d2352762c124401629d7295691de2b6db1d5c
@@ -875,6 +924,7 @@ B e548a02fa04313fd1b6ec5d9ac78c774e8ad935a
B e54e39740fdb360f84a74638db1d6ca71490b01a
B e5637ffcc3a56923982c4254cffe54cc62130ee9
B e57a1be543267175fd479fae7a1a5150bcccccca
+B e5a5d5b64015faffa3479ac009631c66f9f56036
B e5bd083e9b206e7b516329ab7316c3bd025143db
B e5d98fd24b545920f2453e94a56cd9690582af59
B e6085587cd0380b0e64346af53ac07e49734c8db
@@ -899,6 +949,7 @@ B eb4ea1fc03b17b7283b427cd4616507f934ef423
B eba07e615684e475772a7a2d23d7e93a0b099485
B ec3a49b094019544e525aa1b14f494ca3217f17b
B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0
+B ec7743850ee7d26e56ecfbd7dce0dc90ed2d679c
B ecbf4e78586870a507fe4cf91239d51c3f202aad
B ed0f25116f8620841ff96dd1b751d97c11eb09c3
B ed18c008f05af7063d5929d072b86048d12dab4c
@@ -913,6 +964,7 @@ B f0200ef2cc049726798ce53b11bd61d4cb33d45a
B f09bcb55c8841279dbb4c64d777f7e1c50a98196
B f10bfbdb56a0d24ea4f712a48eec24812c71c718
B f116182ef7a5a4bcc38086f62d654b8355279f5b
+B f12eb1a2a2eb2220550cb25dcc54d62127d55244
B f183b9f00a596ff645b30fdc0e4954f0bf26c80f
B f18acbcdfc48aca354610614c0ba3a46dcb8332a
B f26c82ef6ef82f3971e3019f9f43ec9e9685427a
@@ -933,6 +985,7 @@ B f6c56d93132c81392d52a42caf9d1326c342150f
B f71738d894d4143ed57b956ef1dd68aec5b1b41d
B f727886402155288edcb5882b8b08c8a53b583cf
B f746b982ae5848589ded70dbf723f8b4e58c9d1f
+B f7641bc291f38fe2dc5c1d72a7fd871decfce883
B f772a196f03f696d9410e2bfcda8edc75c5a5ce4
B f79eaf42d4640f668077db35b1ced230034c44d9
B f7a091afedbc7ca809a7205d7c053a1f5386865e
@@ -952,6 +1005,7 @@ B f97778f0c21a4dc0f083e840e8157fe2f8528d90
B f97ef83725ba3f54083efe99a7dd97bab6e44dec
B fa37d8722d154bbdec9d2acf4da16a04db0a34f1
B fa940162050202259c3ac7185d7fc2d7e65826d4
+B fa96525a1a4e4131ae1ecc1900e948c93db7b696
B fada1bbc76067b5a1781bbd10773c2ff32571315
B fb94440f6f1d5c7c572b6c0163f275c95073b8ee
B fb9d26581c364c62c7343847ebe4136b8c97700f
@@ -966,6 +1020,7 @@ B fd5abbd3793e232638e4d0793ebb9765e49c638a
B fde8db305f362bd413d2b0f5dcdbb65917cc39a9
B fe416234bab8af30f1789c3164ac256af86e3b62
B fe9e4fbf7d99d8161c1eda0e49647cfcc0c00dc4
+B fe9f455840f085568637f3c0e4af413299a85eb1
B ff4fd0c01aaf8ef1cbdb8707eb50a54d762d640b
B ff693a62de7674464fe28265c48ca07dcdb64026
B ff742436a3e177dc61106edf08f2509e727362dd
@@ -980,6 +1035,7 @@ M 008c8835a460736b6491204aa999712442c7b364
M 00a5a1d6b1da5f3b679c25d4bd988d1277ee62e7
M 00b626af504d3d59419ec2d1eb5e39943ec5b8aa
M 01860c78f6fd7554cf89a9bc912ca78d2b304efe
+M 049fe48c0489cf0e4df632a73bb91a76343d2639
M 05383ffcfc3fe16c6acadf1a343375c00fa1116c
M 05b96b6e8d1c3f845ce4d9b8a77c638ed7e987b7
M 070315cf06b2f2d8596c922115fd3f811e394ecc
@@ -1034,6 +1090,7 @@ M 3348a2999d2693edfeaf1fdd62a94222774186fd
M 3520a87c8b207f911cdd5e139cc84f2d20634a4e
M 3656b40f215f9904ea3649163bf2444eeab0c9cc
M 365cbd07b67cdae4dd29089c1d9bd04fe6a76ed8
+M 3678640f15e3df8439c45a3cbae7ce12854b8a37
M 38a1b770407c6e1955e46ca700e7babd15276c08
M 3a1b80659af65063b8c8aa5bbc79cd2a888c8685
M 3a8a24326d690c8e0b58631b9428e3b460918ab5
@@ -1042,6 +1099,7 @@ M 3af7c785c642db6ae64276f92fb05450d7f9aba3
M 3b45e6080b782eb59395e9093627d4c687fb1151
M 3d3d495a2c58164abfb54b64208b3f72b4d235dd
M 3e648504409d9fbe56a92b62a7b0f581211ef7f2
+M 3fac6a1dd724f3524eda742a01f8d1ffbcc55d0f
M 409188bcc94490f9cd60d6871f853b34e031f300
M 409f987dd9822b7ed0fca97cd795c9131882e07b
M 40a8c9247e0829ecac38764cf4b27d1e0102f7b3
@@ -1054,6 +1112,7 @@ M 431ade6fe85f4d13f56aa4bc530cb50353be0dd5
M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f
M 43d17e63214d8d79ac8796524c026830ffb1043a
M 44bf65e6dd21fbbde4c24685b20dcbcb0f0ccc1d
+M 46247c841db10204eb5afae58f5093efa2edcbe8
M 4640cf1ea20eee09ae650b706bce765a16affc8b
M 4685f06871bf35cee184d020fed025ae9491cb02
M 4715a0ddce4864bbf6e1c34a7a1cd9508a52d9cd
@@ -1064,6 +1123,7 @@ M 4915ce370e5f1905f77ebecc8883cc86fcc3e4f4
M 498a3c2f415c119cd82e1e5779eee4e103755a89
M 49a5e392144d9137bf47c574e701334ff6c41779
M 49b2b813deb93106f1f20ae7b067a318e8f04c0b
+M 49ba8067e9d735c48603e74cccfbcc6cdf3676f7
M 4a292c0cc49c0c4eef5d50efc78a499c7a5e1783
M 4b1729c830f9038ea94e52936aab75a2a3f9f2ab
M 4b4e98b07c9106ee45bc9071fd971e666ed4936d
@@ -1129,8 +1189,10 @@ M 72f81630fba3c74d03e99e724f03c2cd07e0d3dc
M 73a1199ebb4203b0463ae91eb761596ae59722e2
M 741ebc5d360db7b850401a4798f79a3996301885
M 7431af236a19b5b5f899bad317a548a4c5c9cd49
+M 765686ec011bbcbe4f093515fcf0a9a193b2e3a9
M 76c4df1bce5e71b439fb37fa5d9e1af12615786b
M 76cb1e78a0e7e4155e2683d6505799215a60cef1
+M 789e12c7fbdcb97dc7ff6be8426f08ecc4948a68
M 79156d8a23497b9ed9bd912b64f684e610d49863
M 7988c4a974118cc5c2a8bd956fe396a7d5e8bb5c
M 79f8cee005bc09bae7bcb37bba15151bea27e416
@@ -1154,6 +1216,7 @@ M 84c8ce83f5eb9a37784629f856d7d8a94b26ce52
M 84e90e647cfb0b3c3c96705491456ed577a3a6b3
M 8654f83ed145f3be4dabd19205491b7ec5e31a64
M 865eb64d44fd4e904f166cb03b0d15ca8b5f0ba5
+M 87bbc7f8110fc2629aeb6a706e83392442ab0507
M 88a7cd850f0471d6e51f9045bf01f775a905cbf2
M 89b87071f3dedd2cd5ed874e56f69ab7dcf7953d
M 8a9952073cf5edffd848c43d63ac173a2c7455a5
@@ -1172,6 +1235,7 @@ M 953d23f38ddfe044a4dff4783498ebe5d68d76c1
M 96f736726871ac7cb69d04a8527c806e887d7636
M 97fc24b158d3deb18a388a49b01b3436e6c7b1b7
M 982bdbc9dc2127906d0a1ca06ae181c87c38bbfa
+M 986231deab7a335dfcc5c7ef19a721fa93591b03
M 98a578dbf4b7e19c4555bd2011f24c650d0f54c0
M 98f65f2911e063e70e864e7614b062cc124a0f9d
M 990f4b1d594c8f1446d42a516eaef82020df2747
@@ -1199,6 +1263,7 @@ M a895f30153e9c2430cc7d96351074ac986588cf0
M a9555675b829acdfb1672bc2157d6f3c08fdd652
M a97f886f36c8aea2a49860ec8cd33b0021b7b9e2
M a9a1305a9588d2c886d763d0c1ef892c2b9b0b71
+M aa7aef8dc771ecfd8cfa428a83d3f529accbd10a
M aaad96fdf931cdc619a60fbffe3c9c894ae8ea43
M ad75192db72294e6d117e020aea890a50c166f79
M aeff8782d28ec57e5aaab9c7b709d89e1d2a7c15
@@ -1214,8 +1279,10 @@ M b3c1804ba33e0c2c7d991b585ba8147eb13ee07b
M b4aa01a0de28462f7338d232e2e88be8512882af
M b5320827561467de7e04afdba15a6063d26493a3
M b7d33366f3311dc33c7da389f98fced6fd470c93
+M b9c24f41cb1cc7e4d572fa222ae5aa4f5f804ccb
M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
M bbc3ca287cca8cf982b62fb85c6a2bbc5bb59754
+M bc3ee954f0796c82d9ff59c4d45f13382d84d4e8
M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
M bd1d31f195caab56fbe565fbfb63d9170a0c9406
M bd7babd656fc06f3e5839bf11e186ec12fdeb6fa
@@ -1295,6 +1362,7 @@ M f399b9290e42726e30333f261d8d7f6abc4768cc
M f3cfadb6e7bae9233a03fa6bf862ed8eb64ce237
M f456dd41b6352dd55404272d351b1580b53558f7
M f4983a20099dfbf07592ec9b219f3f900159ae32
+M f4d5a6cf1d1b0c6484461171448694600385a6bf
M f5bca059c318d6943eb69a1b6c0600c11acef7ff
M f74e2e060b93fbbfc05ace263fe7f4f588b63e4d
M f7b77f3a552dabeb3269c1fa5791ead88fbef878
[13/14] 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/47dc676d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/47dc676d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/47dc676d
Branch: refs/heads/3.0.x-fixes
Commit: 47dc676dc35f5db4648a11a55b85d2ca95f1b2be
Parents: c82c0e9
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jul 25 10:30:19 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:30:19 2016 -0400
----------------------------------------------------------------------
.gitmergeinfo | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/47dc676d/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 844fc5f..c91bb39 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -6,6 +6,7 @@ B 013eb89d0453bf897d219b762e50ab5232f6ca00
B 015419bf394e219cbb07ca7706b4bd8e2942e856
B 015d7a6dde4e201aaf8eaa90343b6ca9a20f6856
B 01956cc9af68f80d4f12018a3779c12f36d5308e
+B 01bf5f841d27d94485018912a575e4d9b50caab9
B 033815a0e180b8e1abfcc0c1acdbeb0219ad256d
B 035154fb466fb9c833804d1bc747804df9e9992b
B 0384a69b7bc0b4846e89469f974ace534e7734d7
@@ -18,14 +19,17 @@ B 04932cc6e66a6bca0ae25f2bf68e97f6241736eb
B 04960b3a04731e3e0f030c17ac25f154defb5568
B 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5
B 05a7ad32b06dc800d31cffbb39df5be16f847849
+B 05e838902732c879e6a9415f11624d1581b5271e
B 0642440cd3114db0ca86ca99987617d98634697f
B 06e74f175c476c82c773c4ac31cf656ef593d424
+B 06fbd75b77597a6b413c72ab845578ba03bf3a21
B 07297f3c75c3d16a6d81b423d545ababd714f5b9
B 073529c953211160cf9392334a1f9546cb4e0a45
B 07c6322a52c12077567a48c9a87e832ea9362886
B 08246e10e00396811bddf64a3e131b580afb12db
B 0848bdb305b5d6e542da417ff5fd9e7c9ace5381
B 084ad67a648c736e911fa0a419d6e5cca345c1b2
+B 087f7390c71a8a1b07b0a30e9091d290ac75811e
B 088dcdf8c7a3626adf650e80b98a9efd51d48653
B 08d98fbb13440de2da3b19915d8dfe21531cb284
B 091f8bef03e671f151e21a890159e5033b1c5d86
@@ -40,19 +44,25 @@ B 0ba19453f17be19aa2e46848b1908f776a6abb64
B 0befccd8a70d7896d9210f554e19375e5d8cc168
B 0c0555f4ac850ec8e38302d73207170affe4376a
B 0c542f82652995db0d7ce6681dafab086c178b13
+B 0c5d2b9fc11c4e2a0590dc3f3f64612be8dda074
B 0cad194ee50841f1c740097430780044fa1e9eaf
B 0cdd2c03fed0ca51386312e1772ac49edccf1ae3
B 0ceb6a1d93195310c3a9325bf80e4c88d6920755
B 0d0bc938103b0ea9311c3b73f6c385aa3e12260c
B 0d2a6ccabc752708484e2b2c44deb5b48e71b76e
B 0d72569d3fdd360e60d1fcea59c354b754f2a386
+B 0dd29509e42fc412ec0cf214e66885d26da9850e
B 0ddd071dd1e7c475d8a0463564a991d62c96e3b0
B 0de0309f28e1543660c763c158f4353d6d2189be
B 0e639399027b2b43ece5b21f73effa6381a5bf0c
+B 0ea13a8e17b88fd4cdf7273b55115c1e48908bfc
+B 0f66cb025baf40cf84207c87f2428c9942fc8328
B 0f88d05f0a6b04701f01075703a9da532d53c4d5
+B 0fee635ae9a9e6ddcb74485e2a5eb3ce24005892
B 0ff6a3c8609507351d29903d04198fd71b650ae5
B 10ee2d5b3f76f020d0463fb5fbe7194b43965d22
B 11243052a6e1656657776bc3a0c586cba962c49f
+B 117ca31a8479e9f4ca7f37cbfe516f74984a30cc
B 11ea395d0fa226c040f4ca3c4c6114a90ce34e06
B 11f3e36e1af5d979a84040f79a8e9cb0f6840d9d
B 1214338f24a3a7973f2bd72ca01fc57644bcc45a
@@ -61,6 +71,7 @@ B 12225d4f560c30839fd8f2ecb6657663d7559a27
B 12b8e711d2068044caa9ceb57e3fe038e4e92cfc
B 12c325a12e897b3fac6afbd9ec2fe34dcaaa9d02
B 12d7631bb74f7034c2635f1f253eef79b0fae0ca
+B 12f1ce562973e791a38f1495b2c81dc03cb59e9e
B 1308529e8b6a325143fea8256c98e37f79016170
B 1319cddeeca993b6c6f67a392a4807fc46e2e329
B 131c1febfce98364435a3dc5567be89188ee1bda
@@ -73,13 +84,16 @@ B 1444405de684d0a266cbbfbb415e09121412d577
B 1487fccd43c3bcc463f12cdc1573cde68323f8b6
B 14ed2e2c44b6da7641c95fb57212f8b5a5e77f3d
B 159089a4c0bcf4d30ed819f064f0e31c6c3dc2af
+B 15ce3e7fb4db8eafca9a263349bc94f1e9516f7f
B 15e4db9688617af6764f82c234e5a9582692a6e2
B 15ebdfafcd3c54406bcb7ca3405f8aa4fe13ae35
B 161e10bb2d87573974b8a1748f023c47ebbe5d49
B 162bbb5ea63cfeb6c258d750627c77c9e694f928
+B 163e1d2361643251b31b6fdf7def0b52542577dd
B 165ebbf9d0b5541b6abdd5c140cfe921d92cf869
B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373
B 16d789c4a913e0cac51bcf929331abe84010ce1e
+B 1700674150b8619c99ae02fdbd374b08d1855c29
B 1770c6f6cdfd8ddcbefb36b25f7313edd7fd927e
B 17d710cdb3b4d3cd5d07321051ac42753c4817b2
B 1805027c9ce9925fb875e92fc5314aa826632151
@@ -101,6 +115,7 @@ B 1c7a34e313062edff246c2c1943d43b71b0f8aa7
B 1d29dfaa8e686570c1b2ec2da4c31ba380e0b9b0
B 1d29e0af16d1714a44d0144f4b0563d423eb16c0
B 1d9e79ef36bf14e25d7cd2cccb0d804a048aef64
+B 1da1293953e95d756406d8eab9c99a2de459c1ab
B 1db0f0bbe8435bc0c081627857d5047ec8ee7f55
B 1dea643baf6193e9a94abe8b1900c139bf273121
B 1e82efba0035a15afe84ada2d3fd0791733800a7
@@ -108,13 +123,16 @@ B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f
B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2
B 1f44b234594e60f9604959cd2859f3970d3d4360
B 1f692efcbd9fd53e2445b5a09d25df33df9e493d
+B 1f745e1de37c98a0ea2c117d5666847a08bbc6ff
B 2004b1021ce0d0975eb49cae36416863bd8c59bb
B 20076a8c3ee335121dcb580640d8d98f5f48a6d7
B 20467ecea3cb0778bd02e60029d4d4ec7a8a2483
B 20539c0278472689722204f0c08e68a86597aae1
B 205c61c48b2aad973572aa74d8c9dfa83c2dd7bd
B 206738103f5d783d90695aa2e3e750736746d4c3
+B 214b741754b078e41d471889b7233a90aac017b5
B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1
+B 22a9780de14857d7320c41506b23e02b55cd4d05
B 22d0c244d3b60aafbd3c070e9599012019de486c
B 2302aa5820661975bb04857fa6d48bb68bebb4f7
B 23112f714cc6c52bef8678739f216f5a8ef26d49
@@ -124,9 +142,11 @@ B 23849faa6058427381cd3a737d2f37b551db9938
B 23be2c7dd3912b719746e0b68f33208b3608fac1
B 23c0c73092caf223e621617200a55f1613bbef0d
B 23d7bbd18d761e7be6b4ee34e7b77f884f42b57b
+B 241868ec67f7a26516b228427b7b13d9a52877e4
B 2426a0879b06cf6dea32004af16f96f793d568eb
B 24311ae6d88b2359f61b4def6a6308a90378c596
B 243384197f8c395ae001ae0c3ea87aa9724dcda0
+B 249aab10d72ab00110d456ad50fe11dd9a4d038e
B 24b4ed27bf096d657f11320b83ef8449ca366f63
B 24e330c8b6be65c98cd3914f6fe7498e980f4568
B 2616fd04151e5bb7b8a31428f8a9fd0c957dfb48
@@ -135,8 +155,12 @@ B 26762a780f4dd498d9304f70072f1bd339223d8a
B 2680d111e54c90b9dca63df479f68e82716c0eb2
B 26aba8ecb5c4c461e0feac9b1c60e83b3b6a81f8
B 27151209eb440ac03876368d443d8df24488cde5
+B 2728bb512a58c6337b30d64087f0ee9d00805091
+B 27917f3accef78556fa7ed8e79f1746052bfd4d9
+B 27a95f050bfdbeb9d3e63af11fc2e8c4370ae549
B 27c2c25dc3c2c3019543e31afdca7b166911f278
B 280487512eb1c34a6c05bcfe3e2e182388359a25
+B 28054f8aa4a3d208ad7ddadef6f11f692be6787b
B 2814cce0def903ab0e2d2526915ab20253a947ee
B 283406f2376e152e5c663b43c5337de550dd3921
B 289a3e1a9a1f4c304ac441463ecb8fe96785d127
@@ -153,28 +177,34 @@ B 29f0620a9a025afcd2057cdf97c7d93caf6c179f
B 2a02f9729130c0ff6a151418dae5f671fee751bf
B 2a2ed67576b525f9708fcb8bd9e8387a277a1f4f
B 2a5d201be1b85344585094d0f044e9bf1b605fac
+B 2ac7e372ebbb7d27f12c838fc01a2b62faf8e202
B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
B 2b1766a22b17beb4cd462c728d3234be04dfaeee
B 2b5904f6d8b529e7ae18719b5bfab0560abb1e95
B 2ba77327488a8446e6a92af137f644eaf3b06e2e
B 2ba96091771fd8a15852b39373a22b4973d26ca1
B 2c12caa0f20dcb57ff6c580ede352b5fb5453709
+B 2c51dc39c956f90ba50f01b7c230f8f9b33fe68b
B 2caad0c68309fc3f2ccd8aa4795e489c674eab7f
B 2cb99eed19d1a8f097c4ae54967c6e45a7c03d67
+B 2ceb8351e2cd174297c5bf11c389280a33b39fc3
B 2cfa9011aaada9fe68bd0d9aad7ec86991ede43c
B 2cfc6a944bdb2050ca38bea1961ac0b32f9e70c8
B 2d3592e667e0ed5c2345b8fe1ae248a6b0fb1b43
B 2d41042ebc1ee81b61aad4b08938c1c73626b968
+B 2d564d063fd3633e59df16cfb02d580483525e76
B 2d7e7939c5a0e27eae861ea58aba598ba95c5f41
B 2dd91b898f58e99000711810ac0d179a3614d15d
B 2e19b7549462aa8aafc9df7684327375fd4cd673
B 2e221ea50c22d528b6b23dd0c0f0cc862e2d0fa4
+B 2e62f6e3009c0b68d9dbe2c33f878a2fbc8f9126
B 2e7338a15df3b313997be4700cccba9ac6294d02
B 2e7e04b546c73daf61cf5b841db3a104d4fec2eb
B 2e89c38ccfddf8097dbcb874b64c5b2ed8805d72
B 2ec875978a50cd34d07bd7d3bbfc8583fd30250b
B 2f0b3e38212674883d610cfcfbd76b901bd3d997
B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f
+B 2f56d25eccef5e18222b9bd96083a98871e76af9
B 2f5f034b8e8361aed103de5bd7fa7526847ac690
B 2f881786004132611d6b0d52969828899c0f9ca9
B 2fccfdcdbcd3a8bb8ea740eda499b48b74dbaf65
@@ -187,23 +217,29 @@ B 30ad57d5590257960030161c2bd20ab4131d9c7b
B 310b23956dee38cd4e80862f37010acc2b6adfd8
B 3134609dcd0443d4007a7829df57c148fff947b3
B 315e357e850407e9f3233259bab33ea765633271
+B 3198d8b2bba180fe40fb6729695b0d0226dd02a8
+B 31ae9a426ecf380aa4a685aebf50f18a62053bb2
B 321b2f8b66bf6b9d1fa68aba086c8cddf18070e3
B 322cfa1a329b56d7db5c7cbdf5c5f3cd46a23b92
B 3240a6a27e48f41e15ab75ed2c1735a1f5056668
B 32c0aca5fa2a6473dc3e3257fcaaef6efea66874
B 33083c0682d2bdf2f42df7f4021d18bd7ccc34a4
B 3309231e467225b18b24d90d77153a0c572a17e0
+B 33c6109b33d36fad60e830aa14a652ef42356e17
B 33c7781f4f847431a7bbdc9335657d3281cd525e
B 340a1305bfeb84d9ce8248b2e6efea5327bbe615
B 34425010f5c6e50255bcc188db5bd6dd5bed3b97
+B 347a54ca943ce3de9750e2a623fa92a41e7ef526
B 34e083dd1c4cccf4bda941dace30134dad546ab0
B 3506302369c0a28647056c1da469bd9844e45826
B 350b51632f4c5dbd4891636261909c73136981c6
B 354ac95b70a98b4f2e8f9f33c534b3e885e9a935
B 358589c33f44d747f5a924f0b1cdedfcb7018a22
+B 35b673cc6bc3d79098d39b86a00410263fea90e1
B 35c7bb64928cf92da260c588b6d4ea9d60ccb2f3
B 35da295262a43a59717b6f17e739335a04d197ca
B 35f01c94841870afa8331e0591aec8a3bc4ca94d
+B 35fd58669e740af4e7a83fc6ff544321c0fc8e38
B 362437e222ea79e92078323d865fb0b2d7195610
B 3634fd60f85ae12f9de68c69cb2d15a38dac772c
B 36d2bf61511d1921a38d065eb474be802f2f949e
@@ -235,6 +271,7 @@ B 3af4374ddb16ccf86195d64cb2a39fd4d65d43f1
B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
B 3b2ce76de26f35cf782f2607ca65f715a2caae50
B 3c2092b369f06d4f71134397240092a659bcbca1
+B 3c804f7dd89613a47835bcdabf63e9b64bdee79c
B 3c9806ce95374d7e0879b735e8c5f9d640a53efe
B 3ca7722d98bf22f47aab57a3856edfb83074bab8
B 3cf195384c2175085c7840dc4469837a347c7d0a
@@ -246,10 +283,12 @@ B 3ea1c784f248e29dcda46b16b82ad0e923c4b6e1
B 3ec5957b01821138129cc29acb88430fa278d28e
B 3ee69e9404d3ffed74e84b223d7d284c081f7fb4
B 3f90fa6a7adb9c3311663424950fa352d7d5bdbb
+B 40b19d7f6f1877f6c2c397548a4e24582c053706
B 40c9bfd5ee0ba7cccd7abc7e7d19db531e212c97
B 40e31a9f14bb9e494c9240463e17ed232e201876
B 411dff107d089001ffa836bc196f91ab873f76cf
B 42b3ae5ec3ae398082e892d6c37acb0809876894
+B 42db399ac36e1ff114b8e08431acd69eb953e53d
B 42e6fde997a3b7e7408414e79e2003ec067910f3
B 42eba2f948a967d62dc0257a920715ae47ae4310
B 42f6750b3690a19d906c2d9fb146d8fafbcb7620
@@ -261,6 +300,7 @@ B 438eadb78176341f94a44ae3483b076332cf23a0
B 43aa455461fb8a33b0e5844512b263a262c2420c
B 43babb8fc1bfd034657eb44fe82fab960034c85d
B 43c65b07658b8041f6689d16a34ff98132b8a424
+B 43f440bb4705eddaa29907239372205702f32853
B 441cd2cecdd8a88d42e41324643f06a2fccf5a25
B 4463a7be5363bc38d9088c154d7a80a399acf4fa
B 448fdcf01e27006fef31de39c7672cc251e07dbc
@@ -271,16 +311,19 @@ B 44d7b57b7cbab26767eb3e485674210214d87673
B 44ddee3a98918261f18699b895295b53785bb9a7
B 450e3ff7725e1d9fa51ad2aa01d927343e9520da
B 452300ef14037ada7de1534003f771dfc7ba5c40
+B 4533e0040e82de9f11ab68036dceda9b67b8c2f8
B 4534b29556a1da628c920c36e4245d0d35ca6905
B 456eff5885d85e2cfe30b639bd5a442929a3f9de
B 4604ca122a129ee311bbbfc041fbd48777f5354f
B 4612855a0f44b5f3bf4513c241d4ea1622bf1819
+B 464cb102e85d09b9c473c5eab60d53b579e24c87
B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3
B 46ce1778d9a4d6a30e38b393a08dd4ecae2dbb09
B 46f0d5fff8a4d846831b5e9d7ac0405fe06d2ccd
B 46fec2059cdd278b6dd9ad41307b5d758f96eddb
B 4702274c7a8bad71ab512744ad39f5207bfe86cd
B 470bdcb40597dce5e5cf957000ab60b0b4c1fce4
+B 471c0773a207799f878419f123ac32a275941f2a
B 4744117f9228e8f25cc2cba2255f6e6a516e2d2a
B 47839c649a92a4e372eee313e5d53ec5c91df334
B 478de215af2da2c03f439bbbd8341b234bb7bee8
@@ -294,14 +337,18 @@ B 48ecb0fced1dd2e3a68f1f0785e1ced275895aee
B 494ff7640d78b1667547c8aacfc1d517fff00ef8
B 49829a180d3924f3dfc8ecf41ac904e8da020ba1
B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
+B 49e1943994503e96e6c69f4e55d8a0ba9f5464c8
+B 4a1ee7cd1175169d448d4bd557e2ae3deff27b4d
B 4a749e745ee64b3d9ee09eb9e7a35039127d6f40
B 4b15b8a49c1ea75c346ea4a53e3110db7edbd127
B 4b44512d8c3fe76620dbac37d220038435c75ba5
B 4b4a5151c83113bb53d65e0304b8c9fee524d28a
B 4b577dc98cc61e4aead2f0bdff6d017c8a7679df
+B 4b76cb4d35d175ec3ba98ea1286859503e055374
B 4bc00dc9e621b2d61764bfbe24c82042a784d083
B 4bc0c5e52615dac9db94b6fdcd73065a48eb1411
B 4bdbdf6cd2f15560a950aa6f1aebc8aa8f78ac2c
+B 4c64e8b5f8af67d2e163ad575fd6e7191c6636d1
B 4c687895d918deb69cba4f50e62a3746a71b4130
B 4c9cc32f7bba136b3970c91f15a7f24c94c94c89
B 4cccc2361582ab5e785d5ae616af9e58a40c9828
@@ -314,6 +361,7 @@ B 4e4e3994af68ead60c226f89891412d8aca0ac85
B 4e5ef7d769e67d5bd6e6d8c85b2bf01f09d7aca0
B 4e60f32c9c370b99d9574fa54d546badf647db53
B 4e68076d7c9cf5f1be0e03d570a50f80756a82cc
+B 4e694e617884c8df7ea7c8a0a475ac575e42f270
B 4edaad797a57d6968f5ba293b100b856a72c52ab
B 4eec754b1bbd46e0142412cd37dbaf189c47f905
B 4efd6b4c188c7e7c94feb6afc943df831da43180
@@ -326,13 +374,16 @@ B 504b427081cfc2213ce0a5c050b16af67ca7ff46
B 50daa4883dc8078a018ebc985e5c7bd58c6c5ff1
B 512e9e900f3c840e1b0ab4c2fb4c3950bffc84ad
B 51f433d54a1d11eac25c32b0dd69f12fef62c060
+B 5250c5c85b8100236eb27734973ac0b496d59457
B 52c3b6a90314086ece3b7f6df63465434879b2cd
B 534b329c57bb5226e7dc17e72687e85b46ed0a47
B 53790b4670bc17af3fd101b01aff7b62d52fac03
+B 541ce124b5effba655b204c290ad702f44e44cb3
B 54508131155cc71099f6f54c5ee531e159d79ca2
B 54723262aa1cc6f33a9b158e92694c454c3904d6
B 547f8af0519e6fd973e9cf379034fa6940eb7ceb
B 54ae153226739bbe4d3166291e137e600158373c
+B 553be8f2afd1c54158f1fa2eec20c8b8571f8aef
B 5577461dfa57cb8c7c49d788276afbd9253d81c5
B 557dc292f63176ba971ebc8c8e23e1fb74c5c4a1
B 55829d69db9c132f72eab41baff6b6da6d1869e5
@@ -344,14 +395,17 @@ B 564e9a6926f7b41982350e796d55bf8c371b912d
B 5669ebf9b7f3ed1293458d5f3ff3e3e84fde21ef
B 56dda74f468372c471ee28bf84686d4e1038b7b4
B 5705d3db6407dc2e8231f1e3690c5e81cf57308d
+B 573fffce8b927738020cce6ec66b4ee11c9c80a8
B 5743d5e9bf547bcd0066b2369adadcbb5a8bacbd
B 577ccc51c269c66e7810eb4aad9f93cb23c78f8e
B 577dd538a026b339c4a5a1c438a41b5e2d04e184
B 577eb154c09a0654fc1d54d4743b369b84d3fd5a
B 578a51c1ba7f12b35730b0d66ac6b4ab880fb94c
+B 583270d2fe08e0fb294c7b4ced721cf6d5630afa
B 58592742163e7b7e28992304ed1ff2e7e8917f91
B 587b85261f83306ccdbbc5e0e176436f7991a28b
B 5891c0d23b776d41be02e74a3b98a3881970d08f
+B 589f6c7fc52b4b2fa906ee62b558b0aa6f3f84ff
B 58d40a843e50f7c581a9cc2373b431bf4a3f9780
B 58d5200bdc0f666615e99f1c624c53299120518a
B 5902802031e7cf156fe5f0c7a804ec1a53127c27
@@ -365,6 +419,7 @@ B 5ab86e5dd81d68814a12e9c94a6a1b83fdc14f37
B 5afe2b87e820a9847e5b6cfbac3d9c85a28f0a19
B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23
B 5bac26a132e7999bf0bd108d4cffb674873a56ca
+B 5bbd03f8052adb653dc8fa1a2c4ce50737a95405
B 5bc8c0c41e3cef645ee6c7a1587d19e844fc7e4c
B 5bf7ea849a7de8ec2335f6172b4e05848480fb4a
B 5c541cd9c16ed2d982085410cb801f2f21dbc82d
@@ -372,6 +427,7 @@ B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0
B 5ce682771ae91eab61e25eaa90ef416168eb4402
B 5d0ac9e12b9658fbfea8c7c952783973462eabac
B 5d387616bc1787f3ae50dbe2a185c6abb0e9955b
+B 5dd6b7aa92a3acb15e716959f39e83f5d6f48a9a
B 5e06ba0c4970700477484bd2409a226aa9ec7f0a
B 5e5470e7b994b25a318a5b6bbf4e0de5aee430b4
B 5e8334b2d62fa5ae453ba12becffc7db154d71cb
@@ -389,6 +445,7 @@ B 61c9bef8e5115403a44eeddab6755174f44bd92b
B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae
B 6359c930bb27b0ea589c7c2d7ed552babe4897ed
B 6400b3cd1d87e52723fac2641b34a5f0289b908c
+B 6466542bed6b1da51fcd342209db5a7315432561
B 646ec10d153d037cdaf813fc0e64bd9d9bc4d31b
B 647502029b2d82e5e95afcee786ac64d831c782a
B 649a034266ac0584d4d988a6ca0cb5c61f190e84
@@ -397,6 +454,8 @@ B 64f232307444269286b7f14fc3838b07187d4c03
B 64fd0cc1bc2b2260deea1b2127f861f3e47cfb72
B 652d821683f12031258f7727d33157f3ab6ccbe6
B 654ad3ac53607d01875b99314c282f98e42d1072
+B 659bcfeb358a86629206387da636024ab97e0bee
+B 65f3f877e251e0d543d56af353b18f937bca9e5d
B 661c0bd932d539bb63a3b4e938017ccfe1b30347
B 662b14a6e267808e71e786ff873ee27945122a20
B 665eb259fced741f65de061bb026c3ab65a8d99c
@@ -435,15 +494,18 @@ B 6d637dcb21bb4a17b9c581748e85bf5a82f6c9f8
B 6daabe0f4501c59c9f0a135143632d72ec79527e
B 6e2c3553816cecfa1fa009910b6cea0aabb3331a
B 6e4f0f60785de1f5774644323edafb4741b9e4a4
+B 6eaa2bd9f48718d241ef6e779285c65a800862a8
B 6ef5be5869eb0c076f8bc8ed30775028a0b314c7
B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e
B 6f2a98efabe16b6e129ca86b292b74d006093541
B 6f3f4c1f873d8d30a4c30165280dd0ff46e03d5d
B 6f7bfef950da7c4e629c4b3d4fecbdecdc03bbd9
+B 6fb43da4f6c1578aeffe0a8a24dc27b597aec2c6
B 6fb880420de545f7ed09199674b7fec3d0ba4d7c
B 702f27bc4a334b2d117262252632bf580f20f711
B 708f53f7af5a53003f642a4422d8c11de18f8889
B 70aceaa6f3b93f2a64abdc219fac242f5f0830ab
+B 70b32b7e8f672edfbcce459b4f6276efb1c56285
B 712e96428c926bf8aedce8eb91c33d79801dd636
B 71488c6fa7635c88285214a0479379aafef9ed3c
B 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c
@@ -465,17 +527,22 @@ B 75115ee15740b33c5cc09b1f4b79fc4a54e4611c
B 753368bb25f851d858c39b9f2ece764f81e14c2a
B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
B 75edfe9d21fd654d844e24038a72206b4e15457d
+B 7618c7501d6ba6275c10c3cf91c329184d0cef96
B 770ea4c9b218ba34526fce5903feae6959c3366c
B 772ca96b6c3e2ee569b538e8aebdb80777c900d7
B 7737225402d3a7b2e669ee8ecf54de10af686f20
B 77a31c5129db56782313a53895dd140c22d30bbc
+B 782a1cfcea1e6bbf821d327d5500ce9d598063c9
B 785955e8a26a891296908796abac0b1cf88c94ce
B 7923a6209a05d71cfeb752ed2d45c9e6e7116942
B 793f0a7d2a8eade3238deef212dff5f29e0c5b4d
B 799c5389f754eb588f023b646b8983b50dde00be
B 7a0736b8f1adb1a1b64ca15d1b03bedb175a41de
+B 7a365ca6064803abfff7782a0f972dc8b4e29687
B 7a52636862d2d920a2a6d5c5f00821611b7faa37
B 7b004fe38800411ab8d2b693140b6b0e36cf5e48
+B 7b1168ef760b89aa5fe92dbf2da328b1316d4ccd
+B 7b4044e537c7f19fc3a8c4aa23e3534bf7638592
B 7b458be777ddd3819a36541100e39050b41e1279
B 7b4c14f1aadb810d5b91fa0adfa2a6bc70e45a76
B 7b9f72bd7c3dc778da9bee85d54f36f99c0feb23
@@ -483,6 +550,7 @@ B 7c7404970a05900911b97c28a08665f5db3dcaa8
B 7c7bf49e2c980e34610e0647e286ab0f5d7e63e4
B 7c8124a5696de6c20ff5837531aff937eedccf0f
B 7cd4cf67ba5b8a0ddc36c8008bf096b469408f48
+B 7cd6ca060425520c16c06d5a54cbabaa2cc59cea
B 7d06130d4801e9dc5a01ac830de9bfa5ad8aabc6
B 7d1f30f76d95f9eddf0bed995120c71bf1a393b3
B 7d51f38def4160e441ec293c7b924efaaecda91f
@@ -493,6 +561,7 @@ B 7e5efb29ad3e00eb42eb46836d7c3f00d3071d7b
B 7e82d2f10a1ca14a939d2c63ca4e620f8870e256
B 7e8d0b4b1cd868272380ca5779e67a15e46cf799
B 7e95279dd1170f5878687d7eea27f7d7f03a434b
+B 7e9deb7fa8137045c786682ac7f00e288ec6dd36
B 7f17ddd264a0085cde00e06a22400aad43c304cd
B 7f7cc3c390b95f9d7589eb192538551416c313db
B 7faee992154aadf83dde26942f424db4c764b5fd
@@ -512,20 +581,25 @@ B 8176b1b0faad2de44a4ff85083c74b5a4b74918a
B 817727ddca9aad39a66f7001bf5f1c959dc7f581
B 81bc682a409806567fc3485157e184e72feaf086
B 82c4bff5276cc32490507fba4cb9d18539d41907
+B 83846d088d78a03159b259fb9969052a33904faa
B 838c97fdffa333db3adf5d3a2ce4547d366fa6e9
+B 83cc8bf11f0ec98f7ef8aca3d3b775943ad05811
B 842880b3527f0c97bbd1d1dc9f6e1e2aeba21a0a
B 842fade62621490a407729fa1357f043216f25e6
+B 845c3decbf1221fde2ec5111d202fcaa78a76f06
B 84efaebc82361805ea3938803445ede34e8c901e
B 8516661b64e630e033425b24b7af53680d1229ca
B 857b55796dc7fc2b302e26d99f84df1712ff9c58
B 859b7f96f8fd3d437ba3890debdf5323bbdafcb1
B 85c06fc4d6a642627434785a2d228d3c08d68768
+B 85ced5e73b84fdbc25e84a5429af2e3ff17d581c
B 85cf215a831057aa249f4638761a7eeafb9f25a2
B 85d6e1a63c95088917853436fe1adcce4863ce6c
B 85fdb62d0a3bb7c2e1616702204c2bc33f7356e4
B 8632867df4b542aeb158aa8d13d08ff6e31c4b4f
B 868304818c7b687d33cdf0ae1a620d06f2b9028f
B 86a0eca9db696ac997d48b80222c15d43743bf97
+B 87091eefd18770ea7de6c6257a150fb0a217c160
B 8709d976fc796abe7ed6785524e5453b5fc530fb
B 8730aa79707e091f1c86016bb6758e5b3b33f618
B 8781a1c0cfea708e3915e72b83c50877969774a2
@@ -539,11 +613,14 @@ B 894eef1d106f702f19485a8c6b0147d8d2484677
B 895f9b0ff0b43f775309bfc5d064ca22ec7b2df4
B 897d81dc292eb6159aab96390cb3fbfed1c34a6b
B 89b7bb172804ebaffaa69c9207065e50eb5a5d36
+B 89e055d3ad175002bce936b62d2fddf97044ca35
B 8a82bbfb59141801864e74ebe92f499f117ba6ef
B 8a9f6cdafc87a22314c805e995fc5d286fe8beed
B 8ab75c2dc7d99d09d47e9413c5ef89d58f1d4d7a
B 8ac2d4735a9254820ffdb5638f441c4dc051354e
B 8adcef82a87c124006a869a1553e50ba8efaa371
+B 8b29daab843d85af727d24b231b13bf955723567
+B 8b69d2f1839f5c3a8bb6b8938a2d27f09cfc8827
B 8bd6dd23e162946fff6596948129a7cfba6aa753
B 8c09f501af1d7fe77219396f1e0a5de65146bbe6
B 8c4dab45a2b6286e80986c892d4e9ed9b4dc66d5
@@ -551,6 +628,7 @@ B 8c7a97734fd3db3423bf359d4fdb44305ef45cc4
B 8c7e2493dc26e1df4a16168a5491ac96509549d6
B 8cfbd97e0e394dca4f67b4d9bef92380f839f23b
B 8e028a617f026fca2499f850bb680ada0692d681
+B 8e8703d676cd19f238f9b4ba78ffde41fa316422
B 8e930bcfc6e68775db59957df8ee38d73499a6f4
B 8e9c9571f256ddbe06514ccc0c2f232218f905d6
B 8ec55ef0659a4b11fc9a9b8b0b12a65975616509
@@ -563,23 +641,28 @@ B 8f967643447ceec89e58b079d8d8fc00cf232a02
B 8fc16041a43d53965bc0ed794cc8ac13580f429f
B 8fd8c552f4c2a980a5138de19a2b74104776a4ba
B 90312bc48f6e564bcafdaaebc3cd596c966ee674
+B 907fbb7b8b437ebfa902b2daeebf610aa5888bdd
B 90c1207801de16e68d5d40fe78a0fbf6873c0414
B 90cbb21a4068a3b9859a3c67f34896eaa38caa09
B 91197fdb2cfc52c62f63aae1113b387423c8c387
+B 9135ee4d2820042847ab798b0886cee633088050
B 91c7b09005e8d32187283828ac348235b725e3e3
B 91d6630c53f222544e4bb512fb5c918d68518138
B 9240e620875e3e4a6e77e914a2e68818259fc5b1
B 924e6646acc21451c048d72056e90ff42b9c49c0
B 92502a5e2af6e5d3c544f89396de2d05d539fd41
B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225
+B 92cfeea1e557ff870795b5ac7a5699db431efae9
B 92efba580fb430d24bcc0410ca078a9182615667
B 93039ab86bea4f2bdac4e5eec4229d3271f4c7ec
B 9320bea658e97e54d2bd9d47ad07313c388079f9
B 9344b093b8081a68c9f83f0c740d60508e99fd5e
B 9368e4bc9fd4381ecd124da3de3b3d314a590a25
B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2
+B 945daf7e52fc754b6d3e700444cc5619cdc1a800
B 94a6c24399cfa0326edfeb669c770adee6f9c773
B 94cfe7e48a50104b22457aa47b39d06329d16d32
+B 94d778a744f236ac7afc1720f9c6882f5bc46a60
B 9511cd40a9701ee1b46ba28b61154f6f0833b7d9
B 9520839dd27899ba4be4dfd430330a2a7f276d96
B 95c3d899174e39263a773e89a22efbd40be77d4b
@@ -596,19 +679,23 @@ B 9787e41fdd0f4cbb85895769ac266a32ef14e336
B 985b824e0997d65aeb969330cd71b7f8b8b02f9d
B 988caadb6f2eed12456dc576704d4b118c98995f
B 9896b920035a1d1be1aef28a1d1a5eb876445c82
+B 997521186771645706fbee26e3c55094f17547e6
B 998b35ea20b1c37bd8b9dc3f4bc0396ee35a486a
B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe
B 99f4092de01d60b8369ff84036d543e9d20ecefc
+B 9a2a8adc89a098218cf43ce9a6b68e50b6fea32c
B 9a2c82620001b76a2065960686f9bc8f384c4d58
B 9aae4e7641034fd090afdd847764d26e6d0b17b9
B 9aae5c5622dec1198a333ac6bb3508d3ca4634c1
B 9ac66adffb73f3474fde064fab1013ecdd24be7c
B 9ae69b3b323f48de033f62be9fc2780f11b0c761
+B 9b1b6cb2c15a6b4bcbbc14a9927ca35bf711a121
B 9b93ca4bda4ba8abce2e2248059f2ccfd35391b2
B 9bd52f477b0063dfd06b98eeb59c19c5732be1d4
B 9c4239c88829e7555cd7b9e35b608bbc50a77e27
B 9c5f2a65793d73ea010661b5722087cbc692e334
B 9c6a35df3241f9cb3046af9c941fc86116efb541
+B 9d19ae888acec32d70b87e6b9be4817ec2770965
B 9d562b08c0f96c747108aad6385363c514d49a88
B 9da51a99400fad5e6396949bd74a9efaf2093ade
B 9db45329a9bfb1cbbe949f178028797bbd7116b9
@@ -628,6 +715,7 @@ B 9fc26998d89a9f7d04d3a57a97b4c09c745b076b
B 9fce658c4611f790983a3d5cef7312eec8771461
B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9
B a04a1e06f7fffc5f145e33c6832f31b04782516b
+B a07c7696fdb7cf963f2013a98e03d94bf4a3cf7c
B a0ab1ae5797eace72c563d0e2ae15d15e20d4d1f
B a0bb3cc1ba2303ea13ba52da28c9edde22408398
B a0f0667ad6ef136ed32707d361732617bc152c2e
@@ -635,6 +723,7 @@ B a108a6e56e8e5a112d5c9224c9f278b799ce4d3d
B a1487f2cd460028608a693ee6136d62803a633c6
B a16abff276542979aef91f7e56cd8e67a695db14
B a1bd8bd7f0f3877c63c9491fe4c423f43bc58720
+B a1e91a05d9addc0461e98921d07a4c01f4979a63
B a208904a70ba45e64e94d179520a04a38788602b
B a2398cad82a549f9068351baf8185f2a1da4bcb4
B a24e05afba6b86cfc36be39019aa358467e1cfc5
@@ -660,21 +749,28 @@ B a613996359845cfdb9a62b5e25d30a5c08406bee
B a61d946fcfaa4132a1aa2c45e04245cf58044902
B a64b75033db4d4f07052288b9b5c5c54b3d7f4a6
B a67a0a69214717c7c92baa27f74000d5af895c83
+B a69839b8b7a776b9deb80bdf14942b231761ad53
+B a6af7bddf7c00e0d8d6db4f84ac87dd93bd2a9e8
B a75df553a2bb0cee94b96fababa723d7d0f45d90
B a77c05fcbef3f8a0d963dd196fa1f142a975f6cd
+B a78e2e4d67628577ee9418412e8f89fe0c3c243b
B a79bb058aaf71e85dcb5c90e7b2f6e4ab8e63cba
B a7b79ea692add4f9da0f1232e3bfb338099f4147
B a7c6e78b491c4feb6797a6dddd32a6249189a552
B a7cc783a5036e2900a22290738f6aa76d9fcf271
B a7d9370485d0c3940bfefa56af292b6ccd208b80
B a857810da69c43cde90073c77929b5d213d8dc28
+B a8787e71d799bedbeb697c5f86422201c8d429fe
B a892678e5e2976d0c46ccdc44acb303e855aad9a
B a92a1e680d5c7f25ce80295629920fc367442feb
+B a95fdec3fc81f92692ce12aab8e5b7a7e6862ebf
+B a9e7837d71973a76eed184e764d21035969132e7
B aa0263a09466130dab9ed36a0293ed245ab9b233
B aa0a0a21e10709412b7b0491706933654be69dcd
B aa5ef9fc7ed198021a246f99429d00863f336948
B aac1196c9e2ad02b596e24cc6f18cdb7ec30a21d
B aafbcde58a0ef31e76bd4444b99592ef685456a7
+B ab0393e171b256c41043f192eb7c2c13928be670
B ab05845f33e5744f9ed9c2b3569a1001c269f923
B ab1e3ebf03c142df876be561e6720e788b7c6dac
B ab20d353990b20e72500d00e128c0a72d5dcf329
@@ -734,7 +830,9 @@ B b6577a8fa68235fb8bb0103681906289bcf5e069
B b67537dbace0896073b55b375b8ccdc4cce83365
B b6b48c1bca784fd0e84c6e74223f0d535f4c7ec6
B b6dca932548fc130bef28610646699bfafd80798
+B b6f4e67f9e00c9207a6b3e8ab3dbf6e7f7acef54
B b6fd55076af90b68853c5b5db8fb8cb54174dd4c
+B b733306d06d844c4faab0faa5b6f00b530d01761
B b7389c130daac93a96fb781155fcd24d01836d51
B b7562ded6c0b54d02615298c975c54585aebf298
B b75705c1510b13df2dd387e69d52da3efa50cfc9
@@ -742,12 +840,14 @@ B b7657a47aca211d46df04998bf79a9e2ca76a545
B b79272c09949cea80572fb86bc170cb344a9b731
B b7ce0bf1e5106b7913269c1aa24c4ab3aa5631ee
B b7d89466ab1c0ef68156cef6deb5a911fbf511f2
+B b84bd51dad062c605e8acdcdcfce610aaed7c3b3
B b86d467cd18b5fe91300185a8c62e66d2b20375b
B b8fe59b5d696e31b607efca1dc32f2521e99884a
B ba00202288bce9ba80692f151c2d73b101400c50
B ba17570e53cec4386f7c6fd40f075c6fbc1c3981
B ba293c6e7456e80a5fe92f25a4893d3e45380bf0
B ba2d7b85d44970cb4abd8cd18ac24178394ef404
+B ba6c3d4806597d682458a9bad781afd7727b8259
B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
B bb0a94734f583e5b6b1e42303aa6ba7a49958f18
B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
@@ -766,6 +866,7 @@ B bd94b4c8778e360d538d5acb3f6a3710af92e6f1
B bdd359af4de505f7bbe50bf9990da5788e12fd71
B bdff406350ef16dfa61fd02288d6c5e68217da55
B be4e40a46784d81c559b073b487255cf87334a77
+B be95294054d4b18d2b190f3e043a47c8069b4979
B bea22d764138e365513856c23be760a7719530a0
B beb4af748ff260ccbe2ac29a0a251ebcbe77ab8c
B bec40a5178e4ce6a434830589d5e44f62961cabb
@@ -781,14 +882,19 @@ B c04c27200226b564108b4fe58b8ac70ca5ec7638
B c04c68c93c75d4ce78d3354f143ba5fa1e7f8c1f
B c0526a6e55a1eef931bc9257cdd419b64818ea41
B c083d093ceb2c9c8fbcc5a05910b04d221225f5f
+B c0ad4d310af835fa5bd751979898068fd3258fc9
B c0cd1f4464954deff337ede117c32ee5fd2b59c6
+B c0e94108f5dcfe8bf84c0e0411c27e31762609a9
B c0f105cfcbf3b0e618eedb6ea44bfa108e3a7e96
B c0fd11fa058c0422d84e67b9e45233010cc55f7f
B c129ebc7306e29c6010cc544ce4b8e723dbbd504
B c1c9562bb13eeacdd9dae5a46c513e9e03625698
B c27dc582c203d01fa8f63f500def10f0ae57d1e4
B c2b70fd462955b714f0211ff52e1f99399666d44
+B c2ecb40c8fcc1010ba74af5d562cdd3bd50df5ad
B c3399966e4060837fd17511d604a26c8d12dad7c
+B c3656346bd75ba64a467e972281bc3ad69f7a85c
+B c3bef354ca5cd17e3bc545e03f7c01ac64969867
B c3cca2d5d92576235e27692806d0c8233a8ce9b1
B c4a6faf0b8ba43143cdb96c8258a4b335f794b2d
B c4c03e06de3ec8eb8b3e3b35a8c27d1615fd5931
@@ -806,6 +912,7 @@ B c8636c03666ce1d6bc101e5ae5f39a05375077bd
B c87aa76033ddec5a738851117191da098706e494
B c8887c9b250d53148b7c0f59b5f55dbd34f02a80
B c8d77ac8b1d8d5c6307b585409efcdcb52a2ea4d
+B c8e00d41599e5e8716f110d764ed32df7b31fcfa
B c8f54d8c38bfdd186a245fce865e7f32a5e01856
B c933c0be9254f5858102aea69d306908ce8a1f0c
B c99738fc3bfa680bb332a0ad027c430ea0798c0b
@@ -814,6 +921,7 @@ B c9e4ddd3940e330498512846db747cb2acf95f07
B c9ec28df42e815b0771964fdae96b7ecb2e2281b
B ca0b59607b5c401b94fa918abb7b866184a9e1bd
B ca1f38bcbcc5097af7e537173cacb24806b4b490
+B caae5fb26da8cb211bf2a84fb0116d22400826e0
B cab2ad9c5027ae9574de002ddc70908156e6f722
B cb19d05174a3bd078b391c4f6c151ee6e34e2956
B cb2160fee6782b8638477ae7af5ad4cd82d6b88f
@@ -828,6 +936,7 @@ B cd809b8526fc5620c481d4ee5a8534ccf6babae4
B cd9d69a3c92e2c23b85e44bfbfe973c029870e78
B cdafd372c60b7e19229d7e6a91fc69b9c5dbc69c
B ce81b3829764996aa8d6c006ec2dd5c784e98433
+B ce992f3b0cd85ca255950289461c6c48926c8efc
B cec8828bd220abd0d49457df707b9261b50e1a8e
B cef68665303f783fa25ae1ac974a3cb94732e228
B cf9d2131bb78b0c04248454b3ddc5fe5c6387674
@@ -849,11 +958,13 @@ B d3baa23e3cbac2364498f81ab293aeb61902caa7
B d3e9295d3acfe3c970a325bbbafdba83a0d6e83c
B d3ea067659eb3f765df0bee6ce7b4abb55f76ab5
B d3fc22efa8153a1edc1880c05ede6d44208fa03a
+B d4a25bbea9911b8c2debfab6724a3cc95532c4af
B d4bfacb8cc5ed8247ff74eb52061070c0457cbf3
B d4de0ced8b53599229a7a3e43ad3bb5cf70b401b
B d4f3d88802137d285cc3290884c2683ba5e74d33
B d4f9674baa811936429271cbf64c4a558282c764
B d50ffd09c30e606524fb6ed92119d85ccfa13491
+B d530fc8b961a38aed0406b68980b6515872050ba
B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac
B d54b8750a256a4ea6baf6470928bd28cb8f7c9d4
B d55039341b000375256c5db9e79cfad5f8b4c3fb
@@ -863,6 +974,7 @@ B d5cbce1303076be91f66340e42e0218cdef3e954
B d5d87b8c7949bd0d8d8d5b5d5dc435e14aaf8fa4
B d5ea460f20d60c0496c70a2cf0b7f0484d48c806
B d649aed452bb668ec575bd140c7a085e12b4b255
+B d67e9bb186751ac0edebaede9fce0dc98fac3400
B d68f140c76cf7e390dfce134ea5c5d97f129e65d
B d6ff1564248ae7926ab105f6f56018acdc6494b3
B d7872e7faa2f919154467158cd8790d6bd4f4be2
@@ -872,8 +984,10 @@ B d7fd946abbd5c81ed08b057f6c6ac9d0880cf6fa
B d8673543d8723579eaf6a57d4b1ac6e22e0d308d
B d877c0539fd09d79094763b98484576de52198fa
B d8a6bdbd2c84b3fa0187de935e294d5f66974e46
+B d8a6e85e7de8f01f08462a683e9c9f1aaabff908
B d9f624e2eca8affa20243583ace087a8cbba3ac8
B da40221a626a1df88dc1260fa8e58b869bb99cf0
+B da47bede91c824542bef91ea59e39f77c6e1fb2d
B da4ccb008fcad909025cab0a00c56c00728c195b
B da53162f385fa73957626446cbd63ea269c1ee26
B daf19cc33f77e2b4ddd2e2b583926be189b84abb
@@ -894,9 +1008,11 @@ B de9b7936156d622c284df7f055acac80b920b7d0
B deea740143ef9b2d85c5dc2139f6918ae10ca548
B df39a9e14be1f3ff1fdd32e93e4f95c7fab96b00
B df947cb1ca2b9e375f99e199ec65b1afece1c963
+B dfa36ecb161fc0e7121aff68ad41ed969307d4f0
B dfa59762b50f26263716bae769bc4078d4059c37
B dfb5f378bbd1ceab46478a9983efb0c30b629446
B dfecaa60ea6082fda8f2959c083ba2f2f7a03112
+B e038e3149ff842a0a92259611864acdbe3bda650
B e0b56c9e6accb8fd7985cd33ca99391c3a8d76a1
B e0f8164c747d2120b882e565782aab0097290209
B e1246b3d0c00c9fe9489c0aacb683bf1de15d66b
@@ -931,8 +1047,11 @@ B e6085587cd0380b0e64346af53ac07e49734c8db
B e652e672f718f5b361801a623731950ae90988e1
B e6db5c58964c1c93bd65e8cc9dab24fe2cb25fc5
B e6fc7e50266d45c8b5afb002abdc44b69585cc69
+B e7083363ec6bd06a3ccd324a5ae6d7e28642583e
+B e711dc72f4f6f4fce383ae9e4782befea4a0273d
B e72deb71c1cdff55964d77d44054b4a1ef63922e
B e7a75b695afd3c64e42a2dcdf26b1febfa1250a6
+B e7cbefd3c535098c71a1ae03c10e5578706b2759
B e7e71068561546f04fc8b67edcde5e2db72334f8
B e80086821a1f4020247d97bbd62dd8cad81d4ae1
B e8514ea3f5fdf33b19d9ddc0639cc1aaf57e1f62
@@ -951,6 +1070,7 @@ B ec3a49b094019544e525aa1b14f494ca3217f17b
B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0
B ec7743850ee7d26e56ecfbd7dce0dc90ed2d679c
B ecbf4e78586870a507fe4cf91239d51c3f202aad
+B ecc7200c24b7cfcdff50f3ef30764984c0c3d84b
B ed0f25116f8620841ff96dd1b751d97c11eb09c3
B ed18c008f05af7063d5929d072b86048d12dab4c
B ed525fe47bfbb45bc8894e6b993db2ab0376ef5d
@@ -973,6 +1093,8 @@ B f2f6aa016cdd1bb49698b319806a8369f149c8dd
B f3185100ec7caea0ac4b52108210ed7e68e85271
B f33aebb65c66677bf07cb8200c4c62dfcbb8d70f
B f39a7d185e0127e5507376c3034893bd149c9ed3
+B f39ad3bbac2367149f0683bb2025b1df48beb11b
+B f44f6d7d1e869f6f814ffd940299cc77f1e23d07
B f4aafc6f8fe4e4964f6a48a50c43ceee3a171a64
B f51fb332753e9600a6b6e6dd17b42c1a1494395a
B f5655d81ea6a880cf6b8b1cdcabddf1cd4dbe869
@@ -992,9 +1114,11 @@ B f7a091afedbc7ca809a7205d7c053a1f5386865e
B f7a64ca9f12fa2523c35bc5add4be3e979a7604f
B f7c91cac615d7d46b64a7c2b5c1bb6dc515e2e8d
B f7c9fe2f9e3f3ca12b426903be3a1e36e74f9c20
+B f7db188bb0da238dac2e7714285d5ae3463d6428
B f823ad0f878ebca2e35e52240851246302dbab26
B f831e9f5ee56bff9e4472782300f9558ba234f80
B f859eade61005a93f4954b9763b0217e7bf3b15d
+B f8b1ac80551017ad71aab5dffac4c9098d32254c
B f8b8025bcf1b4b74712782db73dc2715aeae70fe
B f8df21ed3d17539a81c9cdfdc4222d13ffbe62cd
B f9272b565c61ea255a88f12ee2ffa66305233d4f
@@ -1009,9 +1133,12 @@ B fa96525a1a4e4131ae1ecc1900e948c93db7b696
B fada1bbc76067b5a1781bbd10773c2ff32571315
B fb94440f6f1d5c7c572b6c0163f275c95073b8ee
B fb9d26581c364c62c7343847ebe4136b8c97700f
+B fba651387907a07d02750de647aa54ed8dd623cb
B fbaad816541bef52cc8d8003e27a3762de82acce
B fbd6027cb272a1ea9f7f7c5a7da2ed9c591c855f
B fc05b9e523626e91ff4b25b61816f224797fd9da
+B fc1d0c57e9349acfcc2af3070f629b4772622254
+B fc54df19531b8071c2cc240b40cb1bfd1d28dec1
B fc54f21168a9294f2900bd6bc30d1b2eb5a172e7
B fc78cd31869a4e580c4d2a9e7864ae6dae8c311b
B fcc8bcb38f33febf5c73c5f5f56d877272f27e20
@@ -1049,6 +1176,7 @@ M 0da8b3a165f1edfbb8648955de9759cee5d12b14
M 0eb7eb1f62be94fa793ac3e11e467c0302462ca9
M 0f361f436f45f248cf118232701ad703a97abe74
M 0f7b744eb8e4ad8c4eee2ffd10bdaa1da1364deb
+M 1046894b83582303820c1b43b03bbdf2b4cbe571
M 10a8386fcef4b7f2220ceceaa6aedca60846f6d1
M 10b043faa0652a6a06f5f020173162edef7fb0ca
M 12d070f4392316cdfff03eb41abe22531ed64ee9
@@ -1192,6 +1320,7 @@ M 7431af236a19b5b5f899bad317a548a4c5c9cd49
M 765686ec011bbcbe4f093515fcf0a9a193b2e3a9
M 76c4df1bce5e71b439fb37fa5d9e1af12615786b
M 76cb1e78a0e7e4155e2683d6505799215a60cef1
+M 78222f96802e321dab8a6c53373f8cda77be6f0e
M 789e12c7fbdcb97dc7ff6be8426f08ecc4948a68
M 79156d8a23497b9ed9bd912b64f684e610d49863
M 7988c4a974118cc5c2a8bd956fe396a7d5e8bb5c
@@ -1280,12 +1409,14 @@ M b4aa01a0de28462f7338d232e2e88be8512882af
M b5320827561467de7e04afdba15a6063d26493a3
M b7d33366f3311dc33c7da389f98fced6fd470c93
M b9c24f41cb1cc7e4d572fa222ae5aa4f5f804ccb
+M b9d69e71057537863700ee5be870f36c2f2e3188
M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
M bbc3ca287cca8cf982b62fb85c6a2bbc5bb59754
M bc3ee954f0796c82d9ff59c4d45f13382d84d4e8
M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
M bd1d31f195caab56fbe565fbfb63d9170a0c9406
M bd7babd656fc06f3e5839bf11e186ec12fdeb6fa
+M beae71f1d6d60921d79c7d2275dd8ce90bbd21e4
M bee82ba7d1766b555d965a75b3846ead4686239e
M bfa97ebf03e8ab6b29129f31d76fa469b054f843
M c014597c2d47243330d6119120a4a81c531cb62e
@@ -1356,6 +1487,7 @@ M ecf6a384aa09062515afd8759fc093cb6117495f
M ed0421182de3256653710893a770447cdc21bab0
M efaf05170b4f76ad61ff423e30ece58bdd226ae5
M f02b02934bf78504ffc462c364dc43e386e727b2
+M f0edb520db9b64ea5ba9b6a016b85eae6091d21c
M f1a015924d53e5e253aad55a49ef9a1853b6c26f
M f3646c6009d16093b0fc42f2efa229fe7ba12272
M f399b9290e42726e30333f261d8d7f6abc4768cc
[08/14] cxf git commit: [CXF-6900,
CXF-6908] More fixes for namespace issues with decrypted faults and
adding faults to SAAJ envelopes
Posted by dk...@apache.org.
[CXF-6900, CXF-6908] More fixes for namespace issues with decrypted faults and adding faults to SAAJ envelopes
# Conflicts:
# rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
# systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/35b808c6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/35b808c6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/35b808c6
Branch: refs/heads/3.0.x-fixes
Commit: 35b808c661b9fe7702b5e875f08cc831fde05eeb
Parents: c372fb7
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon May 23 12:21:56 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:23:24 2016 -0400
----------------------------------------------------------------------
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 24 ++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/35b808c6/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 185079b..8c13b1e 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.binding.soap.saaj;
+import java.util.Iterator;
+
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
@@ -26,6 +28,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPPart;
+import javax.xml.stream.XMLStreamException;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
@@ -33,9 +36,11 @@ import org.w3c.dom.Node;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.staxutils.OverlayW3CDOMStreamWriter;
+import org.apache.cxf.staxutils.W3CNamespaceContext;
import static org.apache.cxf.binding.soap.saaj.SAAJUtils.adjustPrefix;
+
public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
private final SOAPPart part;
private final SOAPEnvelope envelope;
@@ -69,6 +74,25 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
isOverlaid = false;
}
+ @Override
+ public String getPrefix(String nsuri) throws XMLStreamException {
+ if (isOverlaid && part != null && getCurrentNode() == null) {
+ Node nd = part.getFirstChild();
+ while (nd != null) {
+ if (nd instanceof Element) {
+ Iterator<String> it = new W3CNamespaceContext((Element)nd).getPrefixes(nsuri);
+ if (it.hasNext()) {
+ return it.next();
+ } else {
+ nd = null;
+ }
+ } else {
+ nd = nd.getNextSibling();
+ }
+ }
+ }
+ return super.getPrefix(nsuri);
+ }
private String getEnvelopeURI() throws SOAPException {
if (uri == null) {
uri = getEnvelope().getElementName().getURI();
[06/14] cxf git commit: Formatting issues in impl.vm. Closes #88
Posted by dk...@apache.org.
Formatting issues in impl.vm. Closes #88
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8cd54b29
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8cd54b29
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8cd54b29
Branch: refs/heads/3.0.x-fixes
Commit: 8cd54b29524d47efa58ef21152bc105119702d22
Parents: 12049c4
Author: Dustin R. Heart <du...@avalara.com>
Authored: Thu Sep 10 18:14:55 2015 -0700
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:17:21 2016 -0400
----------------------------------------------------------------------
.../org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cd54b29/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
index e24f7cd..d9fe1b7 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm
@@ -64,12 +64,12 @@ public class ${implName} implements $intf.Name {
#foreach ($method in $intf.Methods)
/* (non-Javadoc)
- * @see $intf.PackageName.$intf.Name#${method.Name}(#foreach ($parameter in $method.Parameters)$parameter.ClassName $parameter.Name #if ($velocityCount != $method.getParameters().size()),#end)#end*
+ * @see $intf.PackageName.$intf.Name#${method.Name}(#foreach ($parameter in $method.Parameters)$parameter.ClassName $parameter.Name#if ($velocityCount != $method.getParameters().size()), #end#end)*
*/
#if ($mark-generated == "true")
@Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate")
#end
- public $method.return.ClassName ${method.Name}(#if($method.ParameterListWithoutAnnotation.size() == 0))#end#if($method.ParameterListWithoutAnnotation.size() != 0)#foreach($param in ${method.ParameterListWithoutAnnotation})$param#end)#end#if($method.Exceptions.size() > 0) throws #foreach($exception in $method.Exceptions)$exception.ClassName #if($velocityCount != $method.Exceptions.size()),#end #end #end {
+ public $method.return.ClassName ${method.Name}(#if($method.ParameterListWithoutAnnotation.size() == 0))#end#if($method.ParameterListWithoutAnnotation.size() != 0)#foreach($param in ${method.ParameterListWithoutAnnotation})$param#if($velocityCount != $method.ParameterListWithoutAnnotation.size()) #end#end)#end#if($method.Exceptions.size() > 0) throws #foreach($exception in $method.Exceptions)$exception.ClassName#if($velocityCount != $method.Exceptions.size()), #end #end #end {
#if ($method.Async)
return null;
/* not called */
[10/14] cxf git commit: Fix UDP tests on my mac
Posted by dk...@apache.org.
Fix UDP tests on my mac
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1dbc471f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1dbc471f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1dbc471f
Branch: refs/heads/3.0.x-fixes
Commit: 1dbc471fa2d1872570053b02bc904c76f58b87a1
Parents: cc929d4
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jun 7 13:52:42 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:25:14 2016 -0400
----------------------------------------------------------------------
.../cxf/transport/udp/UDPTransportTest.java | 24 ++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1dbc471f/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
index fea6ce1..9c0052c 100644
--- a/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
+++ b/rt/transports/udp/src/test/java/org/apache/cxf/transport/udp/UDPTransportTest.java
@@ -22,12 +22,13 @@ package org.apache.cxf.transport.udp;
import java.net.NetworkInterface;
import java.util.Enumeration;
+import javax.jws.WebService;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.hello_world.Greeter;
-import org.apache.hello_world.GreeterImpl;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -40,6 +41,23 @@ public class UDPTransportTest extends AbstractBusClientServerTestBase {
static final String PORT = allocatePort(UDPTransportTest.class);
private static Server server;
+ @WebService(serviceName = "SOAPService",
+ endpointInterface = "org.apache.hello_world.Greeter",
+ targetNamespace = "http://apache.org/hello_world")
+ static class GreeterImpl implements Greeter {
+ private String myName = "defaultGreeter";
+ GreeterImpl() {
+ }
+ public String greetMe(String me) {
+ return "Hello " + me;
+ }
+ public String sayHi() {
+ return "Bonjour from " + myName;
+ }
+ public void pingMe() {
+ }
+ }
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
@@ -53,7 +71,9 @@ public class UDPTransportTest extends AbstractBusClientServerTestBase {
@AfterClass
public static void shutdown() throws Exception {
- server.stop();
+ if (server != null) {
+ server.stop();
+ }
}
@Test
[12/14] cxf git commit: [CXF-6966] If classloader is null,
don't use it for loading the bundles
Posted by dk...@apache.org.
[CXF-6966] If classloader is null, don't use it for loading the bundles
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c82c0e90
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c82c0e90
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c82c0e90
Branch: refs/heads/3.0.x-fixes
Commit: c82c0e90dde47fb8c6329b1ee8eac3dae043ed75
Parents: 0d7ec24
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 22 11:31:05 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:29:52 2016 -0400
----------------------------------------------------------------------
.../org/apache/cxf/common/i18n/BundleUtils.java | 24 ++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c82c0e90/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java b/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
index 9aedfcf..5fdd3b4 100644
--- a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
@@ -77,13 +77,21 @@ public final class BundleUtils {
public static ResourceBundle getBundle(Class<?> cls) {
try {
+ ClassLoader loader = cls.getClassLoader();
+ if (loader == null) {
+ return ResourceBundle.getBundle(getBundleName(cls), Locale.getDefault());
+ }
return ResourceBundle.getBundle(getBundleName(cls),
Locale.getDefault(),
- cls.getClassLoader());
+ loader);
} catch (MissingResourceException ex) {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ return ResourceBundle.getBundle(getBundleName(cls), Locale.getDefault());
+ }
return ResourceBundle.getBundle(getBundleName(cls),
Locale.getDefault(),
- Thread.currentThread().getContextClassLoader());
+ loader);
}
}
@@ -98,13 +106,21 @@ public final class BundleUtils {
*/
public static ResourceBundle getBundle(Class<?> cls, String name) {
try {
+ ClassLoader loader = cls.getClassLoader();
+ if (loader == null) {
+ return ResourceBundle.getBundle(getBundleName(cls, name), Locale.getDefault());
+ }
return ResourceBundle.getBundle(getBundleName(cls, name),
Locale.getDefault(),
- cls.getClassLoader());
+ loader);
} catch (MissingResourceException ex) {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader == null) {
+ return ResourceBundle.getBundle(getBundleName(cls, name), Locale.getDefault());
+ }
return ResourceBundle.getBundle(getBundleName(cls, name),
Locale.getDefault(),
- Thread.currentThread().getContextClassLoader());
+ loader);
}
}
[03/14] cxf git commit: [CXF-6900] Get Colm's tests working....
Posted by dk...@apache.org.
[CXF-6900] Get Colm's tests working....
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/40428e41
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/40428e41
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/40428e41
Branch: refs/heads/3.0.x-fixes
Commit: 40428e414a8a724b10ea68b9d7a06e656fd1b867
Parents: 807d2ac
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue May 17 12:13:14 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:16:42 2016 -0400
----------------------------------------------------------------------
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 4 ++++
.../apache/cxf/binding/soap/saaj/ParseBodyTest.java | 14 ++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/40428e41/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 14b5c2e..d29276c 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -52,6 +52,9 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
if (namespace != null
&& namespace.equals(part.getEnvelope().getElementName().getURI())) {
adjustPrefix((SOAPElement)nd2, pfx);
+ if ("Envelope".equals(nd2.getLocalName())) {
+ adjustPrefix(part.getEnvelope().getHeader(), pfx);
+ }
}
} catch (SOAPException e) {
//ignore, fallback
@@ -146,6 +149,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
el = ((SOAPElement)cur).addChildElement(local, "", "");
} else {
el = ((SOAPElement)cur).addChildElement(local, pfx == null ? "" : pfx, ns);
+ adjustPrefix((SOAPElement)el, pfx);
}
cur.removeChild(el);
return el;
http://git-wip-us.apache.org/repos/asf/cxf/blob/40428e41/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index bcdb6f9..1f6eeb4 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -30,6 +30,7 @@ import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
@@ -39,6 +40,7 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.staxutils.StaxSource;
import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -87,26 +89,30 @@ public class ParseBodyTest extends Assert {
// TODO - See CXF-6900
@Test
- @org.junit.Ignore
public void testReadSOAPFault() throws Exception {
InputStream inStream = getClass().getResourceAsStream("soap12-fault.xml");
Document doc = StaxUtils.read(inStream);
-
+
SoapMessage msg = new SoapMessage(new MessageImpl());
Exchange ex = new ExchangeImpl();
ex.setInMessage(msg);
SOAPMessage saajMsg = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL).createMessage();
SOAPPart part = saajMsg.getSOAPPart();
- part.setContent(new DOMSource(doc));
+ SAAJStreamWriter writer = new SAAJStreamWriter(part);
+ StaxUtils.copy(doc, writer);
+ //Source s = new StaxSource(StaxUtils.createXMLStreamReader(doc));
+ //part.setContent(s);
saajMsg.saveChanges();
-
+
msg.setContent(SOAPMessage.class, saajMsg);
doc = part;
// System.out.println("OUTPUT: " + StaxUtils.toString(doc));
byte[] docbytes = getMessageBytes(doc);
+
+ // System.out.println("OUTPUT: " + new String(docbytes));
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(docbytes));
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
[07/14] cxf git commit: Updates to get the transformation stuff to
workaround all the bugs/junk in SAAJ for the faults
Posted by dk...@apache.org.
Updates to get the transformation stuff to workaround all the bugs/junk in SAAJ for the faults
# Conflicts:
# rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
# rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c372fb70
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c372fb70
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c372fb70
Branch: refs/heads/3.0.x-fixes
Commit: c372fb70c18f63cb17cef66a962e4ab90ee89875
Parents: 8cd54b2
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri May 20 11:31:00 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:19:34 2016 -0400
----------------------------------------------------------------------
.../staxutils/OverlayW3CDOMStreamWriter.java | 6 ++
.../cxf/staxutils/W3CDOMStreamWriter.java | 4 +
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 78 ++++++++++++++------
.../ws/security/wss4j/WSS4JFaultCodeTest.java | 2 +
4 files changed, 69 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c372fb70/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
index d30bf4f..475973a 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
@@ -25,6 +25,7 @@ import java.util.List;
import javax.xml.stream.XMLStreamException;
import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
@@ -53,6 +54,11 @@ public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
public OverlayW3CDOMStreamWriter(Document doc, Element e) {
super(doc, e);
}
+ public OverlayW3CDOMStreamWriter(Document doc, DocumentFragment frag) {
+ super(doc, frag);
+ isOverlaid = false;
+ }
+
@Override
protected void createAndAddElement(String prefix, String local, String namespace) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c372fb70/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
index 6903c4c..353da70 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
@@ -60,6 +60,10 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
this.document = frag.getOwnerDocument();
currentNode = frag;
}
+ public W3CDOMStreamWriter(Document document, DocumentFragment frag) {
+ this.document = document;
+ currentNode = frag;
+ }
public W3CDOMStreamWriter(Element e) {
this.document = e.getOwnerDocument();
http://git-wip-us.apache.org/repos/asf/cxf/blob/c372fb70/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 393a553..185079b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -21,11 +21,13 @@ package org.apache.cxf.binding.soap.saaj;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPPart;
+import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,7 +38,10 @@ import static org.apache.cxf.binding.soap.saaj.SAAJUtils.adjustPrefix;
public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
private final SOAPPart part;
-
+ private final SOAPEnvelope envelope;
+ private String uri;
+
+
public SAAJStreamWriter(SOAPPart part) {
super(part);
this.part = part;
@@ -44,20 +49,47 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
if (nd == null) {
isOverlaid = false;
}
+ envelope = null;
}
public SAAJStreamWriter(SOAPPart part, Element current) {
super(part, current);
this.part = part;
+ envelope = null;
}
-
+ public SAAJStreamWriter(SOAPEnvelope env, DocumentFragment frag) {
+ super(env.getOwnerDocument(), frag);
+ this.part = null;
+ this.envelope = env;
+ isOverlaid = false;
+ }
+ public SAAJStreamWriter(SOAPEnvelope env, Element cur) {
+ super(env.getOwnerDocument(), cur);
+ this.part = null;
+ this.envelope = env;
+ isOverlaid = false;
+ }
+
+ private String getEnvelopeURI() throws SOAPException {
+ if (uri == null) {
+ uri = getEnvelope().getElementName().getURI();
+ }
+ return uri;
+ }
+ private SOAPEnvelope getEnvelope() throws SOAPException {
+ if (envelope == null) {
+ return part.getEnvelope();
+ }
+ return envelope;
+ }
+
protected void adjustOverlaidNode(Node nd2, String pfx) {
String namespace = nd2.getNamespaceURI();
try {
if (namespace != null
- && namespace.equals(part.getEnvelope().getElementName().getURI())) {
+ && namespace.equals(getEnvelopeURI())) {
adjustPrefix((SOAPElement)nd2, pfx);
if ("Envelope".equals(nd2.getLocalName())) {
- adjustPrefix(part.getEnvelope().getHeader(), pfx);
+ adjustPrefix(getEnvelope().getHeader(), pfx);
}
}
} catch (SOAPException e) {
@@ -67,37 +99,41 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
protected void createAndAddElement(String prefix, String local, String namespace) {
+ if (part == null) {
+ super.createAndAddElement(prefix, local, namespace);
+ return;
+ }
try {
if (namespace != null
- && namespace.equals(part.getEnvelope().getElementName().getURI())) {
+ && namespace.equals(getEnvelopeURI())) {
if ("Envelope".equals(local)) {
- setChild(adjustPrefix(part.getEnvelope(), prefix), false);
- adjustPrefix(part.getEnvelope().getHeader(), prefix);
- adjustPrefix(part.getEnvelope().getBody(), prefix);
- part.getEnvelope().removeChild(part.getEnvelope().getHeader());
- part.getEnvelope().removeChild(part.getEnvelope().getBody());
+ setChild(adjustPrefix(getEnvelope(), prefix), false);
+ adjustPrefix(getEnvelope().getHeader(), prefix);
+ adjustPrefix(getEnvelope().getBody(), prefix);
+ getEnvelope().removeChild(getEnvelope().getHeader());
+ getEnvelope().removeChild(getEnvelope().getBody());
return;
} else if ("Body".equals(local)) {
- if (part.getEnvelope().getBody() == null) {
- part.getEnvelope().addBody();
+ if (getEnvelope().getBody() == null) {
+ getEnvelope().addBody();
}
- setChild(adjustPrefix(part.getEnvelope().getBody(), prefix), false);
+ setChild(adjustPrefix(getEnvelope().getBody(), prefix), false);
return;
} else if ("Header".equals(local)) {
- if (part.getEnvelope().getHeader() == null) {
- part.getEnvelope().addHeader();
+ if (getEnvelope().getHeader() == null) {
+ getEnvelope().addHeader();
}
- setChild(adjustPrefix(part.getEnvelope().getHeader(), prefix), false);
+ setChild(adjustPrefix(getEnvelope().getHeader(), prefix), false);
return;
} else if ("Fault".equals(local)) {
- SOAPFault f = part.getEnvelope().getBody().getFault();
+ SOAPFault f = getEnvelope().getBody().getFault();
if (f == null) {
- Element el = part.createElementNS(namespace,
+ Element el = getDocument().createElementNS(namespace,
StringUtils.isEmpty(prefix) ? local : prefix + ":" + local);
- part.getEnvelope().getBody().appendChild(el);
- f = part.getEnvelope().getBody().getFault();
+ getEnvelope().getBody().appendChild(el);
+ f = getEnvelope().getBody().getFault();
if (f == null) {
- f = part.getEnvelope().getBody().addFault();
+ f = getEnvelope().getBody().addFault();
}
}
setChild(adjustPrefix(f, prefix), false);
http://git-wip-us.apache.org/repos/asf/cxf/blob/c372fb70/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
index bd1b526..1e443c7 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java
@@ -264,6 +264,8 @@ public class WSS4JFaultCodeTest extends AbstractSecurityTest {
try {
inHandler.handleMessage(inmsg);
+ StaxUtils.print(saajMsg.getSOAPPart());
+
fail("Expected failure on a SOAP Fault");
} catch (SoapFault fault) {
fault.printStackTrace();
[11/14] cxf git commit: Cache the object names to help performance
Posted by dk...@apache.org.
Cache the object names to help performance
# Conflicts:
# rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
# rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0d7ec247
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0d7ec247
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0d7ec247
Branch: refs/heads/3.0.x-fixes
Commit: 0d7ec2470afdb9413dfd2cb37b49ae1d9e07d6ff
Parents: 1dbc471
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jun 20 12:24:42 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:27:35 2016 -0400
----------------------------------------------------------------------
.../AbstractMessageResponseTimeInterceptor.java | 70 ++++++++++++--------
.../AbstractMessageResponseTestBase.java | 16 ++++-
2 files changed, 56 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0d7ec247/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
index 92f9dc4..76bb5e9 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
@@ -113,34 +113,44 @@ public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPha
protected ObjectName getServiceCounterName(Exchange ex) {
Bus bus = ex.get(Bus.class);
StringBuilder buffer = new StringBuilder();
+ ObjectName serviceCounterName = null;
if (ex.get("org.apache.cxf.management.service.counter.name") != null) {
buffer.append((String)ex.get("org.apache.cxf.management.service.counter.name"));
+ try {
+ serviceCounterName = new ObjectName(buffer.toString());
+ } catch (MalformedObjectNameException e) {
+ LOG.log(Level.WARNING, "CREATE_COUNTER_OBJECTNAME_FAILED", e);
+ }
} else {
Service service = ex.get(Service.class);
Endpoint endpoint = ex.get(Endpoint.class);
-
- String serviceName = "\"" + escapePatternChars(service.getName().toString()) + "\"";
- String portName = "\"" + endpoint.getEndpointInfo().getName().getLocalPart() + "\"";
-
- buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":");
- buffer.append(ManagementConstants.BUS_ID_PROP + "=" + bus.getId() + ",");
- Message message = ex.getOutMessage();
- if (isClient(message)) {
- buffer.append(ManagementConstants.TYPE_PROP + "=" + Counter.PERFORMANCE_COUNTER
- + ".Client,");
- } else {
- buffer.append(ManagementConstants.TYPE_PROP + "=" + Counter.PERFORMANCE_COUNTER
- + ".Server,");
+
+ serviceCounterName = (ObjectName)endpoint.get("javax.management.ObjectName");
+ if (serviceCounterName == null) {
+ String serviceName = "\"" + escapePatternChars(service.getName().toString()) + "\"";
+ String portName = "\"" + endpoint.getEndpointInfo().getName().getLocalPart() + "\"";
+
+ buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME + ":");
+ buffer.append(ManagementConstants.BUS_ID_PROP + "=" + bus.getId() + ",");
+ Message message = ex.getOutMessage();
+ if (isClient(message)) {
+ buffer.append(ManagementConstants.TYPE_PROP + "=" + Counter.PERFORMANCE_COUNTER
+ + ".Client,");
+ } else {
+ buffer.append(ManagementConstants.TYPE_PROP + "=" + Counter.PERFORMANCE_COUNTER
+ + ".Server,");
+ }
+ buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ",");
+
+ buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + portName);
+
+ try {
+ serviceCounterName = new ObjectName(buffer.toString());
+ endpoint.put("javax.management.ObjectName", serviceCounterName);
+ } catch (MalformedObjectNameException e) {
+ LOG.log(Level.WARNING, "CREATE_COUNTER_OBJECTNAME_FAILED", e);
+ }
}
- buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ",");
-
- buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + portName);
- }
- ObjectName serviceCounterName = null;
- try {
- serviceCounterName = new ObjectName(buffer.toString());
- } catch (MalformedObjectNameException e) {
- LOG.log(Level.WARNING, "CREATE_COUNTER_OBJECTNAME_FAILED", e);
}
return serviceCounterName;
@@ -162,7 +172,14 @@ public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPha
}
protected ObjectName getOperationCounterName(Exchange ex, ObjectName sericeCounterName) {
- OperationInfo opInfo = ex.get(OperationInfo.class);
+ BindingOperationInfo bop = ex.getBindingOperationInfo();
+ OperationInfo opInfo = bop == null ? null : bop.getOperationInfo();
+ if (opInfo != null) {
+ ObjectName o = opInfo.getProperty("javax.management.ObjectName", ObjectName.class);
+ if (o != null) {
+ return o;
+ }
+ }
String operationName = opInfo == null ? null : "\"" + opInfo.getName().getLocalPart() + "\"";
if (operationName == null) {
@@ -179,16 +196,15 @@ public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPha
ObjectName operationCounter = null;
try {
operationCounter = new ObjectName(operationCounterName);
-
+ if (opInfo != null) {
+ opInfo.setProperty("javax.management.ObjectName", operationCounter);
+ }
} catch (MalformedObjectNameException e) {
LOG.log(Level.WARNING, "CREATE_COUNTER_OBJECTNAME_FAILED", e);
}
return operationCounter;
}
-
-
-
protected String escapePatternChars(String value) {
// This can be replaced if really needed with pattern-based matching
if (value.lastIndexOf(QUESTION_MARK) != -1) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/0d7ec247/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
----------------------------------------------------------------------
diff --git a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
index 751f903..15ffa71 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTestBase.java
@@ -118,6 +118,10 @@ public class AbstractMessageResponseTestBase extends Assert {
EasyMock.expect(endpointInfo.getName()).andReturn(PORT_NAME).anyTimes();
EasyMock.expect(endpoint.getEndpointInfo()).andReturn(endpointInfo).anyTimes();
EasyMock.expect(exchange.get(Endpoint.class)).andReturn(endpoint).anyTimes();
+ EasyMock.expect(endpoint.get("javax.management.ObjectName")).andReturn(null).anyTimes();
+ EasyMock.expect(endpoint.put(EasyMock.eq("javax.management.ObjectName"), EasyMock.anyObject(ObjectName.class)))
+ .andReturn(null).anyTimes();
+ EasyMock.expect(exchange.getEndpoint()).andReturn(endpoint).anyTimes();
EasyMock.replay(endpointInfo);
EasyMock.replay(endpoint);
@@ -128,9 +132,15 @@ public class AbstractMessageResponseTestBase extends Assert {
protected void setupOperationForMessage() {
OperationInfo op = EasyMock.createMock(OperationInfo.class);
- EasyMock.expect(op.getName()).andReturn(OPERATION_NAME);
- EasyMock.expect(exchange.get(OperationInfo.class)).andReturn(op);
- EasyMock.replay(op);
+ BindingOperationInfo bop = EasyMock.createMock(BindingOperationInfo.class);
+ EasyMock.expect(exchange.getBindingOperationInfo()).andReturn(bop);
+ EasyMock.expect(bop.getOperationInfo()).andReturn(op);
+ EasyMock.expect(op.getName()).andReturn(OPERATION_NAME);
+ EasyMock.expect(op.getProperty("javax.management.ObjectName", ObjectName.class)).andReturn(null).anyTimes();
+ op.setProperty(EasyMock.eq("javax.management.ObjectName"),
+ EasyMock.anyObject(ObjectName.class));
+ EasyMock.expectLastCall();
+ EasyMock.replay(bop, op);
}
}
[04/14] cxf git commit: [CXF-6900] More SAAJ fixes
Posted by dk...@apache.org.
[CXF-6900] More SAAJ fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c65d8ee6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c65d8ee6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c65d8ee6
Branch: refs/heads/3.0.x-fixes
Commit: c65d8ee6d0961320006aadb0c3524a8f43448641
Parents: 40428e4
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue May 17 13:26:31 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:16:45 2016 -0400
----------------------------------------------------------------------
.../apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java | 2 +-
.../apache/cxf/binding/soap/saaj/SAAJStreamWriter.java | 10 ++++++++++
.../cxf/ws/security/wss4j/AbstractPolicySecurityTest.java | 5 ++---
.../cxf/ws/security/wss4j/AbstractSecurityTest.java | 8 ++++----
.../cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java | 3 +++
5 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c65d8ee6/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
index 74de7a3..d30bf4f 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
@@ -38,9 +38,9 @@ import org.apache.cxf.common.util.StringUtils;
* location, it will just walk into it instead of creating a new element
*/
public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
+ protected boolean isOverlaid = true;
List<Boolean> isOverlaidStack = new LinkedList<Boolean>();
- boolean isOverlaid = true;
Boolean textOverlay;
public OverlayW3CDOMStreamWriter(Document document) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c65d8ee6/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index d29276c..393a553 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -40,6 +40,10 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
public SAAJStreamWriter(SOAPPart part) {
super(part);
this.part = part;
+ Node nd = part.getFirstChild();
+ if (nd == null) {
+ isOverlaid = false;
+ }
}
public SAAJStreamWriter(SOAPPart part, Element current) {
super(part, current);
@@ -69,8 +73,14 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
if ("Envelope".equals(local)) {
setChild(adjustPrefix(part.getEnvelope(), prefix), false);
adjustPrefix(part.getEnvelope().getHeader(), prefix);
+ adjustPrefix(part.getEnvelope().getBody(), prefix);
+ part.getEnvelope().removeChild(part.getEnvelope().getHeader());
+ part.getEnvelope().removeChild(part.getEnvelope().getBody());
return;
} else if ("Body".equals(local)) {
+ if (part.getEnvelope().getBody() == null) {
+ part.getEnvelope().addBody();
+ }
setChild(adjustPrefix(part.getEnvelope().getBody(), prefix), false);
return;
} else if ("Header".equals(local)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c65d8ee6/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
index 7d62cfe..a0864f3 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.Executor;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.soap.Node;
-import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
@@ -411,7 +410,7 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
* @see #getSoapMessageForDom(Document, AssertionInfoMap)
*/
protected SoapMessage getOutSoapMessageForDom(Document doc, AssertionInfoMap aim)
- throws SOAPException {
+ throws Exception {
SoapMessage msg = this.getSoapMessageForDom(doc, aim);
msg.put(SecurityConstants.SIGNATURE_PROPERTIES, "outsecurity.properties");
msg.put(SecurityConstants.ENCRYPT_PROPERTIES, "outsecurity.properties");
@@ -427,7 +426,7 @@ public abstract class AbstractPolicySecurityTest extends AbstractSecurityTest {
}
protected SoapMessage getSoapMessageForDom(Document doc, AssertionInfoMap aim)
- throws SOAPException {
+ throws Exception {
SoapMessage msg = this.getSoapMessageForDom(doc);
if (aim != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c65d8ee6/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
index e5e531d..38bc2be 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
@@ -32,17 +32,16 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.saaj.SAAJStreamWriter;
import org.apache.cxf.helpers.DOMUtils.NullResolver;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -81,10 +80,11 @@ public abstract class AbstractSecurityTest extends AbstractCXFTest {
* Creates a {@link SoapMessage} from the contents of a document.
* @param doc the document containing the SOAP content.
*/
- protected SoapMessage getSoapMessageForDom(Document doc) throws SOAPException {
+ protected SoapMessage getSoapMessageForDom(Document doc) throws Exception {
SOAPMessage saajMsg = MessageFactory.newInstance().createMessage();
SOAPPart part = saajMsg.getSOAPPart();
- part.setContent(new DOMSource(doc));
+ SAAJStreamWriter writer = new SAAJStreamWriter(part);
+ StaxUtils.copy(doc, writer);
saajMsg.saveChanges();
MessageImpl message = new MessageImpl();
http://git-wip-us.apache.org/repos/asf/cxf/blob/c65d8ee6/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
index 71e7bb3..879ec0d 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
@@ -27,6 +27,8 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.xml.soap.SOAPMessage;
+
import org.w3c.dom.Document;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
@@ -37,6 +39,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.cxf.phase.PhaseInterceptorChain;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageChecker.XPathExpression;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageScope;
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
[05/14] cxf git commit: Fix unused imports
Posted by dk...@apache.org.
Fix unused imports
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/12049c41
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/12049c41
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/12049c41
Branch: refs/heads/3.0.x-fixes
Commit: 12049c41f9d3f157bf1f9d9ecd301d7d3a6a8e48
Parents: c65d8ee
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue May 17 12:24:18 2016 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jul 25 10:16:50 2016 -0400
----------------------------------------------------------------------
.../test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/12049c41/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index 1f6eeb4..c6b2087 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -30,7 +30,6 @@ import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
@@ -40,7 +39,6 @@ import org.apache.cxf.helpers.DOMUtils.NullResolver;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.staxutils.StaxSource;
import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
import org.junit.Test;