Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r764035 - in /cxf/branches/2.1.x-fixes: ./
 api/src/main/java/org/apache/cxf/message/Message.java
 rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Date: Fri, 10 Apr 2009 20:26:46 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20090410202646.C057A23889BB@eris.apache.org>

Author: dkulp
Date: Fri Apr 10 20:26:46 2009
New Revision: 764035

URL: http://svn.apache.org/viewvc?rev=764035&view=rev
Log:
Merged revisions 761094 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r761094 | ericjohnson | 2009-04-01 18:28:01 -0400 (Wed, 01 Apr 2009) | 1 line
  
  added comments to identify what some of the message properties mean.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java
    cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 20:26:46 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761759,761789,762393
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761759,761789,762393

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java?rev=764035&r1=764034&r2=764035&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java (original)
+++ cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java Fri Apr 10 20:26:46 2009
@@ -31,17 +31,40 @@
  */
 public interface Message extends StringMap {
     
-    String TRANSPORT = "org.apache.cxf.transport";    
+    String TRANSPORT = "org.apache.cxf.transport";
+
+    /**
+     * Boolean property specifying if the message is a request message.
+     */
     String REQUESTOR_ROLE = "org.apache.cxf.client";
 
+    /**
+     * Boolean property specifying if the message is inbound.
+     */
     String INBOUND_MESSAGE = "org.apache.cxf.message.inbound";
+    
+    /**
+     * A Map keyed by a string that stores optional context information 
+     * associated with the invocation that spawned the message.
+     */
     String INVOCATION_CONTEXT = "org.apache.cxf.invocation.context";
     
+    /**
+     * A Map containing the MIME headers for a SOAP message.
+     */
     String MIME_HEADERS = "org.apache.cxf.mime.headers";
     
+    /**
+     * Boolean property specifying if the server should send the response 
+     * asynchronously.
+     */
     String ASYNC_POST_RESPONSE_DISPATCH =
         "org.apache.cxf.async.post.response.dispatch";
 
+    /**
+     * Boolean property specifying if this message arrived via a 
+     * decoupled endpoint.
+     */
     String DECOUPLED_CHANNEL_MESSAGE = "decoupled.channel.message";
     String PARTIAL_RESPONSE_MESSAGE = "org.apache.cxf.partial.response";
     
@@ -52,6 +75,11 @@
     String PATH_INFO = Message.class.getName() + ".PATH_INFO";
     String REQUEST_URI = Message.class.getName() + ".REQUEST_URI";
     String QUERY_STRING = Message.class.getName() + ".QUERY_STRING";
+
+    /**
+     * Boolean property specifying in the runtime is configured to process 
+     * MTOM attachments.
+     */
     String MTOM_ENABLED = "mtom-enabled";
     String MTOM_THRESHOLD = "mtom-threshold";
     String SCHEMA_VALIDATION_ENABLED = "schema-validation-enabled";

Modified: cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=764035&r1=764034&r2=764035&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Fri Apr 10 20:26:46 2009
@@ -143,7 +143,7 @@
     * Determine if current messaging role is that of requestor.
     *
     * @param message the current Message
-    * @return true iff the current messaging role is that of requestor
+    * @return true if the current messaging role is that of requestor
     */
     public static boolean isRequestor(Message message) {
         Boolean requestor = (Boolean)message.get(REQUESTOR_ROLE);
@@ -156,9 +156,9 @@
      * @param isProviderContext true if the binding provider request context 
      * available to the client application as opposed to the message context 
      * visible to handlers
-     * @param isRequestor true iff the current messaging role is that of
+     * @param isRequestor true if the current messaging role is that of
      * requestor
-     * @param isOutbound true iff the message is outbound
+     * @param isOutbound true if the message is outbound
      * @return the property name to use when caching the MAPs in the context
      */
     public static String getMAPProperty(boolean isRequestor, 
@@ -179,7 +179,7 @@
      * Store MAPs in the message.
      *
      * @param message the current message
-     * @param isOutbound true iff the message is outbound
+     * @param isOutbound true if the message is outbound
      */
     public static void storeMAPs(AddressingProperties maps,
                                  Message message,
@@ -192,8 +192,8 @@
      *
      * @param maps the MAPs to store
      * @param message the current message
-     * @param isOutbound true iff the message is outbound
-     * @param isRequestor true iff the current messaging role is that of
+     * @param isOutbound true if the message is outbound
+     * @param isRequestor true if the current messaging role is that of
      * requestor
      * @param handler true if HANDLER scope, APPLICATION scope otherwise
      */
@@ -209,8 +209,8 @@
      *
      * @param maps the MAPs to store
      * @param message the current message
-     * @param isOutbound true iff the message is outbound
-     * @param isRequestor true iff the current messaging role is that of
+     * @param isOutbound true if the message is outbound
+     * @param isRequestor true if the current messaging role is that of
      * requestor
      * @param handler true if HANDLER scope, APPLICATION scope otherwise
      * @param isProviderContext true if the binding provider request context 
@@ -234,7 +234,7 @@
      * @param isProviderContext true if the binding provider request context
      * available to the client application as opposed to the message context
      * visible to handlers
-     * @param isOutbound true iff the message is outbound
+     * @param isOutbound true if the message is outbound
      * @return the current addressing properties
      */
     public static AddressingPropertiesImpl retrieveMAPs(
@@ -249,7 +249,7 @@
      * @param isProviderContext true if the binding provider request context
      * available to the client application as opposed to the message context
      * visible to handlers
-     * @param isOutbound true iff the message is outbound
+     * @param isOutbound true if the message is outbound
      * @param warnIfMissing log a warning  message if properties cannot be retrieved
      * @return the current addressing properties
      */
@@ -308,7 +308,7 @@
      * none or anonymous).
      *
      * @param ref the EPR under test
-     * @return true iff the address is generic
+     * @return true if the address is generic
      */
     public static boolean isGenericAddress(EndpointReferenceType ref) {
         return ref == null 
@@ -320,10 +320,10 @@
     /**
      * Helper method to determine if an MAPs Action is empty (a null action
      * is considered empty, whereas a zero length action suppresses
-     * the propogation of the Action property).
+     * the propagation of the Action property).
      *
      * @param ref the MAPs Action under test
-     * @return true iff the Action is empty
+     * @return true if the Action is empty
      */
     public static boolean hasEmptyAction(AddressingProperties maps) {
         boolean empty = maps.getAction() == null;