avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block Block.java
Date Thu, 10 Apr 2003 14:19:50 GMT
mcconnell    2003/04/10 07:19:50

  Modified:    merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
                        DefaultBlock.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultKernel.java
               merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank
                        BankTestCase.java
               merlin/merlin-smp/xdocs/starting/examples/afs/simple
                        index.xml
               merlin/merlin-spi/src/java/org/apache/avalon/merlin/block
                        Block.java
  Log:
  Updated to retract multiple navigation paths to block content.  This update is po0ssible
becuae of the introduction of the URL handling abilities.
  
  Revision  Changes    Path
  1.6       +5 -3      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java
  
  Index: DefaultBlock.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultBlock.java	10 Apr 2003 04:36:14 -0000	1.5
  +++ DefaultBlock.java	10 Apr 2003 14:19:49 -0000	1.6
  @@ -313,7 +313,7 @@
       * Return the set of locally managed appliance instances.
       * @return the set of appliance instances local to this block.
       */
  -    public Appliance[] getAppliances()
  +    private Appliance[] getAppliances()
       {
           return (Appliance[]) m_appliances.toArray( new Appliance[0] );
       }
  @@ -322,12 +322,13 @@
       * Return the set of blocks locally managed by this block.
       * @return the set of immediate sibling blocks.
       */
  -    public Block[] getBlocks()
  +    private Block[] getBlocks()
       {
           return (Block[]) m_blocks.toArray( new Block[0] );
       }
   
  -    public URL[] getURLs()
  +    /*
  +    private URL[] getURLs()
       {
           List list = new ArrayList();
           list.add( getURL() );
  @@ -347,6 +348,7 @@
           }
           return (URL[]) list.toArray( new URL[0] );
       }
  +    */
   
       //-------------------------------------------------------------------------------
       // Appliance
  
  
  
  1.5       +10 -8     avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultKernel.java	10 Apr 2003 04:36:14 -0000	1.4
  +++ DefaultKernel.java	10 Apr 2003 14:19:49 -0000	1.5
  @@ -624,6 +624,7 @@
               throw new KernelException( error, e );
           }
   
  +        /*
           if( getLogger().isDebugEnabled() )
           {
               StringBuffer buffer = new StringBuffer( "listing declared hierachy\n" );
  @@ -640,6 +641,7 @@
               buffer.append( "\n" );
               getLogger().debug( buffer.toString() );
           }
  +        */
   
           try
           {
  @@ -870,7 +872,7 @@
       public String toString()
       {
           StringBuffer buffer = 
  -          new StringBuffer( "DefaultKernel: " + System.identityHashCode( this ) );
  +          new StringBuffer( "DefaultKernel: " + System.identityHashCode( this ) + " block:
" );
   
           if( m_block != null )
           {
  @@ -878,12 +880,12 @@
   
               // list the block URLs
   
  -            URL[] urls = m_block.getURLs();
  -            for( int i=0; i<urls.length; i++ )
  -            {
  -                buffer.append( "\n  " + urls[i].toString() );
  -            }
  -            buffer.append( "\n" );
  +            //URL[] urls = m_block.getURLs();
  +            //for( int i=0; i<urls.length; i++ )
  +            //{
  +            //    buffer.append( "\n  " + urls[i].toString() );
  +            //}
  +            //buffer.append( "\n" );
           }
           return buffer.toString();
       }
  
  
  
  1.3       +0 -1      avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank/BankTestCase.java
  
  Index: BankTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank/BankTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BankTestCase.java	10 Apr 2003 04:36:14 -0000	1.2
  +++ BankTestCase.java	10 Apr 2003 14:19:49 -0000	1.3
  @@ -37,7 +37,6 @@
   import org.apache.avalon.assembly.util.ExceptionHelper;
   import org.apache.avalon.assembly.locator.DefaultLocator;
   import org.apache.avalon.assembly.appliance.Appliance;
  -import org.apache.avalon.assembly.appliance.block.Handler;
   import org.apache.avalon.assembly.util.ExceptionHelper;
   import junit.framework.TestCase;
   
  
  
  
  1.4       +8 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/simple/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/simple/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	8 Apr 2003 10:51:28 -0000	1.3
  +++ index.xml	10 Apr 2003 14:19:49 -0000	1.4
  @@ -13,6 +13,14 @@
           <table>
             <tr><th>Topic</th><th>Summary</th></tr>
             <tr>
  +            <td><a href="build.html">Build Instructions</a></td>
  +            <td>
  +              The servlet bank demo is built up from other demonstrations 
  +              and merlin extensions.  This page takes you the process of 
  +              building the demo servlet and all required resources.
  +            </td>
  +          </tr>
  +          <tr>
               <td><a href="interfaces.html">Interfaces</a></td>
               <td>
                 Description and presentation of the interfaces used in the Simple
  
  
  
  1.2       +4 -4      avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block/Block.java
  
  Index: Block.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block/Block.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Block.java	13 Mar 2003 01:05:55 -0000	1.1
  +++ Block.java	10 Apr 2003 14:19:49 -0000	1.2
  @@ -77,20 +77,20 @@
       * Return the set of locally managed appliance instances.
       * @return the set of appliance instances local to this block.
       */
  -    public Appliance[] getAppliances();
  +    //public Appliance[] getAppliances();
   
      /**
       * Return the set of blocks locally managed by this block.
       * @return the set of immediate sibling blocks.
       */
  -    Block[] getBlocks();
  +    //Block[] getBlocks();
   
      /**
       * Return the set of appliance URLs for the entire block hierachy including the
       * URL of this block.
       * @return the set of urls
       */
  -    URL[] getURLs();
  +    //URL[] getURLs();
   
      /**
       * Decommission the block.
  
  
  

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


Mime
View raw message