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

[ogusakov]

Author: ogusakov
Date: Mon Sep 29 17:09:59 2008
New Revision: 700312

URL: http://svn.apache.org/viewvc?rev=700312&view=rev
Log:
changes to accomodate ITs for mercury wagon: added userAgent, more debugging 
info

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/SecureSender.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=700312&r1=700311&r2=700312&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
 Mon Sep 29 17:09:59 2008
@@ -18,6 +18,7 @@
  */
 package org.apache.maven.mercury.transport.api;
 
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Set;
 
@@ -44,10 +45,26 @@
   private Set<StreamVerifierFactory>  readerStreamVerifierFactories;
   
   private String                      userAgent;
-
+  
   public Server( String id, URL url )
   {
-    this.url = url;
+    if( url == null )
+      throw new IllegalArgumentException( "URL: "+url );
+    
+    String ustr = url.toString();
+    
+    if( ustr.endsWith( "/" ) )
+      try
+      {
+        this.url = new URL( ustr.substring( 0, ustr.length()-1 ) );
+      }
+      catch( MalformedURLException e )
+      {
+        throw new IllegalArgumentException( e.getMessage() );
+      }
+    else
+      this.url = url;
+    
     this.id = id;
   }
 

Modified: 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.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/SecureSender.java?rev=700312&r1=700311&r2=700312&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java
 (original)
+++ 
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java
 Mon Sep 29 17:09:59 2008
@@ -29,6 +29,8 @@
 import org.mortbay.jetty.client.HttpDestination;
 import org.mortbay.jetty.client.HttpExchange;
 import org.mortbay.jetty.client.security.ProxyAuthorization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * SecureSender
@@ -42,7 +44,9 @@
  */
 public class SecureSender
 {
-    public static void send (Server server, HttpClient httpClient, 
HttpExchange exchange)
+  private static final Logger _log = LoggerFactory.getLogger( 
SecureSender.class );
+
+  public static void send (Server server, HttpClient httpClient, HttpExchange 
exchange)
     throws Exception
     {
         if (server != null && server.hasProxy() && (server.getProxy() != null))
@@ -61,10 +65,14 @@
             }
             InetSocketAddress proxyAddress = new InetSocketAddress(host,port);
             HttpDestination destination = 
httpClient.getDestination(exchange.getAddress(), ssl);  
-            
-            System.err.println("Matched destination "+destination);
+            if( _log.isDebugEnabled() )
+              _log.debug("Matched destination "+destination);
+
             destination.setProxy(proxyAddress);
-            System.err.println("Set proxy "+host+":"+port+" on destination");
+            if( _log.isDebugEnabled() )
+              _log.debug("Set proxy "+host+":"+port+" on destination");
+_log.info("Set proxy "+host+":"+port+" on destination");
+System.out.println("Set proxy "+host+":"+port+" on destination");
             
             //set up authentication for the proxy
             Credentials proxyCredentials = server.getProxyCredentials();
@@ -76,7 +84,8 @@
                 else
                 {
                     destination.setProxyAuthentication(new ProxyAuthorization 
(proxyCredentials.getUser(), proxyCredentials.getPass()));
-                    System.err.println("Set proxy authentication: 
"+proxyCredentials.getUser()+":"+proxyCredentials.getPass());
+                    if( _log.isDebugEnabled() )
+                      _log.debug( "Set proxy authentication: 
"+proxyCredentials.getUser()+":"+proxyCredentials.getPass());
                 }
             }
             destination.send(exchange);