svn commit: r614342 - in /maven/components/trunk: maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java

[jdcasey]

Author: jdcasey
Date: Tue Jan 22 14:01:57 2008
New Revision: 614342

URL: http://svn.apache.org/viewvc?rev=614342&view=rev
Log:
Fixing error-reporting pointcut that I broke.

Modified:
    
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
    
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java

Modified: 
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj?rev=614342&r1=614341&r2=614342&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
 (original)
+++ 
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/errors/LifecycleErrorReporterAspect.aj
 Tue Jan 22 14:01:57 2008
@@ -18,6 +18,7 @@
 import org.apache.maven.lifecycle.model.MojoBinding;
 import org.apache.maven.lifecycle.statemgmt.StateManagementUtils;
 import org.apache.maven.lifecycle.DefaultLifecycleExecutor;
+import org.apache.maven.lifecycle.LifecycleExecutor;
 import org.apache.maven.lifecycle.LifecycleException;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
 import org.apache.maven.project.MavenProject;
@@ -55,7 +56,9 @@
         && args( project, .. );
 
     after( MojoBinding binding, MavenProject project ) throwing ( 
PluginLoaderException cause ):
-        call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )
+        ( cflow( le_executeGoalAndHandleFailures( MojoBinding ) )
+          || cflow( execution( * LifecycleExecutor+.isTaskValid( .. ) ) ) )
+        && call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )
         && args( binding, project, .. )
     {
         getReporter().reportErrorLoadingPlugin( binding, project, cause );

Modified: 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java?rev=614342&r1=614341&r2=614342&view=diff
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
 Tue Jan 22 14:01:57 2008
@@ -461,7 +461,7 @@
 
         reporter.reportErrorLoadingPlugin( null, null, null );
         reporterCtl.setMatcher( MockControl.ALWAYS_MATCHER );
-        reporterCtl.setVoidCallable();
+        reporterCtl.setVoidCallable( MockControl.ONE_OR_MORE );
 
         reporterCtl.replay();