Author: brett
Date: Tue Nov 29 21:16:03 2005
New Revision: 349880
URL: http://svn.apache.org/viewcvs?rev=349880&view=rev
Log:
refactor out unneeded vars
PR: MRM-9
Removed:
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/index/
Modified:
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java
Modified:
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java
URL:
http://svn.apache.org/viewcvs/maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java?rev=349880&r1=349879&r2=349880&view=diff
==============================================================================
---
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java
(original)
+++
maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java
Tue Nov 29 21:16:03 2005
@@ -61,8 +61,6 @@
import java.io.Reader;
import java.io.StringReader;
import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Iterator;
@@ -88,36 +86,12 @@
List rewritten = new ArrayList();
- File sourceBase;
- try
- {
- sourceBase = new File( new URL( sourceRepo.getUrl() ).getPath() );
- }
- catch ( MalformedURLException e )
- {
- repoReporter.error( "Cannot construct source repository base File
for: " + sourceRepo, e );
-
- return null;
- }
-
- File targetBase;
- try
- {
- targetBase = new File( new URL( targetRepo.getUrl() ).getPath() );
- }
- catch ( MalformedURLException e )
- {
- repoReporter.error( "Cannot construct target repository base File
for: " + targetRepo, e );
-
- return null;
- }
-
for ( Iterator it = artifacts.iterator(); it.hasNext(); )
{
Artifact artifact = (Artifact) it.next();
- if ( rewriteArtifact( artifact, sourceRepo, targetRepo,
repoReporter, sourceBase, targetBase,
- configuration.force(),
configuration.reportOnly() ) )
+ if ( rewriteArtifact( artifact, sourceRepo, targetRepo,
repoReporter, configuration.force(),
+ configuration.reportOnly() ) )
{
rewritten.add( artifact );
}
@@ -130,8 +104,7 @@
}
private boolean rewriteArtifact( Artifact artifact, ArtifactRepository
sourceRepo, ArtifactRepository targetRepo,
- Reporter repoReporter, File sourceBase,
File targetBase, boolean force,
- boolean reportOnly )
+ Reporter repoReporter, boolean force,
boolean reportOnly )
throws ReportWriteException
{
RewriteTransaction transaction = new RewriteTransaction( artifact );
@@ -184,8 +157,7 @@
digestVerifier.verifyDigest( artifactSource, artifactTarget,
transaction, repoReporter, reportOnly );
- rewriteMetadata( artifact, transaction, sourceBase,
sourceRepo, targetBase, targetRepo, repoReporter,
- reportOnly );
+ rewriteMetadata( artifact, transaction, sourceRepo,
targetRepo, repoReporter, reportOnly );
return true;
}
@@ -226,15 +198,16 @@
return false;
}
- private void rewriteMetadata( Artifact artifact, RewriteTransaction
transaction, File sourceBase,
- ArtifactRepository sourceRepo, File
targetBase, ArtifactRepository targetRepo,
- Reporter artifactReporter, boolean
reportOnly )
+ private void rewriteMetadata( Artifact artifact, RewriteTransaction
transaction, ArtifactRepository sourceRepo,
+ ArtifactRepository targetRepo, Reporter
artifactReporter, boolean reportOnly )
throws Exception
{
ArtifactMetadata metadata = new ArtifactRepositoryMetadata( artifact );
- File metadataSource = new File( sourceBase,
sourceRepo.pathOfRemoteRepositoryMetadata( metadata ) );
- File metadataTarget = new File( targetBase,
targetRepo.pathOfRemoteRepositoryMetadata( metadata ) );
+ File metadataSource =
+ new File( sourceRepo.getBasedir(),
sourceRepo.pathOfRemoteRepositoryMetadata( metadata ) );
+ File metadataTarget =
+ new File( targetRepo.getBasedir(),
targetRepo.pathOfRemoteRepositoryMetadata( metadata ) );
Metadata sourceMetadata = readMetadata( metadataSource, artifact );
if ( sourceMetadata.getVersioning() == null )
@@ -249,8 +222,8 @@
metadata = new SnapshotArtifactRepositoryMetadata( artifact );
- metadataSource = new File( sourceBase,
sourceRepo.pathOfRemoteRepositoryMetadata( metadata ) );
- metadataTarget = new File( targetBase,
targetRepo.pathOfRemoteRepositoryMetadata( metadata ) );
+ metadataSource = new File( sourceRepo.getBasedir(),
sourceRepo.pathOfRemoteRepositoryMetadata( metadata ) );
+ metadataTarget = new File( targetRepo.getBasedir(),
targetRepo.pathOfRemoteRepositoryMetadata( metadata ) );
sourceMetadata = readMetadata( metadataSource, artifact );
if ( artifact.isSnapshot() )
@@ -277,8 +250,9 @@
// The rest is for POM metadata - translation and bridging of
locations in the target repo may be required.
ArtifactMetadata pom = new ProjectArtifactMetadata( artifact, null );
- File sourcePom = new File( sourceBase,
sourceRepo.pathOfRemoteRepositoryMetadata( pom ) );
- File targetPom = new File( targetBase,
targetRepo.pathOfRemoteRepositoryMetadata( pom ).replace( '+', '-' ) );
+ File sourcePom = new File( sourceRepo.getBasedir(),
sourceRepo.pathOfRemoteRepositoryMetadata( pom ) );
+ File targetPom =
+ new File( targetRepo.getBasedir(),
targetRepo.pathOfRemoteRepositoryMetadata( pom ).replace( '+', '-' ) );
String pomContents = null;
@@ -313,8 +287,8 @@
transaction.addFile( targetPom );
- bridgedTargetPom =
- new File( targetBase,
bridgingLayout.pathOfRemoteRepositoryMetadata( pom ).replace( '+', '-' ) );
+ bridgedTargetPom = new File( targetRepo.getBasedir(),
+
bridgingLayout.pathOfRemoteRepositoryMetadata( pom ).replace( '+', '-' ) );
transaction.addFile( bridgedTargetPom );
