svn commit: r1513375 - in /synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru: TargetRequest.java config/TargetConfiguration.java util/TargetRequestFactory.java

[hiranya]

Author: hiranya
Date: Tue Aug 13 07:12:47 2013
New Revision: 1513375

URL: http://svn.apache.org/r1513375
Log:
Using the RequestUserAgent API to set the User-Agent header on outgoing 
messages.

Modified:
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/TargetConfiguration.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/TargetRequestFactory.java

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java?rev=1513375&r1=1513374&r2=1513375&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetRequest.java
 Tue Aug 13 07:12:47 2013
@@ -192,10 +192,8 @@ public class TargetRequest {
                requestMsgCtx.getAxisOperation().getInputAction();
             }
 
-            if (requestMsgCtx.isSOAP11() && soapAction != null &&
-                    soapAction.length() > 0) {
-                Header existingHeader =
-                       
request.getFirstHeader(HTTPConstants.HEADER_SOAP_ACTION);
+            if (requestMsgCtx.isSOAP11() && soapAction != null && 
soapAction.length() > 0) {
+                Header existingHeader = 
request.getFirstHeader(HTTPConstants.HEADER_SOAP_ACTION);
                 if (existingHeader != null) {
                        request.removeHeader(existingHeader);
                 }
@@ -203,7 +201,6 @@ public class TargetRequest {
                     
MessageFormatterDecoratorFactory.createMessageFormatterDecorator(requestMsgCtx);
                 request.setHeader(HTTPConstants.HEADER_SOAP_ACTION,
                         messageFormatter.formatSOAPAction(requestMsgCtx, null, 
soapAction));
-                request.setHeader(HttpHeaders.USER_AGENT, 
"Synapse-PT-HttpComponents-NIO");
             }
        }
 
@@ -216,8 +213,7 @@ public class TargetRequest {
         // Pre-process HTTP request
         HttpContext context = conn.getContext();
         context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
-        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST,
-                new HttpHost(url.getHost(), port));
+        context.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, new 
HttpHost(url.getHost(), port));
         context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
 
         // start the request

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/TargetConfiguration.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/TargetConfiguration.java?rev=1513375&r1=1513374&r2=1513375&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/TargetConfiguration.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/TargetConfiguration.java
 Tue Aug 13 07:12:47 2013
@@ -59,7 +59,7 @@ public class TargetConfiguration extends
                 new RequestContent(),
                 new RequestTargetHost(),
                 new RequestConnControl(),
-                new RequestUserAgent(),
+                new RequestUserAgent("Synapse-PT-HttpComponents-NIO"),
                 new RequestExpectContinue(false));
     }
 

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/TargetRequestFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/TargetRequestFactory.java?rev=1513375&r1=1513374&r2=1513375&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/TargetRequestFactory.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/TargetRequestFactory.java
 Tue Aug 13 07:12:47 2013
@@ -82,7 +82,7 @@ public class TargetRequestFactory {
                         if 
(!HTTPConstants.HEADER_HOST.equalsIgnoreCase((String) entry.getKey())) {
                             request.addHeader((String) entry.getKey(), 
(String) entry.getValue());
                         } else {
-                            if( 
msgContext.getProperty(NhttpConstants.REQUEST_HOST_HEADER) != null) {
+                            if 
(msgContext.getProperty(NhttpConstants.REQUEST_HOST_HEADER) != null) {
                                request.addHeader((String) entry.getKey(),
                                         (String) msgContext.getProperty(
                                                 
NhttpConstants.REQUEST_HOST_HEADER));