mirror of https://github.com/apache/archiva.git
MRM-43
Applied code formatting git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@376170 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
69ee104b55
commit
9c9178d60f
|
@ -33,8 +33,8 @@ import org.apache.maven.wagon.authentication.AuthenticationException;
|
|||
import org.apache.maven.wagon.authorization.AuthorizationException;
|
||||
import org.apache.maven.wagon.observers.ChecksumObserver;
|
||||
import org.codehaus.plexus.logging.AbstractLogEnabled;
|
||||
import org.codehaus.plexus.util.IOUtil;
|
||||
import org.codehaus.plexus.util.FileUtils;
|
||||
import org.codehaus.plexus.util.IOUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
|
@ -392,17 +392,20 @@ public class DefaultProxyManager
|
|||
}
|
||||
catch ( TransferFailedException e )
|
||||
{
|
||||
getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(), e );
|
||||
getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(),
|
||||
e );
|
||||
// do nothing try the next checksum
|
||||
}
|
||||
catch ( ResourceDoesNotExistException e )
|
||||
{
|
||||
getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(), e );
|
||||
getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(),
|
||||
e );
|
||||
// do nothing try the next checksum
|
||||
}
|
||||
catch ( AuthorizationException e )
|
||||
{
|
||||
getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(), e );
|
||||
getLogger().debug( "An error occurred during the download of " + checksumPath + ": " + e.getMessage(),
|
||||
e );
|
||||
// do nothing try the next checksum
|
||||
}
|
||||
catch ( IOException e )
|
||||
|
|
|
@ -16,8 +16,8 @@ package org.apache.maven.repository.proxy;
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import org.apache.maven.wagon.ResourceDoesNotExistException;
|
||||
import org.apache.maven.repository.proxy.configuration.ProxyConfiguration;
|
||||
import org.apache.maven.wagon.ResourceDoesNotExistException;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
|
|
|
@ -17,16 +17,15 @@ package org.apache.maven.repository.proxy;
|
|||
*/
|
||||
|
||||
import org.apache.maven.repository.proxy.configuration.ProxyConfiguration;
|
||||
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
|
||||
import org.codehaus.plexus.PlexusConstants;
|
||||
import org.codehaus.plexus.PlexusContainer;
|
||||
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
|
||||
import org.codehaus.plexus.context.Context;
|
||||
import org.codehaus.plexus.context.ContextException;
|
||||
import org.codehaus.plexus.PlexusContainer;
|
||||
import org.codehaus.plexus.PlexusConstants;
|
||||
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
|
||||
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
|
||||
|
||||
/**
|
||||
* @author Edwin Punzalan
|
||||
*
|
||||
* @plexus.component role="org.apache.maven.repository.proxy.ProxyManagerFactory"
|
||||
*/
|
||||
public class ProxyManagerFactory
|
||||
|
|
|
@ -23,10 +23,10 @@ import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
|
|||
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
|
||||
import org.apache.maven.repository.proxy.repository.ProxyRepository;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.io.File;
|
||||
|
||||
/**
|
||||
* Class to represent the configuration file for the proxy
|
||||
|
@ -46,6 +46,7 @@ public class ProxyConfiguration
|
|||
private boolean browsable;
|
||||
|
||||
private ArtifactRepository repoCache;
|
||||
|
||||
private List repositories = new ArrayList();
|
||||
|
||||
/**
|
||||
|
@ -81,9 +82,9 @@ public class ProxyConfiguration
|
|||
|
||||
ArtifactRepositoryLayout layout = new DefaultRepositoryLayout();
|
||||
|
||||
repoCache = artifactRepositoryFactory.createArtifactRepository( "localCache", "file://" +
|
||||
new File( path ).getAbsolutePath(), layout,
|
||||
standardPolicy, standardPolicy );
|
||||
repoCache = artifactRepositoryFactory.createArtifactRepository( "localCache",
|
||||
"file://" + new File( path ).getAbsolutePath(),
|
||||
layout, standardPolicy, standardPolicy );
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package org.apache.maven.repository.proxy;
|
||||
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
|
||||
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
|
||||
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
|
||||
import org.apache.maven.repository.proxy.configuration.ProxyConfiguration;
|
||||
import org.apache.maven.repository.proxy.repository.ProxyRepository;
|
||||
import org.apache.maven.wagon.ResourceDoesNotExistException;
|
||||
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
|
||||
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
|
||||
import org.codehaus.plexus.PlexusTestCase;
|
||||
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
|
|
|
@ -24,8 +24,8 @@ import org.apache.maven.repository.proxy.repository.ProxyRepository;
|
|||
import org.codehaus.plexus.PlexusTestCase;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ProxyConfigurationTest
|
||||
extends PlexusTestCase
|
||||
|
|
Loading…
Reference in New Issue