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-platform/tutorials/meta .cvsignore
Date Thu, 19 Jun 2003 11:27:10 GMT
mcconnell    2003/06/19 04:27:10

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
                        EngineClassLoader.java
               merlin/merlin-cli/src/java Merlin.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
                        StandardBlock.xinfo
               merlin/merlin-platform/tutorials/meta .cvsignore
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.9       +5 -3      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java
  
  Index: EngineClassLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EngineClassLoader.java	18 Jun 2003 11:16:14 -0000	1.8
  +++ EngineClassLoader.java	19 Jun 2003 11:27:10 -0000	1.9
  @@ -737,7 +737,8 @@
               engine.contextualize( context );
               engine.initialize();
               return engine;
  -        } catch( Throwable e )
  +        } 
  +        catch( Throwable e )
           {
               final String error = "Engine creation failure.";
               throw new EngineException( error, e );
  @@ -1188,7 +1189,8 @@
           if( m_map != null )
           {
               context = new DefaultLocator( m_map );
  -        } else
  +        } 
  +        else
           {
               context = new DefaultLocator();
           }
  
  
  
  1.14      +0 -1      avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java
  
  Index: Merlin.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Merlin.java	15 Jun 2003 18:30:50 -0000	1.13
  +++ Merlin.java	19 Jun 2003 11:27:10 -0000	1.14
  @@ -431,7 +431,6 @@
               Method method = 
                 kernelLoader.getClass().getMethod( "build", new Class[]{ Map.class } );
               method.invoke( kernelLoader, new Object[]{ map } );
  -
           }
           catch( Throwable e )
           {
  
  
  
  1.6       +2 -2      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.xinfo
  
  Index: StandardBlock.xinfo
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.xinfo,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StandardBlock.xinfo	8 May 2003 03:02:40 -0000	1.5
  +++ StandardBlock.xinfo	19 Jun 2003 11:27:10 -0000	1.6
  @@ -29,10 +29,10 @@
          type="org.apache.excalibur.mpool.PoolManager"/>
       <entry key="urn:assembly:appliance.system" 
          type="org.apache.avalon.assembly.locator.Locator"/>
  -    <entry key="urn:assembly:appliance.context" 
  -       type="org.apache.avalon.assembly.appliance.ApplianceContext"/>
       <entry key="urn:assembly:appliance.repository" 
          type="org.apache.avalon.assembly.appliance.ApplianceRepository"/>
  +    <entry key="urn:assembly:appliance.context" 
  +       type="org.apache.avalon.assembly.appliance.ApplianceContext"/>
   
     </context>
   
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-platform/tutorials/meta/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	12 Jun 2003 07:44:41 -0000	1.1
  +++ .cvsignore	19 Jun 2003 11:27:10 -0000	1.2
  @@ -1,3 +1,4 @@
   target
   maven.log
   velocity.log
  +build.xml
  
  
  

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


Mime
View raw message