Author: brianf Date: Mon Oct 9 17:42:40 2006 New Revision: 454574 URL: http://svn.apache.org/viewvc?view=rev&rev=454574 Log: cleaned up formating
Modified: maven/plugins/trunk/maven-dependency-plugin/ (props changed) maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/MarkerHandler.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/DependencyProjectStub.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactRepository.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactResolver.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubDefaultFileMarkerHandler.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubSourcesFileMarkerHandler.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/ArtifactStubFactory.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/DependencyTestUtils.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java Propchange: maven/plugins/trunk/maven-dependency-plugin/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 9 17:42:40 2006 @@ -1,3 +1,4 @@ target .classpath .project +cobertura.ser Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java Mon Oct 9 17:42:40 2006 @@ -23,7 +23,6 @@ import org.apache.maven.plugin.dependency.utils.DependencyStatusSets; import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter; import org.apache.maven.plugin.dependency.utils.filters.FilterArtifacts; -import org.apache.maven.plugin.dependency.utils.filters.MarkerFileFilter; import org.apache.maven.plugin.dependency.utils.filters.ScopeFilter; import org.apache.maven.plugin.dependency.utils.filters.TransitivityFilter; import org.apache.maven.plugin.dependency.utils.filters.TypeFilter; @@ -134,6 +133,7 @@ protected boolean outputArtifactFilename; abstract protected ArtifactsFilter getMarkedArtifactFilter(); + /** * Retrieves dependencies, either direct only or all including transitive. * @@ -141,15 +141,15 @@ * @throws MojoExecutionException * if an error occured. */ - protected Set getDependencies(boolean stopOnFailure) + protected Set getDependencies( boolean stopOnFailure ) throws MojoExecutionException { - DependencyStatusSets status = getDependencySets(stopOnFailure); + DependencyStatusSets status = getDependencySets( stopOnFailure ); return status.getResolvedDependencies(); } - protected DependencyStatusSets getDependencySets(boolean stopOnFailure) + protected DependencyStatusSets getDependencySets( boolean stopOnFailure ) throws MojoExecutionException { // add filters in well known order, least specific to most specific Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java Mon Oct 9 17:42:40 2006 @@ -26,8 +26,6 @@ import org.apache.maven.plugin.dependency.utils.DependencyUtil; import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter; import org.apache.maven.plugin.dependency.utils.filters.DestFileFilter; -import org.apache.maven.plugin.dependency.utils.filters.MarkerFileFilter; -import org.apache.maven.plugin.dependency.utils.markers.DefaultFileMarkerHandler; import org.apache.maven.plugin.logging.Log; /** @@ -76,8 +74,8 @@ { for ( Iterator i = artifacts.iterator(); i.hasNext(); ) { - Artifact artifact = (Artifact)i.next(); - getLog().info(artifact.getFile().getName()+" already exists in destination."); + Artifact artifact = (Artifact) i.next(); + getLog().info( artifact.getFile().getName() + " already exists in destination." ); } } } Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java Mon Oct 9 17:42:40 2006 @@ -26,7 +26,6 @@ import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter; import org.apache.maven.plugin.dependency.utils.filters.MarkerFileFilter; import org.apache.maven.plugin.dependency.utils.markers.DefaultFileMarkerHandler; -import org.apache.maven.plugin.dependency.utils.markers.MarkerHandler; import org.apache.maven.plugin.logging.Log; import org.codehaus.plexus.archiver.manager.ArchiverManager; Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java Mon Oct 9 17:42:40 2006 @@ -20,7 +20,6 @@ import org.apache.maven.plugin.dependency.AbstractResolveMojo; import org.apache.maven.plugin.dependency.utils.DependencyStatusSets; import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter; -import org.apache.maven.plugin.dependency.utils.filters.MarkerFileFilter; import org.apache.maven.plugin.dependency.utils.filters.ResolveFileFilter; import org.apache.maven.plugin.dependency.utils.markers.SourcesFileMarkerHandler; Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java Mon Oct 9 17:42:40 2006 @@ -25,7 +25,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.logging.Log; -import org.codehaus.plexus.util.CollectionUtils; /** * @author brianf Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java Mon Oct 9 17:42:40 2006 @@ -256,7 +256,6 @@ } - /** * This method resolves the plugin artifacts from the project. * Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java Mon Oct 9 17:42:40 2006 @@ -41,17 +41,18 @@ boolean overWriteSnapshots; boolean overWriteIfNewer; - + boolean useSubDirectoryPerArtifact; - + boolean useSubDirectoryPerType; - + boolean removeVersion; File outputFileDirectory; public DestFileFilter( boolean overWriteReleases, boolean overWriteSnapshots, boolean overWriteIfNewer, - boolean useSubDirectoryPerArtifact, boolean useSubDirectoryPerType, boolean removeVersion, File outputFileDirectory ) + boolean useSubDirectoryPerArtifact, boolean useSubDirectoryPerType, boolean removeVersion, + File outputFileDirectory ) { this.overWriteReleases = overWriteReleases; this.overWriteSnapshots = overWriteSnapshots; @@ -86,7 +87,8 @@ return result; } - public boolean okToCopy( Artifact artifact ) throws MojoExecutionException + public boolean okToCopy( Artifact artifact ) + throws MojoExecutionException { boolean overWrite = false; boolean result = false; @@ -96,10 +98,14 @@ overWrite = true; } - File destFolder = DependencyUtil.getFormattedOutputDirectory(this.useSubDirectoryPerType,this.useSubDirectoryPerArtifact,this.outputFileDirectory,artifact); - File destFile = new File(destFolder,DependencyUtil.getFormattedFileName(artifact,this.removeVersion)); - - if ( overWrite || ( !destFile.exists() || ( overWriteIfNewer && artifact.getFile().lastModified() < destFile.lastModified() ) ) ) + File destFolder = DependencyUtil.getFormattedOutputDirectory( this.useSubDirectoryPerType, + this.useSubDirectoryPerArtifact, + this.outputFileDirectory, artifact ); + File destFile = new File( destFolder, DependencyUtil.getFormattedFileName( artifact, this.removeVersion ) ); + + if ( overWrite + || ( !destFile.exists() || ( overWriteIfNewer && artifact.getFile().lastModified() < destFile + .lastModified() ) ) ) { result = true; } Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java Mon Oct 9 17:42:40 2006 @@ -87,8 +87,8 @@ overWrite = true; } - handler.setArtifact(artifact); - + handler.setArtifact( artifact ); + if ( overWrite || ( !handler.isMarkerSet() || ( overWriteIfNewer && handler.isMarkerOlder( artifact ) ) ) ) { result = true; Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/MarkerHandler.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/MarkerHandler.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/MarkerHandler.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/MarkerHandler.java Mon Oct 9 17:42:40 2006 @@ -38,7 +38,7 @@ public boolean isMarkerOlder( Artifact artifact ) throws MojoExecutionException; - - public void setArtifact(Artifact artifact); - + + public void setArtifact( Artifact artifact ); + } Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java Mon Oct 9 17:42:40 2006 @@ -36,7 +36,7 @@ public SourcesFileMarkerHandler( File markerFilesDirectory ) { - super(markerFilesDirectory); + super( markerFilesDirectory ); } public SourcesFileMarkerHandler( Artifact artifact, File markerFilesDirectory, boolean resolved ) @@ -98,20 +98,20 @@ return marker.exists() || marker2.exists(); } - public boolean isMarkerOlder( Artifact artifact ) + public boolean isMarkerOlder( Artifact theArtifact ) throws MojoExecutionException { File marker = getMarkerFile(); if ( marker.exists() ) { - return artifact.getFile().lastModified() > marker.lastModified(); + return theArtifact.getFile().lastModified() > marker.lastModified(); } else { marker = getMarkerFile( !this.resolved ); if ( marker.exists() ) { - return artifact.getFile().lastModified() > marker.lastModified(); + return theArtifact.getFile().lastModified() > marker.lastModified(); } else { Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/DependencyProjectStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/DependencyProjectStub.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/DependencyProjectStub.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/DependencyProjectStub.java Mon Oct 9 17:42:40 2006 @@ -876,15 +876,15 @@ return activeProfiles; } - public void addAttachedArtifact( Artifact artifact ) + public void addAttachedArtifact( Artifact theArtifact ) { if ( attachedArtifacts == null ) { - this.attachedArtifacts = Collections.singletonList( artifact ); + this.attachedArtifacts = Collections.singletonList( theArtifact ); } else { - attachedArtifacts.add( artifact ); + attachedArtifacts.add( theArtifact ); } } @@ -971,7 +971,7 @@ } - public void attachArtifact( String string, String string1, File file ) + public void attachArtifact( String string, String string1, File theFile ) { } Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactRepository.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactRepository.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactRepository.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactRepository.java Mon Oct 9 17:42:40 2006 @@ -10,7 +10,8 @@ implements ArtifactRepository { String baseDir = null; - public StubArtifactRepository(String dir) + + public StubArtifactRepository( String dir ) { baseDir = dir; } Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactResolver.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactResolver.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactResolver.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubArtifactResolver.java Mon Oct 9 17:42:40 2006 @@ -20,8 +20,10 @@ { boolean throwArtifactResolutionException; + boolean throwArtifactNotFoundException; - public StubArtifactResolver(boolean throwArtifactResolutionException, boolean throwArtifactNotFoundException) + + public StubArtifactResolver( boolean throwArtifactResolutionException, boolean throwArtifactNotFoundException ) { this.throwArtifactNotFoundException = throwArtifactNotFoundException; this.throwArtifactResolutionException = throwArtifactResolutionException; @@ -30,21 +32,21 @@ public void resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository ) throws ArtifactResolutionException, ArtifactNotFoundException { - if (!this.throwArtifactNotFoundException && !this.throwArtifactResolutionException) + if ( !this.throwArtifactNotFoundException && !this.throwArtifactResolutionException ) { - // TODO Auto-generated method stub - ArtifactStubFactory factory = new ArtifactStubFactory(new File(localRepository.getBasedir()),true); - factory.setArtifactFile(artifact); + // TODO Auto-generated method stub + ArtifactStubFactory factory = new ArtifactStubFactory( new File( localRepository.getBasedir() ), true ); + factory.setArtifactFile( artifact ); } else { - if (throwArtifactResolutionException) + if ( throwArtifactResolutionException ) { - throw new ArtifactResolutionException("Catch!", artifact); + throw new ArtifactResolutionException( "Catch!", artifact ); } else { - throw new ArtifactNotFoundException("Catch!",artifact); + throw new ArtifactNotFoundException( "Catch!", artifact ); } } } Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubDefaultFileMarkerHandler.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubDefaultFileMarkerHandler.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubDefaultFileMarkerHandler.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubDefaultFileMarkerHandler.java Mon Oct 9 17:42:40 2006 @@ -6,16 +6,17 @@ import org.apache.maven.plugin.dependency.utils.markers.DefaultFileMarkerHandler; public class StubDefaultFileMarkerHandler -extends DefaultFileMarkerHandler + extends DefaultFileMarkerHandler { public StubDefaultFileMarkerHandler( Artifact artifact, File markerFilesDirectory ) - { - super(artifact,markerFilesDirectory); + { + super( artifact, markerFilesDirectory ); // TODO Auto-generated constructor stub } - + protected File getMarkerFile() { return new StubMarkerFile( this.markerFilesDirectory, this.artifact.getId().replace( ':', '-' ) + ".marker" ); - }} + } +} Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubSourcesFileMarkerHandler.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubSourcesFileMarkerHandler.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubSourcesFileMarkerHandler.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/stubs/StubSourcesFileMarkerHandler.java Mon Oct 9 17:42:40 2006 @@ -5,9 +5,8 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.dependency.utils.markers.SourcesFileMarkerHandler; - public class StubSourcesFileMarkerHandler -extends SourcesFileMarkerHandler + extends SourcesFileMarkerHandler { public StubSourcesFileMarkerHandler( Artifact artifact, File markerFilesDirectory, boolean resolved ) @@ -30,7 +29,5 @@ return new StubMarkerFile( this.markerFilesDirectory, this.artifact.getId().replace( ':', '-' ) + suffix ); } - - } Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/ArtifactStubFactory.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/ArtifactStubFactory.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/ArtifactStubFactory.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/ArtifactStubFactory.java Mon Oct 9 17:42:40 2006 @@ -129,7 +129,8 @@ } /** - * @param createFiles The createFiles to set. + * @param createFiles + * The createFiles to set. */ public void setCreateFiles( boolean createFiles ) { @@ -145,7 +146,8 @@ } /** - * @param workingDir The workingDir to set. + * @param workingDir + * The workingDir to set. */ public void setWorkingDir( File workingDir ) { Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/DependencyTestUtils.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/DependencyTestUtils.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/DependencyTestUtils.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/DependencyTestUtils.java Mon Oct 9 17:42:40 2006 @@ -40,21 +40,24 @@ } } - - static public ArtifactFactory getArtifactFactory() throws IllegalAccessException + + static public ArtifactFactory getArtifactFactory() + throws IllegalAccessException { ArtifactFactory artifactFactory; ArtifactHandlerManager manager = new DefaultArtifactHandlerManager(); setVariableValueToObject( manager, "artifactHandlers", new HashMap() ); artifactFactory = new DefaultArtifactFactory(); - setVariableValueToObject( artifactFactory, "artifactHandlerManager", manager ); - + setVariableValueToObject( artifactFactory, "artifactHandlerManager", manager ); + return artifactFactory; } - + /** - * convience method to set values to variables in objects that don't have setters + * convience method to set values to variables in objects that don't have + * setters + * * @param object * @param variable * @param value @@ -67,8 +70,7 @@ field.setAccessible( true ); - field.set(object, value ); + field.set( object, value ); } - } Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyStatusSets.java Mon Oct 9 17:42:40 2006 @@ -3,7 +3,6 @@ import java.util.HashSet; import java.util.Set; -import org.apache.maven.monitor.logging.DefaultLog; import org.apache.maven.plugin.dependency.AbstractDependencyMojoTestCase; import org.apache.maven.plugin.logging.Log; @@ -67,7 +66,7 @@ Set artifacts = this.stubFactory.getMixedArtifacts(); doTestDependencyStatusLog( artifacts ); } - + public void testDependencyStatusEmptySet() { doTestDependencyStatusLog( new HashSet() ); Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java Mon Oct 9 17:42:40 2006 @@ -32,7 +32,6 @@ import org.apache.maven.plugin.dependency.utils.DependencyTestUtils; import org.apache.maven.plugin.dependency.utils.SilentLog; import org.apache.maven.plugin.dependency.utils.markers.DefaultFileMarkerHandler; -import org.apache.maven.plugin.dependency.utils.markers.MarkerHandler; import org.apache.maven.plugin.logging.Log; /** @@ -160,7 +159,6 @@ filter.setOverWriteReleases( false ); filter.setOverWriteSnapshots( true ); filter.setOverWriteIfNewer( false ); - File file = new File( outputFolder, "child" ); assertEquals( false, filter.isOverWriteReleases() ); assertEquals( true, filter.isOverWriteSnapshots() ); Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java?view=diff&rev=454574&r1=454573&r2=454574 ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestSourcesMarkerFileHandler.java Mon Oct 9 17:42:40 2006 @@ -32,7 +32,6 @@ import org.apache.maven.artifact.handler.DefaultArtifactHandler; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.dependency.stubs.StubDefaultFileMarkerHandler; import org.apache.maven.plugin.dependency.stubs.StubSourcesFileMarkerHandler; import org.apache.maven.plugin.dependency.utils.SilentLog; import org.apache.maven.plugin.logging.Log; @@ -219,10 +218,10 @@ Artifact theArtifact = (Artifact) artifacts.get( 0 ); theArtifact.setFile( theFile ); SourcesFileMarkerHandler resolvedHandler = new SourcesFileMarkerHandler( (Artifact) artifacts.get( 0 ), - this.outputFolder, resolved ); + this.outputFolder, resolved ); SourcesFileMarkerHandler unResolvedHandler = new SourcesFileMarkerHandler( (Artifact) artifacts.get( 0 ), - this.outputFolder, !resolved ); - + this.outputFolder, !resolved ); + assertFalse( resolvedHandler.isMarkerSet() ); assertFalse( unResolvedHandler.isMarkerSet() ); // if the marker is not set, assume it is infinately older than the @@ -237,7 +236,7 @@ unResolvedHandler.setMarker(); assertFalse( resolvedHandler.isMarkerOlder( theArtifact ) ); assertFalse( unResolvedHandler.isMarkerOlder( theArtifact ) ); - + theFile.setLastModified( theFile.lastModified() + 222 ); assertTrue( resolvedHandler.isMarkerOlder( theArtifact ) ); assertTrue( unResolvedHandler.isMarkerOlder( theArtifact ) ); @@ -246,6 +245,7 @@ resolvedHandler.clearMarker(); assertFalse( resolvedHandler.isMarkerSet() ); } + public void testMarkerFileException() { // this stub wraps the file with an object to throw exceptions