You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2010/04/08 15:06:59 UTC
svn commit: r931921 - in /maven/maven-3/trunk:
maven-core/src/main/java/org/apache/maven/execution/
maven-core/src/main/java/org/apache/maven/lifecycle/
maven-embedder/src/main/java/org/apache/maven/cli/
Author: krosenvold
Date: Thu Apr 8 13:06:58 2010
New Revision: 931921
URL: http://svn.apache.org/viewvc?rev=931921&view=rev
Log:
[MNG-3004] Re-added calculateExecutionPlan to DLE, fixed ASF code standard
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=931921&r1=931920&r2=931921&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Thu Apr 8 13:06:58 2010
@@ -127,8 +127,8 @@ public class DefaultMavenExecutionReques
private ExecutionListener executionListener;
private String threadCount;
+
private boolean perCoreThreadCount;
- private boolean weaveMode;
/**
* Suppress SNAPSHOT updates.
@@ -1028,28 +1028,29 @@ public class DefaultMavenExecutionReques
return this;
}
- public String getThreadCount() {
+ public String getThreadCount()
+ {
return threadCount;
}
- public void setThreadCount(String threadCount) {
+ public void setThreadCount( String threadCount )
+ {
this.threadCount = threadCount;
}
- public boolean isThreadConfigurationPresent() {
+ public boolean isThreadConfigurationPresent()
+ {
return getThreadCount() != null;
}
- public boolean isPerCoreThreadCount() {
+ public boolean isPerCoreThreadCount()
+ {
return perCoreThreadCount;
}
- public void setPerCoreThreadCount(boolean perCoreThreadCount) {
+ public void setPerCoreThreadCount( boolean perCoreThreadCount )
+ {
this.perCoreThreadCount = perCoreThreadCount;
}
- public boolean isWeaveMode() {
- return weaveMode;
- }
-
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=931921&r1=931920&r2=931921&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Thu Apr 8 13:06:58 2010
@@ -158,9 +158,6 @@ public interface MavenExecutionRequest
void setPerCoreThreadCount(boolean perCoreThreadCount);
boolean isPerCoreThreadCount();
- boolean isWeaveMode();
-
-
// Recursive (really to just process the top-level POM)
MavenExecutionRequest setRecursive( boolean recursive );
boolean isRecursive();
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=931921&r1=931920&r2=931921&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Thu Apr 8 13:06:58 2010
@@ -376,11 +376,13 @@ public class MavenSession
return request.getStartTime();
}
- public boolean isParallel() {
+ public boolean isParallel()
+ {
return parallel;
}
- public void setParallel(boolean parallel) {
+ public void setParallel( boolean parallel )
+ {
this.parallel = parallel;
}
}
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=931921&r1=931920&r2=931921&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 Thu Apr 8 13:06:58 2010
@@ -23,6 +23,7 @@ import org.apache.maven.execution.MavenS
import org.apache.maven.lifecycle.internal.BuildListCalculator;
import org.apache.maven.lifecycle.internal.ConcurrencyDependencyGraph;
import org.apache.maven.lifecycle.internal.LifecycleDebugLogger;
+import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
import org.apache.maven.lifecycle.internal.LifecycleModuleBuilder;
import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
import org.apache.maven.lifecycle.internal.LifecycleThreadedBuilder;
@@ -40,6 +41,7 @@ import org.apache.maven.plugin.InvalidPl
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoNotFoundException;
import org.apache.maven.plugin.PluginDescriptorParsingException;
+import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -94,6 +96,9 @@ public class DefaultLifecycleExecutor
private LifecycleTaskSegmentCalculator lifecycleTaskSegmentCalculator;
@Requirement
+ private LifecycleExecutionPlanCalculator lifecycleExecutionPlanCalculator;
+
+ @Requirement
private ThreadConfigurationService threadConfigService;
public DefaultLifecycleExecutor()
@@ -148,7 +153,7 @@ public class DefaultLifecycleExecutor
{
ExecutorService executor = threadConfigService.getExecutorService( executionRequest.getThreadCount(),
executionRequest.isPerCoreThreadCount(),
- session.getProjects().size());
+ session.getProjects().size() );
try
{
@@ -169,7 +174,8 @@ public class DefaultLifecycleExecutor
CompletionService<ProjectSegment> service =
new ExecutorCompletionService<ProjectSegment>( executor );
- lifecycleThreadedBuilder.build( session, callableContext, projectBuilds, taskSegments, analyzer, service );
+ lifecycleThreadedBuilder.build( session, callableContext, projectBuilds, taskSegments, analyzer,
+ service );
}
}
finally
@@ -208,7 +214,8 @@ public class DefaultLifecycleExecutor
{
try
{
- lifecycleModuleBuilder.buildProject( session, callableContext, projectBuild.getProject(), taskSegment );
+ lifecycleModuleBuilder.buildProject( session, callableContext, projectBuild.getProject(),
+ taskSegment );
if ( reactorBuildStatus.isHalted() )
{
break;
@@ -279,5 +286,27 @@ public class DefaultLifecycleExecutor
return mojoDescriptorCreator.getMojoDescriptor( task, session, project );
}
+ // Used by m2eclipse
+
+ @SuppressWarnings({"UnusedDeclaration"})
+ public MavenExecutionPlan calculateExecutionPlan( MavenSession session, String... tasks )
+ throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
+ MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
+ PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
+ PluginVersionResolutionException
+ {
+
+ List<TaskSegment> taskSegments = buildListCalculator.calculateTaskSegments( session );
+
+ TaskSegment mergedSegment = new TaskSegment( false );
+
+ for ( TaskSegment taskSegment : taskSegments )
+ {
+ mergedSegment.getTasks().addAll( taskSegment.getTasks() );
+ }
+
+ return lifecycleExecutionPlanCalculator.calculateExecutionPlan( session, session.getCurrentProject(),
+ mergedSegment.getTasks() );
+ }
}
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=931921&r1=931920&r2=931921&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Thu Apr 8 13:06:58 2010
@@ -866,21 +866,21 @@ public class MavenCli
request.setLocalRepositoryPath( localRepoProperty );
}
+ final String threadConfiguration = commandLine.hasOption( CLIManager.THREADS )
+ ? commandLine.getOptionValue( CLIManager.THREADS )
+ : request.getSystemProperties().getProperty(
+ MavenCli.THREADS_DEPRECATED ); // TODO: Remove this setting. Note that the int-tests use it
- final String threadConfiguration = commandLine.hasOption( CLIManager.THREADS ) ?
- commandLine.getOptionValue( CLIManager.THREADS) :
- request.getSystemProperties().getProperty(MavenCli.THREADS_DEPRECATED); // TODO: Remove this setting. Note that the int-tests use it
-
- if (threadConfiguration != null){
- request.setPerCoreThreadCount( threadConfiguration.contains("C"));
- if (threadConfiguration.contains("W"))
+ if ( threadConfiguration != null )
+ {
+ request.setPerCoreThreadCount( threadConfiguration.contains( "C" ) );
+ if ( threadConfiguration.contains( "W" ) )
{
- LifecycleWeaveBuilder.setWeaveMode(request.getUserProperties());
+ LifecycleWeaveBuilder.setWeaveMode( request.getUserProperties() );
}
- request.setThreadCount(threadConfiguration.replace("C", "").replace("W", "").replace("auto", ""));
+ request.setThreadCount( threadConfiguration.replace( "C", "" ).replace( "W", "" ).replace( "auto", "" ) );
}
-
return request;
}