Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1895] upgrade to wagon 2.8

This commit is contained in:
Olivier Lamy 2015-07-22 21:36:48 +10:00
parent 01f9aad617
commit 73d92ab376
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
View File

@ -33,6 +33,7 @@ import org.apache.archiva.configuration.WebappConfiguration;
import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.http.impl.conn.PoolingClientConnectionManager; import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.maven.wagon.providers.http.HttpWagon; import org.apache.maven.wagon.providers.http.HttpWagon;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -51,7 +52,7 @@ public class DefaultArchivaAdministration
implements ArchivaAdministration implements ArchivaAdministration
{ {
private PoolingClientConnectionManager poolingClientConnectionManager; private PoolingHttpClientConnectionManager poolingClientConnectionManager;
@PostConstruct @PostConstruct
public void initialize() public void initialize()
@ -413,20 +414,20 @@ public class DefaultArchivaAdministration
if ( networkConfiguration == null ) if ( networkConfiguration == null )
{ {
// back to default values // back to default values
HttpWagon.setUseClientManagerPooled( true ); HttpWagon.setPersistentPool( true );
poolingClientConnectionManager = new PoolingClientConnectionManager(); poolingClientConnectionManager = new PoolingHttpClientConnectionManager();
poolingClientConnectionManager.setDefaultMaxPerRoute( 30 ); poolingClientConnectionManager.setDefaultMaxPerRoute( 30 );
poolingClientConnectionManager.setMaxTotal( 30 ); poolingClientConnectionManager.setMaxTotal( 30 );
HttpWagon.setConnectionManagerPooled( poolingClientConnectionManager ); HttpWagon.setPoolingHttpClientConnectionManager( poolingClientConnectionManager );
} }
else else
{ {
HttpWagon.setUseClientManagerPooled( networkConfiguration.isUsePooling() ); HttpWagon.setPersistentPool( networkConfiguration.isUsePooling() );
poolingClientConnectionManager = new PoolingClientConnectionManager(); poolingClientConnectionManager = new PoolingHttpClientConnectionManager();
poolingClientConnectionManager.setDefaultMaxPerRoute( networkConfiguration.getMaxTotalPerHost() ); poolingClientConnectionManager.setDefaultMaxPerRoute( networkConfiguration.getMaxTotalPerHost() );
poolingClientConnectionManager.setMaxTotal( networkConfiguration.getMaxTotal() ); poolingClientConnectionManager.setMaxTotal( networkConfiguration.getMaxTotal() );
HttpWagon.setConnectionManagerPooled( poolingClientConnectionManager ); HttpWagon.setPoolingHttpClientConnectionManager( poolingClientConnectionManager );
} }
} }

2
pom.xml
View File

@ -63,7 +63,7 @@
<maven-model-converter.version>2.1</maven-model-converter.version> <maven-model-converter.version>2.1</maven-model-converter.version>
<maven.indexer.version>5.1.1</maven.indexer.version> <maven.indexer.version>5.1.1</maven.indexer.version>
<wagon.version>2.5</wagon.version> <wagon.version>2.9</wagon.version>
<redback.version>2.4-SNAPSHOT</redback.version> <redback.version>2.4-SNAPSHOT</redback.version>
<redback.cache.version>2.2</redback.cache.version> <redback.cache.version>2.2</redback.cache.version>
<redback.quartz.version>2.1</redback.quartz.version> <redback.quartz.version>2.1</redback.quartz.version>