You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/20 09:07:30 UTC
svn commit: r290380 - in
/maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean:
digest/DigestVerifier.java discover/DefaultArtifactDiscoverer.java
phase/RewritePhase.java
Author: brett
Date: Tue Sep 20 00:07:23 2005
New Revision: 290380
URL: http://svn.apache.org/viewcvs?rev=290380&view=rev
Log:
don't zero out files that are the same
Modified:
maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/digest/DigestVerifier.java
maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/DefaultArtifactDiscoverer.java
maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java
Modified: maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/digest/DigestVerifier.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/digest/DigestVerifier.java?rev=290380&r1=290379&r2=290380&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/digest/DigestVerifier.java (original)
+++ maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/digest/DigestVerifier.java Tue Sep 20 00:07:23 2005
@@ -83,7 +83,15 @@
{
try
{
- FileUtils.copyFile( digestSourceFile, digestTargetFile );
+ if ( digestTargetFile == null )
+ {
+ reporter.error( "No target digest file for path [" + artifactSource +
+ "] from source to target for digest algorithm: \'" + digestAlgorithm + "\'." );
+ }
+ else if ( !digestSourceFile.getCanonicalFile().equals( digestTargetFile.getCanonicalFile() ) )
+ {
+ FileUtils.copyFile( digestSourceFile, digestTargetFile );
+ }
}
catch ( IOException e )
{
Modified: maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/DefaultArtifactDiscoverer.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/DefaultArtifactDiscoverer.java?rev=290380&r1=290379&r2=290380&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/DefaultArtifactDiscoverer.java (original)
+++ maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/discover/DefaultArtifactDiscoverer.java Tue Sep 20 00:07:23 2005
@@ -70,7 +70,7 @@
Artifact result;
List pathParts = new ArrayList();
- StringTokenizer st = new StringTokenizer( path, "/" );
+ StringTokenizer st = new StringTokenizer( path, "/\\" );
while ( st.hasMoreTokens() )
{
pathParts.add( st.nextToken() );
@@ -80,7 +80,7 @@
if ( pathParts.size() < 4 )
{
- reporter.error( "Not enough parts (4) in path " + path );
+ reporter.error( "Not enough parts (" + pathParts.size() + "/4) in path " + path );
return null;
}
Modified: maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java?rev=290380&r1=290379&r2=290380&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java (original)
+++ maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java Tue Sep 20 00:07:23 2005
@@ -456,9 +456,10 @@
boolean reportOnly )
throws IOException, DigestException, ReportWriteException
{
- if ( source.exists() )
+ if ( source.exists() && !source.getCanonicalFile().equals( target.getCanonicalFile() ) )
{
File targetParent = target.getParentFile();
+
if ( !targetParent.exists() )
{
targetParent.mkdirs();
@@ -515,6 +516,11 @@
throws IOException
{
File artifactSource = artifact.getFile();
+
+ if ( artifactSource.getCanonicalFile().equals( artifactTarget.getCanonicalFile() ) )
+ {
+ return;
+ }
InputStream inStream = null;
OutputStream outStream = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org