svn commit: r1177655 - in /archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src: main/java/org/apache/archiva/admin/repository/admin/ test/java/org/apache/archiva/admin/repository/admin/

[olamy]

Author: olamy
Date: Fri Sep 30 13:37:30 2011
New Revision: 1177655

URL: http://svn.apache.org/viewvc?rev=1177655&view=rev
Log:
[MRM-1526] configure http connection pool values for wagon http : configure 
wagon on Archiva start

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java?rev=1177655&r1=1177654&r2=1177655&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
 Fri Sep 30 13:37:30 2011
@@ -37,6 +37,7 @@ import org.apache.http.impl.conn.tsccm.T
 import org.apache.maven.wagon.providers.http.HttpWagon;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -49,6 +50,17 @@ public class DefaultArchivaAdministratio
     extends AbstractRepositoryAdmin
     implements ArchivaAdministration
 {
+
+    @PostConstruct
+    public void initialize()
+        throws RepositoryAdminException
+    {
+        // setup wagon on start with initial values
+        NetworkConfiguration networkConfiguration = getNetworkConfiguration();
+        setupWagon( networkConfiguration );
+    }
+
+
     public List<LegacyArtifactPath> getLegacyArtifactPaths()
         throws RepositoryAdminException
     {
@@ -345,6 +357,20 @@ public class DefaultArchivaAdministratio
         if ( networkConfiguration == null )
         {
             configuration.setNetworkConfiguration( null );
+        }
+        else
+        {
+            configuration.setNetworkConfiguration( new 
BeanReplicator().replicateBean( networkConfiguration,
+                                                                               
        org.apache.archiva.configuration.NetworkConfiguration.class ) );
+        }
+        setupWagon( networkConfiguration );
+        saveConfiguration( configuration );
+    }
+
+    protected void setupWagon( NetworkConfiguration networkConfiguration )
+    {
+        if ( networkConfiguration == null )
+        {
             // back to default values
             HttpWagon.setUseClientManagerPooled( true );
             ThreadSafeClientConnManager threadSafeClientConnManager = new 
ThreadSafeClientConnManager();
@@ -360,10 +386,7 @@ public class DefaultArchivaAdministratio
             threadSafeClientConnManager.setDefaultMaxPerRoute( 
networkConfiguration.getMaxTotalPerHost() );
             threadSafeClientConnManager.setMaxTotal( 
networkConfiguration.getMaxTotal() );
             HttpWagon.setConnectionManagerPooled( threadSafeClientConnManager 
);
-            configuration.setNetworkConfiguration( new 
BeanReplicator().replicateBean( networkConfiguration,
-                                                                               
        org.apache.archiva.configuration.NetworkConfiguration.class ) );
         }
-        saveConfiguration( configuration );
     }
 
     //-------------------------

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java?rev=1177655&r1=1177654&r2=1177655&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
 Fri Sep 30 13:37:30 2011
@@ -27,9 +27,11 @@ import org.apache.archiva.admin.model.be
 import org.apache.archiva.admin.model.beans.UiConfiguration;
 import org.apache.archiva.admin.repository.AbstractRepositoryAdminTest;
 import org.apache.archiva.audit.AuditEvent;
+import org.apache.maven.wagon.providers.http.HttpWagon;
 import org.junit.Test;
 
 import javax.inject.Inject;
+import java.lang.reflect.Field;
 import java.util.Arrays;
 
 /**
@@ -231,5 +233,6 @@ public class ArchivaAdministrationTest
         assertTrue( networkConfiguration.isUsePooling() );
         assertEquals( 30, networkConfiguration.getMaxTotal() );
         assertEquals( 30, networkConfiguration.getMaxTotalPerHost() );
+
     }
 }