You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/12/13 14:05:59 UTC
svn commit: r1421277 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/message/
api/src/main/java/org/apache/cxf/ws/addressing/
rt/transports/http/src/main/java/org/apache/cxf/transport/http/
rt/transports/http/src/test/java/org/apache/cxf/transport/ht...
Author: ay
Date: Thu Dec 13 13:05:57 2012
New Revision: 1421277
URL: http://svn.apache.org/viewvc?rev=1421277&view=rev
Log:
fix the constant name added in CXF-4248
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java?rev=1421277&r1=1421276&r2=1421277&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/message/Message.java Thu Dec 13 13:05:57 2012
@@ -79,8 +79,12 @@ public interface Message extends StringM
/**
* Boolean property specifying if oneWay response must be processed.
*/
- String PROCESS_ONEWAY_REPONSE = "org.apache.cxf.transport.processOneWayResponse";
+ String PROCESS_ONEWAY_RESPONSE = "org.apache.cxf.transport.processOneWayResponse";
+ /**
+ * @deprecated use PROCESS_ONEWAY_RESPONSE
+ */
+ String PROCESS_ONEWAY_REPONSE = PROCESS_ONEWAY_RESPONSE;
String ROBUST_ONEWAY = "org.apache.cxf.oneway.robust";
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1421277&r1=1421276&r2=1421277&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Thu Dec 13 13:05:57 2012
@@ -93,7 +93,7 @@ public final class ContextUtils {
/**
* Indicates a partial response has already been sent
*/
- private static final String PARTIAL_REPONSE_SENT_PROPERTY =
+ private static final String PARTIAL_RESPONSE_SENT_PROPERTY =
"org.apache.cxf.ws.addressing.partial.response.sent";
/**
@@ -437,7 +437,7 @@ public final class ContextUtils {
* @param message the current message
*/
public static void storePartialResponseSent(Message message) {
- message.put(PARTIAL_REPONSE_SENT_PROPERTY, Boolean.TRUE);
+ message.put(PARTIAL_RESPONSE_SENT_PROPERTY, Boolean.TRUE);
}
/**
@@ -448,7 +448,7 @@ public final class ContextUtils {
* has been sent
*/
public static boolean retrievePartialResponseSent(Message message) {
- Boolean ret = (Boolean)message.get(PARTIAL_REPONSE_SENT_PROPERTY);
+ Boolean ret = (Boolean)message.get(PARTIAL_RESPONSE_SENT_PROPERTY);
return ret != null && ret.booleanValue();
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1421277&r1=1421276&r2=1421277&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Dec 13 13:05:57 2012
@@ -1507,7 +1507,7 @@ public abstract class HTTPConduit
return true;
}
// 2. Context property
- return MessageUtils.getContextualBoolean(message, Message.PROCESS_ONEWAY_REPONSE, false);
+ return MessageUtils.getContextualBoolean(message, Message.PROCESS_ONEWAY_RESPONSE, false);
}
protected void handleResponseInternal() throws IOException {
Modified: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java?rev=1421277&r1=1421276&r2=1421277&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java (original)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java Thu Dec 13 13:05:57 2012
@@ -218,7 +218,7 @@ public class HTTPConduitURLEasyMockTest
HTTPConduit conduit = setUpConduit(true, false);
Message message = new MessageImpl();
conduit.prepare(message);
- message.put(Message.PROCESS_ONEWAY_REPONSE, Boolean.TRUE);
+ message.put(Message.PROCESS_ONEWAY_RESPONSE, Boolean.TRUE);
verifySentMessage(conduit,
message,
ResponseStyle.NONE,
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java?rev=1421277&r1=1421276&r2=1421277&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Thu Dec 13 13:05:57 2012
@@ -119,7 +119,7 @@ public class RMOutInterceptor extends Ab
// Activate process response for oneWay
if (msg.getExchange().isOneWay()) {
- msg.getExchange().put(Message.PROCESS_ONEWAY_REPONSE, true);
+ msg.getExchange().put(Message.PROCESS_ONEWAY_RESPONSE, true);
}
RMProperties rmpsIn = null;