You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2009/09/10 19:48:07 UTC
svn commit: r813526 - in
/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src:
main/java/org/apache/maven/artifact/manager/
main/java/org/apache/maven/artifact/repository/metadata/
main/java/org/apache/maven/artifact/resolver/ main/java/org/a...
Author: hboutemy
Date: Thu Sep 10 17:48:06 2009
New Revision: 813526
URL: http://svn.apache.org/viewvc?rev=813526&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonProviderMapping.java
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Thu Sep 10 17:48:06 2009
@@ -46,7 +46,6 @@
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
@@ -86,7 +85,7 @@
private static final String WAGON_PROVIDER_CONFIGURATION = "wagonProvider";
private static int anonymousMirrorIdSeed = 0;
-
+
private PlexusContainer container;
// TODO: proxies, authentication and mirrors are via settings, and should come in via an alternate method - perhaps
@@ -118,7 +117,7 @@
private RepositoryPermissions defaultRepositoryPermissions;
private String httpUserAgent;
-
+
private WagonProviderMapping providerMapping = new DefaultWagonProviderMapping();
// TODO: this leaks the component in the public api - it is never released back to the container
@@ -138,13 +137,13 @@
return wagon;
}
-
+
public Wagon getWagon( String protocol )
throws UnsupportedProtocolException
{
return getWagon( protocol, null );
}
-
+
private Wagon getWagon( String protocol, String repositoryId )
throws UnsupportedProtocolException
{
@@ -166,12 +165,12 @@
return wagon;
}
-
+
private String getWagonHint( String protocol, String repositoryId )
{
// TODO: Implement a better way to get the hint, via settings.xml or something.
String impl = null;
-
+
if ( repositoryId != null && serverWagonProviderMap.containsKey( repositoryId ) )
{
impl = serverWagonProviderMap.get( repositoryId );
@@ -185,7 +184,7 @@
getLogger().debug( "Using Wagon implementation " + impl + " from default mapping for protocol " + protocol );
}
}
-
+
String hint;
if ( impl != null )
{
@@ -204,7 +203,7 @@
{
hint = protocol;
}
-
+
return hint;
}
@@ -215,7 +214,7 @@
{
container = availableWagons.get( hint );
}
-
+
return container;
}
@@ -312,7 +311,7 @@
{
return getProxy( protocol );
}
- });
+ } );
wagon.put( source, remotePath );
@@ -388,13 +387,13 @@
// This one we will eat when looking through remote repositories
// because we want to cycle through them all before squawking.
- getLogger().info( "Unable to find resource '" + artifact.getId() + "' in repository " +
- repository.getId() + " (" + repository.getUrl() + ")" );
+ getLogger().info( "Unable to find resource '" + artifact.getId() + "' in repository "
+ + repository.getId() + " (" + repository.getUrl() + ")" );
}
catch ( TransferFailedException e )
{
- getLogger().warn( "Unable to get resource '" + artifact.getId() + "' from repository " +
- repository.getId() + " (" + repository.getUrl() + "): " + e.getMessage() );
+ getLogger().warn( "Unable to get resource '" + artifact.getId() + "' from repository "
+ + repository.getId() + " (" + repository.getUrl() + "): " + e.getMessage() );
}
}
@@ -490,7 +489,7 @@
try
{
getLogger().debug( "Connecting to repository: \'" + repository.getId() + "\' with url: \'" + repository.getUrl() + "\'." );
-
+
wagon.connect( new Repository( repository.getId(), repository.getUrl() ),
getAuthenticationInfo( repository.getId() ), new ProxyInfoProvider()
{
@@ -498,7 +497,7 @@
{
return getProxy( protocol );
}
- });
+ } );
boolean firstRun = true;
boolean retry = true;
@@ -694,7 +693,7 @@
// TODO: this should be illegal in settings.xml
id = repository.getId();
}
-
+
getLogger().debug( "Using mirror: " + mirror.getUrl() + " (id: " + id + ")" );
repository = repositoryFactory.createArtifactRepository( id, mirror.getUrl(),
@@ -780,8 +779,8 @@
}
else
{
- throw new ChecksumFailedException( "Checksum failed on download: local = '" + actualChecksum +
- "'; remote = '" + expectedChecksum + "'" );
+ throw new ChecksumFailedException( "Checksum failed on download: local = '" + actualChecksum
+ + "'; remote = '" + expectedChecksum + "'" );
}
}
catch ( IOException e )
@@ -807,7 +806,7 @@
Wagon wagon, String repositoryId )
{
String hint = getWagonHint( protocol, repositoryId );
-
+
PlexusContainer container = getWagonContainer( hint );
try
{
@@ -822,12 +821,12 @@
public ProxyInfo getProxy( String protocol )
{
ProxyInfo info = (ProxyInfo) proxies.get( protocol );
-
+
if ( info != null )
{
getLogger().debug( "Using Proxy: " + info.getHost() );
}
-
+
return info;
}
@@ -1047,11 +1046,11 @@
id = "mirror-" + anonymousMirrorIdSeed++;
getLogger().warn( "You are using a mirror that doesn't declare an <id/> element. Using \'" + id + "\' instead:\nId: " + id + "\nmirrorOf: " + mirrorOf + "\nurl: " + url + "\n" );
}
-
+
ArtifactRepository mirror = new DefaultArtifactRepository( id, url, null );
//to preserve first wins, don't add repeated mirrors.
- if (!mirrors.containsKey( mirrorOf ))
+ if ( !mirrors.containsKey( mirrorOf ) )
{
mirrors.put( mirrorOf, mirror );
}
@@ -1099,12 +1098,12 @@
private void configureWagon( Wagon wagon, String repositoryId, String protocol )
throws WagonConfigurationException
{
- PlexusConfiguration config = (PlexusConfiguration) serverConfigurationMap.get( repositoryId );
+ PlexusConfiguration config = (PlexusConfiguration) serverConfigurationMap.get( repositoryId );
if ( protocol.startsWith( "http" ) || protocol.startsWith( "dav" ) )
{
config = updateUserAgentForHttp( wagon, config );
}
-
+
if ( config != null )
{
ComponentConfigurator componentConfigurator = null;
@@ -1148,17 +1147,17 @@
{
config = new XmlPlexusConfiguration( "configuration" );
}
-
+
if ( httpUserAgent != null )
{
try
{
wagon.getClass().getMethod( "setHttpHeaders", new Class[]{ Properties.class } );
-
+
PlexusConfiguration headerConfig = config.getChild( "httpHeaders", true );
PlexusConfiguration[] children = headerConfig.getChildren( "property" );
boolean found = false;
-
+
getLogger().debug( "Checking for pre-existing User-Agent configuration." );
for ( int i = 0; i < children.length; i++ )
{
@@ -1169,17 +1168,17 @@
break;
}
}
-
+
if ( !found )
{
getLogger().debug( "Adding User-Agent configuration." );
XmlPlexusConfiguration propertyConfig = new XmlPlexusConfiguration( "property" );
headerConfig.addChild( propertyConfig );
-
+
XmlPlexusConfiguration nameConfig = new XmlPlexusConfiguration( "name" );
nameConfig.setValue( "User-Agent" );
propertyConfig.addChild( nameConfig );
-
+
XmlPlexusConfiguration versionConfig = new XmlPlexusConfiguration( "value" );
versionConfig.setValue( httpUserAgent );
propertyConfig.addChild( versionConfig );
@@ -1200,7 +1199,7 @@
// forget it.
}
}
-
+
return config;
}
@@ -1223,13 +1222,13 @@
configuration.removeChild( i );
break;
}
-
+
i++;
}
serverConfigurationMap.put( repositoryId, xmlConf );
}
-
+
public void setDefaultRepositoryPermissions( RepositoryPermissions defaultRepositoryPermissions )
{
this.defaultRepositoryPermissions = defaultRepositoryPermissions;
@@ -1272,7 +1271,7 @@
}
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -1280,7 +1279,7 @@
{
this.httpUserAgent = userAgent;
}
-
+
/**
* {@inheritDoc}
*/
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonProviderMapping.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonProviderMapping.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonProviderMapping.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonProviderMapping.java Thu Sep 10 17:48:06 2009
@@ -23,9 +23,9 @@
{
String ROLE = WagonProviderMapping.class.getName();
-
- public void setWagonProvider( String protocol, String provider );
-
- public String getWagonProvider( String protocol );
+
+ void setWagonProvider( String protocol, String provider );
+
+ String getWagonProvider( String protocol );
}
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Thu Sep 10 17:48:06 2009
@@ -112,8 +112,8 @@
}
catch ( TransferFailedException e )
{
- getLogger().warn( metadata + " could not be retrieved from repository: " +
- repository.getId() + " due to an error: " + e.getMessage() );
+ getLogger().warn( metadata + " could not be retrieved from repository: "
+ + repository.getId() + " due to an error: " + e.getMessage() );
getLogger().debug( "Exception", e );
getLogger().info( "Repository '" + repository.getId() + "' will be blacklisted" );
@@ -149,8 +149,8 @@
}
else
{
- getLogger().debug( "System is offline. Cannot resolve metadata:\n" +
- metadata.extendedToString() + "\n\n" );
+ getLogger().debug( "System is offline. Cannot resolve metadata:\n"
+ + metadata.extendedToString() + "\n\n" );
}
}
}
@@ -247,8 +247,8 @@
}
else
{
- if ( ( m.getVersioning() != null ) && ( m.getVersioning().getSnapshot() != null ) &&
- m.getVersioning().getSnapshot().isLocalCopy() )
+ if ( ( m.getVersioning() != null ) && ( m.getVersioning().getSnapshot() != null )
+ && m.getVersioning().getSnapshot().isLocalCopy() )
{
m.getVersioning().getSnapshot().setLocalCopy( false );
metadata.setMetadata( m );
@@ -348,8 +348,8 @@
}
catch ( TransferFailedException e )
{
- throw new RepositoryMetadataResolutionException( metadata + " could not be retrieved from repository: " +
- remoteRepository.getId() + " due to an error: " + e.getMessage(), e );
+ throw new RepositoryMetadataResolutionException( metadata + " could not be retrieved from repository: "
+ + remoteRepository.getId() + " due to an error: " + e.getMessage(), e );
}
try
@@ -419,9 +419,9 @@
}
catch ( TransferFailedException e )
{
- throw new RepositoryMetadataDeploymentException( metadata +
- " could not be retrieved from repository: " + deploymentRepository.getId() + " due to an error: " +
- e.getMessage(), e );
+ throw new RepositoryMetadataDeploymentException( metadata
+ + " could not be retrieved from repository: " + deploymentRepository.getId() + " due to an error: "
+ + e.getMessage(), e );
}
}
else
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java Thu Sep 10 17:48:06 2009
@@ -40,7 +40,7 @@
private String indent = "";
private static Set ignoredArtifacts = new HashSet();
-
+
public DebugResolutionListener( Logger logger )
{
this.logger = logger;
@@ -83,15 +83,15 @@
public void updateScopeCurrentPom( Artifact artifact, String ignoredScope )
{
- logger.debug( indent + artifact + " (not setting scope to: " + ignoredScope + "; local scope " + artifact.getScope() +
- " wins)" );
+ logger.debug( indent + artifact + " (not setting scope to: " + ignoredScope + "; local scope "
+ + artifact.getScope() + " wins)" );
// TODO: better way than static? this might hide messages in a reactor
if ( !ignoredArtifacts.contains( artifact ) )
{
- logger.warn( "\n\tArtifact " + artifact + " retains local scope '" + artifact.getScope() +
- "' overriding broader scope '" + ignoredScope + "'\n" +
- "\tgiven by a dependency. If this is not intended, modify or remove the local scope.\n" );
+ logger.warn( "\n\tArtifact " + artifact + " retains local scope '" + artifact.getScope()
+ + "' overriding broader scope '" + ignoredScope + "'\n"
+ + "\tgiven by a dependency. If this is not intended, modify or remove the local scope.\n" );
ignoredArtifacts.add( artifact );
}
}
@@ -103,14 +103,14 @@
public void selectVersionFromRange( Artifact artifact )
{
- logger.debug( indent + artifact + " (setting version to: " + artifact.getVersion() + " from range: " +
- artifact.getVersionRange() + ")" );
+ logger.debug( indent + artifact + " (setting version to: " + artifact.getVersion() + " from range: "
+ + artifact.getVersionRange() + ")" );
}
public void restrictRange( Artifact artifact, Artifact replacement, VersionRange newRange )
{
- logger.debug( indent + artifact + " (range restricted from: " + artifact.getVersionRange() + " and: " +
- replacement.getVersionRange() + " to: " + newRange + " )" );
+ logger.debug( indent + artifact + " (range restricted from: " + artifact.getVersionRange() + " and: "
+ + replacement.getVersionRange() + " to: " + newRange + " )" );
}
/**
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Thu Sep 10 17:48:06 2009
@@ -75,7 +75,7 @@
public DefaultArtifactResolver()
{
super();
- resolveArtifactPool =
+ resolveArtifactPool =
new ThreadPoolExecutor( DEFAULT_POOL_SIZE, DEFAULT_POOL_SIZE, 3, TimeUnit.SECONDS,
new LinkedBlockingQueue() );
}
@@ -172,8 +172,8 @@
List repositories = remoteRepositories;
// TODO: would prefer the snapshot transformation took care of this. Maybe we need a "shouldresolve" flag.
- if ( artifact.isSnapshot() && artifact.getBaseVersion().equals( artifact.getVersion() ) &&
- destination.exists() && !localCopy && wagonManager.isOnline() )
+ if ( artifact.isSnapshot() && artifact.getBaseVersion().equals( artifact.getVersion() )
+ && destination.exists() && !localCopy && wagonManager.isOnline() )
{
Date comparisonDate = new Date( destination.lastModified() );
@@ -354,7 +354,7 @@
{
throw (ArtifactResolutionException) resolutionExceptions.get( 0 );
}
-
+
if ( missingArtifacts.size() > 0 )
{
throw new MultipleArtifactsNotFoundException( originatingArtifact, resolvedArtifacts, missingArtifacts,
@@ -436,7 +436,7 @@
{
resolutionExceptions.add( e );
}
- finally
+ finally
{
latch.countDown();
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java Thu Sep 10 17:48:06 2009
@@ -23,9 +23,6 @@
import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.plexus.logging.Logger;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* Send resolution warning events to the warning log.
*
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java Thu Sep 10 17:48:06 2009
@@ -34,19 +34,22 @@
implements ArtifactTransformationManager, Initializable
{
private List<ArtifactTransformation> artifactTransformations;
-
- public void initialize() throws InitializationException {
- // TODO this is a hack until plexus can fix the ordering of the arrays
- ArtifactTransformation transforms[] = artifactTransformations.toArray( new ArtifactTransformation[]{} );
- for (int x = 0; x < transforms.length; x++)
- {
- if (transforms[x].getClass().getName().indexOf("Snapshot") != -1) {
- artifactTransformations.remove(transforms[x]);
- artifactTransformations.add(transforms[x]);
- }
- }
- }
-
+
+ public void initialize()
+ throws InitializationException
+ {
+ // TODO this is a hack until plexus can fix the ordering of the arrays
+ ArtifactTransformation transforms[] = artifactTransformations.toArray( new ArtifactTransformation[] {} );
+ for ( int x = 0; x < transforms.length; x++ )
+ {
+ if ( transforms[x].getClass().getName().indexOf( "Snapshot" ) != -1 )
+ {
+ artifactTransformations.remove( transforms[x] );
+ artifactTransformations.add( transforms[x] );
+ }
+ }
+ }
+
public void transformForResolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java Thu Sep 10 17:48:06 2009
@@ -228,7 +228,7 @@
Writer writer = new FileWriter( artifactFile );
- if( content == null )
+ if ( content == null )
{
writer.write( artifact.getId() );
}
@@ -238,9 +238,9 @@
}
writer.close();
-
+
artifactFile = new File( repository.getBasedir(), path );
-
+
artifact.setFile( artifactFile );
}
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java?rev=813526&r1=813525&r2=813526&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java Thu Sep 10 17:48:06 2009
@@ -19,8 +19,6 @@
* under the License.
*/
-import java.io.File;
-import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
@@ -33,7 +31,6 @@
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
import org.codehaus.plexus.util.StringOutputStream;
@@ -41,7 +38,7 @@
extends StreamWagon
{
private Map expectedContent = new HashMap();
-
+
public void addExpectedContent( String resourceName, String expectedContent )
{
this.expectedContent.put( resourceName, expectedContent );
@@ -63,7 +60,7 @@
Resource resource = inputData.getResource();
String content = (String) expectedContent.get( resource.getName() );
-
+
if ( content != null )
{
resource.setContentLength( content.length() );
@@ -90,6 +87,6 @@
public void clearExpectedContent()
{
- expectedContent.clear();
+ expectedContent.clear();
}
}