svn commit: r645556 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: MessageContext.java core/axis2/Axis2MessageContext.java

[ru...@apache.org]

Author: ruwan
Date: Mon Apr  7 08:12:28 2008
New Revision: 645556

URL: http://svn.apache.org/viewvc?rev=645556&view=rev
Log:
Adding Java 5 features and documentation reformatting

Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java?rev=645556&r1=645555&r2=645556&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java Mon Apr  7 08:12:28 2008
@@ -85,7 +85,7 @@
      * to the current context
      * @param entries the set of local entries to be set
      */
-    public void setContextEntries(Map entries);
+    public void setContextEntries(Map<String, Object> entries);
 
     /**
      * Return the main sequence from the configuration, or the local message context
@@ -171,25 +171,46 @@
     public void setEnvelope(SOAPEnvelope envelope) throws AxisFault;
 
     // --- SOAP Message related methods ------
-    /** Get the faultTo EPR if available */
+    /**
+     * Get the faultTo EPR if available
+     * @return FaultTo epr if available
+     */
     public EndpointReference getFaultTo();
 
-    /** Set the faultTo EPR */
+    /**
+     * Set the faultTo EPR
+     * @param reference epr representing the FaultTo address
+     */
     public void setFaultTo(EndpointReference reference);
 
-    /** Get the from EPR if available */
+    /**
+     * Get the from EPR if available
+     * @return From epr if available
+     */
     public EndpointReference getFrom();
 
-    /** Set the from EPR */
+    /**
+     * Set the from EPR
+     * @param reference epr representing the From address
+     */
     public void setFrom(EndpointReference reference);
 
-    /** Get the message id if available */
+    /**
+     * Get the message id if available
+     * @return message id if available
+     */
     public String getMessageID();
 
-    /** Set the message id */
+    /**
+     * Set the message id
+     * @param string message id to be set
+     */
     public void setMessageID(String string);
 
-    /** Get the relatesTo of this message */
+    /**
+     * Get the relatesTo of this message
+     * @return RelatesTo of the message if available
+     */
     public RelatesTo getRelatesTo();
 
     /**
@@ -198,13 +219,22 @@
      */
     public void setRelatesTo(RelatesTo[] reference);
 
-    /** Set the replyTo EPR */
+    /**
+     * Get the replyTo EPR if available
+     * @return ReplyTo epr of the message if available
+     */
     public EndpointReference getReplyTo();
 
-    /** Get the replyTo EPR if available */
+    /**
+     * Set the replyTo EPR
+     * @param reference epr representing the ReplyTo address
+     */
     public void setReplyTo(EndpointReference reference);
 
-    /** Get the To EPR */
+    /**
+     * Get the To EPR
+     * @return To epr of the message if available
+     */
     public EndpointReference getTo();
 
      /**
@@ -238,8 +268,8 @@
     public void setSoapAction(String string);
 
     /**
-     * Set the message if
-     * @param messageID
+     * Set the message
+     * @param messageID message id to be set
      */
     public void setWSAMessageID(String messageID);
 

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?rev=645556&r1=645555&r2=645556&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java Mon Apr  7 08:12:28 2008
@@ -48,8 +48,6 @@
  */
 public class Axis2MessageContext implements MessageContext {
 
-    private static final Log log = LogFactory.getLog(Axis2MessageContext.class);
-
     /** Holds the reference to the Synapse Message Context */
     private SynapseConfiguration synCfg = null;
 
@@ -103,7 +101,7 @@
         return localEntries;
     }
 
-    public void setContextEntries(Map entries) {
+    public void setContextEntries(Map<String, Object> entries) {
         this.localEntries = entries;
     }
 
@@ -332,10 +330,8 @@
 
     public boolean isResponse() {
         Object o = properties.get(SynapseConstants.RESPONSE);
-        if (o != null && o instanceof String && ((String) o).equalsIgnoreCase("true")) {
-            return true;
-        }
-        return response;
+        return o != null && o instanceof String &&
+                ((String) o).equalsIgnoreCase("true") || response;
     }
 
     public void setFaultResponse(boolean b) {