Re: svn commit: r588144 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/extensio

2007-10-29 Thread John Casey 

done
On Oct 25, 2007, at 7:30 PM, Jason van Zyl wrote:



On 25 Oct 07, at 3:36 PM 25 Oct 07, Carlos Sanchez wrote:


could you please keep the old methods and deprecate them with a
comment, if not keeping up with the changes becomes a nightmare



John, put the any additional things you need in the request. I made  
the request so that the signature wouldn't need to change in order  
to accommodate new things we needed.




On 10/24/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:

Author: jdcasey
Date: Wed Oct 24 22:13:22 2007
New Revision: 588144

URL: http://svn.apache.org/viewvc?rev=588144view=rev
Log:
Improving the use of project sessions in the embedder, and  
exporting control over the project session map to the embedder  
instead of Maven.execute().


Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/ 
maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/ 
maven/Maven.java
maven/components/trunk/maven-core/src/main/java/org/apache/ 
maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/ 
maven/extension/DefaultBuildExtensionScanner.java
maven/components/trunk/maven-embedder/src/main/java/org/ 
apache/maven/embedder/MavenEmbedder.java


Modified: maven/components/trunk/maven-core/src/main/java/org/ 
apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven- 
core/src/main/java/org/apache/maven/DefaultMaven.java? 
rev=588144r1=588143r2=588144view=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 Wed Oct 24 22:13:22 2007

@@ -63,7 +63,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -160,14 +159,12 @@
 return reactorManager;
 }

-public MavenExecutionResult execute( MavenExecutionRequest  
request )
+public MavenExecutionResult execute( MavenExecutionRequest  
request, Map projectSessions )

 {
 request.setStartTime( new Date() );

 MavenExecutionResult result = new  
DefaultMavenExecutionResult();


-Map projectSessions = new HashMap();
-
 ReactorManager reactorManager = createReactorManager(
 request,
 result,
@@ -192,66 +189,59 @@
 dispatcher,
 projectSessions );

-try
+for ( Iterator i = request.getGoals().iterator();  
i.hasNext(); )

 {
-for ( Iterator i = request.getGoals().iterator();  
i.hasNext(); )

-{
-String goal = (String) i.next();
-
-TaskValidationResult tvr =  
lifecycleExecutor.isTaskValid( goal, session,  
reactorManager.getTopLevelProject() );

+String goal = (String) i.next();

-if ( !tvr.isTaskValid() )
-{
-result.addBuildFailureException( new  
InvalidTaskException( tvr ) );
+TaskValidationResult tvr =  
lifecycleExecutor.isTaskValid( goal, session,  
reactorManager.getTopLevelProject() );


-return result;
-}
-}
-
-getLogger().info( Scanning for projects... );
-
-if ( reactorManager.hasMultipleProjects() )
+if ( !tvr.isTaskValid() )
 {
-getLogger().info( Reactor build order:  );
-
-for ( Iterator i =  
reactorManager.getSortedProjects().iterator(); i.hasNext(); )

-{
-MavenProject project = (MavenProject) i.next();
+result.addBuildFailureException( new  
InvalidTaskException( tvr ) );


-getLogger().info(+ project.getName() );
-}
+return result;
 }
+}

-initializeBuildContext( request );
+getLogger().info( Scanning for projects... );

-try
-{
-lifecycleExecutor.execute(
-session,
-reactorManager,
-dispatcher );
-}
-catch ( LifecycleExecutionException e )
-{
-result.addLifecycleExecutionException( e );
-return result;
-}
-catch ( BuildFailureException e )
+if ( reactorManager.hasMultipleProjects() )
+{
+getLogger().info( Reactor build order:  );
+
+for ( Iterator i = reactorManager.getSortedProjects 
().iterator(); i.hasNext(); )

 {
-result.addBuildFailureException( e );
-return result;
-}
+MavenProject project = (MavenProject) i.next();

-

Re: svn commit: r588144 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/extensio

2007-10-25 Thread Carlos Sanchez 
could you please keep the old methods and deprecate them with a
comment, if not keeping up with the changes becomes a nightmare


On 10/24/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:
 Author: jdcasey
 Date: Wed Oct 24 22:13:22 2007
 New Revision: 588144

 URL: http://svn.apache.org/viewvc?rev=588144view=rev
 Log:
 Improving the use of project sessions in the embedder, and exporting control 
 over the project session map to the embedder instead of Maven.execute().

 Modified:
 
 maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 
 maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java
 
 maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
 
 maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
 
 maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

 Modified: 
 maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 URL: 
 http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=588144r1=588143r2=588144view=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
  Wed Oct 24 22:13:22 2007
 @@ -63,7 +63,6 @@
  import java.util.ArrayList;
  import java.util.Collections;
  import java.util.Date;
 -import java.util.HashMap;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
 @@ -160,14 +159,12 @@
  return reactorManager;
  }

 -public MavenExecutionResult execute( MavenExecutionRequest request )
 +public MavenExecutionResult execute( MavenExecutionRequest request, Map 
 projectSessions )
  {
  request.setStartTime( new Date() );

  MavenExecutionResult result = new DefaultMavenExecutionResult();

 -Map projectSessions = new HashMap();
 -
  ReactorManager reactorManager = createReactorManager(
  request,
  result,
 @@ -192,66 +189,59 @@
  dispatcher,
  projectSessions );

 -try
 +for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
  {
 -for ( Iterator i = request.getGoals().iterator(); i.hasNext(); )
 -{
 -String goal = (String) i.next();
 -
 -TaskValidationResult tvr = lifecycleExecutor.isTaskValid( 
 goal, session, reactorManager.getTopLevelProject() );
 +String goal = (String) i.next();

 -if ( !tvr.isTaskValid() )
 -{
 -result.addBuildFailureException( new 
 InvalidTaskException( tvr ) );
 +TaskValidationResult tvr = lifecycleExecutor.isTaskValid( goal, 
 session, reactorManager.getTopLevelProject() );

 -return result;
 -}
 -}
 -
 -getLogger().info( Scanning for projects... );
 -
 -if ( reactorManager.hasMultipleProjects() )
 +if ( !tvr.isTaskValid() )
  {
 -getLogger().info( Reactor build order:  );
 -
 -for ( Iterator i = 
 reactorManager.getSortedProjects().iterator(); i.hasNext(); )
 -{
 -MavenProject project = (MavenProject) i.next();
 +result.addBuildFailureException( new InvalidTaskException( 
 tvr ) );

 -getLogger().info(+ project.getName() );
 -}
 +return result;
  }
 +}

 -initializeBuildContext( request );
 +getLogger().info( Scanning for projects... );

 -try
 -{
 -lifecycleExecutor.execute(
 -session,
 -reactorManager,
 -dispatcher );
 -}
 -catch ( LifecycleExecutionException e )
 -{
 -result.addLifecycleExecutionException( e );
 -return result;
 -}
 -catch ( BuildFailureException e )
 +if ( reactorManager.hasMultipleProjects() )
 +{
 +getLogger().info( Reactor build order:  );
 +
 +for ( Iterator i = 
 reactorManager.getSortedProjects().iterator(); i.hasNext(); )
  {
 -result.addBuildFailureException( e );
 -return result;
 -}
 +MavenProject project = (MavenProject) i.next();

 -result.setTopologicallySortedProjects( 
 reactorManager.getSortedProjects() );
 +getLogger().info(+ project.getName() );
 +}
 +}

 -result.setProject(

Re: svn commit: r588144 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/extensio

2007-10-25 Thread Jason van Zyl 


On 25 Oct 07, at 3:36 PM 25 Oct 07, Carlos Sanchez wrote:


could you please keep the old methods and deprecate them with a
comment, if not keeping up with the changes becomes a nightmare



John, put the any additional things you need in the request. I made  
the request so that the signature wouldn't need to change in order to  
accommodate new things we needed.




On 10/24/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:

Author: jdcasey
Date: Wed Oct 24 22:13:22 2007
New Revision: 588144

URL: http://svn.apache.org/viewvc?rev=588144view=rev
Log:
Improving the use of project sessions in the embedder, and  
exporting control over the project session map to the embedder  
instead of Maven.execute().


Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/ 
maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/ 
maven/Maven.java
maven/components/trunk/maven-core/src/main/java/org/apache/ 
maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/ 
maven/extension/DefaultBuildExtensionScanner.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/ 
maven/embedder/MavenEmbedder.java


Modified: maven/components/trunk/maven-core/src/main/java/org/ 
apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven- 
core/src/main/java/org/apache/maven/DefaultMaven.java? 
rev=588144r1=588143r2=588144view=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 Wed Oct 24 22:13:22 2007

@@ -63,7 +63,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -160,14 +159,12 @@
 return reactorManager;
 }

-public MavenExecutionResult execute( MavenExecutionRequest  
request )
+public MavenExecutionResult execute( MavenExecutionRequest  
request, Map projectSessions )

 {
 request.setStartTime( new Date() );

 MavenExecutionResult result = new  
DefaultMavenExecutionResult();


-Map projectSessions = new HashMap();
-
 ReactorManager reactorManager = createReactorManager(
 request,
 result,
@@ -192,66 +189,59 @@
 dispatcher,
 projectSessions );

-try
+for ( Iterator i = request.getGoals().iterator();  
i.hasNext(); )

 {
-for ( Iterator i = request.getGoals().iterator();  
i.hasNext(); )

-{
-String goal = (String) i.next();
-
-TaskValidationResult tvr =  
lifecycleExecutor.isTaskValid( goal, session,  
reactorManager.getTopLevelProject() );

+String goal = (String) i.next();

-if ( !tvr.isTaskValid() )
-{
-result.addBuildFailureException( new  
InvalidTaskException( tvr ) );
+TaskValidationResult tvr =  
lifecycleExecutor.isTaskValid( goal, session,  
reactorManager.getTopLevelProject() );


-return result;
-}
-}
-
-getLogger().info( Scanning for projects... );
-
-if ( reactorManager.hasMultipleProjects() )
+if ( !tvr.isTaskValid() )
 {
-getLogger().info( Reactor build order:  );
-
-for ( Iterator i =  
reactorManager.getSortedProjects().iterator(); i.hasNext(); )

-{
-MavenProject project = (MavenProject) i.next();
+result.addBuildFailureException( new  
InvalidTaskException( tvr ) );


-getLogger().info(+ project.getName() );
-}
+return result;
 }
+}

-initializeBuildContext( request );
+getLogger().info( Scanning for projects... );

-try
-{
-lifecycleExecutor.execute(
-session,
-reactorManager,
-dispatcher );
-}
-catch ( LifecycleExecutionException e )
-{
-result.addLifecycleExecutionException( e );
-return result;
-}
-catch ( BuildFailureException e )
+if ( reactorManager.hasMultipleProjects() )
+{
+getLogger().info( Reactor build order:  );
+
+for ( Iterator i = reactorManager.getSortedProjects 
().iterator(); i.hasNext(); )

 {
-result.addBuildFailureException( e );
-return result;
-}
+MavenProject project = (MavenProject) i.next();

-result.setTopologicallySortedProjects 
(