You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/03/06 03:48:46 UTC
svn commit: r634134 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/monitor/event/
maven-embedder/src/main/java/org/apache/maven/embedder/execution/
maven-embedder/src/test/java/org/apache/maven/error/
Author: jdcasey
Date: Wed Mar 5 18:48:44 2008
New Revision: 634134
URL: http://svn.apache.org/viewvc?rev=634134&view=rev
Log:
Reinstate mojo execution logging to the console using the default event monitor. Also, have the error-reporting unit test cleanup after itself.
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java (with props)
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
Added: maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java?rev=634134&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java (added)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java Wed Mar 5 18:48:44 2008
@@ -0,0 +1,12 @@
+package org.apache.maven.monitor.event;
+
+public class OnStopWorkspaceMonitor
+ extends AbstractWorkspaceMonitor
+{
+
+ public void embedderStopped( long timestamp )
+ {
+ clearCache();
+ }
+
+}
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/OnStopWorkspaceMonitor.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=634134&r1=634133&r2=634134&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Wed Mar 5 18:48:44 2008
@@ -104,7 +104,7 @@
Configuration configuration )
throws MavenEmbedderException
{
- eventMonitors( request, configuration );
+ eventing( request, configuration );
workspaceMonitor( request, configuration );
@@ -127,8 +127,6 @@
artifactTransferMechanism( request, configuration );
- eventing( request, configuration );
-
realmManager( request, configuration );
profileManager( request, configuration );
@@ -176,21 +174,6 @@
request.addEventMonitor( workspaceMonitor );
}
- private void eventMonitors( MavenExecutionRequest request,
- Configuration configuration )
- {
- List configEventMonitors = configuration.getEventMonitors();
-
- if ( ( configEventMonitors != null ) && !configEventMonitors.isEmpty() )
- {
- for ( Iterator it = configEventMonitors.iterator(); it.hasNext(); )
- {
- EventMonitor monitor = (EventMonitor) it.next();
- request.addEventMonitor( monitor );
- }
- }
- }
-
private void reporter( MavenExecutionRequest request,
Configuration configuration )
{
@@ -701,12 +684,24 @@
Logger logger = container.getLoggerManager().getLoggerForComponent( Mojo.ROLE );
- if ( request.getEventMonitors() == null )
+ if ( ( request.getEventMonitors() == null ) || request.getEventMonitors().isEmpty() )
{
request.addEventMonitor( new DefaultEventMonitor( logger ) );
}
container.getLoggerManager().setThreshold( request.getLoggingLevel() );
+
+ // Now, add in any event monitors from the Configuration instance.
+ List configEventMonitors = configuration.getEventMonitors();
+
+ if ( ( configEventMonitors != null ) && !configEventMonitors.isEmpty() )
+ {
+ for ( Iterator it = configEventMonitors.iterator(); it.hasNext(); )
+ {
+ EventMonitor monitor = (EventMonitor) it.next();
+ request.addEventMonitor( monitor );
+ }
+ }
}
// ------------------------------------------------------------------------
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=634134&r1=634133&r2=634134&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 Wed Mar 5 18:48:44 2008
@@ -76,6 +76,14 @@
maven = new MavenEmbedder( configuration );
}
+ public void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+
+ maven.stop();
+ }
+
private boolean checkOnline()
{
if ( !offlineIsSet )