You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/09/25 14:18:29 UTC
svn commit: r449664 - in
/maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven:
execution/DefaultMavenExecutionRequest.java
execution/MavenExecutionRequest.java lifecycle/DefaultLifecycleExecutor.java
Author: jvanzyl
Date: Mon Sep 25 05:18:28 2006
New Revision: 449664
URL: http://svn.apache.org/viewvc?view=rev&rev=449664
Log:
o add recursive back in
o create the lifecycle mapping using a linked hashmap so they remain ordered.
Modified:
maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified: maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?view=diff&rev=449664&r1=449663&r2=449664
==============================================================================
--- maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Mon Sep 25 05:18:28 2006
@@ -94,6 +94,8 @@
private String globalChecksumPolicy;
+ private boolean recursive;
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -201,6 +203,11 @@
return globalChecksumPolicy;
}
+ public boolean isRecursive()
+ {
+ return recursive;
+ }
+
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -451,4 +458,12 @@
return this;
}
+
+ public MavenExecutionRequest setRecursive( boolean recursive )
+ {
+ this.recursive = recursive;
+
+ return this;
+ }
+
}
Modified: maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?view=diff&rev=449664&r1=449663&r2=449664
==============================================================================
--- maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Mon Sep 25 05:18:28 2006
@@ -108,6 +108,11 @@
boolean useReactor();
+ // Recursive (really to just process the top-level POM)
+ MavenExecutionRequest setRecursive( boolean recursive );
+
+ boolean isRecursive();
+
// Event monitors
MavenExecutionRequest addEventMonitor( EventMonitor monitor );
Modified: maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?view=diff&rev=449664&r1=449663&r2=449664
==============================================================================
--- maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/maven-2.1-jvz/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Mon Sep 25 05:18:28 2006
@@ -67,6 +67,7 @@
import java.util.Map;
import java.util.Stack;
import java.util.StringTokenizer;
+import java.util.LinkedHashMap;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -992,7 +993,7 @@
List optionalMojos = findOptionalMojosForLifecycle( session, project, lifecycle );
- Map lifecycleMappings = new HashMap();
+ Map lifecycleMappings = new LinkedHashMap();
for ( Iterator i = lifecycle.getPhases().iterator(); i.hasNext(); )
{