svn commit: r555861 - in /maven/sandbox/trunk/plugins/maven-component-it-plugin/src: main/java/org/apache/maven/plugin/componentit/ main/java/org/apache/maven/plugin/componentit/tools/ main/java/org/apache/maven/plugin/plugit/ test/java/org/apache/mave...

[jd...@apache.org]

Author: jdcasey
Date: Thu Jul 12 20:49:12 2007
New Revision: 555861

URL: http://svn.apache.org/viewvc?view=rev&rev=555861
Log:
Changing package to reflect wider plugin role.

Added:
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/GenerateJUnitWrapperMojo.java
      - copied, changed from r555835, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/GenerateJUnitWrapperMojo.java
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/StagePluginMojo.java
      - copied, changed from r555854, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/StagePluginMojo.java
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/
      - copied from r555835, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/CodeGenerator.java
      - copied, changed from r555860, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/CodeGenerator.java
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/ToolException.java
      - copied, changed from r555860, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/ToolException.java
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/componentit/
      - copied from r555835, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/plugit/
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/componentit/StagePluginMojoTest.java
      - copied, changed from r555860, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/plugit/StagePluginMojoTest.java
Removed:
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/
    maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/plugit/

Copied: maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/GenerateJUnitWrapperMojo.java (from r555835, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/GenerateJUnitWrapperMojo.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/GenerateJUnitWrapperMojo.java?view=diff&rev=555861&p1=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/GenerateJUnitWrapperMojo.java&r1=555835&p2=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/GenerateJUnitWrapperMojo.java&r2=555861
==============================================================================
--- maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/GenerateJUnitWrapperMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/GenerateJUnitWrapperMojo.java Thu Jul 12 20:49:12 2007
@@ -1,11 +1,11 @@
-package org.apache.maven.plugin.plugit;
+package org.apache.maven.plugin.componentit;
 
 import org.apache.maven.model.Dependency;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.plugit.tools.CodeGenerator;
-import org.apache.maven.plugin.plugit.tools.ToolException;
+import org.apache.maven.plugin.componentit.tools.CodeGenerator;
+import org.apache.maven.plugin.componentit.tools.ToolException;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.shared.model.fileset.util.FileSetManager;
 import org.codehaus.plexus.velocity.VelocityComponent;
@@ -18,7 +18,7 @@
 
 /**
  * Generate JUnit wrappers for each integration-test build matched.
- * 
+ *
  * @goal junit-wrappers
  * @author jdcasey
  *
@@ -30,18 +30,18 @@
     private static final String JUNIT_GROUP_ID = "junit";
 
     private static final String JUNIT_ARTIFACT_ID = "junit";
-    
+
     private static final String ABSTRACT_TEST_CLASS_TEMPLATE = "AbstractJUnitWrapperTest.vm";
-    
+
     private static final String BUILD_WRAPPER_TEMPLATE = "JUnitWrapperTest.vm";
 
     private static final String ABSTRACT_TEST_CLASS = "AbstractJUnitWrapperTest";
-    
+
     private static final String BUILD_WRAPPER_CLASS_BASENAME = "JUnitWrapperTest";
-    
+
     /**
      * This is the Java package name for the generated wrapper classes.
-     * 
+     *
      * @parameter expression="wrapperPackage" default-value="integrationTests"
      * @required
      */
@@ -49,7 +49,7 @@
 
     /**
      * List of direct dependencies of this project, to verify that junit is present.
-     * 
+     *
      * @parameter default-value="${project.dependencies}"
      * @required
      * @readonly
@@ -66,7 +66,7 @@
     /**
      * List of included integration-test POM path patterns. By default, includes all poms under the
      * itBasedir directory.
-     * 
+     *
      * @parameter expression="itIncludes"
      */
     private List itPomIncludes = Collections.singletonList( "**/pom.xml" );
@@ -74,7 +74,7 @@
     /**
      * List of excluded integration-test POM path patterns, such as child-projects of multimodule
      * integration tests. By default, this will exclude all poms under a child* directory structure.
-     * 
+     *
      * @parameter expression="itExcludes"
      */
     private List itPomExcludes = Collections.singletonList( "**/child*/**/pom.xml" );
@@ -86,7 +86,7 @@
 
     /**
      * Source directory where generated wrapper classes will be located.
-     * 
+     *
      * @parameter expression="wrapperSourceDir" default-value="${project.build.directory}/generated-sources/plug-it"
      * @required
      */
@@ -96,7 +96,7 @@
     private CodeGenerator codeGenerator;
 
     private int wrapperCounter;
-    
+
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
@@ -112,12 +112,12 @@
             throw new MojoExecutionException( "Search for IT projects failed.", e );
         }
 
-        if ( poms != null && poms.length > 0 )
+        if ( ( poms != null ) && ( poms.length > 0 ) )
         {
             wrapperCounter = 0;
-            
+
             initializeCodeGenerator();
-            
+
             try
             {
                 generateAbstractTestClass();
@@ -158,7 +158,7 @@
     private void generateTestWrapper( File pomFile ) throws ToolException
     {
         String wrapperName = BUILD_WRAPPER_CLASS_BASENAME + wrapperCounter++;
-        
+
         codeGenerator.generateCode( pomFile.getPath(), wrapperName, BUILD_WRAPPER_TEMPLATE );
     }
 

Copied: maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/StagePluginMojo.java (from r555854, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/StagePluginMojo.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/StagePluginMojo.java?view=diff&rev=555861&p1=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/StagePluginMojo.java&r1=555854&p2=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/StagePluginMojo.java&r2=555861
==============================================================================
--- maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/StagePluginMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/StagePluginMojo.java Thu Jul 12 20:49:12 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.plugit;
+package org.apache.maven.plugin.componentit;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;

Copied: maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/CodeGenerator.java (from r555860, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/CodeGenerator.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/CodeGenerator.java?view=diff&rev=555861&p1=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/CodeGenerator.java&r1=555860&p2=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/CodeGenerator.java&r2=555861
==============================================================================
--- maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/CodeGenerator.java (original)
+++ maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/CodeGenerator.java Thu Jul 12 20:49:12 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.plugit.tools;
+package org.apache.maven.plugin.componentit.tools;
 
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.context.Context;

Copied: maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/ToolException.java (from r555860, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/ToolException.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/ToolException.java?view=diff&rev=555861&p1=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/ToolException.java&r1=555860&p2=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/ToolException.java&r2=555861
==============================================================================
--- maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/plugit/tools/ToolException.java (original)
+++ maven/sandbox/trunk/plugins/maven-component-it-plugin/src/main/java/org/apache/maven/plugin/componentit/tools/ToolException.java Thu Jul 12 20:49:12 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.plugit.tools;
+package org.apache.maven.plugin.componentit.tools;
 
 public class ToolException
     extends Exception

Copied: maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/componentit/StagePluginMojoTest.java (from r555860, maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/plugit/StagePluginMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/componentit/StagePluginMojoTest.java?view=diff&rev=555861&p1=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/plugit/StagePluginMojoTest.java&r1=555860&p2=maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/componentit/StagePluginMojoTest.java&r2=555861
==============================================================================
--- maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/plugit/StagePluginMojoTest.java (original)
+++ maven/sandbox/trunk/plugins/maven-component-it-plugin/src/test/java/org/apache/maven/plugin/componentit/StagePluginMojoTest.java Thu Jul 12 20:49:12 2007
@@ -1,7 +1,8 @@
-package org.apache.maven.plugin.plugit;
+package org.apache.maven.plugin.componentit;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.componentit.StagePluginMojo;
 import org.apache.maven.shared.test.plugin.ComponentTestTool;
 import org.apache.maven.shared.tools.easymock.TestFileManager;
 import org.codehaus.plexus.PlexusTestCase;