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:32:45 UTC
svn commit: r720420 - in /maven/mercury/trunk: ./ mercury-maven/
mercury-maven/mercury-compare-maven-plugin/
mercury-maven/mercury-compare-maven-plugin/src/main/java/org/sonatype/maven/plugins/mercury/compare/maven/
mercury-maven/mercury-compare-mdo/sr...
Author: ogusakov
Date: Mon Nov 24 22:32:44 2008
New Revision: 720420
URL: http://svn.apache.org/viewvc?rev=720420&view=rev
Log:
separating event framework
Modified:
maven/mercury/trunk/mercury-maven/ (props changed)
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/src/main/java/org/sonatype/maven/plugins/mercury/compare/maven/MercuryDepsMojo.java
maven/mercury/trunk/mercury-maven/mercury-compare-mdo/src/main/java/org/apache/maven/mercury/compare/DataBuilder.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-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
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/GenericEvent.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java
maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java
maven/mercury/trunk/pom.xml
Propchange: maven/mercury/trunk/mercury-maven/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 24 22:32:44 2008
@@ -2,3 +2,4 @@
localRepoEmpty
localRepoMaven
localRepoMercury
+1.txt
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c Mon Nov 24 22:32:44 2008
@@ -1 +1 @@
-mvn -s s.xml org.sonatype.maven.plugins:mercury-compare-maven-plugin:1.0:deps -DtargetDir=../deps -DlistFile=../list.txt -DlocalRepo=../localRepoMaven
+mvn -e -s s.xml org.sonatype.maven.plugins:mercury-compare-maven-plugin:1.0:deps -DtargetDir=../deps -DlistFile=../list.txt -DlocalRepo=../localRepoMaven
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml Mon Nov 24 22:32:44 2008
@@ -9,14 +9,14 @@
<profile>
<id>standard</id>
<repositories>
-
+<!--
<repository>
<id>maven.central</id>
<url>http://repo1.maven.org/maven2</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
-<!--
+
<repository>
<id>sona.central</id>
<url>http://repository.sonatype.org/content/groups/public</url>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/src/main/java/org/sonatype/maven/plugins/mercury/compare/maven/MercuryDepsMojo.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/src/main/java/org/sonatype/maven/plugins/mercury/compare/maven/MercuryDepsMojo.java?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/src/main/java/org/sonatype/maven/plugins/mercury/compare/maven/MercuryDepsMojo.java (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/src/main/java/org/sonatype/maven/plugins/mercury/compare/maven/MercuryDepsMojo.java Mon Nov 24 22:32:44 2008
@@ -144,6 +144,7 @@
try {
DataBuilder.visitDeps( list, this );
} catch( Exception e ) {
+ e.printStackTrace();
_log.error( e.getMessage() );
throw new MojoExecutionException( e.getMessage() );
}
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mdo/src/main/java/org/apache/maven/mercury/compare/DataBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mdo/src/main/java/org/apache/maven/mercury/compare/DataBuilder.java?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mdo/src/main/java/org/apache/maven/mercury/compare/DataBuilder.java (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mdo/src/main/java/org/apache/maven/mercury/compare/DataBuilder.java Mon Nov 24 22:32:44 2008
@@ -141,10 +141,11 @@
{
resolver.resolve( gav[0], gav[1], gav[2], count == 4 ? gav[3] : "jar" );
}
- catch( Exception e )
+ catch( Throwable e )
{
e.printStackTrace();
}
+
}
}
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=720420&r1=720419&r2=720420&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:32:44 2008
@@ -25,6 +25,7 @@
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;
@@ -112,7 +113,7 @@
_existingNodes = new HashMap<String, MetadataTreeNode>(256);
- GenericEvent treeBuildEvent = new GenericEvent( MercuryEvent.EventTypeEnum.dependencyBuilder, TREE_BUILD_EVENT, startMD.getGAV() );
+ GenericEvent treeBuildEvent = new GenericEvent( EventTypeEnum.dependencyBuilder, TREE_BUILD_EVENT, startMD.getGAV() );
MetadataTreeNode root = createNode( startMD, null, startMD, treeScope );
@@ -132,7 +133,7 @@
GenericEvent nodeBuildEvent = null;
if( _eventManager != null )
- nodeBuildEvent = new GenericEvent( MercuryEvent.EventTypeEnum.dependencyBuilder, TREE_NODE_BUILD_EVENT, nodeMD.getGAV() );
+ nodeBuildEvent = new GenericEvent( EventTypeEnum.dependencyBuilder, TREE_NODE_BUILD_EVENT, nodeMD.getGAV() );
try
{
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=720420&r1=720419&r2=720420&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:32:44 2008
@@ -17,6 +17,7 @@
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;
@@ -77,7 +78,7 @@
try
{
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.satSolver, EVENT_CREATE_SOLVER, tree.toString() );
+ event = new GenericEvent( EventTypeEnum.satSolver, EVENT_CREATE_SOLVER, tree.toString() );
if( tree.getId() == 0 )
MetadataTreeNode.reNumber( tree, 1 );
@@ -538,7 +539,7 @@
try
{
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.satSolver, EVENT_SOLVE, _root.toString() );
+ event = new GenericEvent( EventTypeEnum.satSolver, EVENT_SOLVE, _root.toString() );
if( _solver.isSatisfiable() )
{
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=720420&r1=720419&r2=720420&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:32:44 2008
@@ -20,6 +20,7 @@
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;
@@ -108,7 +109,7 @@
String gaKey = getGAKey(coord);
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.fsCache, EVENT_FIND_GA, gaKey );
+ event = new GenericEvent( EventTypeEnum.fsCache, EVENT_FIND_GA, gaKey );
RepositoryGAMetadata inMem = gaCache.get( gaKey );
@@ -181,7 +182,7 @@
String gavKey = getGAVKey(coord);
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.fsCache, EVENT_FIND_GAV, gavKey );
+ event = new GenericEvent( EventTypeEnum.fsCache, EVENT_FIND_GAV, gavKey );
RepositoryGAVMetadata inMem = gavCache.get( gavKey );
@@ -256,7 +257,7 @@
String gaKey = getGAKey( gam.getGA() );
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.fsCache, EVENT_UPDATE_GA, gaKey );
+ event = new GenericEvent( EventTypeEnum.fsCache, EVENT_UPDATE_GA, gaKey );
File gaDir = getGADir( gam.getGA() );
@@ -298,7 +299,7 @@
String gavKey = getGAKey( gavm.getGAV() );
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.fsCache, EVENT_UPDATE_GA, gavKey );
+ event = new GenericEvent( EventTypeEnum.fsCache, EVENT_UPDATE_GA, gavKey );
File gavDir = getGAVDir( gavm.getGAV() );
@@ -339,7 +340,7 @@
String rawKey = bmd.getGAV();
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.fsCache, EVENT_FIND_RAW, rawKey );
+ event = new GenericEvent( EventTypeEnum.fsCache, EVENT_FIND_RAW, rawKey );
byte [] res = rawCache.get( rawKey );
@@ -393,7 +394,7 @@
String rawKey = bmd.getGAV();
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.fsCache, EVENT_SAVE_RAW, rawKey );
+ event = new GenericEvent( EventTypeEnum.fsCache, EVENT_SAVE_RAW, rawKey );
rawCache.put( rawKey, rawBytes );
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=720420&r1=720419&r2=720420&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:32:44 2008
@@ -36,6 +36,7 @@
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;
@@ -229,7 +230,7 @@
{
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_VERSIONS );
+ event = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_VERSIONS );
ArtifactBasicResults res = null;
ArtifactListProcessor tp = _processors == null ? null : _processors.get( ArtifactListProcessor.FUNCTION_TP );
@@ -247,7 +248,7 @@
break;
if( _eventManager!= null )
- eventRead = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_VERSIONS_FROM_REPO, rr.getRepository().getId() );
+ eventRead = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_VERSIONS_FROM_REPO, rr.getRepository().getId() );
ArtifactBasicResults repoRes = rr.readVersions( qList );
@@ -341,7 +342,7 @@
{
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_DEPENDENCIES, bmd.toString() );
+ event = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_DEPENDENCIES, bmd.toString() );
init();
@@ -367,7 +368,7 @@
{
if( _eventManager != null )
- eventRead = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_DEPENDENCIES_FROM_REPO, rr.getRepository().getId() );
+ eventRead = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_DEPENDENCIES_FROM_REPO, rr.getRepository().getId() );
ArtifactBasicResults res = rr.readDependencies( query );
@@ -470,7 +471,7 @@
ArtifactResults res = null;
if( _eventManager != null )
- event = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_ARTIFACTS, "" );
+ event = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_ARTIFACTS, "" );
if( Util.isEmpty( query ) )
return res;
@@ -497,7 +498,7 @@
try
{
if( _eventManager != null )
- eventRead = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_ARTIFACTS_FROM_REPO_QUALIFIED, repoId );
+ eventRead = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_ARTIFACTS_FROM_REPO_QUALIFIED, repoId );
List<ArtifactBasicMetadata> rrQuery = buckets.get( rr );
@@ -549,7 +550,7 @@
try
{
if( _eventManager != null )
- eventRead = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_ARTIFACTS_FROM_REPO_UNQUALIFIED, repoId );
+ eventRead = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_ARTIFACTS_FROM_REPO_UNQUALIFIED, repoId );
ArtifactResults rrRes = rr.readArtifacts( rejects );
@@ -631,7 +632,7 @@
+ (Util.isEmpty( classifier )?"":", classifier="+classifier)
+ (Util.isEmpty( type )?"":", type="+type)
;
- event = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_RAW, eventTag );
+ event = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_RAW, eventTag );
}
ArtifactBasicMetadata bmdQuery = bmd;
@@ -698,7 +699,7 @@
try
{
if( _eventManager != null )
- eventRead = new GenericEvent( MercuryEvent.EventTypeEnum.virtualRepositoryReader, EVENT_READ_RAW_FROM_REPO, rr.getRepository().getId()+": "+eventTag );
+ eventRead = new GenericEvent( EventTypeEnum.virtualRepositoryReader, EVENT_READ_RAW_FROM_REPO, rr.getRepository().getId()+": "+eventTag );
res = rr.readRawData( bmdQuery, classifier, type );
if( res != null )
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=720420&r1=720419&r2=720420&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:32:44 2008
@@ -20,7 +20,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.EventManager;
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;
@@ -165,7 +164,7 @@
assertEquals( 0, l.remoteEventCount );
}
-
+ //========================================================================
class Listener
implements MercuryEventListener
{
@@ -182,8 +181,8 @@
else if( _remoteRepoId.equals( tag ) )
++remoteEventCount;
- System.out.println(EventManager.toString( event ));
- System.out.flush();
+// System.out.println(EventManager.toString( event ));
+// System.out.flush();
}
public EventMask getMask()
Modified: 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-util/src/main/java/org/apache/maven/mercury/util/event/AbstractMercuryEvent.java?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/AbstractMercuryEvent.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/AbstractMercuryEvent.java Mon Nov 24 22:32:44 2008
@@ -13,7 +13,7 @@
public abstract class AbstractMercuryEvent
implements MercuryEvent
{
- MercuryEvent.EventTypeEnum type;
+ EventTypeEnum type;
String name;
@@ -32,14 +32,14 @@
start();
}
- public AbstractMercuryEvent( MercuryEvent.EventTypeEnum type, String name )
+ public AbstractMercuryEvent( EventTypeEnum type, String name )
{
this();
this.type = type;
this.name = name;
}
- public AbstractMercuryEvent( MercuryEvent.EventTypeEnum type, String name, String tag )
+ public AbstractMercuryEvent( EventTypeEnum type, String name, String tag )
{
this( type, name );
this.tag = tag;
@@ -60,7 +60,7 @@
return start;
}
- public MercuryEvent.EventTypeEnum getType()
+ public EventTypeEnum getType()
{
return type;
}
Modified: 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-util/src/main/java/org/apache/maven/mercury/util/event/GenericEvent.java?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/GenericEvent.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/GenericEvent.java Mon Nov 24 22:32:44 2008
@@ -11,12 +11,12 @@
extends AbstractMercuryEvent
{
- public GenericEvent( MercuryEvent.EventTypeEnum type, String name )
+ public GenericEvent( EventTypeEnum type, String name )
{
super(type, name);
}
- public GenericEvent( MercuryEvent.EventTypeEnum type, String name, String tag )
+ public GenericEvent( EventTypeEnum type, String name, String tag )
{
super( type, name, tag );
}
Modified: 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-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/event/MercuryEvent.java Mon Nov 24 22:32:44 2008
@@ -13,32 +13,6 @@
*/
public interface MercuryEvent
{
- enum EventTypeEnum
- {
- dependencyBuilder(0)
- , satSolver(1)
-
- , virtualRepositoryReader(2)
-
- , localRepository(3)
- , localRepositoryReader(4)
- , localRepositoryWriter(5)
-
- , remoteRepository(6)
- , remoteRepositoryReader(7)
- , remoteRepositoryWriter(8)
-
- , cache(9)
- , fsCache(10)
- ;
-
- int bitNo;
-
- EventTypeEnum( int bitNo )
- {
- this.bitNo = bitNo;
- }
- }
@SuppressWarnings("serial")
class EventMask
Modified: 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-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java (original)
+++ maven/mercury/trunk/mercury-util/src/test/java/org/apache/maven/mercury/util/event/EventFrameworkTest.java Mon Nov 24 22:32:44 2008
@@ -44,7 +44,7 @@
throws Exception
{
runTest( null
- , new MercuryEvent.EventMask(MercuryEvent.EventTypeEnum.localRepository)
+ , new MercuryEvent.EventMask(EventTypeEnum.localRepository)
, THREAD_COUNT * EventFrameworkTest.EVENT_COUNT
, 0
);
@@ -53,7 +53,7 @@
public void testListenMaskedManagerEvents()
throws Exception
{
- runTest( new MercuryEvent.EventMask(MercuryEvent.EventTypeEnum.remoteRepository)
+ runTest( new MercuryEvent.EventMask(EventTypeEnum.remoteRepository)
, null
, 0
, THREAD_COUNT * EventFrameworkTest.EVENT_COUNT
@@ -63,13 +63,13 @@
public void testListenMismatchedMaskEvents()
throws Exception
{
- runTest( new MercuryEvent.EventMask(MercuryEvent.EventTypeEnum.remoteRepository)
- , new MercuryEvent.EventMask(MercuryEvent.EventTypeEnum.localRepository)
+ runTest( new MercuryEvent.EventMask(EventTypeEnum.remoteRepository)
+ , new MercuryEvent.EventMask(EventTypeEnum.localRepository)
, 0
, 0
);
}
-
+ //-------------------------------------------------------------------------------------------------------------------------------
private void runTest( MercuryEvent.EventMask emMask, MercuryEvent.EventMask listenerMask, int expectedLocal, int expectedRemote )
throws Exception
{
@@ -81,12 +81,12 @@
for( int i=0; i<THREAD_COUNT; i++ )
{
- es.execute( new Generator( em, MercuryEvent.EventTypeEnum.localRepository, ""+i ) );
+ es.execute( new Generator( em, EventTypeEnum.localRepository, ""+i ) );
}
for( int i=0; i<THREAD_COUNT; i++ )
{
- es.execute( new Generator( em, MercuryEvent.EventTypeEnum.remoteRepository, ""+i ) );
+ es.execute( new Generator( em, EventTypeEnum.remoteRepository, ""+i ) );
}
es.awaitTermination( 2, TimeUnit.SECONDS );
@@ -116,10 +116,10 @@
// System.out.println( EventManager.toString( event ) );
// System.out.flush();
- if( event.getType().equals( MercuryEvent.EventTypeEnum.localRepository ) )
+ if( event.getType().equals( EventTypeEnum.localRepository ) )
++localRepoCount;
else
- if( event.getType().equals( MercuryEvent.EventTypeEnum.remoteRepository ) )
+ if( event.getType().equals( EventTypeEnum.remoteRepository ) )
++remoteRepoCount;
}
@@ -138,9 +138,9 @@
String _msg;
- MercuryEvent.EventTypeEnum _myType;
+ EventTypeEnum _myType;
- public Generator( EventManager em, MercuryEvent.EventTypeEnum type, String msg )
+ public Generator( EventManager em, EventTypeEnum type, String msg )
{
_eventManager = em;
_msg = msg;
Modified: maven/mercury/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=720420&r1=720419&r2=720420&view=diff
==============================================================================
--- maven/mercury/trunk/pom.xml (original)
+++ maven/mercury/trunk/pom.xml Mon Nov 24 22:32:44 2008
@@ -51,6 +51,7 @@
<module>mercury-external</module>
<module>mercury-crypto</module>
<module>mercury-util</module>
+ <module>mercury-event</module>
<module>mercury-logging</module>
<module>mercury-plexus</module>
<module>mercury-wagon</module>