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/06 01:21:18 UTC
svn commit: r711748 - in /maven/mercury/trunk: mercury-logging/
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-sat/ mercury-md/mercury-md-sat...
Author: ogusakov
Date: Wed Nov 5 16:21:17 2008
New Revision: 711748
URL: http://svn.apache.org/viewvc?rev=711748&view=rev
Log:
fixed sat4j error
Added:
maven/mercury/trunk/mercury-plexus-logging/
maven/mercury/trunk/mercury-plexus-logging/.classpath
maven/mercury/trunk/mercury-plexus-logging/.project
maven/mercury/trunk/mercury-plexus-logging/.settings/
maven/mercury/trunk/mercury-plexus-logging/.settings/org.eclipse.jdt.core.prefs
maven/mercury/trunk/mercury-plexus-logging/.settings/org.maven.ide.eclipse.prefs
maven/mercury/trunk/mercury-plexus-logging/pom.xml
maven/mercury/trunk/mercury-plexus-logging/src/
maven/mercury/trunk/mercury-plexus-logging/src/main/
maven/mercury/trunk/mercury-plexus-logging/src/main/java/
maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/
maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/
maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/
maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/
maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/
maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/
maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.java
maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.java
maven/mercury/trunk/mercury-plexus-logging/src/test/
maven/mercury/trunk/mercury-plexus-logging/src/test/java/
maven/mercury/trunk/mercury-plexus-logging/src/test/java/org/
maven/mercury/trunk/mercury-plexus-logging/src/test/java/org/apache/
maven/mercury/trunk/mercury-plexus-logging/src/test/java/org/apache/maven/
maven/mercury/trunk/mercury-plexus-logging/src/test/java/org/apache/maven/mercury/
maven/mercury/trunk/mercury-plexus-logging/src/test/java/org/apache/maven/mercury/logging/
maven/mercury/trunk/mercury-plexus-logging/src/test/java/org/apache/maven/mercury/logging/plexus/
maven/mercury/trunk/mercury-plexus-logging/target/
maven/mercury/trunk/mercury-plexus-logging/target/classes/
maven/mercury/trunk/mercury-plexus-logging/target/classes/org/
maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/
maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/
maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/
maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/
maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/
maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.class (with props)
maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.class (with props)
maven/mercury/trunk/mercury-plexus-logging/target/test-classes/
maven/mercury/trunk/mercury-plexus-logging/target/test-classes/org/
maven/mercury/trunk/mercury-plexus-logging/target/test-classes/org/apache/
maven/mercury/trunk/mercury-plexus-logging/target/test-classes/org/apache/maven/
maven/mercury/trunk/mercury-plexus-logging/target/test-classes/org/apache/maven/mercury/
maven/mercury/trunk/mercury-plexus-logging/target/test-classes/org/apache/maven/mercury/logging/
maven/mercury/trunk/mercury-plexus-logging/target/test-classes/org/apache/maven/mercury/logging/plexus/
Modified:
maven/mercury/trunk/mercury-logging/pom.xml
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/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/MercuryConsoleLogger.java
maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java
maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
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
Modified: maven/mercury/trunk/mercury-logging/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/pom.xml?rev=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/pom.xml (original)
+++ maven/mercury/trunk/mercury-logging/pom.xml Wed Nov 5 16:21:17 2008
@@ -6,6 +6,6 @@
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-logging</artifactId>
- <name>Mercury Logging: ${project.version}</name>
+ <name>Mercury Logging: ${project.version}</name>
</project>
\ No newline at end of file
Modified: 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=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java (original)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java Wed Nov 5 16:21:17 2008
@@ -9,12 +9,15 @@
*/
public abstract class AbstractMercuryLogger
{
- protected String className;
+ protected String _className;
+
+ MercuryLoggingLevelEnum _threshold = MercuryLoggerManager.getThreshold();
+
@SuppressWarnings("unchecked")
public AbstractMercuryLogger( Class clazz )
{
- className = clazz.getName();
+ _className = clazz.getName();
}
public boolean isDebugEnabled()
Modified: 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=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java (original)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java Wed Nov 5 16:21:17 2008
@@ -11,4 +11,7 @@
{
@SuppressWarnings("unchecked")
IMercuryLogger getLogger( Class clazz );
+
+ void setThreshold( MercuryLoggingLevelEnum threshold );
+
}
Modified: 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=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java (original)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java Wed Nov 5 16:21:17 2008
@@ -12,10 +12,12 @@
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;
+ public static final String SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD = "maven.mercury.log.threshold";
+ public static final String _loggerThresholdName = System.getProperty( SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD, MercuryLoggingLevelEnum.error.name() );
+
+ static MercuryLoggingLevelEnum _threshold = MercuryLoggingLevelEnum.valueOf( _loggerThresholdName );
static IMercuryLoggerFactory _loggerFactory;
@@ -34,14 +36,9 @@
_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()
{
Modified: 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=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java (original)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java Wed Nov 5 16:21:17 2008
@@ -31,5 +31,5 @@
{
return id;
}
-
+
}
Modified: 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=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java (original)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java Wed Nov 5 16:21:17 2008
@@ -44,14 +44,8 @@
say( MercuryLoggingLevelEnum.debug, message, throwable );
}
- /* (non-Javadoc)
- * @see org.apache.maven.mercury.logging.MercuryLogger#error(java.lang.String)
- */
- public void error(
- String message )
+ public void error( String message )
{
- // TODO Auto-generated method stub
-
}
/* (non-Javadoc)
Modified: 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=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java (original)
+++ maven/mercury/trunk/mercury-logging/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java Wed Nov 5 16:21:17 2008
@@ -2,6 +2,8 @@
import org.apache.maven.mercury.logging.IMercuryLogger;
import org.apache.maven.mercury.logging.IMercuryLoggerFactory;
+import org.apache.maven.mercury.logging.MercuryLoggerManager;
+import org.apache.maven.mercury.logging.MercuryLoggingLevelEnum;
/**
*
@@ -13,10 +15,17 @@
public class MercuryConsoleLoggerFactory
implements IMercuryLoggerFactory
{
+ MercuryLoggingLevelEnum _threshold = MercuryLoggerManager.getThreshold();
+
@SuppressWarnings("unchecked")
public IMercuryLogger getLogger( Class clazz )
{
return new MercuryConsoleLogger(clazz);
}
+ public void setThreshold( MercuryLoggingLevelEnum threshold )
+ {
+ _threshold = threshold;
+ }
+
}
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml?rev=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml Wed Nov 5 16:21:17 2008
@@ -12,7 +12,7 @@
<properties>
- <sat4j.version>2.0.0</sat4j.version>
+ <sat4j.version>2.0.4</sat4j.version>
<commons.digester.version>1.8</commons.digester.version>
</properties>
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java?rev=711748&r1=711747&r2=711748&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java Wed Nov 5 16:21:17 2008
@@ -2,21 +2,29 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.TreeSet;
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.sat.DefaultSatSolver;
+import org.codehaus.plexus.lang.DefaultLanguage;
+import org.codehaus.plexus.lang.Language;
/**
* metadata [dirty] Tree
*
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
*
*/
-
public class MetadataTreeNode
{
private static final int DEFAULT_CHILDREN_COUNT = 8;
+ private static final IMercuryLogger _log = MercuryLoggerManager.getLogger( MetadataTreeNode.class );
+ private static final Language _lang = new DefaultLanguage( MetadataTreeNode.class );
+
/**
* this node's artifact MD
*/
@@ -66,6 +74,32 @@
return res;
}
+ //------------------------------------------------------------------------
+ public int countDistinctNodes()
+ {
+ TreeSet<String> nodes = new TreeSet<String>();
+
+ getDistinctNodes( this, nodes );
+if( _log.isDebugEnabled() )
+{
+ _log.debug( "tree distinct nodes count" );
+ _log.debug( nodes.toString() );
+}
+
+ return nodes.size();
+ }
+ //------------------------------------------------------------------------
+ public static void getDistinctNodes( MetadataTreeNode node, TreeSet<String> nodes )
+ {
+ if( node.getMd() == null )
+ throw new IllegalArgumentException( "tree node without metadata" );
+
+ nodes.add( node.getMd().getGAV() );
+
+ if( node.children != null && node.children.size() > 0)
+ for( MetadataTreeNode child : node.children )
+ getDistinctNodes( child, nodes );
+ }
//------------------------------------------------------------------------
public MetadataTreeNode()
{
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=711748&r1=711747&r2=711748&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 Wed Nov 5 16:21:17 2008
@@ -59,7 +59,9 @@
if( tree == null)
throw new SatException("cannot create a solver for an empty [null] tree");
- int nNodes = tree.countNodes();
+ int nNodes = tree.countDistinctNodes();
+_log.debug( "SatContext: # of variables: "+nNodes );
+
_context = new SatContext( nNodes );
_solver.newVar( _context.varCount );
_root = tree;
@@ -84,7 +86,7 @@
if( _root == null )
throw new SatException( "cannot apply policies to a null tree" );
- // TODO og: assumption - around 128 GA's per tree
+ // TODO og: assumption - around 128 GA's per tree. If more - map reallocates - slow down.
Map<String, List<MetadataTreeNode>> buckets = new HashMap<String, List<MetadataTreeNode>>(128);
fillBuckets( buckets, _root );
sortBuckets( buckets, comparators );
@@ -114,7 +116,7 @@
coeffs.push( BigInteger.valueOf( (long)Math.pow( 2, i ) ) );
}
}
-
+
if( vars.isEmpty() )
return;
@@ -471,12 +473,12 @@
if( _solver.isSatisfiable() )
{
res = new ArrayList<ArtifactMetadata>( _context.varCount );
- for( SatVar v : _context.variables )
- {
- boolean yes = _solver.model( v.getLiteral() );
- if( yes )
- res.add( v.getMd() );
- }
+
+ int [] model = _solver.model();
+
+ for( int i : model )
+ if( i > 0 )
+ res.add( _context.getMd( i ) );
}
}
catch (TimeoutException e)
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=711748&r1=711747&r2=711748&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 Wed Nov 5 16:21:17 2008
@@ -52,6 +52,15 @@
return var;
}
//-----------------------------------------------------------------------
+ public ArtifactMetadata getMd( int literal )
+ {
+ for( SatVar v : variables )
+ if( v._literal == literal )
+ return v.getMd();
+
+ return null;
+ }
+ //-----------------------------------------------------------------------
@Override
public String toString()
{
Added: maven/mercury/trunk/mercury-plexus-logging/.classpath
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/.classpath?rev=711748&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-plexus-logging/.classpath (added)
+++ maven/mercury/trunk/mercury-plexus-logging/.classpath Wed Nov 5 16:21:17 2008
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: maven/mercury/trunk/mercury-plexus-logging/.project
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/.project?rev=711748&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-plexus-logging/.project (added)
+++ maven/mercury/trunk/mercury-plexus-logging/.project Wed Nov 5 16:21:17 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>mercury-plexus-logging</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: maven/mercury/trunk/mercury-plexus-logging/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/.settings/org.eclipse.jdt.core.prefs?rev=711748&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-plexus-logging/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/mercury/trunk/mercury-plexus-logging/.settings/org.eclipse.jdt.core.prefs Wed Nov 5 16:21:17 2008
@@ -0,0 +1,5 @@
+#Wed Nov 05 11:14:49 PST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Added: maven/mercury/trunk/mercury-plexus-logging/.settings/org.maven.ide.eclipse.prefs
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/.settings/org.maven.ide.eclipse.prefs?rev=711748&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-plexus-logging/.settings/org.maven.ide.eclipse.prefs (added)
+++ maven/mercury/trunk/mercury-plexus-logging/.settings/org.maven.ide.eclipse.prefs Wed Nov 5 16:21:17 2008
@@ -0,0 +1,8 @@
+#Wed Nov 05 11:14:48 PST 2008
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
Added: maven/mercury/trunk/mercury-plexus-logging/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/pom.xml?rev=711748&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-plexus-logging/pom.xml (added)
+++ maven/mercury/trunk/mercury-plexus-logging/pom.xml Wed Nov 5 16:21:17 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-pom</artifactId>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>mercury-plexus-logging</artifactId>
+ <name>Mercury Plexus Logging Adapter:${project.version}</name>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-beta-1</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
+
Added: maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.java?rev=711748&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.java (added)
+++ maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.java Wed Nov 5 16:21:17 2008
@@ -0,0 +1,98 @@
+package org.apache.maven.mercury.logging.plexus;
+
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.codehaus.plexus.logging.AbstractLogger;
+import org.codehaus.plexus.logging.Logger;
+
+/**
+ * Mercury adaptor for plexus logger
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MercuryPlexusLogger
+implements IMercuryLogger
+{
+ Logger _logger;
+
+ public MercuryPlexusLogger( Logger logger )
+ {
+ this._logger = logger;
+ }
+
+ public void debug( String message )
+ {
+ _logger.debug( message );
+ }
+
+ public void debug( String message, Throwable throwable )
+ {
+ _logger.debug( message, throwable );
+ }
+
+ public void error( String message )
+ {
+ _logger.error( message );
+ }
+
+ public void error( String message, Throwable throwable )
+ {
+ _logger.error( message, throwable );
+ }
+
+ public void fatal( String message )
+ {
+ _logger.fatalError( message );
+ }
+
+ public void fatal( String message, Throwable throwable )
+ {
+ _logger.fatalError( message, throwable );
+ }
+
+ public void info( String message )
+ {
+ _logger.info( message );
+ }
+
+ public void info( String message, Throwable throwable )
+ {
+ _logger.info( message, throwable );
+ }
+
+ public void warn( String message )
+ {
+ _logger.warn( message );
+ }
+
+ public void warn( String message, Throwable throwable )
+ {
+ _logger.warn( message, throwable );
+ }
+
+ public boolean isDebugEnabled()
+ {
+ return _logger.isDebugEnabled();
+ }
+
+ public boolean isErrorEnabled()
+ {
+ return _logger.isErrorEnabled();
+ }
+
+ public boolean isFatalEnabled()
+ {
+ return _logger.isFatalErrorEnabled();
+ }
+
+ public boolean isInfoEnabled()
+ {
+ return _logger.isInfoEnabled();
+ }
+
+ public boolean isWarnEnabled()
+ {
+ return _logger.isWarnEnabled();
+ }
+}
Added: maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.java?rev=711748&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.java (added)
+++ maven/mercury/trunk/mercury-plexus-logging/src/main/java/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.java Wed Nov 5 16:21:17 2008
@@ -0,0 +1,41 @@
+package org.apache.maven.mercury.logging.plexus;
+
+import org.apache.maven.mercury.logging.IMercuryLogger;
+import org.apache.maven.mercury.logging.IMercuryLoggerFactory;
+import org.apache.maven.mercury.logging.MercuryLoggingLevelEnum;
+import org.codehaus.plexus.logging.LoggerManager;
+
+/**
+ * mercury adaptor for plesux logger factory (manager)
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MercuryPlexusLoggerFactory
+implements IMercuryLoggerFactory
+{
+ LoggerManager _loggerManager;
+
+ public MercuryPlexusLoggerFactory( LoggerManager loggerManager )
+ {
+ setLoggerFactory( loggerManager );
+ }
+
+ public IMercuryLogger getLogger( Class clazz )
+ {
+ return new MercuryPlexusLogger( _loggerManager.getLoggerForComponent( clazz.getName() ) );
+ }
+
+ public void setLoggerFactory( LoggerManager loggerManager )
+ {
+ this._loggerManager = loggerManager;
+ }
+
+ public void setThreshold( MercuryLoggingLevelEnum threshold )
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.class
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.class?rev=711748&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/MercuryPlexusLogger.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.class
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.class?rev=711748&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/mercury/trunk/mercury-plexus-logging/target/classes/org/apache/maven/mercury/logging/plexus/MercuryPlexusLoggerFactory.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream