From 1d615cd2390ba1333903696b2cb48be94a1a2811 Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Mon, 7 Mar 2005 23:02:43 +0000 Subject: [PATCH] turn on logging, resolve some issues surrounding test dependencies git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163473 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/artifact/DefaultArtifact.java | 3 ++- .../java/org/apache/maven/cli/MavenCli.java | 18 +++++++++++++----- maven-model/maven.mdo | 2 ++ .../org/apache/maven/plugin/CompilerMojo.java | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java index 6563b4a126..2bd37e2a2d 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java @@ -57,7 +57,8 @@ public DefaultArtifact( String groupId, String artifactId, String version, Strin /** @todo this should be replaced by type handler */ public DefaultArtifact( String groupId, String artifactId, String version, String type, String extension ) { - this( groupId, artifactId, version, SCOPE_RUNTIME, type, extension ); + // TODO: default should be runtime, except in currently building POM where it is compile. + this( groupId, artifactId, version, SCOPE_COMPILE, type, extension ); } public DefaultArtifact( String groupId, String artifactId, String version, String type ) diff --git a/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java index 5e2caeb9b6..76a3f4bcd9 100644 --- a/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java @@ -37,9 +37,11 @@ import org.apache.maven.monitor.event.DefaultEventMonitor; import org.apache.maven.monitor.event.EventDispatcher; import org.apache.maven.monitor.logging.DefaultLog; +import org.apache.maven.plugin.Plugin; import org.codehaus.classworlds.ClassWorld; import org.codehaus.plexus.embed.ArtifactEnabledEmbedder; import org.codehaus.plexus.logging.Logger; +import org.codehaus.plexus.logging.LoggerManager; import java.io.File; import java.io.FileInputStream; @@ -154,18 +156,24 @@ public static int main( String[] args, ClassWorld classWorld ) ArtifactEnabledEmbedder embedder = new ArtifactEnabledEmbedder(); embedder.start( classWorld ); - - Logger logger = embedder.getContainer().getLogger(); - if( logger != null ) + + LoggerManager manager = (LoggerManager) embedder.lookup( LoggerManager.ROLE ); + if ( commandLine.hasOption( CLIManager.DEBUG ) ) + { + manager.setThreshold( Logger.LEVEL_DEBUG ); + } + + // TODO [BP]: do we set one per mojo? where to do it? + Logger logger = manager.getLoggerForComponent( Plugin.ROLE ); + if ( logger != null ) { request.setLog( new DefaultLog( logger ) ); request.addEventMonitor( new DefaultEventMonitor( logger ) ); } - // TODO [BP]: doing this here as it is CLI specific, though it doesn't feel like the right place. + // TODO [BP]: doing this here as it is CLI specific, though it doesn't feel like the right place (likewise logger). WagonManager wagonManager = (WagonManager) embedder.lookup( WagonManager.ROLE ); - wagonManager.setDownloadMonitor( new ConsoleDownloadMonitor() ); Maven maven = (Maven) embedder.lookup( Maven.ROLE ); diff --git a/maven-model/maven.mdo b/maven-model/maven.mdo index 686ed47856..c8628f9d5f 100644 --- a/maven-model/maven.mdo +++ b/maven-model/maven.mdo @@ -807,7 +807,9 @@ 4.0.0 The scope of the dependency - build, compile, test, runtime String + diff --git a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java index f130e0effc..af3447e8e4 100644 --- a/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java +++ b/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java @@ -108,6 +108,7 @@ public void execute( PluginExecutionRequest request, PluginExecutionResponse res List messages = compiler.compile( compilerConfiguration ); + // TODO: doesn't appear to be called if ( debug ) { for ( Iterator i = classpathElements.iterator(); i.hasNext(); )