avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler Assembler.java
Date Wed, 15 May 2002 12:24:54 GMT
donaldp     02/05/15 05:24:54

  Modified:    src/java/org/apache/avalon/phoenix/tools/assembler
                        Assembler.java
  Log:
  Remove Feature: Using elements named "block-listener" in assembly.xml
  Deprecated since: 2002/01/26
  
  The correct element name is <listener/> now so as not to
  confuse differences between Block and Applicaiton
  Listeners.
  
  Revision  Changes    Path
  1.15      +2 -28     jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java
  
  Index: Assembler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Assembler.java	10 May 2002 13:31:15 -0000	1.14
  +++ Assembler.java	15 May 2002 12:24:54 -0000	1.15
  @@ -30,7 +30,7 @@
    * and is in the format specified for <code>assembly.xml</code> files.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.14 $ $Date: 2002/05/10 13:31:15 $
  + * @version $Revision: 1.15 $ $Date: 2002/05/15 12:24:54 $
    */
   public class Assembler
       extends AbstractLogEnabled
  @@ -74,33 +74,7 @@
           final BlockMetaData[] blocks = buildBlocks( blockConfig, classLoader );
   
           final Configuration[] listenerConfig = assembly.getChildren( "listener" );
  -        BlockListenerMetaData[] listeners = buildBlockListeners( listenerConfig );
  -
  -        // to be phased out - support for the old block-listener descriptor
  -        final Configuration[] legacyListenerConfig = assembly.getChildren( "block-listener"
);
  -        final BlockListenerMetaData[] legacyListeners = buildBlockListeners( legacyListenerConfig
);
  -        for( int i = 0; i < legacyListeners.length; i++ )
  -        {
  -            BlockListenerMetaData data = legacyListeners[ i ];
  -            boolean matched = false;
  -            for( int j = 0; j < listeners.length; j++ )
  -            {
  -                BlockListenerMetaData data2 = listeners[ j ];
  -                if( data.getClassname().equals( data2.getClassname() ) )
  -                {
  -                    matched = true;
  -                }
  -            }
  -            if( !matched )
  -            {
  -                getLogger().warn( "Listener with old style element name 'block-listener'
encounted.  Please change " +
  -                                  "this to 'listener' before compatability is imminently
removed from Phoenix" );
  -                final BlockListenerMetaData[] newListeners = new BlockListenerMetaData[
1 + listeners.length ];
  -                System.arraycopy( listeners, 0, listeners, 0, listeners.length );
  -                newListeners[ listeners.length ] = data;
  -                listeners = newListeners;
  -            }
  -        }
  +        final BlockListenerMetaData[] listeners = buildBlockListeners( listenerConfig );
   
           return new SarMetaData( name, directory, blocks, listeners );
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message