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/src/java/org/apache/avalon/merlin/kernel/impl DefaultKernel.java
Date Wed, 19 Feb 2003 11:54:02 GMT
mcconnell    2003/02/19 03:54:02

  Modified:    merlin/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultKernel.java
  Log:
  Updated javadoc on the kernel context requirements.
  
  Revision  Changes    Path
  1.12      +13 -3     avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultKernel.java	19 Feb 2003 11:18:54 -0000	1.11
  +++ DefaultKernel.java	19 Feb 2003 11:54:02 -0000	1.12
  @@ -274,9 +274,19 @@
       *     <td>The internal system classloader.</td> 
       *   </tr>
       *   <tr>
  -    *     <td><code>urn:merlin:block.configuration</code></td>
  -    *     <td>{@link org.apache.avalon.framework.configuration.Configuration}</td>
  -    *     <td>The block configuration that the kernel will manage.</td> 
  +    *     <td><code>urn:merlin:block.url</code></td>
  +    *     <td>{@link java.net.URL}</td>
  +    *     <td>The url to the block.xml file.</td> 
  +    *   </tr>
  +    *   <tr>
  +    *     <td><code>urn:merlin:block.config</code></td>
  +    *     <td>{@link java.net.URL}</td>
  +    *     <td>The url to a configuration overide file. This entry is optional.</td>

  +    *   </tr>
  +    *   <tr>
  +    *     <td><code>urn:merlin:block.debug</code></td>
  +    *     <td>{@link java.lang.String}</td>
  +    *     <td>The system logging priority (a value of INFO, WARN, ERROR, or DEBUG.</td>

       *   </tr>
       * </table>
       * @param context the runtime context
  
  
  

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


Mime
View raw message