Author: dkulp
Date: Wed Apr 1 18:19:39 2009
New Revision: 760995
URL: http://svn.apache.org/viewvc?rev=760995&view=rev
Log:
Merged revisions 760198 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r760198 | ericjohnson | 2009-03-30 17:56:25 -0400 (Mon, 30 Mar 2009) | 1 line
added some javadoc comments
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Attachment.java
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Exchange.java
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 1 18:19:39 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,760456,760468
+/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,760456,760468
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/Attachment.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Attachment.java?rev=760995&r1=760994&r2=760995&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Attachment.java
(original)
+++
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Attachment.java
Wed Apr 1 18:19:39 2009
@@ -43,7 +43,7 @@
* serialization of the attachment. If true, it will be serialized
* as binary data, and not Base64Binary.
*
- * @return true iff this attachment is an XOP package
+ * @return true if this attachment is an XOP package
*/
boolean isXOP();
}
Modified:
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Exchange.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Exchange.java?rev=760995&r1=760994&r2=760995&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Exchange.java
(original)
+++
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/message/Exchange.java
Wed Apr 1 18:19:39 2009
@@ -24,9 +24,23 @@
import org.apache.cxf.transport.Session;
public interface Exchange extends StringMap {
+
+ /**
+ * Returns the inbound message for the exchange. On the client-side, this
+ * is the response. On the server-side, this is the request.
+ *
+ * @return the inboubnd message
+ */
Message getInMessage();
void setInMessage(Message m);
+ /**
+ * Returns the outbound message for the exchange. On the client-side, this
+ * is the request. On the server-side, this is the response. During the
+ * inbound message processing, the outbound message is null.
+ *
+ * @return the outbound message
+ */
Message getOutMessage();
void setOutMessage(Message m);
@@ -60,14 +74,18 @@
void setConduit(Conduit conduit);
/**
+ * Determines if the exchange is one-way.
+ *
* @return true if the exchange is known to be a one-way exchange
*/
boolean isOneWay();
/**
- * @return true if the frontend will be wait for the response. Transports
- * can then optimize themselves to process the response immediately
instead
- * of using a background thread or similar.
+ * Determines if the exchange requires the frontend to wait for a
+ * response. Transports can then optimize themselves to process the
+ * response immediately instead of using a background thread or similar.
+ *
+ * @return true if the frontend will wait for the response
*/
boolean isSynchronous();
void setSynchronous(boolean b);
@@ -78,5 +96,8 @@
*/
void setOneWay(boolean b);
+ /**
+ * {...@inheritdoc}
+ */
void clear();
}
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=760995&r1=760994&r2=760995&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
Wed Apr 1 18:19:39 2009
@@ -93,6 +93,11 @@
void setExchange(Exchange exchange);
+ /**
+ * Retrieve any binary attachments associated with the message.
+ *
+ * @return a collection containing the attachments
+ */
Collection<Attachment> getAttachments();
void setAttachments(Collection<Attachment> attachments);
