Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 83540 invoked from network); 9 Feb 2007 10:21:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Feb 2007 10:21:48 -0000 Received: (qmail 89567 invoked by uid 500); 9 Feb 2007 10:21:55 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 89503 invoked by uid 500); 9 Feb 2007 10:21:55 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 89493 invoked by uid 99); 9 Feb 2007 10:21:55 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2007 02:21:55 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2007 02:21:47 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 206441A981D; Fri, 9 Feb 2007 02:21:27 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r505240 - in /incubator/cxf/trunk/rt/transports: http/src/main/java/org/apache/cxf/transport/http/ http/src/test/java/org/apache/cxf/transport/http/ http2/src/main/java/org/apache/cxf/transport/http/ http2/src/test/java/org/apache/cxf/trans... Date: Fri, 09 Feb 2007 10:21:26 -0000 To: cxf-commits@incubator.apache.org From: ajaypaibir@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070209102127.206441A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ajaypaibir Date: Fri Feb 9 02:21:25 2007 New Revision: 505240 URL: http://svn.apache.org/viewvc?view=rev&rev=505240 Log: CXF-415 Decoupled endpoint observer should not insert HttpRequest, HttpResponse instances into Message Context Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev=505240&r1=505239&r2=505240 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Fri Feb 9 02:21:25 2007 @@ -65,7 +65,8 @@ * HTTP Conduit implementation. */ public class HTTPConduit extends AbstractConduit implements Configurable { - + public static final String HTTP_REQUEST = "org.apache.cxf.transport.http.JettyHTTPDestination.REQUEST"; + public static final String HTTP_RESPONSE = "org.apache.cxf.transport.http.JettyHTTPDestination.RESPONSE"; public static final String HTTP_CONNECTION = "http.connection"; private static final Logger LOG = LogUtils.getL7dLogger(HTTPConduit.class); @@ -674,6 +675,12 @@ //inMessage.put(Message.PROTOCOL_HEADERS, req.getXXX()); setHeaders(inMessage); inMessage.put(Message.RESPONSE_CODE, HttpURLConnection.HTTP_OK); + + // remove server-specific properties + inMessage.remove(HTTP_REQUEST); + inMessage.remove(HTTP_RESPONSE); + inMessage.remove(Message.ASYNC_POST_RESPONSE_DISPATCH); + incomingObserver.onMessage(inMessage); } } Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java?view=diff&rev=505240&r1=505239&r2=505240 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java Fri Feb 9 02:21:25 2007 @@ -388,6 +388,15 @@ assertEquals("expected DECOUPLED_CHANNEL_MESSAGE flag set", Boolean.TRUE, inMessage.get(DECOUPLED_CHANNEL_MESSAGE)); + assertEquals("unexpected HTTP_REQUEST set", + false, + inMessage.containsKey(HTTPConduit.HTTP_REQUEST)); + assertEquals("unexpected HTTP_RESPONSE set", + false, + inMessage.containsKey(HTTPConduit.HTTP_RESPONSE)); + assertEquals("unexpected Message.ASYNC_POST_RESPONSE_DISPATCH set", + false, + inMessage.containsKey(Message.ASYNC_POST_RESPONSE_DISPATCH)); } private void finalVerify() { Modified: incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev=505240&r1=505239&r2=505240 ============================================================================== --- incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Fri Feb 9 02:21:25 2007 @@ -66,7 +66,8 @@ * HTTP Conduit implementation. */ public class HTTPConduit extends AbstractConduit { - + public static final String HTTP_REQUEST = "org.apache.cxf.transport.http.JettyHTTPDestination.REQUEST"; + public static final String HTTP_RESPONSE = "org.apache.cxf.transport.http.JettyHTTPDestination.RESPONSE"; public static final String HTTP_CONNECTION = "http.connection"; private static final Logger LOG = LogUtils.getL7dLogger(HTTPConduit.class); @@ -644,6 +645,12 @@ //inMessage.put(Message.PROTOCOL_HEADERS, req.getXXX()); setHeaders(inMessage); inMessage.put(Message.RESPONSE_CODE, HttpURLConnection.HTTP_OK); + + // remove server-specific properties + inMessage.remove(HTTP_REQUEST); + inMessage.remove(HTTP_RESPONSE); + inMessage.remove(Message.ASYNC_POST_RESPONSE_DISPATCH); + incomingObserver.onMessage(inMessage); } } Modified: incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java?view=diff&rev=505240&r1=505239&r2=505240 ============================================================================== --- incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java (original) +++ incubator/cxf/trunk/rt/transports/http2/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java Fri Feb 9 02:21:25 2007 @@ -394,6 +394,15 @@ assertEquals("expected DECOUPLED_CHANNEL_MESSAGE flag set", Boolean.TRUE, inMessage.get(DECOUPLED_CHANNEL_MESSAGE)); + assertEquals("unexpected HTTP_REQUEST set", + false, + inMessage.containsKey(HTTPConduit.HTTP_REQUEST)); + assertEquals("unexpected HTTP_RESPONSE set", + false, + inMessage.containsKey(HTTPConduit.HTTP_RESPONSE)); + assertEquals("unexpected Message.ASYNC_POST_RESPONSE_DISPATCH set", + false, + inMessage.containsKey(Message.ASYNC_POST_RESPONSE_DISPATCH)); } private void finalVerify() {