You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/08/18 22:23:22 UTC
svn commit: r986913 - in /maven/maven-3/trunk/maven-core/src:
main/java/org/apache/maven/lifecycle/
main/java/org/apache/maven/lifecycle/internal/
test/java/org/apache/maven/lifecycle/
test/java/org/apache/maven/lifecycle/internal/ test/java/org/apache...
Author: hboutemy
Date: Wed Aug 18 20:23:21 2010
New Revision: 986913
URL: http://svn.apache.org/viewvc?rev=986913&view=rev
Log:
renamed *Impl classes to Default* to match usual convention
Added:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
- copied, changed from r986901, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
- copied, changed from r986901, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
- copied, changed from r986901, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImpl.java
Removed:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImpl.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=986913&r1=986912&r2=986913&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Wed Aug 18 20:23:21 2010
@@ -22,7 +22,7 @@ package org.apache.maven.lifecycle;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.DependencyContext;
import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
-import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculatorImpl;
+import org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator;
import org.apache.maven.lifecycle.internal.LifecycleStarter;
import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
@@ -169,7 +169,7 @@ public class DefaultLifecycleExecutor
Set<String> requiredDependencyResolutionScopes = new TreeSet<String>();
Set<String> requiredDependencyCollectionScopes = new TreeSet<String>();
// Ok, so this method could probably have a better location.
- LifecycleExecutionPlanCalculatorImpl.collectDependencyRequirements( requiredDependencyResolutionScopes,
+ DefaultLifecycleExecutionPlanCalculator.collectDependencyRequirements( requiredDependencyResolutionScopes,
requiredDependencyCollectionScopes,
mojoExecution );
Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java (from r986901, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java&r1=986901&r2=986913&rev=986913&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorImpl.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java Wed Aug 18 20:23:21 2010
@@ -71,7 +71,7 @@ import java.util.TreeSet;
* NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
*/
@Component( role = LifecycleExecutionPlanCalculator.class )
-public class LifecycleExecutionPlanCalculatorImpl
+public class DefaultLifecycleExecutionPlanCalculator
implements LifecycleExecutionPlanCalculator
{
@Requirement
@@ -93,14 +93,15 @@ public class LifecycleExecutionPlanCalcu
private LifecyclePluginResolver lifecyclePluginResolver;
@SuppressWarnings( { "UnusedDeclaration" } )
- public LifecycleExecutionPlanCalculatorImpl()
+ public DefaultLifecycleExecutionPlanCalculator()
{
}
- public LifecycleExecutionPlanCalculatorImpl( BuildPluginManager pluginManager, DefaultLifecycles defaultLifeCycles,
- MojoDescriptorCreator mojoDescriptorCreator,
- LifecyclePluginResolver lifecyclePluginResolver,
- DefaultSchedules defaultSchedules )
+ public DefaultLifecycleExecutionPlanCalculator( BuildPluginManager pluginManager,
+ DefaultLifecycles defaultLifeCycles,
+ MojoDescriptorCreator mojoDescriptorCreator,
+ LifecyclePluginResolver lifecyclePluginResolver,
+ DefaultSchedules defaultSchedules )
{
this.pluginManager = pluginManager;
this.defaultLifeCycles = defaultLifeCycles;
Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java (from r986901, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java&r1=986901&r2=986913&rev=986913&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java Wed Aug 18 20:23:21 2010
@@ -44,7 +44,7 @@ import java.util.Set;
* NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
*/
@Component( role = LifeCyclePluginAnalyzer.class )
-public class LifecyclePluginAnalyzerImpl
+public class DefaultLifecyclePluginAnalyzer
implements LifeCyclePluginAnalyzer
{
@@ -57,7 +57,7 @@ public class LifecyclePluginAnalyzerImpl
@Requirement
private Logger logger;
- public LifecyclePluginAnalyzerImpl()
+ public DefaultLifecyclePluginAnalyzer()
{
}
Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java (from r986901, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImpl.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImpl.java&r1=986901&r2=986913&rev=986913&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImpl.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java Wed Aug 18 20:23:21 2010
@@ -52,7 +52,7 @@ import java.util.List;
*/
@Component( role = LifecycleTaskSegmentCalculator.class )
-public class LifecycleTaskSegmentCalculatorImpl
+public class DefaultLifecycleTaskSegmentCalculator
implements LifecycleTaskSegmentCalculator
{
@Requirement
@@ -61,7 +61,7 @@ public class LifecycleTaskSegmentCalcula
@Requirement
private LifecyclePluginResolver lifecyclePluginResolver;
- public LifecycleTaskSegmentCalculatorImpl()
+ public DefaultLifecycleTaskSegmentCalculator()
{
}
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=986913&r1=986912&r2=986913&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java Wed Aug 18 20:23:21 2010
@@ -1,3 +1,5 @@
+package org.apache.maven.lifecycle;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
@@ -13,9 +15,6 @@
* the License.
*/
-
-package org.apache.maven.lifecycle;
-
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.exception.ExceptionHandler;
@@ -23,8 +22,9 @@ import org.apache.maven.execution.MavenS
import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
-import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculatorImpl;
+import org.apache.maven.lifecycle.internal.DefaultLifecycleTaskSegmentCalculator;
import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
+import org.apache.maven.lifecycle.internal.TaskSegment;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MojoExecution;
@@ -51,7 +51,7 @@ public class LifecycleExecutorTest
private DefaultLifecycleExecutor lifecycleExecutor;
@Requirement
- private LifecycleTaskSegmentCalculatorImpl lifeCycleTaskSegmentCalculator;
+ private DefaultLifecycleTaskSegmentCalculator lifeCycleTaskSegmentCalculator;
@Requirement
private LifecycleExecutionPlanCalculator lifeCycleExecutionPlanCalculator;
@@ -66,7 +66,7 @@ public class LifecycleExecutorTest
super.setUp();
lifecycleExecutor = (DefaultLifecycleExecutor) lookup( LifecycleExecutor.class );
lifeCycleTaskSegmentCalculator =
- (LifecycleTaskSegmentCalculatorImpl) lookup( LifecycleTaskSegmentCalculator.class );
+ (DefaultLifecycleTaskSegmentCalculator) lookup( LifecycleTaskSegmentCalculator.class );
lifeCycleExecutionPlanCalculator = lookup( LifecycleExecutionPlanCalculator.class );
mojoDescriptorCreator = lookup( MojoDescriptorCreator.class );
lookup( ExceptionHandler.class );
@@ -311,13 +311,12 @@ public class LifecycleExecutorTest
PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
PluginVersionResolutionException
{
- List<org.apache.maven.lifecycle.internal.TaskSegment> taskSegments =
+ List<TaskSegment> taskSegments =
lifeCycleTaskSegmentCalculator.calculateTaskSegments( session, Arrays.asList( tasks ) );
- org.apache.maven.lifecycle.internal.TaskSegment mergedSegment =
- new org.apache.maven.lifecycle.internal.TaskSegment( false );
+ TaskSegment mergedSegment = new TaskSegment( false );
- for ( org.apache.maven.lifecycle.internal.TaskSegment taskSegment : taskSegments )
+ for ( TaskSegment taskSegment : taskSegments )
{
mergedSegment.getTasks().addAll( taskSegment.getTasks() );
}
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java?rev=986913&r1=986912&r2=986913&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java Wed Aug 18 20:23:21 2010
@@ -28,7 +28,6 @@ import org.apache.maven.lifecycle.intern
/**
* @author Kristian Rosenvold>
*/
-
public class LifecycleExecutionPlanCalculatorTest
extends TestCase
{
@@ -65,10 +64,10 @@ public class LifecycleExecutionPlanCalcu
{
LifecyclePluginResolver lifecyclePluginResolver =
new LifecyclePluginResolver( new PluginVersionResolverStub() );
- return new LifecycleExecutionPlanCalculatorImpl( new BuildPluginManagerStub(),
- DefaultLifecyclesStub.createDefaultLifecycles(),
- mojoDescriptorCreator, lifecyclePluginResolver,
- DefaultSchedulesStub.createDefaultSchedules());
+ return new DefaultLifecycleExecutionPlanCalculator( new BuildPluginManagerStub(),
+ DefaultLifecyclesStub.createDefaultLifecycles(),
+ mojoDescriptorCreator, lifecyclePluginResolver,
+ DefaultSchedulesStub.createDefaultSchedules() );
}
public static MojoDescriptorCreator createMojoDescriptorCreator()
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java?rev=986913&r1=986912&r2=986913&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java Wed Aug 18 20:23:21 2010
@@ -18,7 +18,7 @@ package org.apache.maven.lifecycle.inter
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.GoalTask;
import org.apache.maven.lifecycle.internal.LifecycleTask;
-import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculatorImpl;
+import org.apache.maven.lifecycle.internal.DefaultLifecycleTaskSegmentCalculator;
import org.apache.maven.lifecycle.internal.TaskSegment;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MojoNotFoundException;
@@ -34,9 +34,8 @@ import java.util.List;
/**
* @author Kristian Rosenvold
*/
-
public class LifecycleTaskSegmentCalculatorStub
- extends LifecycleTaskSegmentCalculatorImpl
+ extends DefaultLifecycleTaskSegmentCalculator
{
public static final String clean = "clean";