svn commit: r1158442 - in /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos: CreateArchetypeFromProjectMojo.java JarMojo.java UpdateLocalCatalogMojo.java

[hboutemy]

Author: hboutemy
Date: Tue Aug 16 20:51:03 2011
New Revision: 1158442

URL: http://svn.apache.org/viewvc?rev=1158442&view=rev
Log:
o renamed ArchetypeManager attribute to better distinguish it
o removed unused code

Modified:
    
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
    
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
    
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java

Modified: 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=1158442&r1=1158441&r2=1158442&view=diff
==============================================================================
--- 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
 (original)
+++ 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
 Tue Aug 16 20:51:03 2011
@@ -53,7 +53,7 @@ public class CreateArchetypeFromProjectM
     extends AbstractMojo
 {
     /** @component */
-    ArchetypeCreationConfigurator configurator;
+    private ArchetypeCreationConfigurator configurator;
 
     /**
      * Enable the interactive mode to define the archetype from the project.
@@ -63,10 +63,7 @@ public class CreateArchetypeFromProjectM
     private boolean interactive;
 
     /** @component */
-    ArchetypeRegistryManager archetypeRegistryManager;
-
-    /** @component */
-    ArchetypeManager archetype;
+    private ArchetypeManager manager;
 
     /**
      * File extensions which are checked for project's text files (vs binary 
files).
@@ -203,7 +200,7 @@ public class CreateArchetypeFromProjectM
                 .setPostPhase( archetypePostPhase )
                 .setOutputDirectory( outputDirectory );
 
-            ArchetypeCreationResult result = 
archetype.createArchetypeFromProject( request );
+            ArchetypeCreationResult result = 
manager.createArchetypeFromProject( request );
 
             if ( result.getCause() != null )
             {

Modified: 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java?rev=1158442&r1=1158441&r2=1158442&view=diff
==============================================================================
--- 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
 (original)
+++ 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
 Tue Aug 16 20:51:03 2011
@@ -78,14 +78,14 @@ public class JarMojo
      *
      * @component
      */
-    private ArchetypeManager archetype;
+    private ArchetypeManager manager;
 
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
         try
         {
-            File jarFile = archetype.archiveArchetype( archetypeDirectory, 
outputDirectory, finalName );
+            File jarFile = manager.archiveArchetype( archetypeDirectory, 
outputDirectory, finalName );
 
             project.getArtifact().setFile( jarFile );
         }

Modified: 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java?rev=1158442&r1=1158441&r2=1158442&view=diff
==============================================================================
--- 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java
 (original)
+++ 
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/UpdateLocalCatalogMojo.java
 Tue Aug 16 20:51:03 2011
@@ -40,7 +40,7 @@ public class UpdateLocalCatalogMojo
     implements ContextEnabled
 {
     /** @component */
-    private ArchetypeManager archetyper;
+    private ArchetypeManager manager;
 
     /**
      * The project artifact, which should have the LATEST metadata added to it.
@@ -68,6 +68,6 @@ public class UpdateLocalCatalogMojo
             archetype.setDescription( project.getName() );
         }
 
-        archetyper.updateLocalCatalog( archetype );
+        manager.updateLocalCatalog( archetype );
     }
 }
\ No newline at end of file