You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/06/20 04:29:16 UTC
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase GoalAttainmentPhase.java
jvanzyl 2004/06/19 19:29:16
Modified: maven-core/src/main/java/org/apache/maven
DefaultMavenCore.java
maven-core/src/main/java/org/apache/maven/lifecycle
AbstractMavenLifecyclePhase.java
DefaultMavenLifecycleManager.java
MavenLifecyclePhase.java
maven-core/src/main/java/org/apache/maven/lifecycle/phase
GoalAttainmentPhase.java
Log:
o fix logging in the phases
Revision Changes Path
1.6 +1 -0 maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java
Index: DefaultMavenCore.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultMavenCore.java 20 Jun 2004 02:02:18 -0000 1.5
+++ DefaultMavenCore.java 20 Jun 2004 02:29:16 -0000 1.6
@@ -108,6 +108,7 @@
}
catch ( Exception e )
{
+ e.printStackTrace();
response.setException( e );
}
}
1.3 +0 -0 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/AbstractMavenLifecyclePhase.java
Index: AbstractMavenLifecyclePhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/AbstractMavenLifecyclePhase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +4 -0 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultMavenLifecycleManager.java
Index: DefaultMavenLifecycleManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultMavenLifecycleManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultMavenLifecycleManager.java 20 Jun 2004 02:02:18 -0000 1.2
+++ DefaultMavenLifecycleManager.java 20 Jun 2004 02:29:16 -0000 1.3
@@ -1,6 +1,7 @@
package org.apache.maven.lifecycle;
import org.apache.maven.ExecutionResponse;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.Iterator;
import java.util.List;
@@ -10,6 +11,7 @@
* @version $Id$
*/
public class DefaultMavenLifecycleManager
+ extends AbstractLogEnabled
implements MavenLifecycleManager
{
private List lifecyclePhases;
@@ -25,6 +27,8 @@
for ( Iterator iterator = lifecyclePhases.iterator(); iterator.hasNext(); )
{
MavenLifecyclePhase phase = (MavenLifecyclePhase) iterator.next();
+
+ phase.enableLogging( getLogger() );
phase.execute( context );
1.2 +4 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecyclePhase.java
Index: MavenLifecyclePhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecyclePhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenLifecyclePhase.java 11 Jun 2004 15:11:54 -0000 1.1
+++ MavenLifecyclePhase.java 20 Jun 2004 02:29:16 -0000 1.2
@@ -1,5 +1,6 @@
package org.apache.maven.lifecycle;
+import org.codehaus.plexus.logging.Logger;
/**
@@ -12,4 +13,6 @@
void execute( MavenLifecycleContext context )
throws Exception;
+
+ void enableLogging( Logger logger );
}
1.8 +1 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java
Index: GoalAttainmentPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GoalAttainmentPhase.java 20 Jun 2004 02:02:19 -0000 1.7
+++ GoalAttainmentPhase.java 20 Jun 2004 02:29:16 -0000 1.8
@@ -55,7 +55,6 @@
}
}
- // invalid parameter exception
private Map createParameters( Goal goal, MavenProject project, PlexusContainer container )
{
Map map = null;