Author: ay Date: Thu Dec 13 13:53:37 2012 New Revision: 1421297 URL: http://svn.apache.org/viewvc?rev=1421297&view=rev Log: Merged revisions 1421284 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1421284 | ay | 2012-12-13 14:14:27 +0100 (Thu, 13 Dec 2012) | 9 lines Merged revisions 1421277 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1421277 | ay | 2012-12-13 14:05:57 +0100 (Thu, 13 Dec 2012) | 1 line fix the constant name added in CXF-4248 ........ ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Propchange: cxf/branches/2.5.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java?rev=1421297&r1=1421296&r2=1421297&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java (original) +++ cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/message/Message.java Thu Dec 13 13:53:37 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/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1421297&r1=1421296&r2=1421297&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Dec 13 13:53:37 2012 @@ -1583,7 +1583,7 @@ public 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/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java?rev=1421297&r1=1421296&r2=1421297&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java Thu Dec 13 13:53:37 2012 @@ -217,7 +217,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/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1421297&r1=1421296&r2=1421297&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Thu Dec 13 13:53:37 2012 @@ -115,7 +115,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"; /** @@ -682,7 +682,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); } /** @@ -693,7 +693,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/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java?rev=1421297&r1=1421296&r2=1421297&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java Thu Dec 13 13:53:37 2012 @@ -116,7 +116,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;
