You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/11/05 04:05:34 UTC
svn commit: r711497 - in /maven/mercury/trunk: mercury-it/
mercury-logging/src/main/java/org/apache/maven/mercury/logging/
mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/
mercury-md/ mercury-md/mercury-md-sat/src/main/java/org/a...
Author: ogusakov
Date: Tue Nov 4 19:05:33 2008
New Revision: 711497
URL: http://svn.apache.org/viewvc?rev=711497&view=rev
Log:
switched to flawed, but better logging. Got rid of slf4j
Added:
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java
Removed:
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/MercuryMonitor.java
Modified:
maven/mercury/trunk/mercury-it/pom.xml
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-md/pom.xml
maven/mercury/trunk/mercury-plexus/pom.xml
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
maven/mercury/trunk/mercury-pom/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
maven/mercury/trunk/mercury-repo/pom.xml
maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
maven/mercury/trunk/mercury-transport/pom.xml
maven/mercury/trunk/mercury-util/pom.xml
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
Modified: maven/mercury/trunk/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/pom.xml?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Tue Nov 4 19:05:33 2008
@@ -129,19 +129,11 @@
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ <version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
Added: maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java?rev=711497&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java (added)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java Tue Nov 4 19:05:33 2008
@@ -0,0 +1,44 @@
+package org.apache.maven.mercury.logging;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public abstract class AbstractMercuryLogger
+{
+ protected String className;
+
+ @SuppressWarnings("unchecked")
+ public AbstractMercuryLogger( Class clazz )
+ {
+ className = clazz.getName();
+ }
+
+ public boolean isDebugEnabled()
+ {
+ return MercuryLoggerManager._threshold.getId() <= MercuryLoggingLevelEnum.debug.getId();
+ }
+
+ public boolean isErrorEnabled()
+ {
+ return MercuryLoggerManager._threshold.getId() <= MercuryLoggingLevelEnum.error.getId();
+ }
+
+ public boolean isFatalEnabled()
+ {
+ return MercuryLoggerManager._threshold.getId() <= MercuryLoggingLevelEnum.error.getId();
+ }
+
+ public boolean isInfoEnabled()
+ {
+ return MercuryLoggerManager._threshold.getId() <= MercuryLoggingLevelEnum.info.getId();
+ }
+
+ public boolean isWarnEnabled()
+ {
+ return MercuryLoggerManager._threshold.getId() <= MercuryLoggingLevelEnum.warn.getId();
+ }
+}
Added: maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java?rev=711497&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java (added)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java Tue Nov 4 19:05:33 2008
@@ -0,0 +1,41 @@
+package org.apache.maven.mercury.logging;
+
+/**
+ * A copy of plexus default container logger interface. Need it to externalize the logging system
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public interface IMercuryLogger
+{
+ void debug( String message );
+
+ void debug( String message, Throwable throwable );
+
+ boolean isDebugEnabled();
+
+ void info( String message );
+
+ void info( String message, Throwable throwable );
+
+ boolean isInfoEnabled();
+
+ void warn( String message );
+
+ void warn( String message, Throwable throwable );
+
+ boolean isWarnEnabled();
+
+ void error( String message );
+
+ void error( String message, Throwable throwable );
+
+ boolean isErrorEnabled();
+
+ void fatal( String message );
+
+ void fatal( String message, Throwable throwable );
+
+ boolean isFatalEnabled();
+}
Added: maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java?rev=711497&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java (added)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java Tue Nov 4 19:05:33 2008
@@ -0,0 +1,14 @@
+package org.apache.maven.mercury.logging;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public interface IMercuryLoggerFactory
+{
+ @SuppressWarnings("unchecked")
+ IMercuryLogger getLogger( Class clazz );
+}
Added: maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java?rev=711497&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java (added)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java Tue Nov 4 19:05:33 2008
@@ -0,0 +1,50 @@
+package org.apache.maven.mercury.logging;
+
+import org.apache.maven.mercury.logging.console.MercuryConsoleLoggerFactory;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MercuryLoggerManager
+{
+ public static final String SYSTEM_PROPERTY_MERCURY_LOG_FACTORY = "maven.mercury.log.factory";
+
+ public static final String _loggerFactoryClassName = System.getProperty( SYSTEM_PROPERTY_MERCURY_LOG_FACTORY, MercuryConsoleLoggerFactory.class.getName() );
+
+ static MercuryLoggingLevelEnum _threshold = MercuryLoggingLevelEnum.error;
+
+ static IMercuryLoggerFactory _loggerFactory;
+
+ @SuppressWarnings("unchecked")
+ public static final IMercuryLogger getLogger( Class clazz )
+ {
+ if( _loggerFactory == null )
+ {
+ try
+ {
+ _loggerFactory = (IMercuryLoggerFactory)Class.forName( _loggerFactoryClassName ).newInstance();
+ }
+ catch( Exception e )
+ {
+ _loggerFactory = new MercuryConsoleLoggerFactory();
+ _loggerFactory.getLogger( MercuryLoggerManager.class ).error( "cannot load logger for "+_loggerFactoryClassName, e );
+ }
+ }
+
+ return _loggerFactory.getLogger( clazz );
+ }
+
+ public static void setThreshold( MercuryLoggingLevelEnum threshold )
+ {
+ _threshold = threshold;
+ }
+
+ public static MercuryLoggingLevelEnum getThreshold()
+ {
+ return _threshold;
+ }
+}
Added: maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java?rev=711497&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java (added)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java Tue Nov 4 19:05:33 2008
@@ -0,0 +1,35 @@
+package org.apache.maven.mercury.logging;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public enum MercuryLoggingLevelEnum
+{
+ debug(0)
+ , info(1)
+ , warn(2)
+ , error(3)
+ , fatal(4)
+ , disabled(5)
+ ;
+
+ public static final MercuryLoggingLevelEnum DEFAULT_LEVEL = error;
+
+ private int id;
+
+ // Constructor
+ MercuryLoggingLevelEnum( int id )
+ {
+ this.id = id;
+ }
+
+ int getId()
+ {
+ return id;
+ }
+
+}
Added: maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java?rev=711497&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java (added)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java Tue Nov 4 19:05:33 2008
@@ -0,0 +1,105 @@
+package org.apache.maven.mercury.logging.console;
+
+import org.apache.maven.mercury.logging.AbstractMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggingLevelEnum;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MercuryConsoleLogger
+extends AbstractMercuryLogger
+implements IMercuryLogger
+{
+
+ @SuppressWarnings("unchecked")
+ public MercuryConsoleLogger( Class clazz )
+ {
+ super( clazz );
+ }
+
+ private static final void say( MercuryLoggingLevelEnum level, String message, Throwable throwable )
+ {
+ System.out.print( "["+level.name()+"] " );
+ System.out.println( message );
+ if( throwable != null )
+ {
+ throwable.printStackTrace( System.out );
+ }
+ }
+
+ public void debug( String message )
+ {
+ if( isDebugEnabled() )
+ say( MercuryLoggingLevelEnum.debug, message, null );
+ }
+
+ public void debug( String message, Throwable throwable )
+ {
+ if( isDebugEnabled() )
+ say( MercuryLoggingLevelEnum.debug, message, throwable );
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.mercury.logging.MercuryLogger#error(java.lang.String)
+ */
+ public void error(
+ String message )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.maven.mercury.logging.MercuryLogger#error(java.lang.String, java.lang.Throwable)
+ */
+ public void error(
+ String message,
+ Throwable throwable )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void fatal( String message )
+ {
+ }
+
+ public void fatal( String message, Throwable throwable )
+ {
+ }
+
+ public int getThreshold()
+ {
+ return 0;
+ }
+
+ public void info( String message )
+ {
+ }
+
+ public void info(
+ String message,
+ Throwable throwable )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void warn( String message )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void warn( String message, Throwable throwable )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java?rev=711497&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java (added)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java Tue Nov 4 19:05:33 2008
@@ -0,0 +1,22 @@
+package org.apache.maven.mercury.logging.console;
+
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.IMercuryLoggerFactory;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MercuryConsoleLoggerFactory
+implements IMercuryLoggerFactory
+{
+ @SuppressWarnings("unchecked")
+ public IMercuryLogger getLogger( Class clazz )
+ {
+ return new MercuryConsoleLogger(clazz);
+ }
+
+}
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java Tue Nov 4 19:05:33 2008
@@ -12,6 +12,8 @@
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.metadata.MetadataTreeNode;
import org.apache.maven.mercury.metadata.MetadataTreeNodeGAComparator;
import org.apache.maven.mercury.metadata.MetadataTreeNodeGAVComparator;
@@ -36,7 +38,7 @@
public class DefaultSatSolver
implements SatSolver
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( DefaultSatSolver.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DefaultSatSolver.class );
private static final Language _lang = new DefaultLanguage( DefaultSatSolver.class );
protected SatContext _context;
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java Tue Nov 4 19:05:33 2008
@@ -4,6 +4,8 @@
import java.util.List;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
/**
* This class hold all variables fed to the SAT solver. Because of the
@@ -13,7 +15,7 @@
*/
class SatContext
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( SatContext.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( SatContext.class );
List<SatVar> variables;
int varCount = 0;
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java Tue Nov 4 19:05:33 2008
@@ -10,6 +10,8 @@
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
@@ -23,7 +25,7 @@
public class DependencyTreeBuilderTest
extends TestCase
{
- private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger( DependencyTreeBuilderTest.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DependencyTreeBuilderTest.class );
// ArtifactMetadata md = new ArtifactMetadata( "pmd:pmd:3.9" );
// File repo = new File("./target/test-classes/localRepo");
Modified: maven/mercury/trunk/mercury-md/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/pom.xml?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/pom.xml Tue Nov 4 19:05:33 2008
@@ -15,4 +15,14 @@
<module>mercury-md-shared</module>
</modules>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-plexus/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/pom.xml?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/pom.xml (original)
+++ maven/mercury/trunk/mercury-plexus/pom.xml Tue Nov 4 19:05:33 2008
@@ -66,16 +66,9 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Tue Nov 4 19:05:33 2008
@@ -20,6 +20,8 @@
import org.apache.maven.mercury.crypto.api.StreamVerifierException;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.metadata.DependencyBuilder;
import org.apache.maven.mercury.metadata.DependencyBuilderFactory;
import org.apache.maven.mercury.metadata.MetadataTreeException;
@@ -50,7 +52,7 @@
extends AbstractLogEnabled
implements PlexusMercury, Initializable
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( DefaultPlexusMercury.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( DefaultPlexusMercury.class );
private static final Language _lang = new DefaultLanguage( DefaultPlexusMercury.class );
//---------------------------------------------------------------
Modified: maven/mercury/trunk/mercury-pom/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-pom/pom.xml?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-pom/pom.xml (original)
+++ maven/mercury/trunk/mercury-pom/pom.xml Tue Nov 4 19:05:33 2008
@@ -260,16 +260,19 @@
</build>
<dependencies>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-43</version>
</dependency>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.5.1</version>
</dependency>
+
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -283,20 +286,6 @@
<artifactId>plexus-lang</artifactId>
<version>1.0</version>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.3</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java Tue Nov 4 19:05:33 2008
@@ -11,6 +11,8 @@
import org.apache.maven.mercury.artifact.ArtifactCoordinates;
import org.apache.maven.mercury.artifact.Quality;
import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.MetadataCacheException;
import org.apache.maven.mercury.repository.api.MetadataCorruptionException;
import org.apache.maven.mercury.repository.api.RepositoryGAMetadata;
@@ -32,7 +34,7 @@
public class MetadataCacheFs
implements RepositoryMetadataCache
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( MetadataCacheFs.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( MetadataCacheFs.class );
private static final Language _lang = new DefaultLanguage( RepositoryGAVMetadata.class );
static volatile Map<String, MetadataCacheFs> fsCaches = Collections.synchronizedMap( new HashMap<String, MetadataCacheFs>(2) );
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryWriterFlat.java Tue Nov 4 19:05:33 2008
@@ -11,6 +11,8 @@
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.AbstractRepositoryWriter;
import org.apache.maven.mercury.repository.api.LocalRepository;
@@ -38,7 +40,7 @@
public static final long SLEEP_FOR_LOCK_TICK = 5l;
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( LocalRepositoryWriterFlat.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( LocalRepositoryWriterFlat.class );
private static final Language _lang = new DefaultLanguage( LocalRepositoryWriterFlat.class );
//---------------------------------------------------------------------------------------------------------------
private static final String [] _protocols = new String [] { "file" };
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java Tue Nov 4 19:05:33 2008
@@ -10,6 +10,8 @@
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.DefaultArtifact;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.RepositoryWriter;
import org.apache.maven.mercury.util.FileUtil;
@@ -23,7 +25,7 @@
public class LocalRepositoryFlatTest
extends TestCase
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( LocalRepositoryFlatTest.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( LocalRepositoryFlatTest.class );
File _dir;
LocalRepositoryFlat _repo;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Tue Nov 4 19:05:33 2008
@@ -23,6 +23,8 @@
import org.apache.maven.mercury.crypto.api.StreamVerifier;
import org.apache.maven.mercury.crypto.api.StreamVerifierException;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.AbstracRepositoryReader;
import org.apache.maven.mercury.repository.api.AbstractRepOpResult;
import org.apache.maven.mercury.repository.api.AbstractRepository;
@@ -40,7 +42,7 @@
extends AbstracRepositoryReader
implements RepositoryReader, MetadataReader
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( LocalRepositoryReaderM2.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( LocalRepositoryReaderM2.class );
private static final Language _lang = new DefaultLanguage( LocalRepositoryReaderM2.class );
//---------------------------------------------------------------------------------------------------------------
private static final String [] _protocols = new String [] { "file" };
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryWriterM2.java Tue Nov 4 19:05:33 2008
@@ -18,6 +18,8 @@
import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
import org.apache.maven.mercury.crypto.api.StreamObserverException;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.AbstractRepositoryWriter;
import org.apache.maven.mercury.repository.api.LocalRepository;
@@ -53,7 +55,7 @@
public static final long SLEEP_FOR_LOCK_TICK = 5l;
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( LocalRepositoryWriterM2.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( LocalRepositoryWriterM2.class );
private static final Language _lang = new DefaultLanguage( LocalRepositoryWriterM2.class );
//---------------------------------------------------------------------------------------------------------------
private static final String [] _protocols = new String [] { "file" };
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java Tue Nov 4 19:05:33 2008
@@ -23,6 +23,8 @@
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.AbstracRepositoryReader;
import org.apache.maven.mercury.repository.api.AbstractRepOpResult;
import org.apache.maven.mercury.repository.api.AbstractRepository;
@@ -67,7 +69,7 @@
extends AbstracRepositoryReader
implements RepositoryReader, MetadataReader
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( RemoteRepositoryReaderM2.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( RemoteRepositoryReaderM2.class );
private static final Language _lang = new DefaultLanguage( RemoteRepositoryReaderM2.class );
// TODO - replace with known Transport's protocols. Should be similar to RepositoryReader/Writer registration
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java Tue Nov 4 19:05:33 2008
@@ -15,6 +15,8 @@
import org.apache.maven.mercury.artifact.Quality;
import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.AbstractRepository;
import org.apache.maven.mercury.repository.api.AbstractRepositoryWriter;
import org.apache.maven.mercury.repository.api.RemoteRepository;
@@ -46,7 +48,7 @@
extends AbstractRepositoryWriter
implements RepositoryWriter
{
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( RemoteRepositoryWriterM2.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( RemoteRepositoryWriterM2.class );
private static final Language _lang = new DefaultLanguage( RemoteRepositoryWriterM2.class );
//---------------------------------------------------------------------------------------------------------------
private static final String [] _protocols = new String [] { "http", "https", "dav", "webdav" };
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java Tue Nov 4 19:05:33 2008
@@ -18,6 +18,8 @@
import org.apache.maven.mercury.artifact.version.MetadataVersionComparator;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
import org.apache.maven.mercury.repository.api.ArtifactResults;
import org.apache.maven.mercury.repository.api.LocalRepository;
@@ -50,7 +52,7 @@
private static int MIN_PARALLEL = 5;
private static final Language _lang = new DefaultLanguage( VirtualRepositoryReader.class );
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( VirtualRepositoryReader.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( VirtualRepositoryReader.class );
//----------------------------------------------------------------------------------------------------------------------------
private List<Repository> _repositories = new ArrayList<Repository>(8);
Modified: maven/mercury/trunk/mercury-repo/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/pom.xml?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/pom.xml Tue Nov 4 19:05:33 2008
@@ -18,5 +18,14 @@
<module>mercury-repo-cache-fs</module>
<module>mercury-repo-virtual</module>
</modules>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/src/main/java/org/apache/maven/mercury/transport/api/Binding.java Tue Nov 4 19:05:33 2008
@@ -25,6 +25,9 @@
import java.io.OutputStream;
import java.net.URL;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
+
/**
* Binding <p/> A Binding represents a remote uri whose contents are to be
* downloaded and stored in a locally, or a local resource whose contents are to
@@ -32,7 +35,7 @@
*/
public class Binding
{
- private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger( Binding.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( Binding.class );
protected URL remoteResource;
protected File localFile;
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/DestinationRealmResolver.java Tue Nov 4 19:05:33 2008
@@ -24,12 +24,12 @@
import java.util.Iterator;
import java.util.Set;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.transport.api.Server;
import org.mortbay.jetty.client.HttpDestination;
import org.mortbay.jetty.client.security.Realm;
import org.mortbay.jetty.client.security.RealmResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* DestinationRealmResolver
@@ -39,7 +39,7 @@
*/
public class DestinationRealmResolver implements RealmResolver
{
- private static final Logger log = LoggerFactory.getLogger(DestinationRealmResolver.class);
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger(DestinationRealmResolver.class);
protected Set<Server> _servers = new HashSet<Server>();
@@ -56,10 +56,10 @@
InetSocketAddress address = dest.getAddress();
boolean secure = dest.isSecure();
- if( log.isDebugEnabled() )
+ if( _log.isDebugEnabled() )
{
- log.debug("Dest "+address.getHostName()+":"+address.getPort()+"(secure="+secure+")" );
- log.debug("Server list: "+_servers );
+ _log.debug("Dest "+address.getHostName()+":"+address.getPort()+"(secure="+secure+")" );
+ _log.debug("Server list: "+_servers );
}
@@ -80,8 +80,8 @@
port = "https".equalsIgnoreCase( protocol ) ? 443 : 80;
}
- if( log.isDebugEnabled() )
- log.debug("Trying dest "+address.getHostName()+":"+address.getPort()+"(secure="+dest.isSecure()
+ if( _log.isDebugEnabled() )
+ _log.debug("Trying dest "+address.getHostName()+":"+address.getPort()+"(secure="+dest.isSecure()
+") against server "+protocol+"://"+host+":"+port );
if (((secure && "https".equalsIgnoreCase(protocol)) || (!secure && "http".equalsIgnoreCase(protocol)))
@@ -91,8 +91,8 @@
if (address.getHostName().equalsIgnoreCase(host) || address.getAddress().getHostAddress().equalsIgnoreCase(host))
{
server = s;
- if (log.isDebugEnabled())
- log.debug("Matched server "+address.getHostName()+":"+address.getPort());
+ if (_log.isDebugEnabled())
+ _log.debug("Matched server "+address.getHostName()+":"+address.getPort());
}
}
}
@@ -100,8 +100,8 @@
if (server == null || server.getServerCredentials() == null)
{
- if (log.isDebugEnabled())
- log.debug("No server matching "+address.getHostName()+":"+address.getPort()+" or no credentials");
+ if (_log.isDebugEnabled())
+ _log.debug("No server matching "+address.getHostName()+":"+address.getPort()+" or no credentials");
return null;
}
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/SecureSender.java Tue Nov 4 19:05:33 2008
@@ -23,14 +23,14 @@
import java.net.URI;
import java.net.URL;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.transport.api.Credentials;
import org.apache.maven.mercury.transport.api.Server;
import org.mortbay.jetty.client.HttpClient;
import org.mortbay.jetty.client.HttpDestination;
import org.mortbay.jetty.client.HttpExchange;
import org.mortbay.jetty.client.security.ProxyAuthorization;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* SecureSender
@@ -44,7 +44,7 @@
*/
public class SecureSender
{
- private static final Logger _log = LoggerFactory.getLogger( SecureSender.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( SecureSender.class );
public static void send (Server server, HttpClient httpClient, HttpExchange exchange)
throws Exception
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/DeploymentTarget.java Tue Nov 4 19:05:33 2008
@@ -31,18 +31,18 @@
import org.apache.maven.mercury.crypto.api.StreamObserver;
import org.apache.maven.mercury.crypto.api.StreamVerifier;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.spi.http.client.HttpClientException;
import org.apache.maven.mercury.spi.http.validate.Validator;
import org.apache.maven.mercury.transport.api.Binding;
import org.apache.maven.mercury.transport.api.Server;
import org.mortbay.jetty.HttpHeaders;
import org.mortbay.jetty.client.HttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class DeploymentTarget
{
- private static final Logger log = LoggerFactory.getLogger(DeploymentTarget.class);
+ private static final IMercuryLogger log = MercuryLoggerManager.getLogger(DeploymentTarget.class);
protected Server _server;
protected HttpClient _httpClient;
protected String _batchId;
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java Tue Nov 4 19:05:33 2008
@@ -30,6 +30,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.maven.mercury.crypto.api.StreamObserver;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.HttpClientException;
import org.apache.maven.mercury.spi.http.client.ObservableInputStream;
@@ -38,8 +40,6 @@
import org.mortbay.io.Buffer;
import org.mortbay.jetty.HttpMethods;
import org.mortbay.jetty.client.HttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -51,7 +51,7 @@
public abstract class FilePutExchange extends FileExchange
{
private static final int __readLimit = 1024;
- private static final Logger log = LoggerFactory.getLogger(FilePutExchange.class);
+ private static final IMercuryLogger log = MercuryLoggerManager.getLogger(FilePutExchange.class);
private String _batchId;
private InputStream _inputStream;
private String _remoteRepoUrl;
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java Tue Nov 4 19:05:33 2008
@@ -31,6 +31,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.maven.mercury.crypto.api.StreamObserver;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.HttpClientException;
import org.apache.maven.mercury.spi.http.client.ObservableOutputStream;
@@ -41,8 +43,6 @@
import org.mortbay.jetty.HttpHeaders;
import org.mortbay.jetty.HttpMethods;
import org.mortbay.jetty.client.HttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -56,7 +56,7 @@
*/
public abstract class FileGetExchange extends FileExchange
{
- private static final Logger log = LoggerFactory.getLogger(FileGetExchange.class);
+ private static final IMercuryLogger log = MercuryLoggerManager.getLogger(FileGetExchange.class);
private OutputStream _outputStream;
private Set<StreamObserver> _observers = new HashSet<StreamObserver>();
int _contentLength = -1;
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java Tue Nov 4 19:05:33 2008
@@ -35,6 +35,8 @@
import org.apache.maven.mercury.crypto.api.StreamObserver;
import org.apache.maven.mercury.crypto.api.StreamVerifier;
import org.apache.maven.mercury.crypto.api.StreamVerifierException;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.spi.http.client.FileExchange;
import org.apache.maven.mercury.spi.http.client.HttpClientException;
import org.apache.maven.mercury.spi.http.client.SecureSender;
@@ -43,8 +45,6 @@
import org.apache.maven.mercury.transport.api.Server;
import org.mortbay.jetty.HttpHeaders;
import org.mortbay.jetty.client.HttpExchange;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@@ -58,7 +58,7 @@
*/
public abstract class RetrievalTarget
{
- private static final Logger log = LoggerFactory.getLogger( RetrievalTarget.class );
+ private static final IMercuryLogger log = MercuryLoggerManager.getLogger( RetrievalTarget.class );
public static final String __PREFIX = "JTY_";
public static final String __TEMP_SUFFIX = ".tmp";
public static final int __START_STATE = 1;
Modified: maven/mercury/trunk/mercury-transport/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/pom.xml?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/pom.xml Tue Nov 4 19:05:33 2008
@@ -15,5 +15,15 @@
<module>mercury-transport-http</module>
<module>mercury-transport-file</module>
</modules>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-util/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/pom.xml?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/pom.xml (original)
+++ maven/mercury/trunk/mercury-util/pom.xml Tue Nov 4 19:05:33 2008
@@ -73,9 +73,16 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
Modified: maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java?rev=711497&r1=711496&r2=711497&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java Tue Nov 4 19:05:33 2008
@@ -37,6 +37,8 @@
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
import org.apache.maven.mercury.crypto.sha.SHA1VerifierFactory;
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
@@ -61,7 +63,7 @@
public static final int K = 1024;
public static final int DEFAULT_BUFFER_SIZE = 10 * K;
//---------------------------------------------------------------------------------------------------------------
- private static final org.slf4j.Logger _log = org.slf4j.LoggerFactory.getLogger( FileUtil.class );
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( FileUtil.class );
private static final Language _lang = new DefaultLanguage( FileUtil.class );
private static final OverlappingFileLockException FILE_LOCKED = new OverlappingFileLockException();