Updated Branches: refs/heads/master 7fa2bacfd -> fba14039b
MNG-5549 introduced MojoExecutionListener and ProjectExecutionListener Signed-off-by: Igor Fedorenko <i...@ifedorenko.com> Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/fba14039 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/fba14039 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/fba14039 Branch: refs/heads/master Commit: fba14039bdc14da8d32062139a8fcdeb4dfed9d4 Parents: 7fa2bac Author: Igor Fedorenko <i...@ifedorenko.com> Authored: Sun Dec 15 23:24:24 2013 -0500 Committer: Igor Fedorenko <i...@ifedorenko.com> Committed: Sun Dec 15 23:24:24 2013 -0500 ---------------------------------------------------------------------- .../MavenITmng5530MojoExecutionScopeTest.java | 6 ++--- .../TestExecutionScopedComponent.java | 23 +++++++++++++++----- 2 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/fba14039/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index 2b14720..22ab7fc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java @@ -52,8 +52,8 @@ public class MavenITmng5530MojoExecutionScopeTest verifier.resetStreams(); verifier.verifyErrorFreeLog(); - verifier.assertFilePresent( "target/execution-executed.txt" ); - verifier.assertFilePresent( "target/execution-committed.txt" ); - verifier.assertFilePresent( "target/execution-disposed.txt" ); + //verifier.assertFilePresent( "target/execution-failure.txt" ); + verifier.assertFilePresent( "target/execution-success.txt" ); + verifier.assertFilePresent( "target/execution-before.txt" ); } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/fba14039/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java b/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java index 50c1420..c0c7d66 100644 --- a/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java +++ b/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java @@ -27,15 +27,17 @@ import javax.inject.Inject; import javax.inject.Named; import org.apache.maven.execution.MavenSession; -import org.apache.maven.execution.scope.MojoExecutionListener; import org.apache.maven.execution.scope.MojoExecutionScoped; +import org.apache.maven.execution.scope.WeakMojoExecutionListener; +import org.apache.maven.plugin.Mojo; import org.apache.maven.plugin.MojoExecution; +import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; @Named @MojoExecutionScoped public class TestExecutionScopedComponent - implements MojoExecutionListener + implements WeakMojoExecutionListener { private final File basedir; @@ -69,13 +71,22 @@ public class TestExecutionScopedComponent } } - public void afterMojoExecutionAlways() + public void afterExecutionFailure( MavenSession session, MavenProject project, MojoExecution execution, Mojo mojo, + Throwable cause ) { - touch( new File( basedir, "execution-disposed.txt" ) ); + touch( new File( basedir, "execution-failure.txt" ) ); } - public void afterMojoExecutionSuccess() + public void afterMojoExecutionSuccess( MavenSession session, MavenProject project, MojoExecution execution, + Mojo mojo ) + throws MojoExecutionException { - touch( new File( basedir, "execution-committed.txt" ) ); + touch( new File( basedir, "execution-success.txt" ) ); + } + + public void beforeMojoExecution( MavenSession session, MavenProject project, MojoExecution execution, Mojo mojo ) + throws MojoExecutionException + { + touch( new File( basedir, "execution-before.txt" ) ); } }