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 2009/04/28 01:12:32 UTC
svn commit: r769199 [3/19] - in /maven/mercury/trunk:
mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/
mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/
mercury-core/src/main/java/org/apache/maven/mercury/artifact/ ...
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/DumbListener.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/DumbListener.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/DumbListener.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/DumbListener.java Mon Apr 27 23:12:25 2009
@@ -26,44 +26,41 @@
import org.apache.maven.mercury.event.MercuryEvent.EventMask;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class DumbListener
-implements MercuryEventListener
+ implements MercuryEventListener
{
-
- Writer wr;
-
- public DumbListener()
- {
- this( System.out );
- }
-
- public DumbListener( OutputStream os )
- {
- wr = new OutputStreamWriter( os );
- }
-
- public void fire( MercuryEvent event )
- {
- try
+
+ Writer wr;
+
+ public DumbListener()
+ {
+ this( System.out );
+ }
+
+ public DumbListener( OutputStream os )
{
- wr.write( "mercury event: "+EventManager.toString( event )+"\n" );
- wr.flush();
+ wr = new OutputStreamWriter( os );
}
- catch( IOException e )
+
+ public void fire( MercuryEvent event )
{
- e.printStackTrace();
+ try
+ {
+ wr.write( "mercury event: " + EventManager.toString( event ) + "\n" );
+ wr.flush();
+ }
+ catch ( IOException e )
+ {
+ e.printStackTrace();
+ }
}
- }
- public EventMask getMask()
- {
- return null;
- }
+ public EventMask getMask()
+ {
+ return null;
+ }
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventGenerator.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventGenerator.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventGenerator.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventGenerator.java Mon Apr 27 23:12:25 2009
@@ -19,34 +19,32 @@
package org.apache.maven.mercury.event;
/**
+ * this component generates events
*
- * this component generates events
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public interface EventGenerator
{
- /**
- * register event listener
- *
- * @param listener
- */
- void register( MercuryEventListener listener );
-
- /**
- * remove particular event listener
- *
- * @param listener
- */
- void unRegister( MercuryEventListener listener );
-
- /**
- * set entire event manager
- *
- * @param eventManager
- */
- void setEventManager( EventManager eventManager );
-
+ /**
+ * register event listener
+ *
+ * @param listener
+ */
+ void register( MercuryEventListener listener );
+
+ /**
+ * remove particular event listener
+ *
+ * @param listener
+ */
+ void unRegister( MercuryEventListener listener );
+
+ /**
+ * set entire event manager
+ *
+ * @param eventManager
+ */
+ void setEventManager( EventManager eventManager );
+
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventManager.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventManager.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventManager.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventManager.java Mon Apr 27 23:12:25 2009
@@ -32,177 +32,174 @@
/**
* event queue dispatcher. It registers/unregisters listeners, dispatches events
- *
+ *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class EventManager
{
- public static final int THREAD_COUNT = 4;
+ public static final int THREAD_COUNT = 4;
- /**
- * this property may contain comma separated list of bit numbers defined in MercuryEvent.EventTypeEnum. It supersedes
- * any bits set by the appropriate EventManager constructor by OR operation with those
- */
- public static final String SYSTEM_PROPERTY_EVENT_MASK = "maven.mercury.events";
- public static final String systemPropertyEventMask = System.getProperty( SYSTEM_PROPERTY_EVENT_MASK, null );
-
- private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( EventManager.class );
- private static final Language LANG = new DefaultLanguage( EventManager.class );
-
- final List<MercuryEventListener> _listeners = new ArrayList<MercuryEventListener>(8);
-
- final LinkedBlockingQueue<UnitOfWork> _queue = new LinkedBlockingQueue<UnitOfWork>( 512 );
-
- private ExecutorService _execService;
-
- private MercuryEvent.EventMask _eventMask;
-
- /**
- * default initialization - create thread pool
- */
- public EventManager()
- {
- _execService = Executors.newFixedThreadPool( THREAD_COUNT );
-
- for( int i = 0; i < THREAD_COUNT; i++ )
- _execService.execute( new Runner( _queue ) );
-
- processSystemOptions();
- }
-
- /**
- * default initialization - create thread pool
- */
- public EventManager( MercuryEvent.EventMask eventMask )
- {
- this();
-
- this._eventMask = eventMask;
-
- processSystemOptions();
- }
-
- private final void processSystemOptions()
- {
- if( systemPropertyEventMask == null )
- return;
-
- if( _eventMask == null )
- _eventMask = new MercuryEvent.EventMask( systemPropertyEventMask );
- else
- _eventMask.setBits( systemPropertyEventMask );
- }
-
- /**
- * add listener only if it meets the criteria
- *
- * @param listener
- */
- public void register( MercuryEventListener listener )
- {
- MercuryEvent.EventMask lMask = listener.getMask();
-
- if( lMask == null || _eventMask == null || _eventMask.intersects( lMask ) )
- _listeners.add( listener );
- }
-
- public void unRegister( MercuryEventListener listener )
- {
- _listeners.remove( listener );
- }
-
- public List<MercuryEventListener> getListeners()
- {
- return _listeners;
- }
-
- public void fireEvent( MercuryEvent event )
- {
- for( MercuryEventListener listener : _listeners )
- _queue.add( new UnitOfWork( listener, event ) );
- }
-
- public static final String toString( MercuryEvent event )
- {
- return new Date( event.getStart() )+", dur: "+ event.getDuration()+" millis :"
- + " ["+ event.getType()+":"+event.getName()+"] "
- + ( isEmpty( event.getTag() ) ? "" : ", tag: "+event.getTag() )
- + ( isEmpty( event.getInfo() ) ? "" : ", info: "+event.getInfo() )
- + ( isEmpty( event.getResult() ) ? "" : ", result: "+event.getResult() )
- ;
- }
-
- public static final boolean isEmpty( String o )
- {
- return o == null || o.length() < 1;
- }
-
-
- class UnitOfWork
- {
- MercuryEventListener listener;
- MercuryEvent event;
-
- public UnitOfWork( MercuryEventListener listener, MercuryEvent event )
+ /**
+ * this property may contain comma separated list of bit numbers defined in MercuryEvent.EventTypeEnum. It
+ * supersedes any bits set by the appropriate EventManager constructor by OR operation with those
+ */
+ public static final String SYSTEM_PROPERTY_EVENT_MASK = "maven.mercury.events";
+
+ public static final String systemPropertyEventMask = System.getProperty( SYSTEM_PROPERTY_EVENT_MASK, null );
+
+ private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( EventManager.class );
+
+ private static final Language LANG = new DefaultLanguage( EventManager.class );
+
+ final List<MercuryEventListener> _listeners = new ArrayList<MercuryEventListener>( 8 );
+
+ final LinkedBlockingQueue<UnitOfWork> _queue = new LinkedBlockingQueue<UnitOfWork>( 512 );
+
+ private ExecutorService _execService;
+
+ private MercuryEvent.EventMask _eventMask;
+
+ /**
+ * default initialization - create thread pool
+ */
+ public EventManager()
+ {
+ _execService = Executors.newFixedThreadPool( THREAD_COUNT );
+
+ for ( int i = 0; i < THREAD_COUNT; i++ )
+ _execService.execute( new Runner( _queue ) );
+
+ processSystemOptions();
+ }
+
+ /**
+ * default initialization - create thread pool
+ */
+ public EventManager( MercuryEvent.EventMask eventMask )
+ {
+ this();
+
+ this._eventMask = eventMask;
+
+ processSystemOptions();
+ }
+
+ private final void processSystemOptions()
{
- this.listener = listener;
- this.event = event;
+ if ( systemPropertyEventMask == null )
+ return;
+
+ if ( _eventMask == null )
+ _eventMask = new MercuryEvent.EventMask( systemPropertyEventMask );
+ else
+ _eventMask.setBits( systemPropertyEventMask );
}
-
- void execute()
+
+ /**
+ * add listener only if it meets the criteria
+ *
+ * @param listener
+ */
+ public void register( MercuryEventListener listener )
{
- try
- {
MercuryEvent.EventMask lMask = listener.getMask();
-
- if( _eventMask != null )
+
+ if ( lMask == null || _eventMask == null || _eventMask.intersects( lMask ) )
+ _listeners.add( listener );
+ }
+
+ public void unRegister( MercuryEventListener listener )
+ {
+ _listeners.remove( listener );
+ }
+
+ public List<MercuryEventListener> getListeners()
+ {
+ return _listeners;
+ }
+
+ public void fireEvent( MercuryEvent event )
+ {
+ for ( MercuryEventListener listener : _listeners )
+ _queue.add( new UnitOfWork( listener, event ) );
+ }
+
+ public static final String toString( MercuryEvent event )
+ {
+ return new Date( event.getStart() ) + ", dur: " + event.getDuration() + " millis :" + " [" + event.getType()
+ + ":" + event.getName() + "] " + ( isEmpty( event.getTag() ) ? "" : ", tag: " + event.getTag() )
+ + ( isEmpty( event.getInfo() ) ? "" : ", info: " + event.getInfo() )
+ + ( isEmpty( event.getResult() ) ? "" : ", result: " + event.getResult() );
+ }
+
+ public static final boolean isEmpty( String o )
+ {
+ return o == null || o.length() < 1;
+ }
+
+ class UnitOfWork
+ {
+ MercuryEventListener listener;
+
+ MercuryEvent event;
+
+ public UnitOfWork( MercuryEventListener listener, MercuryEvent event )
+ {
+ this.listener = listener;
+ this.event = event;
+ }
+
+ void execute()
{
- if( lMask == null )
- lMask = _eventMask;
- else
- lMask.and( _eventMask );
+ try
+ {
+ MercuryEvent.EventMask lMask = listener.getMask();
+
+ if ( _eventMask != null )
+ {
+ if ( lMask == null )
+ lMask = _eventMask;
+ else
+ lMask.and( _eventMask );
+ }
+
+ if ( lMask == null || lMask.get( event.getType().bitNo ) )
+ listener.fire( event );
+ }
+ catch ( Throwable th )
+ {
+ LOG.error( LANG.getMessage( "listener.error", th.getMessage() ) );
+ }
}
-
-
- if( lMask == null || lMask.get( event.getType().bitNo ) )
- listener.fire( event );
- }
- catch( Throwable th )
- {
- LOG.error( LANG.getMessage( "listener.error", th.getMessage() ) );
- }
- }
- }
-
- class Runner
- implements Runnable
- {
- final LinkedBlockingQueue<UnitOfWork> queue;
-
- public Runner( LinkedBlockingQueue<UnitOfWork> queue )
- {
- this.queue = queue;
}
- public void run()
+ class Runner
+ implements Runnable
{
- UnitOfWork uow;
+ final LinkedBlockingQueue<UnitOfWork> queue;
- for(;;)
- try
+ public Runner( LinkedBlockingQueue<UnitOfWork> queue )
{
- uow = queue.take();
- uow.execute();
+ this.queue = queue;
}
- catch( InterruptedException e )
+
+ public void run()
{
- return;
+ UnitOfWork uow;
+
+ for ( ;; )
+ try
+ {
+ uow = queue.take();
+ uow.execute();
+ }
+ catch ( InterruptedException e )
+ {
+ return;
+ }
}
+
}
-
- }
}
-
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/EventTypeEnum.java Mon Apr 27 23:12:25 2009
@@ -19,35 +19,25 @@
package org.apache.maven.mercury.event;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public enum EventTypeEnum
{
- dependencyBuilder(0)
- , satSolver(1)
-
- , virtualRepositoryReader(2)
-
- , localRepository(3)
- , localRepositoryReader(4)
- , localRepositoryWriter(5)
-
- , remoteRepository(6)
- , remoteRepositoryReader(7)
- , remoteRepositoryWriter(8)
-
- , cache(9)
- , fsCache(10)
- ;
-
+ 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;
+ this.bitNo = bitNo;
}
- }
+}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/GenericEvent.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/GenericEvent.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/GenericEvent.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/GenericEvent.java Mon Apr 27 23:12:25 2009
@@ -19,24 +19,21 @@
package org.apache.maven.mercury.event;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class GenericEvent
-extends AbstractMercuryEvent
+ extends AbstractMercuryEvent
{
- public GenericEvent( EventTypeEnum type, String name )
- {
- super(type, name);
- }
+ public GenericEvent( EventTypeEnum type, String name )
+ {
+ super( type, name );
+ }
- public GenericEvent( EventTypeEnum type, String name, String tag )
- {
- super( type, name, tag );
- }
+ public GenericEvent( EventTypeEnum type, String name, String tag )
+ {
+ super( type, name, tag );
+ }
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEvent.java Mon Apr 27 23:12:25 2009
@@ -23,143 +23,143 @@
import java.util.StringTokenizer;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public interface MercuryEvent
{
- @SuppressWarnings("serial")
- class EventMask
- extends BitSet
- {
- public EventMask( EventTypeEnum... bits )
+ @SuppressWarnings( "serial" )
+ class EventMask
+ extends BitSet
{
- super();
-
- for( EventTypeEnum bit : bits )
- set( bit.bitNo );
- }
+ public EventMask( EventTypeEnum... bits )
+ {
+ super();
- public EventMask( String bits )
- {
- super();
-
- setBits( bits );
- }
-
- public final void setBits( String bits )
- {
- if( bits == null )
- return;
-
- StringTokenizer st = new StringTokenizer( bits, ",");
-
- while( st.hasMoreTokens() )
- {
- String bit = st.nextToken();
-
- int bitNo = Integer.valueOf( bit );
-
- set( bitNo, true );
- }
+ for ( EventTypeEnum bit : bits )
+ set( bit.bitNo );
+ }
+
+ public EventMask( String bits )
+ {
+ super();
+
+ setBits( bits );
+ }
+
+ public final void setBits( String bits )
+ {
+ if ( bits == null )
+ return;
+
+ StringTokenizer st = new StringTokenizer( bits, "," );
+
+ while ( st.hasMoreTokens() )
+ {
+ String bit = st.nextToken();
+
+ int bitNo = Integer.valueOf( bit );
+
+ set( bitNo, true );
+ }
+ }
}
- }
- /**
- * event type
- *
- * @return
- */
- EventTypeEnum getType();
-
- /**
- * event name inside type
- *
- * @return
- */
- String getName();
-
- /**
- * aggregation tag of this event. Used to trace event propagation in the system
- *
- * @return
- */
- String getTag();
- 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
- */
- long getStart();
-
- /**
- * start the event
- */
- void start();
-
- /**
- * stop the event and calculate the duration
- */
- void stop();
-
-
- /**
- * result field
- *
- * @return
- */
- public String getResult();
-
- public void setResult( String result );
-
- public boolean hasResult();
-
- /**
- * duration of this event in millis
- *
- * @return duration of this event
- */
- long getDuration();
-
- /**
- * event's payload
- *
- * @return results, associated with this event
- */
- Map<String,Object> getPayload();
-
- /**
- * get one of payload values
- *
- * @param name element name
- * @return results, associated with this event
- */
- Object getPayload( String name );
-
- /**
- * set the whole payload
- * @param payload
- */
- void setPayload( Map<String,Object> payload );
-
- /**
- * set the whole payload
- * @param name
- * @param value
- */
- void setPayload( String name, Object value );
+ /**
+ * event type
+ *
+ * @return
+ */
+ EventTypeEnum getType();
+
+ /**
+ * event name inside type
+ *
+ * @return
+ */
+ String getName();
+
+ /**
+ * aggregation tag of this event. Used to trace event propagation in the system
+ *
+ * @return
+ */
+ String getTag();
+
+ 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
+ */
+ long getStart();
+
+ /**
+ * start the event
+ */
+ void start();
+
+ /**
+ * stop the event and calculate the duration
+ */
+ void stop();
+
+ /**
+ * result field
+ *
+ * @return
+ */
+ public String getResult();
+
+ public void setResult( String result );
+
+ public boolean hasResult();
+
+ /**
+ * duration of this event in millis
+ *
+ * @return duration of this event
+ */
+ long getDuration();
+
+ /**
+ * event's payload
+ *
+ * @return results, associated with this event
+ */
+ Map<String, Object> getPayload();
+
+ /**
+ * get one of payload values
+ *
+ * @param name element name
+ * @return results, associated with this event
+ */
+ Object getPayload( String name );
+
+ /**
+ * set the whole payload
+ *
+ * @param payload
+ */
+ void setPayload( Map<String, Object> payload );
+
+ /**
+ * set the whole payload
+ *
+ * @param name
+ * @param value
+ */
+ void setPayload( String name, Object value );
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/event/MercuryEventListener.java Mon Apr 27 23:12:25 2009
@@ -19,25 +19,22 @@
package org.apache.maven.mercury.event;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public interface MercuryEventListener
{
- /**
- * identifies what events this listrener is interested in.
- *
- * @return the mask - BitSet of event type bits, or null, if this listener wants to be notified of all events
- */
- MercuryEvent.EventMask getMask();
-
- /**
- * this is called when an event matching the listener mask is generated
- *
- * @param event
- */
- void fire( MercuryEvent event );
+ /**
+ * identifies what events this listrener is interested in.
+ *
+ * @return the mask - BitSet of event type bits, or null, if this listener wants to be notified of all events
+ */
+ MercuryEvent.EventMask getMask();
+
+ /**
+ * this is called when an event matching the listener mask is generated
+ *
+ * @param event
+ */
+ void fire( MercuryEvent event );
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/AbstractMercuryLogger.java Mon Apr 27 23:12:25 2009
@@ -19,47 +19,43 @@
package org.apache.maven.mercury.logging;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public abstract class AbstractMercuryLogger
{
- protected String _className;
-
- MercuryLoggingLevelEnum _threshold = MercuryLoggerManager.getThreshold();
-
-
- @SuppressWarnings("unchecked")
- public AbstractMercuryLogger( Class clazz )
- {
- _className = clazz.getName();
- }
-
- public boolean isDebugEnabled()
- {
- return _threshold.getId() <= MercuryLoggingLevelEnum.debug.getId();
- }
-
- public boolean isErrorEnabled()
- {
- return _threshold.getId() <= MercuryLoggingLevelEnum.error.getId();
- }
-
- public boolean isFatalEnabled()
- {
- return _threshold.getId() <= MercuryLoggingLevelEnum.error.getId();
- }
-
- public boolean isInfoEnabled()
- {
- return _threshold.getId() <= MercuryLoggingLevelEnum.info.getId();
- }
-
- public boolean isWarnEnabled()
- {
- return _threshold.getId() <= MercuryLoggingLevelEnum.warn.getId();
- }
+ protected String _className;
+
+ MercuryLoggingLevelEnum _threshold = MercuryLoggerManager.getThreshold();
+
+ @SuppressWarnings( "unchecked" )
+ public AbstractMercuryLogger( Class clazz )
+ {
+ _className = clazz.getName();
+ }
+
+ public boolean isDebugEnabled()
+ {
+ return _threshold.getId() <= MercuryLoggingLevelEnum.debug.getId();
+ }
+
+ public boolean isErrorEnabled()
+ {
+ return _threshold.getId() <= MercuryLoggingLevelEnum.error.getId();
+ }
+
+ public boolean isFatalEnabled()
+ {
+ return _threshold.getId() <= MercuryLoggingLevelEnum.error.getId();
+ }
+
+ public boolean isInfoEnabled()
+ {
+ return _threshold.getId() <= MercuryLoggingLevelEnum.info.getId();
+ }
+
+ public boolean isWarnEnabled()
+ {
+ return _threshold.getId() <= MercuryLoggingLevelEnum.warn.getId();
+ }
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLogger.java Mon Apr 27 23:12:25 2009
@@ -20,40 +20,39 @@
/**
* A copy of plexus default container logger interface. Need it to externalize the logging system
- *
+ *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public interface IMercuryLogger
{
- void debug( String message );
+ void debug( String message );
- void debug( String message, Throwable throwable );
+ void debug( String message, Throwable throwable );
- boolean isDebugEnabled();
+ boolean isDebugEnabled();
- void info( String message );
+ void info( String message );
- void info( String message, Throwable throwable );
+ void info( String message, Throwable throwable );
- boolean isInfoEnabled();
+ boolean isInfoEnabled();
- void warn( String message );
+ void warn( String message );
- void warn( String message, Throwable throwable );
+ void warn( String message, Throwable throwable );
- boolean isWarnEnabled();
+ boolean isWarnEnabled();
- void error( String message );
+ void error( String message );
- void error( String message, Throwable throwable );
+ void error( String message, Throwable throwable );
- boolean isErrorEnabled();
+ boolean isErrorEnabled();
- void fatal( String message );
+ void fatal( String message );
- void fatal( String message, Throwable throwable );
+ void fatal( String message, Throwable throwable );
- boolean isFatalEnabled();
+ boolean isFatalEnabled();
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/IMercuryLoggerFactory.java Mon Apr 27 23:12:25 2009
@@ -19,17 +19,14 @@
package org.apache.maven.mercury.logging;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public interface IMercuryLoggerFactory
{
- @SuppressWarnings("unchecked")
- IMercuryLogger getLogger( Class clazz );
-
- /** is not used for now */
- void setThreshold( MercuryLoggingLevelEnum threshold );
+ @SuppressWarnings( "unchecked" )
+ IMercuryLogger getLogger( Class clazz );
+
+ /** is not used for now */
+ void setThreshold( MercuryLoggingLevelEnum threshold );
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggerManager.java Mon Apr 27 23:12:25 2009
@@ -21,47 +21,48 @@
import org.apache.maven.mercury.logging.console.MercuryConsoleLoggerFactory;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class MercuryLoggerManager
{
- public static final String SYSTEM_PROPERTY_MERCURY_LOG_FACTORY = "mercury.log.factory";
- public static final String _loggerFactoryClassName = System.getProperty( SYSTEM_PROPERTY_MERCURY_LOG_FACTORY, MercuryConsoleLoggerFactory.class.getName() );
-
- public static final String SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD = "mercury.log.level";
- public static final String _loggerThresholdName = System.getProperty( SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD
- , MercuryLoggingLevelEnum.DEFAULT_LEVEL.name()
- );
-
- static MercuryLoggingLevelEnum _threshold = MercuryLoggingLevelEnum.valueOf( _loggerThresholdName );
-
- static IMercuryLoggerFactory _loggerFactory;
-
- @SuppressWarnings("unchecked")
- public static final IMercuryLogger getLogger( Class clazz )
- {
- if( _loggerFactory == null )
+ public static final String SYSTEM_PROPERTY_MERCURY_LOG_FACTORY = "mercury.log.factory";
+
+ public static final String _loggerFactoryClassName =
+ System.getProperty( SYSTEM_PROPERTY_MERCURY_LOG_FACTORY, MercuryConsoleLoggerFactory.class.getName() );
+
+ public static final String SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD = "mercury.log.level";
+
+ public static final String _loggerThresholdName =
+ System.getProperty( SYSTEM_PROPERTY_MERCURY_LOG_THRESHOLD, MercuryLoggingLevelEnum.DEFAULT_LEVEL.name() );
+
+ static MercuryLoggingLevelEnum _threshold = MercuryLoggingLevelEnum.valueOf( _loggerThresholdName );
+
+ static IMercuryLoggerFactory _loggerFactory;
+
+ @SuppressWarnings( "unchecked" )
+ public static final IMercuryLogger getLogger( Class clazz )
+ {
+ if ( _loggerFactory == null )
+ {
+ try
+ {
+ _loggerFactory = (IMercuryLoggerFactory) Class.forName( _loggerFactoryClassName ).newInstance();
+ }
+ catch ( Exception e )
+ {
+ _loggerFactory = new MercuryConsoleLoggerFactory();
+ _loggerFactory.getLogger( MercuryLoggerManager.class ).error(
+ "cannot create logger factory "
+ + _loggerFactoryClassName, e );
+ }
+ }
+
+ return _loggerFactory.getLogger( clazz );
+ }
+
+ public static MercuryLoggingLevelEnum getThreshold()
{
- try
- {
- _loggerFactory = (IMercuryLoggerFactory)Class.forName( _loggerFactoryClassName ).newInstance();
- }
- catch( Exception e )
- {
- _loggerFactory = new MercuryConsoleLoggerFactory();
- _loggerFactory.getLogger( MercuryLoggerManager.class ).error( "cannot create logger factory "+_loggerFactoryClassName, e );
- }
+ return _threshold;
}
-
- return _loggerFactory.getLogger( clazz );
- }
-
- public static MercuryLoggingLevelEnum getThreshold()
- {
- return _threshold;
- }
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/MercuryLoggingLevelEnum.java Mon Apr 27 23:12:25 2009
@@ -19,35 +19,26 @@
package org.apache.maven.mercury.logging;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public enum MercuryLoggingLevelEnum
{
- debug(0)
- , info(1)
- , warn(2)
- , error(3)
- , fatal(4)
- , disabled(5)
- ;
-
- public static final MercuryLoggingLevelEnum DEFAULT_LEVEL = info;
-
- private int id;
-
- // Constructor
- MercuryLoggingLevelEnum( int id )
- {
- this.id = id;
- }
-
- int getId()
- {
- return id;
- }
-
+ debug( 0 ), info( 1 ), warn( 2 ), error( 3 ), fatal( 4 ), disabled( 5 );
+
+ public static final MercuryLoggingLevelEnum DEFAULT_LEVEL = info;
+
+ private int id;
+
+ // Constructor
+ MercuryLoggingLevelEnum( int id )
+ {
+ this.id = id;
+ }
+
+ int getId()
+ {
+ return id;
+ }
+
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLogger.java Mon Apr 27 23:12:25 2009
@@ -23,91 +23,88 @@
import org.apache.maven.mercury.logging.MercuryLoggingLevelEnum;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class MercuryConsoleLogger
-extends AbstractMercuryLogger
-implements IMercuryLogger
+ extends AbstractMercuryLogger
+ implements IMercuryLogger
{
-
- @SuppressWarnings("unchecked")
- public MercuryConsoleLogger( Class clazz )
- {
- super( clazz );
- }
-
- private static final void say( MercuryLoggingLevelEnum level, String message, Throwable throwable )
- {
- System.out.print( "["+level.name()+"] " );
- System.out.println( message );
- if( throwable != null )
- {
- throwable.printStackTrace( System.out );
- }
- }
-
- public void debug( String message )
- {
- if( isDebugEnabled() )
- say( MercuryLoggingLevelEnum.debug, message, null );
- }
-
- public void debug( String message, Throwable throwable )
- {
- if( isDebugEnabled() )
- say( MercuryLoggingLevelEnum.debug, message, throwable );
- }
-
- public void error( String message )
- {
- if( isErrorEnabled() )
- say( MercuryLoggingLevelEnum.error, message, null );
- }
-
- public void error( String message, Throwable throwable )
- {
- if( isErrorEnabled() )
- say( MercuryLoggingLevelEnum.error, message, throwable );
- }
-
- public void fatal( String message )
- {
- if( isErrorEnabled() )
- say( MercuryLoggingLevelEnum.error, message, null );
- }
-
- public void fatal( String message, Throwable throwable )
- {
- if( isErrorEnabled() )
- say( MercuryLoggingLevelEnum.error, message, throwable );
- }
-
- public void info( String message )
- {
- if( isInfoEnabled() )
- say( MercuryLoggingLevelEnum.info, message, null );
- }
-
- public void info( String message, Throwable throwable )
- {
- if( isInfoEnabled() )
- say( MercuryLoggingLevelEnum.info, message, throwable );
- }
-
- public void warn( String message )
- {
- if( isWarnEnabled() )
- say( MercuryLoggingLevelEnum.warn, message, null );
- }
-
- public void warn( String message, Throwable throwable )
- {
- if( isWarnEnabled() )
- say( MercuryLoggingLevelEnum.warn, message, throwable );
- }
+
+ @SuppressWarnings( "unchecked" )
+ public MercuryConsoleLogger( Class clazz )
+ {
+ super( clazz );
+ }
+
+ private static final void say( MercuryLoggingLevelEnum level, String message, Throwable throwable )
+ {
+ System.out.print( "[" + level.name() + "] " );
+ System.out.println( message );
+ if ( throwable != null )
+ {
+ throwable.printStackTrace( System.out );
+ }
+ }
+
+ public void debug( String message )
+ {
+ if ( isDebugEnabled() )
+ say( MercuryLoggingLevelEnum.debug, message, null );
+ }
+
+ public void debug( String message, Throwable throwable )
+ {
+ if ( isDebugEnabled() )
+ say( MercuryLoggingLevelEnum.debug, message, throwable );
+ }
+
+ public void error( String message )
+ {
+ if ( isErrorEnabled() )
+ say( MercuryLoggingLevelEnum.error, message, null );
+ }
+
+ public void error( String message, Throwable throwable )
+ {
+ if ( isErrorEnabled() )
+ say( MercuryLoggingLevelEnum.error, message, throwable );
+ }
+
+ public void fatal( String message )
+ {
+ if ( isErrorEnabled() )
+ say( MercuryLoggingLevelEnum.error, message, null );
+ }
+
+ public void fatal( String message, Throwable throwable )
+ {
+ if ( isErrorEnabled() )
+ say( MercuryLoggingLevelEnum.error, message, throwable );
+ }
+
+ public void info( String message )
+ {
+ if ( isInfoEnabled() )
+ say( MercuryLoggingLevelEnum.info, message, null );
+ }
+
+ public void info( String message, Throwable throwable )
+ {
+ if ( isInfoEnabled() )
+ say( MercuryLoggingLevelEnum.info, message, throwable );
+ }
+
+ public void warn( String message )
+ {
+ if ( isWarnEnabled() )
+ say( MercuryLoggingLevelEnum.warn, message, null );
+ }
+
+ public void warn( String message, Throwable throwable )
+ {
+ if ( isWarnEnabled() )
+ say( MercuryLoggingLevelEnum.warn, message, throwable );
+ }
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/logging/console/MercuryConsoleLoggerFactory.java Mon Apr 27 23:12:25 2009
@@ -24,26 +24,23 @@
import org.apache.maven.mercury.logging.MercuryLoggingLevelEnum;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class MercuryConsoleLoggerFactory
-implements IMercuryLoggerFactory
+ implements IMercuryLoggerFactory
{
- MercuryLoggingLevelEnum _threshold = MercuryLoggerManager.getThreshold();
-
- @SuppressWarnings("unchecked")
- public IMercuryLogger getLogger( Class clazz )
- {
- return new MercuryConsoleLogger(clazz);
- }
+ MercuryLoggingLevelEnum _threshold = MercuryLoggerManager.getThreshold();
- public void setThreshold( MercuryLoggingLevelEnum threshold )
- {
- _threshold = threshold;
- }
+ @SuppressWarnings( "unchecked" )
+ public IMercuryLogger getLogger( Class clazz )
+ {
+ return new MercuryConsoleLogger( clazz );
+ }
+
+ public void setThreshold( MercuryLoggingLevelEnum threshold )
+ {
+ _threshold = threshold;
+ }
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ArtifactFilterList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ArtifactFilterList.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ArtifactFilterList.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ArtifactFilterList.java Mon Apr 27 23:12:25 2009
@@ -15,7 +15,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-*/
+ */
package org.apache.maven.mercury.metadata;
@@ -27,15 +27,12 @@
import org.apache.maven.mercury.util.Util;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class ArtifactFilterList
{
- List<MetadataTreeArtifactFilter> _filters = new ArrayList<MetadataTreeArtifactFilter>(4);
+ List<MetadataTreeArtifactFilter> _filters = new ArrayList<MetadataTreeArtifactFilter>( 4 );
public ArtifactFilterList()
{
@@ -43,10 +40,10 @@
public ArtifactFilterList( Map<String, Collection<String>> filter )
{
- if( Util.isEmpty( filter ) )
+ if ( Util.isEmpty( filter ) )
return;
-
- _filters.add( new MetadataTreeArtifactFilterMap(filter) );
+
+ _filters.add( new MetadataTreeArtifactFilterMap( filter ) );
}
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicDepthComparator.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicDepthComparator.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicDepthComparator.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicDepthComparator.java Mon Apr 27 23:12:25 2009
@@ -23,28 +23,27 @@
import org.apache.maven.mercury.artifact.MetadataTreeNode;
/**
- * classical depth comparator: shallower is better by default, but that could
- * be changed by appropriate constructor
+ * classical depth comparator: shallower is better by default, but that could be changed by appropriate constructor
*
* @author Oleg Gusakov
* @version $Id$
*/
public class ClassicDepthComparator
-implements Comparator<MetadataTreeNode>
+ implements Comparator<MetadataTreeNode>
{
- boolean _closerBetter = true;
-
- public ClassicDepthComparator()
- {
- }
+ boolean _closerBetter = true;
- public ClassicDepthComparator( boolean closerBetter )
- {
- _closerBetter = closerBetter;
- }
-
- public int compare( MetadataTreeNode n1, MetadataTreeNode n2 )
- {
- return _closerBetter ? n2.getDepth() - n1.getDepth() : n1.getDepth() - n2.getDepth() ;
- }
+ public ClassicDepthComparator()
+ {
+ }
+
+ public ClassicDepthComparator( boolean closerBetter )
+ {
+ _closerBetter = closerBetter;
+ }
+
+ public int compare( MetadataTreeNode n1, MetadataTreeNode n2 )
+ {
+ return _closerBetter ? n2.getDepth() - n1.getDepth() : n1.getDepth() - n2.getDepth();
+ }
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java Mon Apr 27 23:12:25 2009
@@ -25,35 +25,34 @@
import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
/**
- * classical version comparator: newer is better by default, but that could
- * be changed by appropriate constructor
+ * classical version comparator: newer is better by default, but that could be changed by appropriate constructor
*
* @author Oleg Gusakov
* @version $Id$
*/
public class ClassicVersionComparator
-implements Comparator<MetadataTreeNode>
+ implements Comparator<MetadataTreeNode>
{
- boolean _newerBetter = true;
-
- public ClassicVersionComparator()
- {
- }
-
- public ClassicVersionComparator( boolean newerBetter )
- {
- _newerBetter = newerBetter;
- }
-
- public int compare( MetadataTreeNode n1, MetadataTreeNode n2 )
- {
- ArtifactMetadata md1 = n1.getMd();
- DefaultArtifactVersion v1 = new DefaultArtifactVersion( md1.getVersion() );
-
- ArtifactMetadata md2 = n2.getMd();
- DefaultArtifactVersion v2 = new DefaultArtifactVersion( md2.getVersion() );
-
- return _newerBetter ? v1.compareTo(v2) : v2.compareTo(v1) ;
- }
-
+ boolean _newerBetter = true;
+
+ public ClassicVersionComparator()
+ {
+ }
+
+ public ClassicVersionComparator( boolean newerBetter )
+ {
+ _newerBetter = newerBetter;
+ }
+
+ public int compare( MetadataTreeNode n1, MetadataTreeNode n2 )
+ {
+ ArtifactMetadata md1 = n1.getMd();
+ DefaultArtifactVersion v1 = new DefaultArtifactVersion( md1.getVersion() );
+
+ ArtifactMetadata md2 = n2.getMd();
+ DefaultArtifactVersion v2 = new DefaultArtifactVersion( md2.getVersion() );
+
+ return _newerBetter ? v1.compareTo( v2 ) : v2.compareTo( v1 );
+ }
+
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java Mon Apr 27 23:12:25 2009
@@ -38,26 +38,26 @@
private ArtifactScopeEnum scope;
- //-------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
public ClasspathContainer( ArtifactScopeEnum scope )
{
this.scope = ArtifactScopeEnum.checkScope( scope );
}
- //-------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
public ClasspathContainer( List<ArtifactMetadata> classpath, ArtifactScopeEnum scope )
{
this( scope );
this.classpath = classpath;
}
- //-------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
public Iterator<ArtifactMetadata> iterator()
{
return classpath == null ? null : classpath.iterator();
}
- //-------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
public ClasspathContainer add( ArtifactMetadata md )
{
if ( classpath == null )
@@ -70,13 +70,13 @@
return this;
}
- //-------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
public List<ArtifactMetadata> getClasspath()
{
return classpath;
}
- //-------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
public MetadataTreeNode getClasspathAsTree()
{
if ( classpath == null || classpath.size() < 1 )
@@ -88,9 +88,9 @@
for ( ArtifactMetadata md : classpath )
{
- // TODO Oleg: is null for query good here ??
+ // TODO Oleg: is null for query good here ??
node = new MetadataTreeNode( md, parent, null );
-
+
if ( tree == null )
{
tree = node;
@@ -122,7 +122,7 @@
this.scope = scope;
}
- //-------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
@Override
public String toString()
{
@@ -136,6 +136,6 @@
sb.append( ']' );
return sb.toString();
}
- //-------------------------------------------------------------------------------------------
- //-------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java Mon Apr 27 23:12:25 2009
@@ -30,110 +30,100 @@
import org.apache.maven.mercury.event.MercuryEventListener;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public interface DependencyBuilder
-extends Configurable
+ extends Configurable
{
- public static final String TREE_BUILD_EVENT = "tree.build";
- public static final String TREE_NODE_BUILD_EVENT = "tree.node.build";
- public static final String TREE_NODE_VERSION_REPLACE_EVENT = "tree.node.build.version.replace";
-
- public static final String SYSTEM_PROPERTY_ALLOW_CIRCULAR_DEPENDENCIES = "mercury.circular.allow";
-
- public static final String CONFIGURATION_PROPERTY_VERSION_MAP = "mercury.version.map";
- //------------------------------------------------------------------------
- /**
- * build the tree, using the repositories specified in the
- * constructor
- *
- * @param startMD - root of the tree to build
- * @param targetPlatform - limitations to use when retrieving metadata. Format is G:A=V, where V is Version Range
- * @return the root of the tree built
- * @throws MetadataTreeException
- */
- public abstract MetadataTreeNode buildTree( ArtifactMetadata startMD, ArtifactScopeEnum scope )
- throws MetadataTreeException;
-
- /**
- * hard to believe, but this actually resolves the conflicts, removing all duplicate GAVs from the tree
- *
- * @param root the tree to resolve conflicts on
- * @return list of resolved GAVs
- * @throws MetadataTreeException
- */
- public abstract List<ArtifactMetadata> resolveConflicts( MetadataTreeNode root )
- throws MetadataTreeException;
-
- /**
- * consolidated entry point: give it a collection of GAVs, it
- * will create a classpath out of it
- *
- * @param root the tree to resolve conflicts on
- * @return list of resolved GAVs
- * @throws MetadataTreeException
- */
- public abstract List<ArtifactMetadata> resolveConflicts(
- ArtifactScopeEnum scope
- , ArtifactQueryList artifacts
- , ArtifactInclusionList inclusions
- , ArtifactExclusionList exclusions
- )
-
- throws MetadataTreeException;
-
- /**
- * consolidated entry point: give it a collection of GAVs, it
- * will create a tree out of it
- *
- * @param root the tree to resolve conflicts on
- * @return resolved metadata tree
- * @throws MetadataTreeException
- */
- public abstract MetadataTreeNode resolveConflictsAsTree(
- ArtifactScopeEnum scope
- , ArtifactQueryList artifacts
- , ArtifactInclusionList inclusions
- , ArtifactExclusionList exclusions
- )
-
- throws MetadataTreeException;
-
- /**
- * this one resolves the conflicts, removing all duplicate GAVs from the tree and
- * returning a copy of the resulting subtree - original tree should be intact
- *
- * @param root the tree to resolve conflicts on
- * @return resolved subtree
- * @throws MetadataTreeException
- */
- public abstract MetadataTreeNode resolveConflictsAsTree( MetadataTreeNode root )
- throws MetadataTreeException;
-
- /**
- * register a listener for dependency events
- *
- * @param listener
- */
- public abstract void register( MercuryEventListener listener );
-
- /**
- * remove a listener
- *
- * @param listener
- */
- public abstract void unRegister( MercuryEventListener listener );
-
- /**
- * release all resources
- *
- */
- public abstract void close();
- //-----------------------------------------------------
- //-----------------------------------------------------
+ public static final String TREE_BUILD_EVENT = "tree.build";
+
+ public static final String TREE_NODE_BUILD_EVENT = "tree.node.build";
+
+ public static final String TREE_NODE_VERSION_REPLACE_EVENT = "tree.node.build.version.replace";
+
+ public static final String SYSTEM_PROPERTY_ALLOW_CIRCULAR_DEPENDENCIES = "mercury.circular.allow";
+
+ public static final String CONFIGURATION_PROPERTY_VERSION_MAP = "mercury.version.map";
+
+ // ------------------------------------------------------------------------
+ /**
+ * build the tree, using the repositories specified in the constructor
+ *
+ * @param startMD - root of the tree to build
+ * @param targetPlatform - limitations to use when retrieving metadata. Format is G:A=V, where V is Version Range
+ * @return the root of the tree built
+ * @throws MetadataTreeException
+ */
+ public abstract MetadataTreeNode buildTree( ArtifactMetadata startMD, ArtifactScopeEnum scope )
+ throws MetadataTreeException;
+
+ /**
+ * hard to believe, but this actually resolves the conflicts, removing all duplicate GAVs from the tree
+ *
+ * @param root the tree to resolve conflicts on
+ * @return list of resolved GAVs
+ * @throws MetadataTreeException
+ */
+ public abstract List<ArtifactMetadata> resolveConflicts( MetadataTreeNode root )
+ throws MetadataTreeException;
+
+ /**
+ * consolidated entry point: give it a collection of GAVs, it will create a classpath out of it
+ *
+ * @param root the tree to resolve conflicts on
+ * @return list of resolved GAVs
+ * @throws MetadataTreeException
+ */
+ public abstract List<ArtifactMetadata> resolveConflicts( ArtifactScopeEnum scope, ArtifactQueryList artifacts,
+ ArtifactInclusionList inclusions,
+ ArtifactExclusionList exclusions )
+
+ throws MetadataTreeException;
+
+ /**
+ * consolidated entry point: give it a collection of GAVs, it will create a tree out of it
+ *
+ * @param root the tree to resolve conflicts on
+ * @return resolved metadata tree
+ * @throws MetadataTreeException
+ */
+ public abstract MetadataTreeNode resolveConflictsAsTree( ArtifactScopeEnum scope, ArtifactQueryList artifacts,
+ ArtifactInclusionList inclusions,
+ ArtifactExclusionList exclusions )
+
+ throws MetadataTreeException;
+
+ /**
+ * this one resolves the conflicts, removing all duplicate GAVs from the tree and returning a copy of the resulting
+ * subtree - original tree should be intact
+ *
+ * @param root the tree to resolve conflicts on
+ * @return resolved subtree
+ * @throws MetadataTreeException
+ */
+ public abstract MetadataTreeNode resolveConflictsAsTree( MetadataTreeNode root )
+ throws MetadataTreeException;
+
+ /**
+ * register a listener for dependency events
+ *
+ * @param listener
+ */
+ public abstract void register( MercuryEventListener listener );
+
+ /**
+ * remove a listener
+ *
+ * @param listener
+ */
+ public abstract void unRegister( MercuryEventListener listener );
+
+ /**
+ * release all resources
+ */
+ public abstract void close();
+ // -----------------------------------------------------
+ // -----------------------------------------------------
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilderFactory.java Mon Apr 27 23:12:25 2009
@@ -25,7 +25,6 @@
import org.apache.maven.mercury.artifact.MetadataTreeNode;
import org.apache.maven.mercury.artifact.api.ArtifactListProcessor;
-import org.apache.maven.mercury.artifact.api.Configurable;
import org.apache.maven.mercury.artifact.api.ConfigurationException;
import org.apache.maven.mercury.artifact.api.ConfigurationUtil;
import org.apache.maven.mercury.repository.api.Repository;
@@ -34,69 +33,58 @@
import org.codehaus.plexus.lang.Language;
/**
- *
- *
* @author Oleg Gusakov
* @version $Id$
- *
*/
public class DependencyBuilderFactory
{
- public static final String JAVA_DEPENDENCY_MODEL = "java";
- public static final String OSGI_DEPENDENCY_MODEL = "osgi";
+ public static final String JAVA_DEPENDENCY_MODEL = "java";
- private static final Language LANG = new DefaultLanguage( DependencyBuilderFactory.class);
-
- public static final DependencyBuilder create(
- String dependencyModel
- , Collection<Repository> repositories
- )
- throws RepositoryException
- {
- return create( dependencyModel, repositories, null, null, null );
- }
-
- public static final DependencyBuilder create(
- String dependencyModel
- , Collection<Repository> repositories
- , Collection<MetadataTreeArtifactFilter> filters
- , List<Comparator<MetadataTreeNode>> comparators
- , Map<String,ArtifactListProcessor> processors
- )
- throws RepositoryException
- {
- return create( dependencyModel, repositories, null, null, null, null );
- }
-
- // TODO: oleg: switch to request/response paradigm - too many parameters
- //
- public static final DependencyBuilder create(
- String dependencyModel
- , Collection<Repository> repositories
- , Collection<MetadataTreeArtifactFilter> filters
- , List<Comparator<MetadataTreeNode>> comparators
- , Map<String,ArtifactListProcessor> processors
- , Map<String,Object> config
- )
- throws RepositoryException
- {
- if( JAVA_DEPENDENCY_MODEL.equals( dependencyModel ) )
+ public static final String OSGI_DEPENDENCY_MODEL = "osgi";
+
+ private static final Language LANG = new DefaultLanguage( DependencyBuilderFactory.class );
+
+ public static final DependencyBuilder create( String dependencyModel, Collection<Repository> repositories )
+ throws RepositoryException
{
- DependencyBuilder db = new DependencyTreeBuilder( repositories, filters, comparators, processors );
-
- try
- {
- ConfigurationUtil.configure( db, config );
- }
- catch ( ConfigurationException e )
+ return create( dependencyModel, repositories, null, null, null );
+ }
+
+ public static final DependencyBuilder create( String dependencyModel, Collection<Repository> repositories,
+ Collection<MetadataTreeArtifactFilter> filters,
+ List<Comparator<MetadataTreeNode>> comparators,
+ Map<String, ArtifactListProcessor> processors )
+ throws RepositoryException
+ {
+ return create( dependencyModel, repositories, null, null, null, null );
+ }
+
+ // TODO: oleg: switch to request/response paradigm - too many parameters
+ //
+ public static final DependencyBuilder create( String dependencyModel, Collection<Repository> repositories,
+ Collection<MetadataTreeArtifactFilter> filters,
+ List<Comparator<MetadataTreeNode>> comparators,
+ Map<String, ArtifactListProcessor> processors,
+ Map<String, Object> config )
+ throws RepositoryException
+ {
+ if ( JAVA_DEPENDENCY_MODEL.equals( dependencyModel ) )
{
- throw new RepositoryException( e );
+ DependencyBuilder db = new DependencyTreeBuilder( repositories, filters, comparators, processors );
+
+ try
+ {
+ ConfigurationUtil.configure( db, config );
+ }
+ catch ( ConfigurationException e )
+ {
+ throw new RepositoryException( e );
+ }
+
+ return db;
}
-
- return db;
+
+ throw new IllegalArgumentException( LANG.getMessage( "dependency.model.not.implemented", dependencyModel ) );
}
-
- throw new IllegalArgumentException( LANG.getMessage( "dependency.model.not.implemented", dependencyModel ) );
- }
}
Modified: maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=769199&r1=769198&r2=769199&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java (original)
+++ maven/mercury/trunk/mercury-core/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java Mon Apr 27 23:12:25 2009
@@ -63,15 +63,16 @@
public static final ArtifactMetadata DUMMY_ROOT = new ArtifactMetadata( "__fake:__fake:1.0" );
private static final Language LANG = new DefaultLanguage( DependencyTreeBuilder.class );
-
+
public static final String SYSTEM_PROPERTY_DUMP_DEPENDENCY_TREE = "mercury.dump.tree";
-
+
private static final String _depTreeDumpFileName = System.getProperty( SYSTEM_PROPERTY_DUMP_DEPENDENCY_TREE );
private static final boolean _dumpDepTree = _depTreeDumpFileName != null;
-
- private static final DependencyTreeDumper _dumper = _dumpDepTree ? new DependencyTreeDumper(_depTreeDumpFileName ) : null;
-
+
+ private static final DependencyTreeDumper _dumper =
+ _dumpDepTree ? new DependencyTreeDumper( _depTreeDumpFileName ) : null;
+
private static final IMercuryLogger LOG = MercuryLoggerManager.getLogger( DependencyTreeBuilder.class );
private Collection<MetadataTreeArtifactFilter> _filters;
@@ -85,28 +86,30 @@
private Map<String, MetadataTreeNode> _existingNodes;
private EventManager _eventManager;
-
+
private boolean _buildIndividualTrees = true;
-
- private boolean _allowCircularDependencies = Boolean.parseBoolean( System.getProperty( SYSTEM_PROPERTY_ALLOW_CIRCULAR_DEPENDENCIES, "false" ) );
-
+
+ private boolean _allowCircularDependencies =
+ Boolean.parseBoolean( System.getProperty( SYSTEM_PROPERTY_ALLOW_CIRCULAR_DEPENDENCIES, "false" ) );
+
/** mandated versions in the format G:A:T[:C] -> V */
private Map<String, ArtifactMetadata> _versionMap;
-
+
class TruckLoad
{
List<ArtifactMetadata> cp;
+
MetadataTreeNode root;
-
+
public TruckLoad()
{
}
-
+
public TruckLoad( List<ArtifactMetadata> cp )
{
this.cp = cp;
}
-
+
public TruckLoad( MetadataTreeNode root )
{
this.root = root;
@@ -189,47 +192,37 @@
}
// ------------------------------------------------------------------------
- public List<ArtifactMetadata> resolveConflicts(
- ArtifactScopeEnum scope
- , ArtifactQueryList artifacts
- , ArtifactInclusionList inclusions
- , ArtifactExclusionList exclusions
- )
- throws MetadataTreeException
+ public List<ArtifactMetadata> resolveConflicts( ArtifactScopeEnum scope, ArtifactQueryList artifacts,
+ ArtifactInclusionList inclusions, ArtifactExclusionList exclusions )
+ throws MetadataTreeException
{
TruckLoad tl = resolveConflictsInternally( scope, artifacts, inclusions, exclusions, false );
-
+
return tl == null ? null : tl.cp;
}
+
// ------------------------------------------------------------------------
- public MetadataTreeNode resolveConflictsAsTree(
- ArtifactScopeEnum scope
- , ArtifactQueryList artifacts
- , ArtifactInclusionList inclusions
- , ArtifactExclusionList exclusions
- )
- throws MetadataTreeException
+ public MetadataTreeNode resolveConflictsAsTree( ArtifactScopeEnum scope, ArtifactQueryList artifacts,
+ ArtifactInclusionList inclusions, ArtifactExclusionList exclusions )
+ throws MetadataTreeException
{
TruckLoad tl = resolveConflictsInternally( scope, artifacts, inclusions, exclusions, true );
-
+
return tl == null ? null : tl.root;
}
+
// ------------------------------------------------------------------------
- public TruckLoad resolveConflictsInternally(
- ArtifactScopeEnum scope
- , ArtifactQueryList artifacts
- , ArtifactInclusionList inclusions
- , ArtifactExclusionList exclusions
- , boolean asTree
- )
+ public TruckLoad resolveConflictsInternally( ArtifactScopeEnum scope, ArtifactQueryList artifacts,
+ ArtifactInclusionList inclusions, ArtifactExclusionList exclusions,
+ boolean asTree )
- throws MetadataTreeException
+ throws MetadataTreeException
{
if ( artifacts == null )
throw new MetadataTreeException( LANG.getMessage( "empty.md.collection" ) );
List<ArtifactMetadata> startMDs = artifacts.getMetadataList();
-
+
if ( Util.isEmpty( startMDs ) )
throw new MetadataTreeException( LANG.getMessage( "empty.md.collection" ) );
@@ -241,20 +234,20 @@
MetadataTreeNode rooty = buildTree( bmd, scope );
TruckLoad tl = null;
-
- if( asTree )
+
+ if ( asTree )
{
MetadataTreeNode tr = resolveConflictsAsTree( rooty );
-
+
tl = new TruckLoad( tr );
}
else
{
List<ArtifactMetadata> res = resolveConflicts( rooty );
-
+
tl = new TruckLoad( res );
-
- if(_dumpDepTree )
+
+ if ( _dumpDepTree )
_dumper.dump( scope, artifacts, inclusions, exclusions, rooty, res );
}
@@ -264,97 +257,96 @@
DUMMY_ROOT.setDependencies( startMDs );
DUMMY_ROOT.setInclusions( inclusions == null ? null : inclusions.getMetadataList() );
DUMMY_ROOT.setExclusions( exclusions == null ? null : exclusions.getMetadataList() );
-
+
MetadataTreeNode root = null;
-
- if( _buildIndividualTrees )
+
+ if ( _buildIndividualTrees )
{
List<MetadataTreeNode> deps = new ArrayList<MetadataTreeNode>( nodeCount );
-
+
for ( ArtifactMetadata bmd : startMDs )
{
- if( scope != null && !scope.encloses( bmd.getArtifactScope() ) )
+ if ( scope != null && !scope.encloses( bmd.getArtifactScope() ) )
continue;
-
+
try
{
- if( ! DUMMY_ROOT.allowDependency( bmd ) )
+ if ( !DUMMY_ROOT.allowDependency( bmd ) )
continue;
}
catch ( VersionException e )
{
- throw new MetadataTreeException(e);
+ throw new MetadataTreeException( e );
}
-
- if( inclusions != null )
+
+ if ( inclusions != null )
{
List<ArtifactMetadata> inc = inclusions.getMetadataList();
-
- if( bmd.hasInclusions() )
+
+ if ( bmd.hasInclusions() )
bmd.getInclusions().addAll( inc );
else
bmd.setInclusions( inc );
}
-
- if( exclusions != null )
+
+ if ( exclusions != null )
{
List<ArtifactMetadata> excl = exclusions.getMetadataList();
-
- if( bmd.hasExclusions() )
+
+ if ( bmd.hasExclusions() )
bmd.getExclusions().addAll( excl );
else
bmd.setExclusions( excl );
}
-
+
MetadataTreeNode rooty = buildTree( bmd, scope );
-
+
deps.add( rooty );
}
-
- if( Util.isEmpty( deps ) ) // all dependencies are filtered out
+
+ if ( Util.isEmpty( deps ) ) // all dependencies are filtered out
return null;
-
+
// combine into one tree
root = new MetadataTreeNode( DUMMY_ROOT, null, null );
-
+
for ( MetadataTreeNode kid : deps )
root.addChild( kid );
-
+
}
else
{
DUMMY_ROOT.setDependencies( startMDs );
root = buildTree( DUMMY_ROOT, scope );
}
-
-
+
TruckLoad tl = null;
-
- if( asTree )
+
+ if ( asTree )
{
MetadataTreeNode tr = resolveConflictsAsTree( root );
-
+
tl = new TruckLoad( tr );
}
else
{
- List<ArtifactMetadata> cp = resolveConflicts( root );
+ List<ArtifactMetadata> cp = resolveConflicts( root );
- if( cp != null )
+ if ( cp != null )
cp.remove( DUMMY_ROOT );
-
- if(_dumpDepTree )
- _dumper.dump( scope, artifacts, inclusions, exclusions, root, cp );
-
- tl = new TruckLoad( cp );
+
+ if ( _dumpDepTree )
+ _dumper.dump( scope, artifacts, inclusions, exclusions, root, cp );
+
+ tl = new TruckLoad( cp );
}
return tl;
}
+
// -----------------------------------------------------
- private MetadataTreeNode createNode( ArtifactMetadata nodeMD, MetadataTreeNode parent
- , ArtifactMetadata nodeQuery, ArtifactScopeEnum globalScope
- )
+ private MetadataTreeNode createNode( ArtifactMetadata nodeMD, MetadataTreeNode parent, ArtifactMetadata nodeQuery,
+ ArtifactScopeEnum globalScope )
throws MetadataTreeException
{
GenericEvent nodeBuildEvent = null;
@@ -370,7 +362,7 @@
}
catch ( MetadataTreeCircularDependencyException e )
{
- if( _allowCircularDependencies )
+ if ( _allowCircularDependencies )
{
String line = LANG.getMessage( "attention.line" );
LOG.info( line + e.getMessage() + line );
@@ -387,7 +379,7 @@
if ( existingNode != null )
return MetadataTreeNode.deepCopy( existingNode );
- if( DUMMY_ROOT.equals( nodeMD ))
+ if ( DUMMY_ROOT.equals( nodeMD ) )
mr = DUMMY_ROOT;
else
mr = _reader.readDependencies( nodeMD );
@@ -401,24 +393,26 @@
if ( allDependencies == null || allDependencies.size() < 1 )
return node;
-
- if( !Util.isEmpty( _versionMap ) )
- for( ArtifactMetadata am : allDependencies )
+
+ if ( !Util.isEmpty( _versionMap ) )
+ for ( ArtifactMetadata am : allDependencies )
{
String key = am.toManagementString();
ArtifactMetadata ver = _versionMap.get( key );
- if( ver != null )
+ if ( ver != null )
{
- if( LOG.isDebugEnabled() )
- LOG.debug( "managed replacement: "+am+" -> "+ver );
-
+ if ( LOG.isDebugEnabled() )
+ LOG.debug( "managed replacement: " + am + " -> " + ver );
+
if ( _eventManager != null )
{
- GenericEvent replaceEvent = new GenericEvent( EventTypeEnum.dependencyBuilder, TREE_NODE_VERSION_REPLACE_EVENT, "managed replacement: "+am+" -> "+ver );
+ GenericEvent replaceEvent =
+ new GenericEvent( EventTypeEnum.dependencyBuilder, TREE_NODE_VERSION_REPLACE_EVENT,
+ "managed replacement: " + am + " -> " + ver );
replaceEvent.stop();
_eventManager.fireEvent( replaceEvent );
}
-
+
am.setVersion( ver.getVersion() );
am.setInclusions( ver.getInclusions() );
am.setExclusions( ver.getExclusions() );
@@ -441,8 +435,8 @@
return node;
MetadataResults res = _reader.readVersions( dependencies );
-
- if( res == null )
+
+ if ( res == null )
throw new MetadataTreeException( LANG.getMessage( "no.versions", dependencies.toString() ) );
Map<ArtifactMetadata, List<ArtifactMetadata>> expandedDeps = res.getResults();
@@ -456,10 +450,11 @@
List<ArtifactMetadata> versions = expandedDeps.get( md );
if ( versions == null || versions.size() < 1 )
{
- if ( md.isOptional() || checkOptional( node) )
+ if ( md.isOptional() || checkOptional( node ) )
continue;
- throw new MetadataTreeException( LANG.getMessage( "not.optional.missing" ) + md + " <== "+ showPath( node ) );
+ throw new MetadataTreeException( LANG.getMessage( "not.optional.missing" ) + md + " <== "
+ + showPath( node ) );
}
boolean noVersions = true;
@@ -475,7 +470,7 @@
}
MetadataTreeNode kid = createNode( ver, node, md, globalScope );
- if( kid != null )
+ if ( kid != null )
node.addChild( kid );
noVersions = false;
@@ -492,8 +487,9 @@
{
if ( md.isOptional() )
continue;
-
- throw new MetadataTreeException( LANG.getMessage( "not.optional.missing" ) + md + " <== "+ showPath( node ) );
+
+ throw new MetadataTreeException( LANG.getMessage( "not.optional.missing" ) + md + " <== "
+ + showPath( node ) );
}
else
node.addQuery( md );
@@ -555,7 +551,8 @@
if ( md.sameGA( p.getMd() ) )
{
throw new MetadataTreeCircularDependencyException( "circular dependency " + count
- + " levels up. " + sb.toString() + " <= " + ( p.getParent() == null ? "no parent" : p.getParent().getMd() ) );
+ + " levels up. " + sb.toString() + " <= "
+ + ( p.getParent() == null ? "no parent" : p.getParent().getMd() ) );
}
p = p.getParent();
}
@@ -594,7 +591,7 @@
{
if ( root == null )
throw new MetadataTreeException( LANG.getMessage( "empty.tree" ) );
-
+
root.createNames( 0, 0 );
try
@@ -660,14 +657,15 @@
while ( p != null )
{
- if( p.getMd() != null && p.getMd().isOptional() )
+ if ( p.getMd() != null && p.getMd().isOptional() )
return true;
-
+
p = p.getParent();
}
return false;
}
+
// -----------------------------------------------------
private String showPath( MetadataTreeNode node )
{
@@ -711,20 +709,20 @@
_eventManager.getListeners().addAll( eventManager.getListeners() );
}
-
+
public void close()
{
- if( _reader != null )
+ if ( _reader != null )
_reader.close();
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
public void setOption( String name, Object val )
throws ConfigurationException
{
- if( SYSTEM_PROPERTY_ALLOW_CIRCULAR_DEPENDENCIES.equals( name ) )
- _allowCircularDependencies = Boolean.parseBoolean( (String)val );
- else if( CONFIGURATION_PROPERTY_VERSION_MAP.equals( name ) )
+ if ( SYSTEM_PROPERTY_ALLOW_CIRCULAR_DEPENDENCIES.equals( name ) )
+ _allowCircularDependencies = Boolean.parseBoolean( (String) val );
+ else if ( CONFIGURATION_PROPERTY_VERSION_MAP.equals( name ) )
_versionMap = (Map<String, ArtifactMetadata>) val;
}
}