leosimons    2003/03/22 03:25:07

  Modified:    .        build.xml default.properties forrest.properties
               instrument/src/java/org/apache/excalibur/instrument
                        InstrumentManager.java
  Log:
  s/@year@/1999-2003/
  
  Revision  Changes    Path
  1.205     +1 -1      avalon-excalibur/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/build.xml,v
  retrieving revision 1.204
  retrieving revision 1.205
  diff -u -r1.204 -r1.205
  --- build.xml 18 Mar 2003 17:28:01 -0000      1.204
  +++ build.xml 22 Mar 2003 11:25:06 -0000      1.205
  @@ -340,7 +340,7 @@
   
       <!-- Generate all docs -->
       <target name="site" depends="mega-jar" description="Generate all the docs for 
site">
  -        <ant dir="site" target="site"/>
  +        <ant dir="site" target="site" inheritAll="false"/>
       </target>
   
       <!-- Generate all docs -->
  
  
  
  1.4       +3 -0      avalon-excalibur/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/default.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default.properties        8 Apr 2002 10:32:06 -0000       1.3
  +++ default.properties        22 Mar 2003 11:25:07 -0000      1.4
  @@ -9,3 +9,6 @@
   # component is distributed separately, the component-specific
   # default.properties will set it to "./".
   depchecker.prefix=../
  +
  +# this breaks configuration!
  +#lib.dir=../lib
  
  
  
  1.3       +1 -1      avalon-excalibur/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/forrest.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forrest.properties        7 Feb 2003 17:56:31 -0000       1.2
  +++ forrest.properties        22 Mar 2003 11:25:07 -0000      1.3
  @@ -53,7 +53,7 @@
   # These props determine if validation is performed at all
   # Values are inherited unless overridden.
   # Eg, if forrest.validate=false, then all others are false unless set to true.
  -#forrest.validate=true
  +forrest.validate=false
   #forrest.validate.xdocs=${forrest.validate}
   #forrest.validate.skinconf=${forrest.validate}
   #forrest.validate.sitemap=${forrest.validate}
  
  
  
  1.5       +23 -15    
avalon-excalibur/instrument/src/java/org/apache/excalibur/instrument/InstrumentManager.java
  
  Index: InstrumentManager.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-excalibur/instrument/src/java/org/apache/excalibur/instrument/InstrumentManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InstrumentManager.java    20 Feb 2003 17:07:55 -0000      1.4
  +++ InstrumentManager.java    22 Mar 2003 11:25:07 -0000      1.5
  @@ -3,34 +3,34 @@
    ============================================================================
                      The Apache Software License, Version 1.1
    ============================================================================
  - 
  +
    Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - 
  +
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  - 
  +
    1. Redistributions of  source code must  retain the above copyright  notice,
       this list of conditions and the following disclaimer.
  - 
  +
    2. Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
  - 
  +
    3. The end-user documentation included with the redistribution, if any, must
       include  the following  acknowledgment:  "This product includes  software
       developed  by the  Apache Software Foundation  (http://www.apache.org/)."
       Alternately, this  acknowledgment may  appear in the software itself,  if
       and wherever such third-party acknowledgments normally appear.
  - 
  - 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"  
  -    must not be used to endorse or promote products derived from this  software 
  -    without  prior written permission. For written permission, please contact 
  +
  + 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
  +    must not be used to endorse or promote products derived from this  software
  +    without  prior written permission. For written permission, please contact
       [EMAIL PROTECTED]
  - 
  +
    5. Products  derived from this software may not  be called "Apache", nor may
       "Apache" appear  in their name,  without prior written permission  of the
       Apache Software Foundation.
  - 
  +
    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  @@ -41,16 +41,24 @@
    ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
    (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - 
  +
    This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation. For more  information on the 
  + on  behalf of the Apache Software  Foundation. For more  information on the
    Apache Software Foundation, please see <http://www.apache.org/>.
  - 
  +
   */
   package org.apache.excalibur.instrument;
   
   /**
  + * The InstrumentManager is a utility for management of instrumentable
  + * objects. You can use it in a container in order to keep track of
  + * [EMAIL PROTECTED] Instrumentable Instrumentable} components.
    *
  + * The InstrumentManager typically provides a mechanism to communicate
  + * which instrumentables are registered with it, and exposes them to
  + * the client. The mechanism through which this is accomplished is
  + * application-specific.
  + * 
    * @author <a href="mailto:[EMAIL PROTECTED]">Leif Mortenson</a>
    * @version CVS $Revision$ $Date$
    * @since 4.1
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to