You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/25 00:42:54 UTC
svn commit: r1235559 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-converter/ archiva-base/archiva-proxy-common/
archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/
archiva-base/archiva-proxy-common/src/main/res...
Author: olamy
Date: Tue Jan 24 23:42:53 2012
New Revision: 1235559
URL: http://svn.apache.org/viewvc?rev=1235559&view=rev
Log:
avoid using plexus-sisu bridge to get wagon instances: use now spring
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/META-INF/plexus/components.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/test/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml Tue Jan 24 23:42:53 2012
@@ -58,6 +58,11 @@
<artifactId>plexus-i18n</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/pom.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/pom.xml Tue Jan 24 23:42:53 2012
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
</dependency>
@@ -79,6 +84,8 @@
org.apache.archiva.common.plexusbridge;version=${project.version},
org.apache.commons.lang;version="[2.4,3)",
org.springframework.stereotype;version="[3,4)",
+ org.springframework.context;version="[3,4)",
+ org.springframework.beans;version="[3,4)",
org.apache.maven.wagon*,
org.slf4j;resolution:=optional
</Import-Package>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/DefaultWagonFactory.java Tue Jan 24 23:42:53 2012
@@ -23,6 +23,8 @@ import org.apache.archiva.common.plexusb
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.wagon.Wagon;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
@@ -38,12 +40,15 @@ public class DefaultWagonFactory
private PlexusSisuBridge plexusSisuBridge;
+ private ApplicationContext applicationContext;
+
private DebugTransferListener debugTransferListener = new DebugTransferListener();
@Inject
- public DefaultWagonFactory( PlexusSisuBridge plexusSisuBridge )
+ public DefaultWagonFactory( PlexusSisuBridge plexusSisuBridge, ApplicationContext applicationContext )
{
this.plexusSisuBridge = plexusSisuBridge;
+ this.applicationContext = applicationContext;
}
public Wagon getWagon( String protocol )
@@ -53,12 +58,17 @@ public class DefaultWagonFactory
{
// with sisu inject bridge hint is file or http
// so remove wagon#
- protocol = StringUtils.remove( protocol, "wagon#" );
- Wagon wagon = plexusSisuBridge.lookup( Wagon.class, protocol );
+ //protocol = StringUtils.remove( protocol, "wagon#" );
+ // spring beans will be named wagon#protocol (http, https, file )
+ protocol = StringUtils.startsWith( protocol, "wagon#" ) ? protocol : "wagon#" + protocol;
+ //Wagon wagon = plexusSisuBridge.lookup( Wagon.class, protocol );
+
+ Wagon wagon = applicationContext.getBean( protocol, Wagon.class );
wagon.addTransferListener( debugTransferListener );
return wagon;
}
- catch ( PlexusSisuBridgeException e )
+ //catch ( PlexusSisuBridgeException e )
+ catch ( BeansException e )
{
throw new WagonFactoryException( e.getMessage(), e );
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/resources/META-INF/spring-context.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/resources/META-INF/spring-context.xml Tue Jan 24 23:42:53 2012
@@ -30,5 +30,8 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.proxy.common"/>
+ <bean name="wagon#http" scope="prototype" class="org.apache.maven.wagon.providers.http.HttpWagon"/>
+
+ <bean name="wagon#https" scope="prototype" class="org.apache.maven.wagon.providers.http.HttpWagon"/>
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/test/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/test/resources/META-INF/spring-context.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/test/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/test/resources/META-INF/spring-context.xml Tue Jan 24 23:42:53 2012
@@ -27,4 +27,6 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="true">
+ <bean name="wagon#file" scope="prototype" class="org.apache.maven.wagon.providers.file.FileWagon"/>
+
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/pom.xml Tue Jan 24 23:42:53 2012
@@ -75,6 +75,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
</dependency>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java Tue Jan 24 23:42:53 2012
@@ -1042,8 +1042,8 @@ public class DefaultRepositoryProxyConne
{
boolean connected = false;
- final ProxyInfo networkProxy = this.networkProxyMap.get( connector.getProxyId() );
-
+ final ProxyInfo networkProxy =
+ connector.getProxyId() == null ? null : this.networkProxyMap.get( connector.getProxyId() );
if ( log.isDebugEnabled() )
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java Tue Jan 24 23:42:53 2012
@@ -135,7 +135,7 @@ public abstract class AbstractProxyTestC
protected ManagedRepositoryAdmin managedRepositoryAdmin;
@Inject
- PlexusSisuBridge plexusSisuBridge;
+ protected PlexusSisuBridge plexusSisuBridge;
@Before
public void setUp()
@@ -208,7 +208,7 @@ public abstract class AbstractProxyTestC
wagonMockControl = MockControl.createNiceControl( Wagon.class );
wagonMock = (Wagon) wagonMockControl.getMock();
- delegate = (WagonDelegate) plexusSisuBridge.lookup( Wagon.class, "test" );
+ delegate = (WagonDelegate) applicationContext.getBean( "wagon#test", Wagon.class );
delegate.setDelegate( wagonMock );
@@ -221,7 +221,7 @@ public abstract class AbstractProxyTestC
public void shutdown()
throws Exception
{
- removeMavenIndexes();
+ removeMavenIndexes();
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/WagonDelegate.java Tue Jan 24 23:42:53 2012
@@ -19,10 +19,6 @@ package org.apache.archiva.proxy;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
import org.apache.commons.io.FileUtils;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
@@ -40,16 +36,21 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
/**
* A dummy wagon implementation
- *
*/
-@Service("wagon#test")
+@Service( "wagon#test" )
public class WagonDelegate
implements Wagon
{
private Logger log = LoggerFactory.getLogger( WagonDelegate.class );
-
+
private Wagon delegate;
private String contentToGet;
@@ -90,7 +91,7 @@ public class WagonDelegate
return delegate.resourceExists( resourceName );
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
public List<String> getFileList( String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
@@ -102,15 +103,15 @@ public class WagonDelegate
return delegate.supportsDirectoryCopy();
}
- public void setTimeout(int val)
- {
- // ignore
- }
-
- public int getTimeout()
- {
- return 0;
- }
+ public void setTimeout( int val )
+ {
+ // ignore
+ }
+
+ public int getTimeout()
+ {
+ return 0;
+ }
public Repository getRepository()
{
@@ -153,7 +154,7 @@ public class WagonDelegate
delegate.connect( source, authenticationInfo, proxyInfoProvider );
}
- @SuppressWarnings("deprecation")
+ @SuppressWarnings( "deprecation" )
public void openConnection()
throws ConnectionException, AuthenticationException
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/META-INF/spring-context.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/META-INF/spring-context.xml Tue Jan 24 23:42:53 2012
@@ -27,4 +27,6 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="true">
+
+
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml Tue Jan 24 23:42:53 2012
@@ -80,5 +80,7 @@
<property name="timeToLiveSeconds" value="1800"/>
</bean>
+ <bean name="wagon#test" class="org.apache.archiva.proxy.WagonDelegate" scope="singleton"/>
+ <bean name="wagon#file" scope="prototype" class="org.apache.maven.wagon.providers.file.FileWagon"/>
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml Tue Jan 24 23:42:53 2012
@@ -75,6 +75,11 @@
<groupId>org.apache.archiva</groupId>
<artifactId>maven2-repository</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java Tue Jan 24 23:42:53 2012
@@ -130,7 +130,6 @@ public class DownloadRemoteIndexTask
final Wagon wagon = wagonFactory.getWagon( new URL( this.remoteRepository.getUrl() ).getProtocol() );
setupWagonReadTimeout( wagon );
- // TODO transferListener
wagon.addTransferListener( new DownloadListener() );
ProxyInfo proxyInfo = null;
if ( this.networkProxy != null )
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Tue Jan 24 23:42:53 2012
@@ -63,6 +63,11 @@
<artifactId>archiva-repository-scanner</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-layer</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Tue Jan 24 23:42:53 2012
@@ -100,6 +100,11 @@
<artifactId>wagon-provider-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java?rev=1235559&r1=1235558&r2=1235559&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java Tue Jan 24 23:42:53 2012
@@ -19,20 +19,15 @@ package org.apache.archiva.metadata.repo
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
+import org.apache.archiva.common.utils.VersionUtil;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
import org.apache.archiva.proxy.common.WagonFactory;
import org.apache.archiva.proxy.common.WagonFactoryException;
+import org.apache.archiva.xml.XMLException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.archiva.configuration.RemoteRepositoryConfiguration;
-import org.apache.archiva.xml.XMLException;
import org.apache.maven.model.Repository;
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelSource;
@@ -50,6 +45,11 @@ import org.apache.maven.wagon.proxy.Prox
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
public class RepositoryModelResolver
implements ModelResolver
{
@@ -77,9 +77,10 @@ public class RepositoryModelResolver
this.pathTranslator = pathTranslator;
}
- public RepositoryModelResolver( File basedir, RepositoryPathTranslator pathTranslator,
- WagonFactory wagonFactory, List<RemoteRepositoryConfiguration> remoteRepositories,
- Map<String, ProxyInfo> networkProxiesMap, ManagedRepositoryConfiguration targetRepository )
+ public RepositoryModelResolver( File basedir, RepositoryPathTranslator pathTranslator, WagonFactory wagonFactory,
+ List<RemoteRepositoryConfiguration> remoteRepositories,
+ Map<String, ProxyInfo> networkProxiesMap,
+ ManagedRepositoryConfiguration targetRepository )
{
this( basedir, pathTranslator );
@@ -100,24 +101,25 @@ public class RepositoryModelResolver
File model = pathTranslator.toFile( basedir, groupId, artifactId, version, filename );
- if( !model.exists() )
+ if ( !model.exists() )
{
- for( RemoteRepositoryConfiguration remoteRepository : remoteRepositories )
+ for ( RemoteRepositoryConfiguration remoteRepository : remoteRepositories )
{
try
{
boolean success = getModelFromProxy( remoteRepository, groupId, artifactId, version, filename );
- if( success && model.exists() )
+ if ( success && model.exists() )
{
- log.info( "Model '" + model.getAbsolutePath() + "' successfully retrieved from remote repository '"
- + remoteRepository.getId() + "'" );
+ log.info(
+ "Model '" + model.getAbsolutePath() + "' successfully retrieved from remote repository '"
+ + remoteRepository.getId() + "'" );
break;
}
}
- catch( Exception e )
+ catch ( Exception e )
{
log.warn( "An exception was caught while attempting to retrieve model '" + model.getAbsolutePath()
- + "' from remote repository '" + remoteRepository.getId() + "'.", e );
+ + "' from remote repository '" + remoteRepository.getId() + "'.", e );
continue;
}
}
@@ -142,7 +144,7 @@ public class RepositoryModelResolver
// FIXME: we need to do some refactoring, we cannot re-use the proxy components of archiva-proxy in maven2-repository
// because it's causing a cyclic dependency
private boolean getModelFromProxy( RemoteRepositoryConfiguration remoteRepository, String groupId,
- String artifactId, String version, String filename )
+ String artifactId, String version, String filename )
throws AuthorizationException, TransferFailedException, ResourceDoesNotExistException, WagonFactoryException,
XMLException
{
@@ -177,7 +179,8 @@ public class RepositoryModelResolver
// get the metadata first!
File tmpMetadataResource = new File( workingDirectory, METADATA_FILENAME );
- String metadataPath = StringUtils.substringBeforeLast( artifactPath, "/" ) + "/" + METADATA_FILENAME;
+ String metadataPath =
+ StringUtils.substringBeforeLast( artifactPath, "/" ) + "/" + METADATA_FILENAME;
wagon.get( metadataPath, tmpMetadataResource );
@@ -190,10 +193,10 @@ public class RepositoryModelResolver
String timestampVersion = version;
if ( snapshotVersion != null )
{
- timestampVersion =
- timestampVersion.substring( 0, timestampVersion.length() - 8 ); // remove SNAPSHOT from end
- timestampVersion =
- timestampVersion + snapshotVersion.getTimestamp() + "-" + snapshotVersion.getBuildNumber();
+ timestampVersion = timestampVersion.substring( 0, timestampVersion.length()
+ - 8 ); // remove SNAPSHOT from end
+ timestampVersion = timestampVersion + snapshotVersion.getTimestamp() + "-"
+ + snapshotVersion.getBuildNumber();
filename = artifactId + "-" + timestampVersion + ".pom";
@@ -209,10 +212,10 @@ public class RepositoryModelResolver
log.debug( "Downloaded successfully." );
- tmpSha1 =
- transferChecksum( wagon, remoteRepository, artifactPath, tmpResource, workingDirectory, ".sha1" );
- tmpMd5 =
- transferChecksum( wagon, remoteRepository, artifactPath, tmpResource, workingDirectory, ".md5" );
+ tmpSha1 = transferChecksum( wagon, remoteRepository, artifactPath, tmpResource, workingDirectory,
+ ".sha1" );
+ tmpMd5 = transferChecksum( wagon, remoteRepository, artifactPath, tmpResource, workingDirectory,
+ ".md5" );
}
}
finally
@@ -267,9 +270,8 @@ public class RepositoryModelResolver
if ( networkProxy != null )
{
- String msg =
- "Using network proxy " + networkProxy.getHost() + ":" + networkProxy.getPort()
- + " to connect to remote repository " + remoteRepository.getUrl();
+ 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();
@@ -289,7 +291,7 @@ public class RepositoryModelResolver
if ( StringUtils.isNotBlank( username ) && StringUtils.isNotBlank( password ) )
{
- log.debug( "Using username " + username + " to connect to remote repository " + remoteRepository.getUrl() );
+ log.debug( "Using username {} to connect to remote repository {}", username, remoteRepository.getUrl() );
authInfo = new AuthenticationInfo();
authInfo.setUserName( username );
authInfo.setPassword( password );
@@ -366,7 +368,8 @@ public class RepositoryModelResolver
File newLocation = new File( directory, fileToMove.getName() );
if ( newLocation.exists() && !newLocation.delete() )
{
- throw new RuntimeException( "Unable to overwrite existing target file: " + newLocation.getAbsolutePath() );
+ throw new RuntimeException(
+ "Unable to overwrite existing target file: " + newLocation.getAbsolutePath() );
}
newLocation.getParentFile().mkdirs();
@@ -383,12 +386,12 @@ public class RepositoryModelResolver
if ( newLocation.exists() )
{
log.error( "Tried to copy file " + fileToMove.getName() + " to " + newLocation.getAbsolutePath()
- + " but file with this name already exists." );
+ + " but file with this name already exists." );
}
else
{
- throw new RuntimeException( "Cannot copy tmp file " + fileToMove.getAbsolutePath()
- + " to its final location", e );
+ throw new RuntimeException(
+ "Cannot copy tmp file " + fileToMove.getAbsolutePath() + " to its final location", e );
}
}
finally