svn commit: r940731 - in /synapse/trunk/java: modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ modules/core/src/test/java/org/apache/synapse/config/xml/ src/site/xdoc/

[hiranya]

Author: hiranya
Date: Tue May  4 05:26:37 2010
New Revision: 940731

URL: http://svn.apache.org/viewvc?rev=940731&view=rev
Log:
Changing the 'Action' element in the endpoint timeout configuration to 
'responseAction'. Applying the patch provided by Rajika for SYNAPSE-604.


Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
    
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
    synapse/trunk/java/src/site/xdoc/Synapse_Configuration_Language.xml

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java?rev=940731&r1=940730&r2=940731&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
 Tue May  4 05:26:37 2010
@@ -47,7 +47,7 @@ import javax.xml.namespace.QName;
  *
  *     <timeout>
  *       &lt;duration&gt;<em>timeout duration in seconds</em>&lt;/duration&gt;
- *       &lt;action&gt;discard|fault&lt;/action&gt;
+ *       &lt;responseAction&gt;discard|fault&lt;/responseAction&gt;
  *     &lt;/timeout&gt;?
  *
  *     &lt;suspendDurationOnFailure&gt;

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java?rev=940731&r1=940730&r2=940731&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
 Tue May  4 05:26:37 2010
@@ -47,7 +47,7 @@ import javax.xml.namespace.QName;
  *
  *     &lt;timeout&gt;
  *       &lt;duration&gt;<em>timeout duration in seconds</em>&lt;/duration&gt;
- *       &lt;action&gt;discard|fault&lt;/action&gt;
+ *       &lt;responseAction&gt;discard|fault&lt;/responseAction&gt;
  *     &lt;/timeout&gt;?
  *
  *     &lt;suspendDurationOnFailure&gt;

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java?rev=940731&r1=940730&r2=940731&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
 Tue May  4 05:26:37 2010
@@ -245,7 +245,7 @@ public abstract class EndpointFactory im
             }
 
             OMElement action = timeout.getFirstChildWithName(
-                    new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "action"));
+                    new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, 
"responseAction"));
             if (action != null && action.getText() != null) {
                 String actionString = action.getText();
                 if ("discard".equalsIgnoreCase(actionString.trim())) {

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java?rev=940731&r1=940730&r2=940731&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
 Tue May  4 05:26:37 2010
@@ -162,7 +162,7 @@ public abstract class EndpointSerializer
             
duration.setText(Long.toString(endpointDefinition.getTimeoutDuration()));
             timeout.addChild(duration);
 
-            OMElement action = fac.createOMElement("action", 
SynapseConstants.SYNAPSE_OMNAMESPACE);
+            OMElement action = fac.createOMElement("responseAction", 
SynapseConstants.SYNAPSE_OMNAMESPACE);
             if (endpointDefinition.getTimeoutAction() == 
SynapseConstants.DISCARD) {
                 action.setText("discard");
             } else if (endpointDefinition.getTimeoutAction()

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?rev=940731&r1=940730&r2=940731&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
 Tue May  4 05:26:37 2010
@@ -55,7 +55,7 @@ import java.net.URL;
  *
  *     &lt;timeout&gt;
  *       &lt;duration&gt;<em>timeout duration in seconds</em>&lt;/duration&gt;
- *       &lt;action&gt;discard|fault&lt;/action&gt;
+ *       &lt;responseAction&gt;discard|fault&lt;/responseAction&gt;
  *     &lt;/timeout&gt;?
  *
  *     &lt;suspendDurationOnFailure&gt;

Modified: 
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java?rev=940731&r1=940730&r2=940731&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
 Tue May  4 05:26:37 2010
@@ -51,7 +51,7 @@ public class SendMediatorSerializationTe
                                "<enableAddressing/>" +
                                 "<timeout>" +
                                     "<duration>60</duration>" +
-                                    "<action>discard</action>" +
+                                    "<responseAction>discard</responseAction>" 
+
                                 "</timeout>" +
                           "</address>" +
                      "</endpoint>" +

Modified: synapse/trunk/java/src/site/xdoc/Synapse_Configuration_Language.xml
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/src/site/xdoc/Synapse_Configuration_Language.xml?rev=940731&r1=940730&r2=940731&view=diff
==============================================================================
--- synapse/trunk/java/src/site/xdoc/Synapse_Configuration_Language.xml 
(original)
+++ synapse/trunk/java/src/site/xdoc/Synapse_Configuration_Language.xml Tue May 
 4 05:26:37 2010
@@ -528,8 +528,8 @@ where "sequence/dynamic_seq_1.xml" refer
     </p>       
     <p>
       Address endpoints can timeout if responses fail to arrive at Synapse by a
-      predefined timeout-duration specified in seconds. The timeout action
-      specifies whether to discard responses that arrives late, or to trigger a
+      predefined timeout-duration specified in seconds. The timeout 
responseAction
+      specifies whether to discard responses that arrive late, or to trigger a
       fault. Synapse has a periodic timeout handler that triggers itself at 
each
       15 second interval. Thus endpoint timeouts will have a +/- error on 
actual
       trigger time. Though this can be minimized by setting a System property
@@ -558,7 +558,7 @@ where "sequence/dynamic_seq_1.xml" refer
   
   &lt;timeout&gt;
     &lt;duration&gt;<em>timeout duration in seconds</em>&lt;/duration&gt;
-    &lt;action&gt;discard|fault&lt;/action&gt;
+    &lt;responseAction&gt;discard|fault&lt;/responseAction&gt;
   &lt;/timeout&gt;?
   
   &lt;markForSuspension&gt;
@@ -613,7 +613,7 @@ where "sequence/dynamic_seq_1.xml" refer
 
   &lt;timeout&gt;
     &lt;duration&gt;<em>timeout duration in seconds</em>&lt;/duration&gt;
-    &lt;action&gt;discard|fault&lt;/action&gt;
+    &lt;responseAction&gt;discard|fault&lt;/responseAction&gt;
   &lt;/timeout&gt;?
 
    &lt;markForSuspension&gt;
@@ -650,7 +650,7 @@ where "sequence/dynamic_seq_1.xml" refer
   
   &lt;timeout&gt;
     &lt;duration&gt;timeout-duration&lt;/duration&gt;
-    &lt;action&gt;discard|fault&lt;/action&gt;
+    &lt;responseAction&gt;discard|fault&lt;/responseAction&gt;
   &lt;/timeout&gt;?
   &lt;markForSuspension&gt;
         [&lt;errorCodes&gt;xxx,yyy&lt;/errorCodes&gt;]