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 08:48:53 UTC
svn commit: r720433 - in /maven/mercury/trunk:
mercury-event/src/main/java/org/apache/maven/mercury/event/ mercury-it/
mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/
mercury-repo/mercury-repo-virtual/src/te...
Author: ogusakov
Date: Mon Nov 24 23:48:51 2008
New Revision: 720433
URL: http://svn.apache.org/viewvc?rev=720433&view=rev
Log:
separated event framework
Modified:
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java
maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java
maven/mercury/trunk/mercury-it/pom.xml
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/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java?rev=720433&r1=720432&r2=720433&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/AbstractMercuryEvent.java Mon Nov 24 23:48:51 2008
@@ -13,19 +13,21 @@
public abstract class AbstractMercuryEvent
implements MercuryEvent
{
- EventTypeEnum type;
+ EventTypeEnum _type;
- String name;
+ String _name;
- String tag;
+ String _tag;
- String result;
+ String _info;
- long start;
+ String _result;
- long duration;
+ long _start;
- Map<String, Object> payload;
+ long _duration;
+
+ Map<String, Object> _payload;
public AbstractMercuryEvent()
{
@@ -35,19 +37,19 @@
public AbstractMercuryEvent( EventTypeEnum type, String name )
{
this();
- this.type = type;
- this.name = name;
+ this._type = type;
+ this._name = name;
}
- public AbstractMercuryEvent( EventTypeEnum type, String name, String tag )
+ public AbstractMercuryEvent( EventTypeEnum type, String name, String info )
{
this( type, name );
- this.tag = tag;
+ this._info = info;
}
public long getDuration()
{
- return duration;
+ return _duration;
}
public Map<String, Object> getPayload()
@@ -57,65 +59,80 @@
public long getStart()
{
- return start;
+ return _start;
}
public EventTypeEnum getType()
{
- return type;
+ return _type;
}
public String getName()
{
- return name;
+ return _name;
+ }
+
+ public String getInfo()
+ {
+ return _info;
}
public String getTag()
{
- return tag;
+ return _tag;
}
public String getResult()
{
- return result;
+ return _result;
}
public void setResult( String result )
{
- this.result = result;
+ this._result = result;
+ }
+
+ public void setTag( String tag )
+ {
+ this._tag = tag;
+ }
+
+ public void setInfo( String info )
+ {
+ this._info = info;
}
public boolean hasResult()
{
- return result != null;
+ return _result != null;
}
public Object getPayload( String name )
{
- return payload == null ? null : payload.get( name );
+ return _payload == null ? null : _payload.get( name );
}
public void setPayload( Map<String, Object> payload )
{
- this.payload = payload;
+ this._payload = payload;
}
public void setPayload( String name, Object value )
{
- if( payload == null )
- payload = new HashMap<String, Object>(4);
+ if( _payload == null )
+ _payload = new HashMap<String, Object>(4);
- payload.put( name, value );
+ _payload.put( name, value );
}
public void start()
{
- this.start = System.currentTimeMillis();
+ this._start = System.currentTimeMillis();
}
public void stop()
{
- duration = System.currentTimeMillis() - start;
+ _duration = System.currentTimeMillis() - _start;
}
}
Modified: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java?rev=720433&r1=720432&r2=720433&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/EventManager.java Mon Nov 24 23:48:51 2008
@@ -110,7 +110,8 @@
{
return new Date( event.getStart() )+", dur: "+ event.getDuration()+" millis :"
+ " ["+ event.getType()+":"+event.getName()+"] "
- + ( isEmpty( event.getTag() ) ? "" : ", tag: "+event.getTag() )
+ + ( isEmpty( event.getTag() ) ? "" : ", tag: "+event.getTag() )
+ + ( isEmpty( event.getInfo() ) ? "" : ", info: "+event.getInfo() )
+ ( isEmpty( event.getResult() ) ? "" : ", result: "+event.getResult() )
;
}
Modified: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java?rev=720433&r1=720432&r2=720433&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/GenericEvent.java Mon Nov 24 23:48:51 2008
@@ -21,9 +21,4 @@
super( type, name, tag );
}
- public void setTag( String tag )
- {
- this.tag = tag;
- }
-
}
Modified: maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java?rev=720433&r1=720432&r2=720433&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java (original)
+++ maven/mercury/trunk/mercury-event/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java Mon Nov 24 23:48:51 2008
@@ -74,6 +74,14 @@
void setTag( String tag );
/**
+ * information for this event. Used to trace event propagation in the system
+ *
+ * @return
+ */
+ String getInfo();
+ void setInfo( String info );
+
+ /**
* get the event start time as UTC timestapm
*
* @return start time as UTC timestamp
Modified: maven/mercury/trunk/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/pom.xml?rev=720433&r1=720432&r2=720433&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Mon Nov 24 23:48:51 2008
@@ -127,6 +127,18 @@
</build>
<dependencies>
+
+ <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-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
@@ -140,62 +152,68 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.8</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-virtual</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-md-sat</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-http</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
</dependency>
+
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
@@ -235,27 +253,25 @@
<artifactId>jetty-client</artifactId>
<version>${jetty.version}</version>
</dependency>
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<version>${jetty.version}</version>
</dependency>
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-servlet-tester</artifactId>
<version>${jetty.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
<version>${maven.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-sat</artifactId>
- <version>${mercury.version}</version>
- </dependency>
</dependencies>
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=720433&r1=720432&r2=720433&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 23:48:51 2008
@@ -378,7 +378,7 @@
md.setTracker( rr );
if( _eventManager != null )
- eventRead.setTag( eventRead.getTag()+", found: "+md.getDependencies() );
+ eventRead.setInfo( eventRead.getInfo()+", found: "+md.getDependencies() );
return md;
}
@@ -708,7 +708,7 @@
_log.debug( bmdQuery+" found in "+rr.getRepository().getServer() );
if( _eventManager != null )
- eventRead.setTag( eventRead.getTag() );
+ eventRead.setInfo( eventRead.getInfo() );
return res;
}
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=720433&r1=720432&r2=720433&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 23:48:51 2008
@@ -174,7 +174,7 @@
public void fire( MercuryEvent event )
{
- String tag = event.getTag();
+ String tag = event.getInfo();
if( _localRepoId.equals( tag ) )
++localEventCount;