You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/11/28 02:36:03 UTC

svn commit: r349341 - in /maven/sandbox/repoclean: ./ src/main/java/org/apache/maven/tools/repoclean/phase/ src/main/java/org/apache/maven/tools/repoclean/rewrite/ src/main/java/org/apache/maven/tools/repoclean/translate/ src/main/resources/META-INF/pl...

Author: brett
Date: Sun Nov 27 17:35:38 2005
New Revision: 349341

URL: http://svn.apache.org/viewcvs?rev=349341&view=rev
Log:
use factored out converted
PR: MRM-29

Removed:
    maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite/ArtifactPomRewriter.java
    maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite/V3PomRewriter.java
    maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite/V4PomRewriter.java
    maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomTranslationException.java
    maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
    maven/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/rewrite/V3PomRewriterTest.java
    maven/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java
Modified:
    maven/sandbox/repoclean/pom.xml
    maven/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/phase/RewritePhase.java
    maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml

Modified: maven/sandbox/repoclean/pom.xml
URL: http://svn.apache.org/viewcvs/maven/sandbox/repoclean/pom.xml?rev=349341&r1=349340&r2=349341&view=diff
==============================================================================
--- maven/sandbox/repoclean/pom.xml (original)
+++ maven/sandbox/repoclean/pom.xml Sun Nov 27 17:35:38 2005
@@ -39,9 +39,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0</version>
-      <classifier>all</classifier>
+      <artifactId>maven-model-converter</artifactId>
+      <version>2.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

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=349341&r1=349340&r2=349341&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 Sun Nov 27 17:35:38 2005
@@ -27,6 +27,7 @@
 import org.apache.maven.artifact.repository.metadata.Versioning;
 import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
+import org.apache.maven.model.converter.ArtifactPomRewriter;
 import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 import org.apache.maven.tools.repoclean.RepositoryCleanerConfiguration;
 import org.apache.maven.tools.repoclean.digest.DigestException;
@@ -34,7 +35,6 @@
 import org.apache.maven.tools.repoclean.digest.Digestor;
 import org.apache.maven.tools.repoclean.report.ReportWriteException;
 import org.apache.maven.tools.repoclean.report.Reporter;
-import org.apache.maven.tools.repoclean.rewrite.ArtifactPomRewriter;
 import org.apache.maven.tools.repoclean.transaction.RewriteTransaction;
 import org.apache.maven.tools.repoclean.transaction.RollbackException;
 import org.codehaus.plexus.PlexusConstants;
@@ -121,15 +121,15 @@
             try
             {
                 File artifactSource = new File( sourceRepo.getBasedir(), sourceRepo.pathOf( artifact ) );
-                File artifactTarget = new File( targetRepo.getBasedir(),
-                                                targetRepo.pathOf( artifact ).replace( '+', '-' ) );
+                File artifactTarget =
+                    new File( targetRepo.getBasedir(), targetRepo.pathOf( artifact ).replace( '+', '-' ) );
 
                 transaction.addFile( artifactTarget );
 
                 artifact.setFile( artifactSource );
 
-                boolean targetMissingOrOlder = !artifactTarget.exists() ||
-                    artifactTarget.lastModified() < artifactSource.lastModified();
+                boolean targetMissingOrOlder =
+                    !artifactTarget.exists() || artifactTarget.lastModified() < artifactSource.lastModified();
 
                 if ( artifactSource.exists() && ( configuration.force() || targetMissingOrOlder ) )
                 {
@@ -297,13 +297,13 @@
 
             try
             {
-                artifactPomRewriter = (ArtifactPomRewriter) container.lookup( ArtifactPomRewriter.ROLE,
-                                                                              ArtifactPomRewriter.V3_POM );
+                artifactPomRewriter =
+                    (ArtifactPomRewriter) container.lookup( ArtifactPomRewriter.ROLE, ArtifactPomRewriter.V3_POM );
 
                 transaction.addFile( targetPom );
 
-                bridgedTargetPom = new File( targetBase,
-                                             bridgingLayout.pathOfRemoteRepositoryMetadata( pom ).replace( '+', '-' ) );
+                bridgedTargetPom =
+                    new File( targetBase, bridgingLayout.pathOfRemoteRepositoryMetadata( pom ).replace( '+', '-' ) );
 
                 transaction.addFile( bridgedTargetPom );
 
@@ -324,15 +324,23 @@
 
                     to = new FileWriter( targetPom );
 
-                    artifactPomRewriter.rewrite( artifact, from, to, artifactReporter, reportOnly );
+                    artifactPomRewriter.rewrite( from, to, reportOnly, artifact.getGroupId(), artifact.getArtifactId(),
+                                                 artifact.getVersion(), artifact.getType() );
+
+                    for ( Iterator i = artifactPomRewriter.getWarnings().iterator(); i.hasNext(); )
+                    {
+                        String warning = (String) i.next();
+
+                        artifactReporter.warn( warning );
+                    }
                 }
                 finally
                 {
                     IOUtil.close( to );
                 }
 
-                wroteBridge = bridgePomLocations( targetPom, bridgedTargetPom, artifactReporter, transaction,
-                                                  reportOnly );
+                wroteBridge =
+                    bridgePomLocations( targetPom, bridgedTargetPom, artifactReporter, transaction, reportOnly );
             }
             finally
             {

Modified: maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml?rev=349341&r1=349340&r2=349341&view=diff
==============================================================================
--- maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/sandbox/repoclean/src/main/resources/META-INF/plexus/components.xml Sun Nov 27 17:35:38 2005
@@ -272,39 +272,5 @@
       <role>org.apache.maven.tools.repoclean.digest.Digestor</role>
       <implementation>org.apache.maven.tools.repoclean.digest.Digestor</implementation>
     </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.apache.maven.tools.repoclean.rewrite.ArtifactPomRewriter</role>
-      <role-hint>v3</role-hint>
-      <implementation>org.apache.maven.tools.repoclean.rewrite.V3PomRewriter</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.tools.repoclean.translate.PomV3ToV4Translator</role>
-        </requirement>
-      </requirements>
-    </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.apache.maven.tools.repoclean.rewrite.ArtifactPomRewriter</role>
-      <role-hint>v4</role-hint>
-      <implementation>org.apache.maven.tools.repoclean.rewrite.V4PomRewriter</implementation>
-    </component>
-    <!--
-     |
-     |
-     |
-     -->
-    <component>
-      <role>org.apache.maven.tools.repoclean.translate.PomV3ToV4Translator</role>
-      <implementation>org.apache.maven.tools.repoclean.translate.PomV3ToV4Translator</implementation>
-    </component>
   </components>
 </component-set>