Author: brett
Date: Mon Sep 19 21:50:47 2005
New Revision: 290357
URL: http://svn.apache.org/viewcvs?rev=290357&view=rev
Log:
add metadata for new artifact
Modified:
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/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=290357&r1=290356&r2=290357&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
Mon Sep 19 21:50:47 2005
@@ -364,10 +364,11 @@
private void mergeMetadata( Metadata sourceMetadata, File target, boolean
reportOnly )
throws IOException, DigestException, XmlPullParserException,
NoSuchAlgorithmException
{
+ boolean changed = false;
+ Metadata targetMetadata = null;
+
if ( target.exists() )
{
- Metadata targetMetadata = null;
-
Reader reader = null;
try
@@ -383,32 +384,36 @@
IOUtil.close( reader );
}
- boolean changed = targetMetadata.merge( sourceMetadata );
-
- if ( changed )
+ changed = targetMetadata.merge( sourceMetadata );
+ }
+ else
+ {
+ changed = true;
+ targetMetadata = sourceMetadata;
+ }
+ if ( changed )
+ {
+ Writer writer = null;
+ try
{
- Writer writer = null;
- try
- {
- target.getParentFile().mkdirs();
- writer = new FileWriter( target );
+ target.getParentFile().mkdirs();
+ writer = new FileWriter( target );
- MetadataXpp3Writer mappingWriter = new
MetadataXpp3Writer();
+ MetadataXpp3Writer mappingWriter = new MetadataXpp3Writer();
- mappingWriter.write( writer, targetMetadata );
+ mappingWriter.write( writer, targetMetadata );
- if ( !reportOnly )
- {
- File digestFile = artifactDigestor.getDigestFile(
target, Digestor.MD5 );
- artifactDigestor.createArtifactDigest( target,
digestFile, Digestor.MD5 );
- digestFile = artifactDigestor.getDigestFile( target,
Digestor.SHA );
- artifactDigestor.createArtifactDigest( target,
digestFile, Digestor.SHA );
- }
- }
- finally
+ if ( !reportOnly )
{
- IOUtil.close( writer );
+ File digestFile = artifactDigestor.getDigestFile( target,
Digestor.MD5 );
+ artifactDigestor.createArtifactDigest( target, digestFile,
Digestor.MD5 );
+ digestFile = artifactDigestor.getDigestFile( target,
Digestor.SHA );
+ artifactDigestor.createArtifactDigest( target, digestFile,
Digestor.SHA );
}
+ }
+ finally
+ {
+ IOUtil.close( writer );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
