avalon-dev 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/phoenix/engine/phases DefaultPhase.java
Date Wed, 28 Feb 2001 08:13:55 GMT
donaldp     01/02/28 00:13:55

  Modified:    src/java/org/apache/phoenix/engine
                        DefaultServerApplication.java Main.java
               src/java/org/apache/phoenix/engine/blocks BlockEntry.java
               src/java/org/apache/phoenix/engine/phases DefaultPhase.java
  Log:
  Moved AvalonState into pipeline in avalon. This updates phoenix to use this version.
  
  Revision  Changes    Path
  1.5       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java
  
  Index: DefaultServerApplication.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultServerApplication.java	2001/02/26 01:49:46	1.4
  +++ DefaultServerApplication.java	2001/02/28 08:13:54	1.5
  @@ -21,7 +21,7 @@
   import org.apache.avalon.Initializable;
   import org.apache.avalon.atlantis.ApplicationException;
   import org.apache.avalon.camelot.AbstractContainer;
  -import org.apache.avalon.camelot.AvalonState;
  +import org.apache.avalon.camelot.pipeline.AvalonState;
   import org.apache.avalon.camelot.ContainerException;
   import org.apache.avalon.camelot.Entry;
   import org.apache.avalon.camelot.Factory;
  
  
  
  1.4       +0 -1      jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/Main.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Main.java	2001/02/24 04:59:35	1.3
  +++ Main.java	2001/02/28 08:13:54	1.4
  @@ -118,7 +118,6 @@
        * Main entry point.
        *
        * @param args[] the command line arguments
  -     * @exception Exception if an error occurs
        */
       public void main( final String args[] )
       { 
  
  
  
  1.2       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockEntry.java
  
  Index: BlockEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockEntry.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BlockEntry.java	2001/02/24 04:31:00	1.1
  +++ BlockEntry.java	2001/02/28 08:13:55	1.2
  @@ -7,9 +7,9 @@
    */
   package org.apache.phoenix.engine.blocks;
   
  -import org.apache.avalon.camelot.AvalonState;
   import org.apache.avalon.camelot.Entry;
   import org.apache.avalon.camelot.Locator;
  +import org.apache.avalon.camelot.pipeline.AvalonState;
   import org.apache.avalon.configuration.Configuration;
   import org.apache.phoenix.Block;
   import org.apache.phoenix.metainfo.BlockInfo;
  
  
  
  1.2       +2 -2      jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/DefaultPhase.java
  
  Index: DefaultPhase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/DefaultPhase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultPhase.java	2001/02/24 04:31:02	1.1
  +++ DefaultPhase.java	2001/02/28 08:13:55	1.2
  @@ -15,13 +15,13 @@
   import org.apache.avalon.Contextualizable;
   import org.apache.avalon.Initializable;
   import org.apache.avalon.atlantis.ApplicationException;
  +import org.apache.avalon.camelot.pipeline.AvalonState;
   import org.apache.avalon.camelot.pipeline.LifeCycleStage;
   import org.apache.avalon.util.Enum;
  +import org.apache.avalon.util.thread.ThreadManager;
   import org.apache.log.LogKit;
   import org.apache.log.Logger;
   import org.apache.phoenix.engine.blocks.BlockEntry;
  -import org.apache.avalon.camelot.AvalonState;
  -import org.apache.avalon.util.thread.ThreadManager;
   
   /**
    *
  
  
  

Mime
View raw message