You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/04/29 02:12:11 UTC
svn commit: r165238 -
/maven/components/trunk/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit
/maven/components/trunk/maven-core/src/main/java/org/apache/maven
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin
/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus
/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin
/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java
/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly
/maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean
/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin
/maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy
/maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb
/maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea
/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install
/maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar
/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin
/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources
/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia
/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
/maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance
Author: jdcasey
Date: Thu Apr 28 17:12:09 2005
New Revision: 165238
URL: http://svn.apache.org/viewcvs?rev=165238&view=rev
Log:
Renamed Plugin.java, AbstractPlugin.java, PluginExecutionRe(quest|sponse) PluginExecutionException to Mojo*
Added:
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
- copied, changed from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractPlugin.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java
- copied, changed from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Plugin.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java
- copied, changed from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionRequest.java
- copied, changed from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionRequest.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionResponse.java
- copied, changed from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionResponse.java
Removed:
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractPlugin.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Plugin.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionRequest.java
maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionResponse.java
Modified:
maven/components/trunk/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java
maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Modified: maven/components/trunk/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java (original)
+++ maven/components/trunk/maven-core-it-plugin/src/main/java/org/apache/maven/plugin/coreit/CoreItMojo.java Thu Apr 28 17:12:09 2005
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import java.io.IOException;
import java.io.File;
@@ -31,7 +31,7 @@
* @description Goal which cleans the build
*/
public class CoreItMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
* @parameter expression="${project.build.directory}"
@@ -55,7 +55,7 @@
private String goalItem = "bar";
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
touch( new File( outputDirectory ), "touch.txt" );
@@ -64,7 +64,7 @@
if ( basedirAlignmentDirectory.getPath().equals( "target/test-basedir-alignment" ) )
{
- throw new PluginExecutionException( "basedirAlignmentDirectory not aligned" );
+ throw new MojoExecutionException( "basedirAlignmentDirectory not aligned" );
}
touch( basedirAlignmentDirectory, "touch.txt" );
@@ -82,7 +82,7 @@
}
private static void touch( File dir, String file )
- throws PluginExecutionException
+ throws MojoExecutionException
{
try
{
@@ -101,7 +101,7 @@
}
catch ( IOException e )
{
- throw new PluginExecutionException( "Error touching file", e );
+ throw new MojoExecutionException( "Error touching file", e );
}
}
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Thu Apr 28 17:12:09 2005
@@ -27,7 +27,7 @@
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
@@ -236,11 +236,11 @@
// TODO: yuck! Revisit when cleaning up the exception handling from the top down
Throwable exception = response.getException();
- if ( exception instanceof PluginExecutionException )
+ if ( exception instanceof MojoExecutionException )
{
if ( exception.getCause() == null )
{
- PluginExecutionException e = (PluginExecutionException) exception;
+ MojoExecutionException e = (MojoExecutionException) exception;
logFailure( response, e, e.getLongMessage() );
}
else
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Thu Apr 28 17:12:09 2005
@@ -37,7 +37,7 @@
import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.logging.DefaultLog;
-import org.apache.maven.plugin.Plugin;
+import org.apache.maven.plugin.Mojo;
import org.apache.maven.reactor.ReactorException;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Profile;
@@ -264,7 +264,7 @@
}
// TODO [BP]: do we set one per mojo? where to do it?
- Logger logger = manager.getLoggerForComponent( Plugin.ROLE );
+ Logger logger = manager.getLoggerForComponent( Mojo.ROLE );
if ( logger != null )
{
request.setLog( new DefaultLog( logger ) );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Thu Apr 28 17:12:09 2005
@@ -28,7 +28,7 @@
import org.apache.maven.model.PluginManagement;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
@@ -93,7 +93,7 @@
{
processGoals( session, tasks );
}
- catch ( PluginExecutionException e )
+ catch ( MojoExecutionException e )
{
response.setException( e );
}
@@ -115,7 +115,7 @@
private void processGoals( MavenSession session, List tasks )
throws ArtifactHandlerNotFoundException, LifecycleExecutionException, PluginNotFoundException,
- PluginExecutionException, ArtifactResolutionException
+ MojoExecutionException, ArtifactResolutionException
{
Map phaseMap = new HashMap();
@@ -406,7 +406,7 @@
}
private void executePhase( String phase, MavenSession session, Map phaseMap )
- throws PluginExecutionException, PluginNotFoundException, PluginManagerException, ArtifactResolutionException,
+ throws MojoExecutionException, PluginNotFoundException, PluginManagerException, ArtifactResolutionException,
LifecycleExecutionException
{
// only execute up to the given phase
@@ -437,7 +437,7 @@
}
}
}
- catch ( PluginExecutionException e )
+ catch ( MojoExecutionException e )
{
dispatcher.dispatchError( event, p.getId(), e );
throw e;
@@ -458,7 +458,7 @@
}
protected void executeMojo( String id, MavenSession session )
- throws PluginExecutionException, PluginNotFoundException, PluginManagerException, ArtifactResolutionException,
+ throws MojoExecutionException, PluginNotFoundException, PluginManagerException, ArtifactResolutionException,
LifecycleExecutionException
{
// ----------------------------------------------------------------------
@@ -481,7 +481,7 @@
if ( mojoDescriptor == null )
{
- throw new PluginExecutionException( "Unable to find goal: " + id );
+ throw new MojoExecutionException( "Unable to find goal: " + id );
}
if ( mojoDescriptor.getExecutePhase() != null )
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Thu Apr 28 17:12:09 2005
@@ -159,7 +159,7 @@
}
// ----------------------------------------------------------------------
- // Plugin discovery
+ // Mojo discovery
// ----------------------------------------------------------------------
public void componentDiscovered( ComponentDiscoveryEvent event )
@@ -314,13 +314,13 @@
}
// ----------------------------------------------------------------------
- // Plugin execution
+ // Mojo execution
// ----------------------------------------------------------------------
public void executeMojo( MavenSession session, MojoDescriptor mojoDescriptor )
- throws ArtifactResolutionException, PluginManagerException, PluginExecutionException
+ throws ArtifactResolutionException, PluginManagerException, MojoExecutionException
{
- PluginExecutionRequest request = null;
+ MojoExecutionRequest request = null;
if ( mojoDescriptor.getRequiresDependencyResolution() != null )
{
@@ -354,13 +354,13 @@
}
}
- Plugin plugin = null;
+ Mojo plugin = null;
String goalName = mojoDescriptor.getId();
try
{
- plugin = (Plugin) container.lookup( Plugin.ROLE, goalName );
+ plugin = (Mojo) container.lookup( Mojo.ROLE, goalName );
plugin.setLog( session.getLog() );
@@ -420,7 +420,7 @@
}
catch ( ExpressionEvaluationException e )
{
- throw new PluginExecutionException( "Unable to configure plugin", e );
+ throw new MojoExecutionException( "Unable to configure plugin", e );
}
// !! This is ripe for refactoring to an aspect.
@@ -442,7 +442,7 @@
dispatcher.dispatchEnd( event, goalName );
}
- catch ( PluginExecutionException e )
+ catch ( MojoExecutionException e )
{
session.getEventDispatcher().dispatchError( event, goalName, e );
throw e;
@@ -453,11 +453,11 @@
catch ( PluginConfigurationException e )
{
String msg = "Error configuring plugin for execution of '" + goalName + "'.";
- throw new PluginExecutionException( msg, e );
+ throw new MojoExecutionException( msg, e );
}
catch ( ComponentLookupException e )
{
- throw new PluginExecutionException( "Error looking up plugin: ", e );
+ throw new MojoExecutionException( "Error looking up plugin: ", e );
}
finally
{
@@ -564,7 +564,7 @@
// intentionally ignored
Class superclass = aClass.getSuperclass();
- if ( superclass != AbstractPlugin.class )
+ if ( superclass != AbstractMojo.class )
{
return checkMojoTechnique( superclass );
}
@@ -582,7 +582,7 @@
* @return
* @deprecated
*/
- private static PluginExecutionRequest createPluginRequest( PlexusConfiguration configuration, Map map )
+ private static MojoExecutionRequest createPluginRequest( PlexusConfiguration configuration, Map map )
{
Map parameters = new HashMap();
PlexusConfiguration[] children = configuration.getChildren();
@@ -592,10 +592,10 @@
parameters.put( child.getName(), child.getValue( null ) );
}
map = CollectionUtils.mergeMaps( map, parameters );
- return new PluginExecutionRequest( map );
+ return new MojoExecutionRequest( map );
}
- private void populatePluginFields( Plugin plugin, PlexusConfiguration configuration, Map map,
+ private void populatePluginFields( Mojo plugin, PlexusConfiguration configuration, Map map,
ExpressionEvaluator expressionEvaluator )
throws PluginConfigurationException
{
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/MavenMojoDescriptor.java Thu Apr 28 17:12:09 2005
@@ -58,7 +58,7 @@
public String getRole()
{
- return Plugin.ROLE;
+ return Mojo.ROLE;
}
public String getRoleHint()
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Thu Apr 28 17:12:09 2005
@@ -31,7 +31,7 @@
String ROLE = PluginManager.class.getName();
void executeMojo( MavenSession session, MojoDescriptor mojoDescriptor )
- throws PluginExecutionException, PluginManagerException, ArtifactResolutionException;
+ throws MojoExecutionException, PluginManagerException, ArtifactResolutionException;
MojoDescriptor getMojoDescriptor( String goalId );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java Thu Apr 28 17:12:09 2005
@@ -29,7 +29,7 @@
{
public PluginNotFoundException( String groupId, String artifactId, String version, ArtifactResolutionException e )
{
- super( "Plugin could not be found - check that the goal name is correct", groupId, artifactId, version,
+ super( "Mojo could not be found - check that the goal name is correct", groupId, artifactId, version,
"maven-plugin", e );
}
}
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Thu Apr 28 17:12:09 2005
@@ -52,7 +52,7 @@
<role>org.apache.maven.project.MavenProjectBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.plugin.PluginManager</role>
+ <role>org.apache.maven.plugin.MojoManager</role>
</requirement>
</requirements>
<configuration>
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/plexus.xml Thu Apr 28 17:12:09 2005
@@ -2,7 +2,7 @@
<component-discoverer-manager implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager">
<listeners>
<listener implementation="org.codehaus.plexus.component.discovery.DiscoveryListenerDescriptor">
- <role>org.apache.maven.plugin.PluginManager</role>
+ <role>org.apache.maven.plugin.MojoManager</role>
</listener>
</listeners>
<component-discoverers>
@@ -18,7 +18,7 @@
</component-factory-manager>
<components>
<component>
- <role>org.apache.maven.plugin.PluginManager</role>
+ <role>org.apache.maven.plugin.MojoManager</role>
<implementation>org.apache.maven.plugin.DefaultPluginManager</implementation>
<requirements>
<requirement>
Copied: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java (from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractPlugin.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java?p2=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java&p1=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractPlugin.java&r1=165225&r2=165238&rev=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractPlugin.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java Thu Apr 28 17:12:09 2005
@@ -22,8 +22,8 @@
/**
* @version $Id$
*/
-public abstract class AbstractPlugin
- implements Plugin
+public abstract class AbstractMojo
+ implements Mojo
{
private Log log;
@@ -32,21 +32,21 @@
*
* @deprecated
*/
- public void execute( PluginExecutionRequest request )
- throws PluginExecutionException
+ public void execute( MojoExecutionRequest request )
+ throws MojoExecutionException
{
- PluginExecutionResponse response = new PluginExecutionResponse();
+ MojoExecutionResponse response = new MojoExecutionResponse();
try
{
execute( request, response );
}
catch ( Exception e )
{
- throw new PluginExecutionException( e.getMessage(), e );
+ throw new MojoExecutionException( e.getMessage(), e );
}
if ( response.isExecutionFailure() )
{
- throw new PluginExecutionException( response.getFailureResponse().getSource(),
+ throw new MojoExecutionException( response.getFailureResponse().getSource(),
response.getFailureResponse().shortMessage(),
response.getFailureResponse().longMessage() );
}
@@ -55,7 +55,7 @@
/**
* @deprecated
*/
- public void execute( PluginExecutionRequest request, PluginExecutionResponse response )
+ public void execute( MojoExecutionRequest request, MojoExecutionResponse response )
throws Exception
{
throw new UnsupportedOperationException(
@@ -81,9 +81,9 @@
}
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
- throw new PluginExecutionException( "You must override execute() if you implement the new paradigm" );
+ throw new MojoExecutionException( "You must override execute() if you implement the new paradigm" );
}
}
Copied: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java (from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Plugin.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java?p2=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java&p1=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Plugin.java&r1=165225&r2=165238&rev=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Plugin.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java Thu Apr 28 17:12:09 2005
@@ -22,16 +22,16 @@
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
*/
-public interface Plugin
+public interface Mojo
{
- String ROLE = Plugin.class.getName();
+ String ROLE = Mojo.class.getName();
void execute()
- throws PluginExecutionException;
+ throws MojoExecutionException;
/** @deprecated */
- void execute( PluginExecutionRequest request )
- throws PluginExecutionException;
+ void execute( MojoExecutionRequest request )
+ throws MojoExecutionException;
// TODO: not sure about this here, and may want a getLog on here as well/instead
void setLog( Log log );
Copied: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java (from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionException.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java?p2=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java&p1=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionException.java&r1=165225&r2=165238&rev=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionException.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java Thu Apr 28 17:12:09 2005
@@ -22,25 +22,25 @@
* @author Brett Porter
* @version $Id$
*/
-public class PluginExecutionException extends Exception
+public class MojoExecutionException extends Exception
{
private Object source;
private String longMessage;
- public PluginExecutionException( Object source, String shortMessage, String longMessage )
+ public MojoExecutionException( Object source, String shortMessage, String longMessage )
{
super( shortMessage );
this.source = source;
this.longMessage = longMessage;
}
- public PluginExecutionException( String message, Exception cause )
+ public MojoExecutionException( String message, Exception cause )
{
super( message, cause );
}
- public PluginExecutionException( String message )
+ public MojoExecutionException( String message )
{
super( message );
}
Copied: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionRequest.java (from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionRequest.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionRequest.java?p2=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionRequest.java&p1=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionRequest.java&r1=165225&r2=165238&rev=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionRequest.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionRequest.java Thu Apr 28 17:12:09 2005
@@ -23,11 +23,11 @@
* @version $Id$
* @deprecated
*/
-public class PluginExecutionRequest
+public class MojoExecutionRequest
{
private Map parameters;
- public PluginExecutionRequest( Map parameters )
+ public MojoExecutionRequest( Map parameters )
{
this.parameters = parameters;
}
Copied: maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionResponse.java (from r165225, maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionResponse.java)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionResponse.java?p2=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionResponse.java&p1=maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionResponse.java&r1=165225&r2=165238&rev=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/PluginExecutionResponse.java (original)
+++ maven/components/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionResponse.java Thu Apr 28 17:12:09 2005
@@ -21,7 +21,7 @@
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
*/
-public class PluginExecutionResponse
+public class MojoExecutionResponse
{
private FailureResponse failureResponse = null;
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Thu Apr 28 17:12:09 2005
@@ -110,7 +110,7 @@
}
// ----------------------------------------------------------------------
- // Plugin descriptor creation from @tags
+ // Mojo descriptor creation from @tags
// ----------------------------------------------------------------------
private MojoDescriptor createMojoDescriptor( JavaSource javaSource, MavenProject project )
Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java Thu Apr 28 17:12:09 2005
@@ -21,8 +21,8 @@
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
import org.apache.maven.artifact.resolver.filter.IncludesArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.DependencySet;
import org.apache.maven.plugins.assembly.model.FileSet;
@@ -57,7 +57,7 @@
* @description assemble an application bundle or distribution
*/
public class AssemblyMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
private static final String[] EMPTY_STRING_ARRAY = {};
@@ -106,7 +106,7 @@
private File workDirectory;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
try
{
@@ -115,7 +115,7 @@
catch ( Exception e )
{
// TODO: don't catch exception
- throw new PluginExecutionException( "Error creating assembly", e );
+ throw new MojoExecutionException( "Error creating assembly", e );
}
}
@@ -133,14 +133,14 @@
InputStream resourceAsStream = getClass().getResourceAsStream( "/assemblies/" + descriptorId + ".xml" );
if ( resourceAsStream == null )
{
- throw new PluginExecutionException( "Descriptor with ID '" + descriptorId + "' not found" );
+ throw new MojoExecutionException( "Descriptor with ID '" + descriptorId + "' not found" );
}
r = new InputStreamReader( resourceAsStream );
}
else
{
// TODO: better exception
- throw new PluginExecutionException( "You must specify descriptor or descriptorId" );
+ throw new MojoExecutionException( "You must specify descriptor or descriptorId" );
}
try
Modified: maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java (original)
+++ maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java Thu Apr 28 17:12:09 2005
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import java.io.File;
@@ -28,7 +28,7 @@
* @description Goal which cleans the build
*/
public class CleanPlugin
- extends AbstractPlugin
+ extends AbstractMojo
{
private static final int DELETE_RETRY_SLEEP_MILLIS = 10;
@@ -45,7 +45,7 @@
// private boolean failOnError;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
if ( outputDirectory != null )
{
Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Thu Apr 28 17:12:09 2005
@@ -33,7 +33,7 @@
import java.util.Set;
public abstract class AbstractCompilerMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
private Compiler compiler = new JavacCompiler();
@@ -79,7 +79,7 @@
protected abstract String getOutputDirectory();
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
// ----------------------------------------------------------------------
//
@@ -134,7 +134,7 @@
catch ( Exception e )
{
// TODO: don't catch Exception
- throw new PluginExecutionException( "Fatal error compiling", e );
+ throw new MojoExecutionException( "Fatal error compiling", e );
}
boolean compilationError = false;
@@ -156,7 +156,7 @@
}
private Set computeStaleSources()
- throws PluginExecutionException
+ throws MojoExecutionException
{
long staleTime = 0;
@@ -168,7 +168,7 @@
}
catch ( NumberFormatException e )
{
- throw new PluginExecutionException( "Invalid staleMillis plugin parameter value: \'" + staleMillis
+ throw new MojoExecutionException( "Invalid staleMillis plugin parameter value: \'" + staleMillis
+ "\'", e );
}
@@ -195,7 +195,7 @@
}
catch ( InclusionScanException e )
{
- throw new PluginExecutionException( "Error scanning source root: \'" + sourceRoot
+ throw new MojoExecutionException( "Error scanning source root: \'" + sourceRoot
+ "\' for stale files to recompile.", e );
}
}
Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java (original)
+++ maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java Thu Apr 28 17:12:09 2005
@@ -10,7 +10,7 @@
* @version $Id$
*/
public class CompilationFailureException
- extends PluginExecutionException
+ extends MojoExecutionException
{
private static final String LS = System.getProperty( "line.separator" );
Modified: maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java Thu Apr 28 17:12:09 2005
@@ -22,8 +22,8 @@
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import java.io.File;
@@ -36,7 +36,7 @@
* @description deploys an artifact to remote repository
*/
public class DeployMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
@@ -109,13 +109,13 @@
private ArtifactRepository localRepository;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
if ( deploymentRepository == null )
{
String msg = "Deployment failed: repository element was not specified in the pom inside"
+ " distributionManagement element";
- throw new PluginExecutionException( msg );
+ throw new MojoExecutionException( msg );
}
// Deploy the POM
@@ -142,7 +142,7 @@
catch ( ArtifactDeploymentException e )
{
// TODO: deployment exception that does not give a trace
- throw new PluginExecutionException( "Error deploying artifact", e );
+ throw new MojoExecutionException( "Error deploying artifact", e );
}
}
}
Modified: maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Thu Apr 28 17:12:09 2005
@@ -18,8 +18,8 @@
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import java.io.File;
@@ -32,7 +32,7 @@
* @description build an ejb
*/
public class EjbMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
// TODO: will null work instead?
private static final String[] DEFAULT_INCLUDES = new String[]{"**/**"};
@@ -84,7 +84,7 @@
* @todo Add license files in META-INF directory.
*/
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
getLog().info( "Building ejb " + jarName );
@@ -126,7 +126,7 @@
catch ( Exception e )
{
// TODO: improve error handling
- throw new PluginExecutionException( "Error assembling EJB", e );
+ throw new MojoExecutionException( "Error assembling EJB", e );
}
}
Modified: maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java Thu Apr 28 17:12:09 2005
@@ -18,8 +18,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -44,7 +44,7 @@
* @todo use dom4j or something. Xpp3Dom can't cope properly with entities and so on
*/
public class IdeaMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
* @parameter expression="${project}"
@@ -54,7 +54,7 @@
private MavenProject project;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
rewriteModule();
@@ -64,7 +64,7 @@
}
private void rewriteWorkspace()
- throws PluginExecutionException
+ throws MojoExecutionException
{
File workspaceFile = new File( project.getBasedir(), project.getArtifactId() + ".iws" );
if ( !workspaceFile.exists() )
@@ -77,7 +77,7 @@
}
catch ( IOException e )
{
- throw new PluginExecutionException( "Unable to create workspace file", e );
+ throw new MojoExecutionException( "Unable to create workspace file", e );
}
finally
{
@@ -88,7 +88,7 @@
}
private void rewriteProject()
- throws PluginExecutionException
+ throws MojoExecutionException
{
try
{
@@ -148,16 +148,16 @@
}
catch ( XmlPullParserException e )
{
- throw new PluginExecutionException( "Error parsing existing IML file", e );
+ throw new MojoExecutionException( "Error parsing existing IML file", e );
}
catch ( IOException e )
{
- throw new PluginExecutionException( "Error parsing existing IML file", e );
+ throw new MojoExecutionException( "Error parsing existing IML file", e );
}
}
private void rewriteModule()
- throws PluginExecutionException
+ throws MojoExecutionException
{
try
{
@@ -262,11 +262,11 @@
}
catch ( XmlPullParserException e )
{
- throw new PluginExecutionException( "Error parsing existing IML file", e );
+ throw new MojoExecutionException( "Error parsing existing IML file", e );
}
catch ( IOException e )
{
- throw new PluginExecutionException( "Error parsing existing IML file", e );
+ throw new MojoExecutionException( "Error parsing existing IML file", e );
}
}
Modified: maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java Thu Apr 28 17:12:09 2005
@@ -22,8 +22,8 @@
import org.apache.maven.artifact.installer.ArtifactInstaller;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import java.io.File;
@@ -35,7 +35,7 @@
* @description installs project's main artifact in local repository
*/
public class InstallMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
@@ -101,7 +101,7 @@
private ArtifactRepository localRepository;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
Artifact artifact = new DefaultArtifact( groupId, artifactId, version, packaging );
@@ -128,7 +128,7 @@
catch ( ArtifactInstallationException e )
{
// TODO: install exception that does not give a trace
- throw new PluginExecutionException( "Error installing artifact", e );
+ throw new MojoExecutionException( "Error installing artifact", e );
}
}
}
Modified: maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java Thu Apr 28 17:12:09 2005
@@ -18,8 +18,8 @@
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import java.io.File;
@@ -32,7 +32,7 @@
* @description build a jar
*/
public class JarMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
private static final String[] DEFAULT_EXCLUDES = new String[]{"**/package.html"};
@@ -77,7 +77,7 @@
* @todo Add license files in META-INF directory.
*/
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
File jarFile = new File( basedir, finalName + ".jar" );
@@ -102,7 +102,7 @@
catch ( Exception e )
{
// TODO: improve error handling
- throw new PluginExecutionException( "Error assembling JAR", e );
+ throw new MojoExecutionException( "Error assembling JAR", e );
}
}
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java Thu Apr 28 17:12:09 2005
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.scanner.MojoScanner;
@@ -28,7 +28,7 @@
* @version $Id$
*/
public abstract class AbstractGeneratorMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
* @parameter expression="${project}"
@@ -48,7 +48,7 @@
throws Exception;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
try
{
@@ -59,7 +59,7 @@
catch ( Exception e )
{
// TODO: improve error handling
- throw new PluginExecutionException( "Error generating plugin descriptor", e );
+ throw new MojoExecutionException( "Error generating plugin descriptor", e );
}
}
}
Modified: maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java Thu Apr 28 17:12:09 2005
@@ -17,8 +17,8 @@
*/
import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -41,7 +41,7 @@
* @description copy application resources
*/
public class ResourcesMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
* The output directory into which to copy the resources.
@@ -60,13 +60,13 @@
private List resources;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
copyResources( resources, outputDirectory );
}
protected void copyResources( List resources, String outputDirectory )
- throws PluginExecutionException
+ throws MojoExecutionException
{
try
{
@@ -89,7 +89,7 @@
catch ( Exception e )
{
// TODO: handle exception
- throw new PluginExecutionException( "Error copying resources", e );
+ throw new MojoExecutionException( "Error copying resources", e );
}
}
Modified: maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java Thu Apr 28 17:12:09 2005
@@ -1,6 +1,6 @@
package org.apache.maven.plugin.resources;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.MojoExecutionException;
import java.util.List;
@@ -47,7 +47,7 @@
private List resources;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
copyResources( resources, outputDirectory );
}
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java Thu Apr 28 17:12:09 2005
@@ -1,8 +1,8 @@
package org.apache.maven.doxia;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReportConfiguration;
import org.apache.maven.reporting.manager.MavenReportManager;
@@ -16,7 +16,7 @@
* @description Doxia plugin
*/
public class DoxiaMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
* @parameter expression="${basedir}/src/site"
@@ -77,7 +77,7 @@
private List remoteRepositories;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
try
{
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java Thu Apr 28 17:12:09 2005
@@ -4,8 +4,8 @@
package org.apache.maven.doxia;
import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.WagonUtils;
@@ -35,7 +35,7 @@
* then making file by file copy.
*/
public class ScpSiteDeployMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
* @parameter alias="siteDirectory" expression="${project.build.directory}/site"
@@ -62,7 +62,7 @@
private MavenProject project;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
File baseDir = new File( inputDirectory );
@@ -74,7 +74,7 @@
}
catch ( IOException e )
{
- throw new PluginExecutionException( "Cannot create site archive!", e );
+ throw new MojoExecutionException( "Cannot create site archive!", e );
}
SshCommandExecutor commandExecutor = new ScpWagon();
@@ -89,7 +89,7 @@
String msg = "distributionManagement element is missing in the POM: "
+ project.getId();
- throw new PluginExecutionException( msg );
+ throw new MojoExecutionException( msg );
}
@@ -98,7 +98,7 @@
String msg = "distributionManagement/repository element is missing in the POM: "
+ project.getId();
- throw new PluginExecutionException( msg );
+ throw new MojoExecutionException( msg );
}
@@ -111,7 +111,7 @@
String msg = "distributionManagement/site/url element is missing in the POM: "
+ project.getId();
- throw new PluginExecutionException( msg );
+ throw new MojoExecutionException( msg );
}
@@ -149,7 +149,7 @@
}
catch( Exception e )
{
- throw new PluginExecutionException( "Error transfering site archive!", e );
+ throw new MojoExecutionException( "Error transfering site archive!", e );
}
finally
{
Modified: maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original)
+++ maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Thu Apr 28 17:12:09 2005
@@ -19,8 +19,8 @@
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactPathFormatException;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.surefire.SurefireBooter;
import java.io.File;
@@ -38,7 +38,7 @@
* @todo make report to be produced configurable
*/
public class SurefirePlugin
- extends AbstractPlugin
+ extends AbstractMojo
{
/**
@@ -98,7 +98,7 @@
private ArtifactRepository localRepository;
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
// ----------------------------------------------------------------------
// Setup the surefire booter
@@ -169,7 +169,7 @@
}
catch ( ArtifactPathFormatException e )
{
- throw new PluginExecutionException( "Error finding surefire JAR", e );
+ throw new MojoExecutionException( "Error finding surefire JAR", e );
}
surefireBooter.addClassPathUrl( new File( classesDirectory ).getPath() );
@@ -193,12 +193,12 @@
catch ( Exception e )
{
// TODO: better handling
- throw new PluginExecutionException( "Error executing surefire", e );
+ throw new MojoExecutionException( "Error executing surefire", e );
}
if ( !success )
{
- throw new PluginExecutionException( "There are some test failures." );
+ throw new MojoExecutionException( "There are some test failures." );
}
}
Modified: maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java Thu Apr 28 17:12:09 2005
@@ -20,8 +20,8 @@
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.plugin.AbstractPlugin;
-import org.apache.maven.plugin.PluginExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.ManifestException;
@@ -43,7 +43,7 @@
* @description build a war/webapp
*/
public class WarMojo
- extends AbstractPlugin
+ extends AbstractMojo
{
public static final String WEB_INF = "WEB-INF";
@@ -203,7 +203,7 @@
}
public void execute()
- throws PluginExecutionException
+ throws MojoExecutionException
{
File warFile = new File( outputDirectory, warName + ".war" );
@@ -214,7 +214,7 @@
catch ( Exception e )
{
// TODO: improve error handling
- throw new PluginExecutionException( "Error assembling WAR", e );
+ throw new MojoExecutionException( "Error assembling WAR", e );
}
}
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Thu Apr 28 17:12:09 2005
@@ -709,7 +709,7 @@
Xpp3Dom dom = null;
// ----------------------------------------------------------------------
- // I would like to be able to lookup the Plugin object using a key but
+ // I would like to be able to lookup the Mojo object using a key but
// we have a limitation in modello that will be remedied shortly. So
// for now I have to iterate through and see what we have.
// ----------------------------------------------------------------------
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=165238&r1=165237&r2=165238&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Thu Apr 28 17:12:09 2005
@@ -151,7 +151,7 @@
}
}
- // Plugin Repositories :: aggregate
+ // Mojo Repositories :: aggregate
List parentPluginRepositories = parent.getPluginRepositories();
List childPluginRepositories = child.getPluginRepositories();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org