Apply patch by Chanaka Fernando to fix SYNAPSE-1070 together with documentation update
git-svn-id: https://svn.apache.org/repos/asf/synapse/trunk@1776172 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/modules/documentation/src/site/xdoc/userguide/samples/sample430.xml b/java/modules/documentation/src/site/xdoc/userguide/samples/sample430.xml
index a75ad12..abfde32 100644
--- a/java/modules/documentation/src/site/xdoc/userguide/samples/sample430.xml
+++ b/java/modules/documentation/src/site/xdoc/userguide/samples/sample430.xml
@@ -36,10 +36,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions></div>
diff --git a/java/modules/documentation/src/site/xdoc/userguide/samples/sample431.xml b/java/modules/documentation/src/site/xdoc/userguide/samples/sample431.xml
index 2ad544d..e428ad2 100644
--- a/java/modules/documentation/src/site/xdoc/userguide/samples/sample431.xml
+++ b/java/modules/documentation/src/site/xdoc/userguide/samples/sample431.xml
@@ -39,10 +39,7 @@
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
<enableSec policy="sec_policy"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions></div>
diff --git a/java/modules/documentation/src/site/xdoc/userguide/samples/sample432.xml b/java/modules/documentation/src/site/xdoc/userguide/samples/sample432.xml
index b2efc45..cb07ebb 100644
--- a/java/modules/documentation/src/site/xdoc/userguide/samples/sample432.xml
+++ b/java/modules/documentation/src/site/xdoc/userguide/samples/sample432.xml
@@ -40,10 +40,7 @@
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
<enableSec outboundPolicy="sec_policy_outbound" inboundPolicy="sec_policy_inbound"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions></div>
diff --git a/java/modules/documentation/src/site/xdoc/userguide/samples/sample433.xml b/java/modules/documentation/src/site/xdoc/userguide/samples/sample433.xml
index b17d4b7..1abb3e5 100644
--- a/java/modules/documentation/src/site/xdoc/userguide/samples/sample433.xml
+++ b/java/modules/documentation/src/site/xdoc/userguide/samples/sample433.xml
@@ -36,10 +36,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
<endpoint name="StockQuoteServiceEndpoint">
diff --git a/java/modules/documentation/src/site/xdoc/userguide/samples/sample434.xml b/java/modules/documentation/src/site/xdoc/userguide/samples/sample434.xml
index 1d36122..be71db4 100644
--- a/java/modules/documentation/src/site/xdoc/userguide/samples/sample434.xml
+++ b/java/modules/documentation/src/site/xdoc/userguide/samples/sample434.xml
@@ -38,10 +38,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions></div>
diff --git a/java/modules/documentation/src/site/xdoc/userguide/samples/sample470.xml b/java/modules/documentation/src/site/xdoc/userguide/samples/sample470.xml
index b9bd729..3293474 100644
--- a/java/modules/documentation/src/site/xdoc/userguide/samples/sample470.xml
+++ b/java/modules/documentation/src/site/xdoc/userguide/samples/sample470.xml
@@ -59,9 +59,7 @@
<bean action="GET_PROPERTY" var="store" property="address" target="{//store/address/text()}"/>
<bean action="GET_PROPERTY" var="store" property="phoneNo" target="{//store/phone/text()}"/>
<!-- Send the response back to the client of the ESB. -->
- <header name="To" action="remove"/>
- <property name="RESPONSE" value="true"/>
- <send/>
+ <respond/>
</inSequence>
</target>
</proxy>
diff --git a/java/modules/documentation/src/site/xdoc/userguide/samples/sample471.xml b/java/modules/documentation/src/site/xdoc/userguide/samples/sample471.xml
index 8b83a16..f409b4e 100644
--- a/java/modules/documentation/src/site/xdoc/userguide/samples/sample471.xml
+++ b/java/modules/documentation/src/site/xdoc/userguide/samples/sample471.xml
@@ -66,9 +66,7 @@
<arg expression="get-property('TOTAL')"/>
</args>
</payloadFactory>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
+ <respond/>
</onComplete>
</aggregate>
</sequence>
diff --git a/java/modules/documentation/src/site/xdoc/userguide/samples/sample850.xml b/java/modules/documentation/src/site/xdoc/userguide/samples/sample850.xml
index e217251..36336d3 100644
--- a/java/modules/documentation/src/site/xdoc/userguide/samples/sample850.xml
+++ b/java/modules/documentation/src/site/xdoc/userguide/samples/sample850.xml
@@ -34,10 +34,7 @@
<with-param xmlns:s11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:s12="http://www.w3.org/2003/05/soap-envelope" name="source_xpath" value="{{s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]}}"/>
<with-param xmlns:s11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:s12="http://www.w3.org/2003/05/soap-envelope" name="target_xpath" value="{{s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]}}"/>
</call-template>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions></div>
<subsection name="Objective">
diff --git a/java/modules/integration/src/test/resources/extras/synapse_sample_430_altered.xml b/java/modules/integration/src/test/resources/extras/synapse_sample_430_altered.xml
index e953dd3..9d51aae 100644
--- a/java/modules/integration/src/test/resources/extras/synapse_sample_430_altered.xml
+++ b/java/modules/integration/src/test/resources/extras/synapse_sample_430_altered.xml
@@ -32,10 +32,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
diff --git a/java/modules/integration/src/test/resources/extras/synapse_sample_431_altered.xml b/java/modules/integration/src/test/resources/extras/synapse_sample_431_altered.xml
index 586e8dd..27d83fd 100644
--- a/java/modules/integration/src/test/resources/extras/synapse_sample_431_altered.xml
+++ b/java/modules/integration/src/test/resources/extras/synapse_sample_431_altered.xml
@@ -35,10 +35,7 @@
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
<enableSec policy="sec_policy"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
diff --git a/java/modules/integration/src/test/resources/extras/synapse_sample_432_altered.xml b/java/modules/integration/src/test/resources/extras/synapse_sample_432_altered.xml
index 1f91940..1db2674 100644
--- a/java/modules/integration/src/test/resources/extras/synapse_sample_432_altered.xml
+++ b/java/modules/integration/src/test/resources/extras/synapse_sample_432_altered.xml
@@ -36,10 +36,7 @@
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
<enableSec outboundPolicy="sec_policy_outbound" inboundPolicy="sec_policy_inbound"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
diff --git a/java/modules/integration/src/test/resources/extras/synapse_sample_433_altered.xml b/java/modules/integration/src/test/resources/extras/synapse_sample_433_altered.xml
index 2317e54..985c494 100644
--- a/java/modules/integration/src/test/resources/extras/synapse_sample_433_altered.xml
+++ b/java/modules/integration/src/test/resources/extras/synapse_sample_433_altered.xml
@@ -32,10 +32,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
<endpoint name="StockQuoteServiceEndpoint">
diff --git a/java/modules/integration/src/test/resources/extras/synapse_sample_434_altered.xml b/java/modules/integration/src/test/resources/extras/synapse_sample_434_altered.xml
index 5da4b54..c4ebc80 100644
--- a/java/modules/integration/src/test/resources/extras/synapse_sample_434_altered.xml
+++ b/java/modules/integration/src/test/resources/extras/synapse_sample_434_altered.xml
@@ -34,10 +34,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
diff --git a/java/repository/conf/sample/synapse_sample_430.xml b/java/repository/conf/sample/synapse_sample_430.xml
index d557203..f1c4e20 100644
--- a/java/repository/conf/sample/synapse_sample_430.xml
+++ b/java/repository/conf/sample/synapse_sample_430.xml
@@ -31,10 +31,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
diff --git a/java/repository/conf/sample/synapse_sample_431.xml b/java/repository/conf/sample/synapse_sample_431.xml
index dd00d8a..89a9b4c 100644
--- a/java/repository/conf/sample/synapse_sample_431.xml
+++ b/java/repository/conf/sample/synapse_sample_431.xml
@@ -34,10 +34,7 @@
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
<enableSec policy="sec_policy"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
diff --git a/java/repository/conf/sample/synapse_sample_432.xml b/java/repository/conf/sample/synapse_sample_432.xml
index 8f4b07d..201a027 100644
--- a/java/repository/conf/sample/synapse_sample_432.xml
+++ b/java/repository/conf/sample/synapse_sample_432.xml
@@ -35,10 +35,7 @@
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
<enableSec outboundPolicy="sec_policy_outbound" inboundPolicy="sec_policy_inbound"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
diff --git a/java/repository/conf/sample/synapse_sample_433.xml b/java/repository/conf/sample/synapse_sample_433.xml
index 69d562c..ffa145c 100644
--- a/java/repository/conf/sample/synapse_sample_433.xml
+++ b/java/repository/conf/sample/synapse_sample_433.xml
@@ -31,10 +31,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
<endpoint name="StockQuoteServiceEndpoint">
diff --git a/java/repository/conf/sample/synapse_sample_434.xml b/java/repository/conf/sample/synapse_sample_434.xml
index 95d080e..c4afedc 100644
--- a/java/repository/conf/sample/synapse_sample_434.xml
+++ b/java/repository/conf/sample/synapse_sample_434.xml
@@ -33,10 +33,7 @@
xmlns:s12="http://www.w3.org/2003/05/soap-envelope"
xpath="s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]"/>
</callout>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
diff --git a/java/repository/conf/sample/synapse_sample_470.xml b/java/repository/conf/sample/synapse_sample_470.xml
index 896b9cd..3fbe4d5 100644
--- a/java/repository/conf/sample/synapse_sample_470.xml
+++ b/java/repository/conf/sample/synapse_sample_470.xml
@@ -55,9 +55,7 @@
<bean action="GET_PROPERTY" var="store" property="name" target="{//store/name/text()}"/>
<bean action="GET_PROPERTY" var="store" property="address" target="{//store/address/text()}"/>
<bean action="GET_PROPERTY" var="store" property="phoneNo" target="{//store/phone/text()}"/>
- <header name="To" action="remove"/>
- <property name="RESPONSE" value="true"/>
- <send/>
+ <respond/>
</inSequence>
</target>
</proxy>
diff --git a/java/repository/conf/sample/synapse_sample_471.xml b/java/repository/conf/sample/synapse_sample_471.xml
index 69d40c4..a85876e 100644
--- a/java/repository/conf/sample/synapse_sample_471.xml
+++ b/java/repository/conf/sample/synapse_sample_471.xml
@@ -65,9 +65,7 @@
<arg expression="get-property('TOTAL')"/>
</args>
</payloadFactory>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
+ <respond/>
</onComplete>
</aggregate>
</sequence>
diff --git a/java/repository/conf/sample/synapse_sample_850.xml b/java/repository/conf/sample/synapse_sample_850.xml
index 54fc352..deaef56 100644
--- a/java/repository/conf/sample/synapse_sample_850.xml
+++ b/java/repository/conf/sample/synapse_sample_850.xml
@@ -28,9 +28,6 @@
<with-param xmlns:s11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:s12="http://www.w3.org/2003/05/soap-envelope" name="source_xpath" value="{{s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]}}"/>
<with-param xmlns:s11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:s12="http://www.w3.org/2003/05/soap-envelope" name="target_xpath" value="{{s11:Body/child::*[fn:position()=1] | s12:Body/child::*[fn:position()=1]}}"/>
</call-template>
- <property name="RESPONSE" value="true"/>
- <header name="To" action="remove"/>
- <send/>
- <drop/>
+ <respond/>
</sequence>
</definitions>
