svn commit: r680917 - /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java

[brett]

Author: brett
Date: Tue Jul 29 23:19:23 2008
New Revision: 680917

URL: http://svn.apache.org/viewvc?rev=680917&view=rev
Log:
add proxy logging in debug mode

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=680917&r1=680916&r2=680917&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
 Tue Jul 29 23:19:23 2008
@@ -980,32 +980,48 @@
         {
             networkProxy = (ProxyInfo) this.networkProxyMap.get( 
connector.getProxyId() );
         }
+        
+        if ( log.isDebugEnabled() )
+        {            
+            if ( networkProxy != null )
+            {
+                // TODO: move to proxyInfo.toString()
+                String msg =
+                    "Using network proxy " + networkProxy.getHost() + ":" + 
networkProxy.getPort()
+                        + " to connect to remote repository " + 
remoteRepository.getURL();
+                if ( networkProxy.getNonProxyHosts() != null )
+                {
+                    msg += "; excluding hosts: " + 
networkProxy.getNonProxyHosts();
+                }
+                if ( StringUtils.isNotBlank( networkProxy.getUserName() ) )
+                {
+                    msg += "; as user: " + networkProxy.getUserName();
+                }
+                log.debug( msg );
+            }
+        }
 
-        try
-        {
-            AuthenticationInfo authInfo = null;
-            String username = remoteRepository.getRepository().getUsername();
-            String password = remoteRepository.getRepository().getPassword();
+        AuthenticationInfo authInfo = null;
+        String username = remoteRepository.getRepository().getUsername();
+        String password = remoteRepository.getRepository().getPassword();
 
-            if ( StringUtils.isNotBlank( username ) && StringUtils.isNotBlank( 
password ) )
-            {
-                log.debug( "Using username " + username + " to connect to 
remote repository "
-                                       + remoteRepository.getURL() );
-                authInfo = new AuthenticationInfo();
-                authInfo.setUserName( username );
-                authInfo.setPassword( password );
-            }
-            else
-            {
-                log.debug( "No authentication for remote repository needed" );
-            }
+        if ( StringUtils.isNotBlank( username ) && StringUtils.isNotBlank( 
password ) )
+        {
+            log.debug( "Using username " + username + " to connect to remote 
repository "
+                + remoteRepository.getURL() );
+            authInfo = new AuthenticationInfo();
+            authInfo.setUserName( username );
+            authInfo.setPassword( password );
+        }
 
-            //Convert seconds to milliseconds
-            int timeoutInMilliseconds = 
remoteRepository.getRepository().getTimeout() * 1000;
+        //Convert seconds to milliseconds
+        int timeoutInMilliseconds = 
remoteRepository.getRepository().getTimeout() * 1000;
 
-            //Set timeout
-            wagon.setTimeout(timeoutInMilliseconds);
+        //Set timeout
+        wagon.setTimeout(timeoutInMilliseconds);
 
+        try
+        {
             Repository wagonRepository = new Repository( 
remoteRepository.getId(), remoteRepository.getURL().toString() );
             wagon.connect( wagonRepository, authInfo, networkProxy );
             connected = true;