maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r773646 - /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Date Mon, 11 May 2009 18:32:32 GMT
Author: jvanzyl
Date: Mon May 11 18:32:32 2009
New Revision: 773646

URL: http://svn.apache.org/viewvc?rev=773646&view=rev
Log:
o prepare to bring the project dependency downloading in directly after calculating the build
plan

Modified:
    maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=773646&r1=773645&r2=773646&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Mon May 11 18:32:32 2009
@@ -88,6 +88,14 @@
     public void execute( MavenSession session )
         throws LifecycleExecutionException, MojoFailureException
     {
+        logger.info(  "Build Order:" );
+        logger.info( "" );
+        for( MavenProject project : session.getProjects() )
+        {
+            logger.info( project.getName() );
+        }
+        logger.info( "" );
+        
         MavenProject rootProject = session.getTopLevelProject();
 
         List<String> goals = session.getGoals();
@@ -111,16 +119,53 @@
         {
             logger.info( "Building " + currentProject.getName() );
 
-            long buildStartTime = System.currentTimeMillis();
-
             try
             {
                 session.setCurrentProject( currentProject );
 
                 for ( String goal : goals )
                 {
-                    String target = currentProject.getId() + " ( " + goal + " )";
-                    executeGoalAndHandleFailures( goal, session, currentProject, buildStartTime,
target );
+                    
+                    List<MojoExecution> lifecyclePlan = calculateLifecyclePlan( goal,
session );        
+
+                    //TODO: once we have calculated the build plan then we should accurately
be able to download
+                    // the project dependencies. Having it happen in the plugin manager is
a tangled mess.
+                    
+                    if ( logger.isDebugEnabled() )
+                    {
+                        logger.debug( "=== BUILD PLAN ===" );
+                        logger.debug( "Project:       " + currentProject );
+                        for ( MojoExecution mojoExecution : lifecyclePlan )
+                        {
+                            MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
+                            PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
+                            logger.debug( "------------------" );
+                            logger.debug( "Goal:          " + pluginDescriptor.getGroupId()
+ ':' + pluginDescriptor.getArtifactId() + ':'
+                                + pluginDescriptor.getVersion() + ':' + mojoDescriptor.getGoal()
+ ':'
+                                + mojoExecution.getExecutionId() );
+                            logger.debug( "Configuration: " + String.valueOf( mojoExecution.getConfiguration()
) );
+                        }
+                        logger.debug( "==================" );
+                    }
+
+                    for ( MojoExecution mojoExecution : lifecyclePlan )
+                    {            
+                        try
+                        {                
+                            logger.info( executionDescription( mojoExecution, currentProject
) );
+                            pluginManager.executeMojo( session, mojoExecution );
+                        }
+                        catch ( PluginExecutionException e )
+                        {
+                            // This looks like a duplicate
+                            throw new LifecycleExecutionException( "Error executing goal.",
e );                                        
+                        }
+                        catch ( PluginConfigurationException e )
+                        {
+                            // If the mojo can't actually be configured
+                            throw new LifecycleExecutionException( "Error executing goal.",
e );                                        
+                        }
+                    }                         
                 }
             }
             finally
@@ -128,66 +173,7 @@
                 session.setCurrentProject( null );
             }
         }        
-    }
-
-    private void executeGoalAndHandleFailures( String task, MavenSession session, MavenProject
project, long buildStartTime, String target )
-        throws LifecycleExecutionException, MojoFailureException
-    {
-        try
-        {
-            executeGoal( task, session, project );
-        }
-        catch ( LifecycleExecutionException e )
-        {
-            //TODO: Look at the reactor manager failure behavior
-            throw e;
-        }
-    }
-    
-    private void executeGoal( String task, MavenSession session, MavenProject project )
-        throws LifecycleExecutionException, MojoFailureException
-    {
-        List<MojoExecution> lifecyclePlan = calculateLifecyclePlan( task, session );
       
-
-        if ( logger.isDebugEnabled() )
-        {
-            logger.debug( "=== BUILD PLAN ===" );
-            logger.debug( "Project:       " + project );
-            for ( MojoExecution mojoExecution : lifecyclePlan )
-            {
-                MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-                PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
-                logger.debug( "------------------" );
-                logger.debug( "Goal:          " + pluginDescriptor.getGroupId() + ':' + pluginDescriptor.getArtifactId()
+ ':'
-                    + pluginDescriptor.getVersion() + ':' + mojoDescriptor.getGoal() + ':'
-                    + mojoExecution.getExecutionId() );
-                logger.debug( "Configuration: " + String.valueOf( mojoExecution.getConfiguration()
) );
-            }
-            logger.debug( "==================" );
-        }
-
-        for ( MojoExecution mojoExecution : lifecyclePlan )
-        {            
-            try
-            {                
-                logger.info( executionDescription( mojoExecution, project ) );
-//                mojoExecution.getMojoDescriptor().getRealm().display();
-//                System.out.println( "!!!");
-//                System.out.println( mojoExecution.getConfiguration() );
-                pluginManager.executeMojo( session, mojoExecution );
-            }
-            catch ( PluginExecutionException e )
-            {
-                // This looks like a duplicate
-                throw new LifecycleExecutionException( "Error executing goal.", e );    
                                   
-            }
-            catch ( PluginConfigurationException e )
-            {
-                // If the mojo can't actually be configured
-                throw new LifecycleExecutionException( "Error executing goal.", e );    
                                   
-            }
-        }         
-    }
+    }    
     
     private String executionDescription( MojoExecution me, MavenProject project )
     {



Mime
View raw message