svn commit: r699180 - in /maven/sandbox/trunk/mercury/mercury-transport: mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/ mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/ mercury-transport...

[ogusakov]

Author: ogusakov
Date: Thu Sep 25 22:19:03 2008
New Revision: 699180

URL: http://svn.apache.org/viewvc?rev=699180&view=rev
Log:
added user agent configuration to jetty transport

Modified:
    
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
    
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
    
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java

Modified: 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java?rev=699180&r1=699179&r2=699180&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
 (original)
+++ 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Server.java
 Thu Sep 25 22:19:03 2008
@@ -42,6 +42,8 @@
 
   private Set<StreamVerifierFactory>  writerStreamVerifierFactories;
   private Set<StreamVerifierFactory>  readerStreamVerifierFactories;
+  
+  private String                      userAgent;
 
   public Server( String id, URL url )
   {
@@ -80,6 +82,21 @@
     return id;
   }
 
+  public boolean hasUserAgent()
+  {
+    return userAgent != null;
+  }
+
+  public String getUserAgent()
+  {
+    return userAgent;
+  }
+
+  public void setUserAgent( String userAgent )
+  {
+    this.userAgent = userAgent;
+  }
+
   public void setURL( URL url )
   {
     this.url = url;

Modified: 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java?rev=699180&r1=699179&r2=699180&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
 (original)
+++ 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
 Thu Sep 25 22:19:03 2008
@@ -35,6 +35,7 @@
 import org.apache.maven.mercury.spi.http.validate.Validator;
 import org.apache.maven.mercury.transport.api.Binding;
 import org.apache.maven.mercury.transport.api.Server;
+import org.mortbay.jetty.HttpHeaders;
 import org.mortbay.jetty.client.HttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -226,7 +227,12 @@
                 updateState( e );
             }
         };
+
+        if( _server != null && _server.hasUserAgent() )
+          fileExchange.setRequestHeader( HttpHeaders.USER_AGENT, 
_server.getUserAgent() );
+
         _targetState.requested();
+        
         fileExchange.send();
     }
 
@@ -282,6 +288,10 @@
                 updateState( e );
             }
         };
+
+        if( _server != null && _server.hasUserAgent() )
+          checksumExchange.setRequestHeader( HttpHeaders.USER_AGENT, 
_server.getUserAgent() );
+
         _checksumState.requested();
         checksumExchange.send();
     }

Modified: 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java?rev=699180&r1=699179&r2=699180&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
 (original)
+++ 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
 Thu Sep 25 22:19:03 2008
@@ -41,6 +41,7 @@
 import org.apache.maven.mercury.spi.http.validate.Validator;
 import org.apache.maven.mercury.transport.api.Binding;
 import org.apache.maven.mercury.transport.api.Server;
+import org.mortbay.jetty.HttpHeaders;
 import org.mortbay.jetty.client.HttpExchange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -451,6 +452,10 @@
                 updateTargetState( __READY_STATE, e );
             }
         };
+
+        if( _server != null && _server.hasUserAgent() )
+          exchange.setRequestHeader( HttpHeaders.USER_AGENT, 
_server.getUserAgent() );
+
         exchange.send();
         return exchange;
     }