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/25 07:55:01 UTC
svn commit: r720426 - in /maven/mercury/trunk: mercury-event/
mercury-event/src/main/java/org/apache/maven/mercury/event/
mercury-event/src/test/java/org/ mercury-event/src/test/java/org/apache/
mercury-event/src/test/java/org/apache/maven/ mercury-eve...
Author: ogusakov
Date: Mon Nov 24 22:55:00 2008
New Revision: 720426
URL: http://svn.apache.org/viewvc?rev=720426&view=rev
Log:
separating event framework
Added:
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/AbstractMercuryEvent.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/DumbListener.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/DumbListener.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventGenerator.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventGenerator.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventManager.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventTypeEnum.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/GenericEvent.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEventListener.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/Messages.properties (props changed)
- copied unchanged from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/Messages.properties
maven/mercury/trunk/mercury-event/src/test/java/org/
maven/mercury/trunk/mercury-event/src/test/java/org/apache/
maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/
maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/mercury/
maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/mercury/event/
maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java (contents, props changed)
- copied, changed from r720421, maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java
Removed:
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/AbstractMercuryEvent.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/DumbListener.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventGenerator.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventManager.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventTypeEnum.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/GenericEvent.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEventListener.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/Messages.properties
maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java
Modified:
maven/mercury/trunk/mercury-event/pom.xml
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.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/SatSolver.java
maven/mercury/trunk/mercury-md/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryMetadataCache.java
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-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
Modified: maven/mercury/trunk/mercury-event/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/pom.xml (original)
+++ maven/mercury/trunk/mercury-event/pom.xml Mon Nov 24 22:55:00 2008
@@ -8,4 +8,14 @@
<artifactId>mercury-event</artifactId>
<name>Mercury Event Framework</name>
+ <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
Copied: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java (from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/AbstractMercuryEvent.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java?p2=maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java&p1=maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/AbstractMercuryEvent.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/AbstractMercuryEvent.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java Mon Nov 24 22:55:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
import java.util.HashMap;
import java.util.Map;
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/DumbListener.java (from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/DumbListener.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/DumbListener.java?p2=maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/DumbListener.java&p1=maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/DumbListener.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/DumbListener.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/DumbListener.java Mon Nov 24 22:55:00 2008
@@ -1,11 +1,11 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import org.apache.maven.mercury.util.event.MercuryEvent.EventMask;
+import org.apache.maven.mercury.event.MercuryEvent.EventMask;
/**
*
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/DumbListener.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventGenerator.java (from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventGenerator.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventGenerator.java?p2=maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventGenerator.java&p1=maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventGenerator.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventGenerator.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventGenerator.java Mon Nov 24 22:55:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
/**
*
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventGenerator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java (from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventManager.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java?p2=maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java&p1=maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventManager.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventManager.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java Mon Nov 24 22:55:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
import java.util.ArrayList;
import java.util.Date;
@@ -9,7 +9,6 @@
import org.apache.maven.mercury.logging.IMercuryLogger;
import org.apache.maven.mercury.logging.MercuryLoggerManager;
-import org.apache.maven.mercury.util.Util;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
@@ -111,10 +110,16 @@
{
return new Date( event.getStart() )+", dur: "+ event.getDuration()+" millis :"
+ " ["+ event.getType()+":"+event.getName()+"] "
- + ( Util.isEmpty( event.getTag() ) ? "" : ", tag: "+event.getTag() )
- + ( Util.isEmpty( event.getResult() ) ? "" : ", result: "+event.getResult() )
+ + ( isEmpty( event.getTag() ) ? "" : ", tag: "+event.getTag() )
+ + ( isEmpty( event.getResult() ) ? "" : ", result: "+event.getResult() )
;
}
+
+ public static final boolean isEmpty( String o )
+ {
+ return o == null || o.length() < 1;
+ }
+
class UnitOfWork
{
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java (from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventTypeEnum.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java?p2=maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java&p1=maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventTypeEnum.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/EventTypeEnum.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java Mon Nov 24 22:55:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
/**
*
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java (from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/GenericEvent.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java?p2=maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java&p1=maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/GenericEvent.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/GenericEvent.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java Mon Nov 24 22:55:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
/**
*
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java (from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java?p2=maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java&p1=maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java Mon Nov 24 22:55:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
import java.util.BitSet;
import java.util.Map;
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java (from r720421, maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEventListener.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java?p2=maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java&p1=maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEventListener.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEventListener.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java Mon Nov 24 22:55:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
/**
*
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/Messages.properties
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java (from r720421, maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java)
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java?p2=maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java&p1=maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java&r1=720421&r2=720426&rev=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java (original)
+++ maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java Mon Nov 24 22:55:00 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.util.event;
+package org.apache.maven.mercury.event;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -6,7 +6,13 @@
import junit.framework.TestCase;
-import org.apache.maven.mercury.util.event.MercuryEvent.EventMask;
+import org.apache.maven.mercury.event.EventGenerator;
+import org.apache.maven.mercury.event.EventManager;
+import org.apache.maven.mercury.event.EventTypeEnum;
+import org.apache.maven.mercury.event.GenericEvent;
+import org.apache.maven.mercury.event.MercuryEvent;
+import org.apache.maven.mercury.event.MercuryEventListener;
+import org.apache.maven.mercury.event.MercuryEvent.EventMask;
/**
*
Propchange: maven/mercury/trunk/mercury-event/src/test/java/org/apache/maven/mercury/event/EventFrameworkTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java Mon Nov 24 22:55:00 2008
@@ -15,6 +15,7 @@
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.event.DumbListener;
import org.apache.maven.mercury.metadata.DependencyBuilder;
import org.apache.maven.mercury.metadata.DependencyBuilderFactory;
import org.apache.maven.mercury.metadata.MetadataTreeException;
@@ -27,7 +28,6 @@
import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
import org.apache.maven.mercury.repository.virtual.VirtualRepositoryReader;
import org.apache.maven.mercury.transport.api.Server;
-import org.apache.maven.mercury.util.event.DumbListener;
/**
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java Mon Nov 24 22:55:00 2008
@@ -5,7 +5,7 @@
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.util.event.MercuryEventListener;
+import org.apache.maven.mercury.event.MercuryEventListener;
/**
*
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java Mon Nov 24 22:55:00 2008
@@ -14,6 +14,12 @@
import org.apache.maven.mercury.artifact.version.VersionException;
import org.apache.maven.mercury.artifact.version.VersionRange;
import org.apache.maven.mercury.artifact.version.VersionRangeFactory;
+import org.apache.maven.mercury.event.EventGenerator;
+import org.apache.maven.mercury.event.EventManager;
+import org.apache.maven.mercury.event.EventTypeEnum;
+import org.apache.maven.mercury.event.GenericEvent;
+import org.apache.maven.mercury.event.MercuryEvent;
+import org.apache.maven.mercury.event.MercuryEventListener;
import org.apache.maven.mercury.logging.IMercuryLogger;
import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.metadata.sat.DefaultSatSolver;
@@ -23,12 +29,6 @@
import org.apache.maven.mercury.repository.api.RepositoryException;
import org.apache.maven.mercury.repository.virtual.VirtualRepositoryReader;
import org.apache.maven.mercury.util.Util;
-import org.apache.maven.mercury.util.event.EventGenerator;
-import org.apache.maven.mercury.util.event.EventManager;
-import org.apache.maven.mercury.util.event.EventTypeEnum;
-import org.apache.maven.mercury.util.event.GenericEvent;
-import org.apache.maven.mercury.util.event.MercuryEvent;
-import org.apache.maven.mercury.util.event.MercuryEventListener;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
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=720426&r1=720425&r2=720426&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 Mon Nov 24 22:55:00 2008
@@ -11,16 +11,16 @@
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.event.EventManager;
+import org.apache.maven.mercury.event.EventTypeEnum;
+import org.apache.maven.mercury.event.GenericEvent;
+import org.apache.maven.mercury.event.MercuryEvent;
+import org.apache.maven.mercury.event.MercuryEventListener;
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;
-import org.apache.maven.mercury.util.event.EventManager;
-import org.apache.maven.mercury.util.event.EventTypeEnum;
-import org.apache.maven.mercury.util.event.GenericEvent;
-import org.apache.maven.mercury.util.event.MercuryEvent;
-import org.apache.maven.mercury.util.event.MercuryEventListener;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
import org.sat4j.core.Vec;
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java Mon Nov 24 22:55:00 2008
@@ -4,8 +4,8 @@
import java.util.List;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.event.EventGenerator;
import org.apache.maven.mercury.metadata.MetadataTreeNode;
-import org.apache.maven.mercury.util.event.EventGenerator;
/**
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
Modified: maven/mercury/trunk/mercury-md/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/pom.xml?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/pom.xml Mon Nov 24 22:55:00 2008
@@ -23,6 +23,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-event</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml Mon Nov 24 22:55:00 2008
@@ -29,6 +29,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-event</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
<version>${project.version}</version>
</dependency>
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryMetadataCache.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryMetadataCache.java?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryMetadataCache.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryMetadataCache.java Mon Nov 24 22:55:00 2008
@@ -2,7 +2,7 @@
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactCoordinates;
-import org.apache.maven.mercury.util.event.EventGenerator;
+import org.apache.maven.mercury.event.EventGenerator;
/**
* this object abstracts the existence of multiple repositories and repository
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=720426&r1=720425&r2=720426&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 Mon Nov 24 22:55:00 2008
@@ -11,6 +11,11 @@
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.event.EventManager;
+import org.apache.maven.mercury.event.EventTypeEnum;
+import org.apache.maven.mercury.event.GenericEvent;
+import org.apache.maven.mercury.event.MercuryEvent;
+import org.apache.maven.mercury.event.MercuryEventListener;
import org.apache.maven.mercury.repository.api.MetadataCacheException;
import org.apache.maven.mercury.repository.api.MetadataCorruptionException;
import org.apache.maven.mercury.repository.api.RepositoryGAMetadata;
@@ -19,11 +24,6 @@
import org.apache.maven.mercury.repository.api.RepositoryUpdatePolicy;
import org.apache.maven.mercury.util.FileLockBundle;
import org.apache.maven.mercury.util.FileUtil;
-import org.apache.maven.mercury.util.event.EventManager;
-import org.apache.maven.mercury.util.event.EventTypeEnum;
-import org.apache.maven.mercury.util.event.GenericEvent;
-import org.apache.maven.mercury.util.event.MercuryEvent;
-import org.apache.maven.mercury.util.event.MercuryEventListener;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
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=720426&r1=720425&r2=720426&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 Mon Nov 24 22:55:00 2008
@@ -21,6 +21,12 @@
import org.apache.maven.mercury.artifact.version.VersionRangeFactory;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
+import org.apache.maven.mercury.event.EventGenerator;
+import org.apache.maven.mercury.event.EventManager;
+import org.apache.maven.mercury.event.EventTypeEnum;
+import org.apache.maven.mercury.event.GenericEvent;
+import org.apache.maven.mercury.event.MercuryEvent;
+import org.apache.maven.mercury.event.MercuryEventListener;
import org.apache.maven.mercury.logging.IMercuryLogger;
import org.apache.maven.mercury.logging.MercuryLoggerManager;
import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
@@ -34,12 +40,6 @@
import org.apache.maven.mercury.repository.api.RepositoryWriter;
import org.apache.maven.mercury.repository.cache.fs.MetadataCacheFs;
import org.apache.maven.mercury.util.Util;
-import org.apache.maven.mercury.util.event.EventGenerator;
-import org.apache.maven.mercury.util.event.EventManager;
-import org.apache.maven.mercury.util.event.EventTypeEnum;
-import org.apache.maven.mercury.util.event.GenericEvent;
-import org.apache.maven.mercury.util.event.MercuryEvent;
-import org.apache.maven.mercury.util.event.MercuryEventListener;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java?rev=720426&r1=720425&r2=720426&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java Mon Nov 24 22:55:00 2008
@@ -11,6 +11,9 @@
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.event.MercuryEvent;
+import org.apache.maven.mercury.event.MercuryEventListener;
+import org.apache.maven.mercury.event.MercuryEvent.EventMask;
import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
import org.apache.maven.mercury.repository.api.ArtifactResults;
import org.apache.maven.mercury.repository.api.LocalRepository;
@@ -20,9 +23,6 @@
import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
import org.apache.maven.mercury.transport.api.Server;
import org.apache.maven.mercury.util.FileUtil;
-import org.apache.maven.mercury.util.event.MercuryEvent;
-import org.apache.maven.mercury.util.event.MercuryEventListener;
-import org.apache.maven.mercury.util.event.MercuryEvent.EventMask;
/**
*