You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/02/14 13:24:28 UTC
svn commit: r1730326 - in /axis/axis2/java/core/branches/1_7: ./
modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/
modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/a...
Author: veithen
Date: Sun Feb 14 12:24:28 2016
New Revision: 1730326
URL: http://svn.apache.org/viewvc?rev=1730326&view=rev
Log:
Merge r1730308 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java
axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 12:24:28 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730186,1730195,1730197,1730222,1730300,1730310
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730186,1730195,1730197,1730222,1730300,1730308,1730310
Modified: axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java?rev=1730326&r1=1730325&r2=1730326&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java Sun Feb 14 12:24:28 2016
@@ -114,7 +114,7 @@ public class SOAP12InFlowHandlerDefaultB
//fault.setReason(reason);
if (roleValue != null && roleValue.equals(SAMPLE_ROLE + "/" + ROLE_BY_B)) {
SOAPFaultNode node = factory.createSOAPFaultNode(fault);
- node.setNodeValue(SAMPLE_ROLE + "/" + ROLE_BY_B);
+ node.setFaultNodeValue(SAMPLE_ROLE + "/" + ROLE_BY_B);
SOAPFaultRole role = factory.createSOAPFaultRole(fault);
role.setRoleValue(SAMPLE_ROLE + "/" + ROLE_BY_B);
msgContext.setProperty(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME, node);
Modified: axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java?rev=1730326&r1=1730325&r2=1730326&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java Sun Feb 14 12:24:28 2016
@@ -117,7 +117,7 @@ public class SOAP12InFlowHandlerDefaultC
//fault.setReason(reason);
if (roleValue != null && roleValue.equals(SAMPLE_ROLE + "/" + ROLE_BY_B)) {
SOAPFaultNode node = factory.createSOAPFaultNode(fault);
- node.setNodeValue(SAMPLE_ROLE + "/" + ROLE_BY_B);
+ node.setFaultNodeValue(SAMPLE_ROLE + "/" + ROLE_BY_B);
SOAPFaultRole role = factory.createSOAPFaultRole(fault);
role.setRoleValue(SAMPLE_ROLE + "/" + ROLE_BY_B);
msgContext.setProperty(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME, node);