svn commit: r513681 - in /incubator/cxf/trunk/rt/transports/http2/src: main/java/org/apache/cxf/transport/http/HTTPConduit.java test/java/org/apache/cxf/transport/http/HTTPConduitTest.java

[ningjiang]

Author: ningjiang
Date: Fri Mar  2 01:50:28 2007
New Revision: 513681

URL: http://svn.apache.org/viewvc?view=rev&rev=513681
Log:
[CXF-343] update the HTTPConduit to use AbstractHTTPConduit's constants

Modified:
    
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/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=513681&r1=513680&r2=513681
==============================================================================
--- 
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 Mar  2 01:50:28 2007
@@ -65,9 +65,7 @@
 /**
  * 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 class HTTPConduit extends AbstractConduit implements Configurable {   
     public static final String HTTP_CONNECTION = "http.connection";
     private static final Logger LOG = LogUtils.getL7dLogger(HTTPConduit.class);
     
@@ -674,8 +672,8 @@
             inMessage.put(Message.RESPONSE_CODE, HttpURLConnection.HTTP_OK);
 
             // remove server-specific properties
-            inMessage.remove(HTTP_REQUEST);
-            inMessage.remove(HTTP_RESPONSE);
+            inMessage.remove(AbstractHTTPDestination.HTTP_REQUEST);
+            inMessage.remove(AbstractHTTPDestination.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=513681&r1=513680&r2=513681
==============================================================================
--- 
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 Mar  2 01:50:28 2007
@@ -233,7 +233,7 @@
                                               connectionFactory);
         conduit.retrieveConnectionFactory();
 
-        //HTTPConduitConfigBean config = conduit.getConfig();
+        
         if (send) {
             conduit.getClient().setConnectionTimeout(303030);
             conduit.getClient().setReceiveTimeout(404040);
@@ -395,10 +395,10 @@
                      inMessage.get(DECOUPLED_CHANNEL_MESSAGE));
         assertEquals("unexpected HTTP_REQUEST set",
                      false,
-                     inMessage.containsKey(HTTPConduit.HTTP_REQUEST));
+                     
inMessage.containsKey(AbstractHTTPDestination.HTTP_REQUEST));
         assertEquals("unexpected HTTP_RESPONSE set",
                      false,
-                     inMessage.containsKey(HTTPConduit.HTTP_RESPONSE));
+                     
inMessage.containsKey(AbstractHTTPDestination.HTTP_RESPONSE));
         assertEquals("unexpected Message.ASYNC_POST_RESPONSE_DISPATCH set",
                      false,
                      
inMessage.containsKey(Message.ASYNC_POST_RESPONSE_DISPATCH));