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-extensions/merlin-servlet/src/webapp/BLOCK-INF block.xml
Date Sat, 16 Aug 2003 11:19:49 GMT
mcconnell    2003/08/16 04:19:49

  Modified:    merlin/activation/src/java/org/apache/avalon/activation/appliance/impl
                        BlockThread.java package.html
               merlin/activation/src/java/org/apache/avalon/activation/lifestyle/impl
                        AbstractLifestyleHandler.java
               merlin/activation-spi/src/java/org/apache/avalon/activation/appliance
                        package.html
               merlin/composition/src/java/org/apache/avalon/composition/data/builder
                        SerializedProfilePackageCreator.java
                        SerializedTargetsCreator.java
                        XMLContainmentProfileCreator.java
                        XMLTargetsCreator.java
               merlin/composition/src/java/org/apache/avalon/composition/logging/impl
                        package.html
               merlin/composition/src/java/org/apache/avalon/composition/model/impl
                        DefaultModel.java
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultKernelContext.java
               merlin/merlin-extensions/merlin-jmx/conf block.xml
               merlin/merlin-extensions/merlin-servlet/src/webapp/BLOCK-INF
                        block.xml
  Log:
  Synchronization of documentation with 3.0 (in progress).
  
  Revision  Changes    Path
  1.3       +1 -2      avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/BlockThread.java
  
  Index: BlockThread.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/BlockThread.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BlockThread.java	12 Aug 2003 05:30:44 -0000	1.2
  +++ BlockThread.java	16 Aug 2003 11:19:48 -0000	1.3
  @@ -87,7 +87,6 @@
      /**
       * Creation of a block thread.
       *
  -    * @param classloader the classloader
       * @param block the block
       */
       public BlockThread( Block block )
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	7 Aug 2003 17:11:17 -0000	1.1
  +++ package.html	16 Aug 2003 11:19:48 -0000	1.2
  @@ -1,7 +1,7 @@
   <body>
   <p>The <code>appliance.impl</code> package contains the
   default implementations defining and enabling use of the central
  -{@link org.apache.avalon.assembly.appliance.Appliance} interface. An
  +{@link org.apache.avalon.activation.appliance.Appliance} interface. An
   Appliance is the basic tool merlin wraps around a component to provide
   support for lifecycle and lifestyle management. Different implementations
   of Appliance can be plugged into the merlin system to allow merlin to
  
  
  
  1.2       +8 -3      avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java
  
  Index: AbstractLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractLifestyleHandler.java	7 Aug 2003 17:11:18 -0000	1.1
  +++ AbstractLifestyleHandler.java	16 Aug 2003 11:19:48 -0000	1.2
  @@ -55,7 +55,8 @@
   import org.apache.avalon.activation.lifestyle.LifestyleHandler;
   
   /**
  - * 
  + * Abstract implentation class for a lifestyle handler.
  + *
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
  @@ -63,6 +64,10 @@
     implements LifestyleHandler
   {
   
  +   /**
  +    * Creation of a new instance.
  +    * @param the logging channel
  +    */
       public AbstractLifestyleHandler( Logger logger )
       {
           enableLogging( logger );
  @@ -83,8 +88,8 @@
       /**
        * Release an object.  The abstract implementation does nothing,
        *
  -     * @param the object to be reclaimed
        * @param source the context with respect the reclaimed object is qualified
  +     * @param object the object to be reclaimed
        */
       public void release( Object source, Object object )
       {
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	7 Aug 2003 17:09:21 -0000	1.1
  +++ package.html	16 Aug 2003 11:19:48 -0000	1.2
  @@ -1,7 +1,7 @@
   <body>
   <p>The <code>appliance</code> package contains interfaces, utilities
and
   default implementations defining and enabling use of the central
  -{@link org.apache.avalon.assembly.appliance.Appliance} interface. An
  +{@link org.apache.avalon.activation.appliance.Appliance} interface. An
   Appliance is the basic tool merlin wraps around a component to provide
   support for lifecycle and lifestyle management. Different implementations
   of Appliance can be plugged into the merlin system to allow merlin to
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/SerializedProfilePackageCreator.java
  
  Index: SerializedProfilePackageCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/SerializedProfilePackageCreator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SerializedProfilePackageCreator.java	27 Jul 2003 11:50:05 -0000	1.2
  +++ SerializedProfilePackageCreator.java	16 Aug 2003 11:19:48 -0000	1.3
  @@ -56,7 +56,7 @@
   import org.apache.avalon.composition.data.ProfilePackage;
   
   /**
  - * Create {@link Type} from stream made up of
  + * Create {@link ProfilePackage} from stream made up of
    * serialized object.
    *
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
  
  
  
  1.2       +2 -3      avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/SerializedTargetsCreator.java
  
  Index: SerializedTargetsCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/SerializedTargetsCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SerializedTargetsCreator.java	8 Aug 2003 22:12:18 -0000	1.1
  +++ SerializedTargetsCreator.java	16 Aug 2003 11:19:48 -0000	1.2
  @@ -57,8 +57,7 @@
   import org.apache.avalon.composition.data.builder.TargetsCreator;
   
   /**
  - * Create {@link ContainmentProfile} from stream made up of
  - * serialized object.
  + * Create {@link Targets} from stream made up of serialized object.
    *
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
  
  
  
  1.9       +3 -4      avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
  
  Index: XMLContainmentProfileCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XMLContainmentProfileCreator.java	12 Aug 2003 05:30:44 -0000	1.8
  +++ XMLContainmentProfileCreator.java	16 Aug 2003 11:19:48 -0000	1.9
  @@ -87,9 +87,8 @@
   import org.apache.excalibur.configuration.ConfigurationUtil;
   
   /**
  - * Handles internalization of an XML based description of a {@link Profile}
  - * from a Configuration object. The format for Configuration object
  - * is specified in the <a href="package-summary.html#external">package summary</a>.
  + * Handles internalization of an XML based description of a {@link ContainmentProfile}
  + * from a Configuration object.
    *
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
  
  
  
  1.2       +6 -3      avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java
  
  Index: XMLTargetsCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLTargetsCreator.java	8 Aug 2003 22:12:18 -0000	1.1
  +++ XMLTargetsCreator.java	16 Aug 2003 11:19:48 -0000	1.2
  @@ -103,11 +103,14 @@
       private TargetDirective createTargetDirective( Configuration config )
         throws Exception
       {
  -        final String name = config.getAttribute( "name" );
  +        String name = config.getAttribute( "name", null ); // legacy
  +        if( name == null )
  +        {
  +            name = config.getAttribute( "path" );
  +        }
           final Configuration conf = config.getChild( "configuration" );
           CategoriesDirective categories = 
              getCategoriesDirective( config.getChild( "categories", false ), name );
           return new TargetDirective( name, conf, categories );
       }
  - 
   }
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/logging/impl/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/logging/impl/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	8 Jul 2003 15:01:22 -0000	1.1
  +++ package.html	16 Aug 2003 11:19:48 -0000	1.2
  @@ -1,6 +1,6 @@
   <body>
   <p>The <code>logging</code> package contains the
  -{@link org.apache.avalon.assembly.logging.impl.DefaultLoggingManager} which
  +{@link org.apache.avalon.composition.logging.impl.DefaultLoggingManager} which
   is an initial bootstrap logging mananager that uses mata information
   about logging targets and catagories.  This class is subject to
   refactoring to bring in into a component model to enable easy
  
  
  
  1.9       +3 -2      avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultModel.java
  
  Index: DefaultModel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultModel.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultModel.java	19 Jul 2003 06:16:42 -0000	1.8
  +++ DefaultModel.java	16 Aug 2003 11:19:48 -0000	1.9
  @@ -63,7 +63,8 @@
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
  -public abstract class DefaultModel implements Model
  +public abstract class DefaultModel
  +  implements Model
   {
       //==============================================================
       // static
  
  
  
  1.3       +4 -2      avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
  
  Index: DefaultKernelContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultKernelContext.java	12 Aug 2003 05:30:44 -0000	1.2
  +++ DefaultKernelContext.java	16 Aug 2003 11:19:48 -0000	1.3
  @@ -183,8 +183,10 @@
       * @param kernel the kernel configuration URL - if null, the 
       *   default kernel repository will be loaded from the supplied 
       *   repository
  -    * @param block a url to block directive
  +    * @param blocks a sequence of block urls
       * @param config a url to a configuration override descriptor
  +    * @param server server mode flag
  +    * @param debug debug flag
       */
       public DefaultKernelContext( 
         Repository repository, File system, File home, 
  
  
  
  1.2       +2 -9      avalon-sandbox/merlin/merlin-extensions/merlin-jmx/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jmx/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	25 Jun 2003 04:09:42 -0000	1.1
  +++ block.xml	16 Aug 2003 11:19:48 -0000	1.2
  @@ -3,13 +3,7 @@
   Test
   -->
   
  -<block>
  -
  -  <info>
  -    <name>test</name>
  -  </info>
  -
  -  <implementation>
  +<container name="test">
   
       <classloader>
         <classpath>
  @@ -27,6 +21,5 @@
           class="org.apache.avalon.merlin.jmx.DefaultJMXServer" 
           activation="true"/>
   
  -  </implementation>
   
  -</block>
  +</container>
  
  
  
  1.4       +2 -6      avalon-sandbox/merlin/merlin-extensions/merlin-servlet/src/webapp/BLOCK-INF/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-servlet/src/webapp/BLOCK-INF/block.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- block.xml	15 Apr 2003 03:09:12 -0000	1.3
  +++ block.xml	16 Aug 2003 11:19:49 -0000	1.4
  @@ -1,12 +1,8 @@
   
  -<block>
  -
  -  <info>
  -    <name>merlin</name>
  -  </info>
  +<container name="merlin">
   
     <implementation>
        <!-- include components and subcontainers here -->
     </implementation>
   
  -</block>
  +</container>
  
  
  

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


Mime
View raw message