You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/06/02 01:12:34 UTC
svn commit: r543657 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven: core/
core/monitor/ core/monitor/event/ core/monitor/logging/ monitor/event/
monitor/logging/ plugin/
Author: carlos
Date: Fri Jun 1 16:12:33 2007
New Revision: 543657
URL: http://svn.apache.org/viewvc?view=rev&rev=543657
Log:
[MNG-2943] Avoid using package names used in other artifacts
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/event/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/event/DefaultEventMonitor.java
- copied, changed from r543378, maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/logging/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/logging/DefaultLog.java
- copied, changed from r543651, maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/event/DefaultEventMonitor.java (from r543378, maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/event/DefaultEventMonitor.java?view=diff&rev=543657&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java&r1=543378&p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/event/DefaultEventMonitor.java&r2=543657
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/event/DefaultEventMonitor.java Fri Jun 1 16:12:33 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.monitor.event;
+package org.apache.maven.core.monitor.event;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@
* under the License.
*/
+import org.apache.maven.monitor.event.AbstractSelectiveEventMonitor;
+import org.apache.maven.monitor.event.MavenEvents;
import org.codehaus.plexus.logging.Logger;
/**
Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/logging/DefaultLog.java (from r543651, maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/logging/DefaultLog.java?view=diff&rev=543657&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java&r1=543651&p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/logging/DefaultLog.java&r2=543657
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/core/monitor/logging/DefaultLog.java Fri Jun 1 16:12:33 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.monitor.logging;
+package org.apache.maven.core.monitor.logging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java?view=diff&rev=543657&r1=543656&r2=543657
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/DefaultEventMonitor.java Fri Jun 1 16:12:33 2007
@@ -23,25 +23,14 @@
/**
* @author jdcasey
+ * @deprecated use {@link org.apache.maven.core.monitor.event.DefaultEventMonitor}
*/
public class DefaultEventMonitor
- extends AbstractSelectiveEventMonitor
+ extends org.apache.maven.core.monitor.event.DefaultEventMonitor
{
- private static final String[] START_EVENTS = {MavenEvents.MOJO_EXECUTION};
-
- private final Logger logger;
-
public DefaultEventMonitor( Logger logger )
{
- super( START_EVENTS, MavenEvents.NO_EVENTS, MavenEvents.NO_EVENTS );
-
- this.logger = logger;
+ super( logger );
}
-
- protected void doStartEvent( String event, String target, long time )
- {
- logger.info( "[" + target + "]" );
- }
-
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java?view=diff&rev=543657&r1=543656&r2=543657
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java Fri Jun 1 16:12:33 2007
@@ -19,113 +19,19 @@
* under the License.
*/
-import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.logging.Logger;
/**
* @author jdcasey
+ * @deprecated use {@link org.apache.maven.core.monitor.logging.DefaultLog}
*/
public class DefaultLog
- implements Log
+ extends org.apache.maven.core.monitor.logging.DefaultLog
{
- private final Logger logger;
-
public DefaultLog( Logger logger )
{
- this.logger = logger;
- }
-
- public void debug( CharSequence content )
- {
- logger.debug( toString( content ) );
- }
-
- private String toString( CharSequence content )
- {
- if ( content == null )
- {
- return "";
- }
- else
- {
- return content.toString();
- }
- }
-
- public void debug( CharSequence content, Throwable error )
- {
- logger.debug( toString( content ), error );
- }
-
- public void debug( Throwable error )
- {
- logger.debug( "", error );
- }
-
- public void info( CharSequence content )
- {
- logger.info( toString( content ) );
- }
-
- public void info( CharSequence content, Throwable error )
- {
- logger.info( toString( content ), error );
- }
-
- public void info( Throwable error )
- {
- logger.info( "", error );
- }
-
- public void warn( CharSequence content )
- {
- logger.warn( toString( content ) );
- }
-
- public void warn( CharSequence content, Throwable error )
- {
- logger.warn( toString( content ), error );
- }
-
- public void warn( Throwable error )
- {
- logger.warn( "", error );
- }
-
- public void error( CharSequence content )
- {
- logger.error( toString( content ) );
- }
-
- public void error( CharSequence content, Throwable error )
- {
- logger.error( toString( content ), error );
- }
-
- public void error( Throwable error )
- {
- logger.error( "", error );
- }
-
- public boolean isDebugEnabled()
- {
- return logger.isDebugEnabled();
- }
-
- public boolean isInfoEnabled()
- {
- return logger.isInfoEnabled();
- }
-
- public boolean isWarnEnabled()
- {
- return logger.isWarnEnabled();
- }
-
- public boolean isErrorEnabled()
- {
- return logger.isErrorEnabled();
+ super( logger );
}
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=543657&r1=543656&r2=543657
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Fri Jun 1 16:12:33 2007
@@ -37,6 +37,7 @@
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.context.BuildContextManager;
+import org.apache.maven.core.monitor.logging.DefaultLog;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.lifecycle.LifecycleExecutionContext;
@@ -45,7 +46,6 @@
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
-import org.apache.maven.monitor.logging.DefaultLog;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
Re: svn commit: r543657 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven: core/ core/monitor/ core/monitor/event/ core/monitor/logging/ monitor/event/ monitor/logging/ plugin/
Posted by Jason van Zyl <ja...@maven.org>.
On 1 Jun 07, at 7:12 PM 1 Jun 07, carlos@apache.org wrote:
> Author: carlos
> Date: Fri Jun 1 16:12:33 2007
> New Revision: 543657
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=543657
> Log:
I'm not sure if you've noticed but the whole embedder has been
provided as a single bundle from the day it's been used inside
eclipse. Why are you packaging everything up separately.
I would like to just export a single bundle that encapsulates
everything any client needs in a single bundle. The only thing anyone
is every going to use is from the embedder. I could see having wagon
providers, or SCM providers in other bundles if they need to be
pulled in but every Maven module as an OSGi bundle I'm not in favor
of which is why it has always been consumed externally as a single
bundle.
Thanks,
Jason
----------------------------------------------------------
Jason van Zyl
Founder and PMC Chair, Apache Maven
jason at sonatype dot com
----------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org