avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/util/defaults/src/test static.properties test.keys test.properties
Date Sat, 21 Feb 2004 10:21:46 GMT
mcconnell    2004/02/21 02:21:46

  Modified:    logging/site/xdocs/impl/logkit navigation.xml
               meta     .cvsignore
  Added:       logging/logkit/impl/src/java/org/apache/avalon/logging/logkit
                        DefaultLoggingCriteria.properties
               logging/site/xdocs/spec index.xml navigation.xml
               merlin/kernel/impl/conf merlin.template
               merlin/platform/tutorials/simple-web .cvsignore
               util/defaults/src/test/org/apache/avalon/util/defaults/test
                        DefaultsBuilderTestCase.java
               util/defaults/src/test static.properties test.keys
                        test.properties
  Removed:     merlin/kernel/impl/conf avalon.properties
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.4       +1 -1      avalon/logging/site/xdocs/impl/logkit/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/site/xdocs/impl/logkit/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	19 Feb 2004 08:58:03 -0000	1.3
  +++ navigation.xml	21 Feb 2004 10:21:45 -0000	1.4
  @@ -32,7 +32,7 @@
       </links>
   
       <menu name="About Avalon Logging">
  -      <item name="Overview" href="/about/index.html"/>
  +      <item name="Overview" href="/index.html"/>
         <item name="Specification" href="/spec/index.html"/>
         <item name="Implementations" href="/impl/index.html">
           <item name="LogKit" href="/impl/logkit/index.html"/>
  
  
  
  1.2       +2 -1      avalon/meta/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon/meta/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .cvsignore	1 Jan 2004 21:48:36 -0000	1.1
  +++ .cvsignore	21 Feb 2004 10:21:46 -0000	1.2
  @@ -1,4 +1,5 @@
   target
   .classpath
   .project
  -*.log
  \ No newline at end of file
  +*.log
  +build.properties
  \ No newline at end of file
  
  
  
  1.1                  avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingCriteria.properties
  
  Index: DefaultLoggingCriteria.properties
  ===================================================================
  #
  # Default static properties for the logkit logging criteria.
  # (no properties defined at this time)
  #
  
  
  1.1                  avalon/logging/site/xdocs/spec/index.xml
  
  Index: index.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <!-- 
   Copyright 2004 Apache Software Foundation
   Licensed  under the  Apache License,  Version 2.0  (the "License");
   you may not use  this file  except in  compliance with the License.
   You may obtain a copy of the License at 
   
     http://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing, software
   distributed  under the  License is distributed on an "AS IS" BASIS,
   WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
   implied.
   
   See the License for the specific language governing permissions and
   limitations under the License.
  -->
  
  <document>
  
    <properties>
      <author email="mcconnell@apache.org">Stephen McConnell</author>
      <title>Avalon Logging</title>
    </properties>
  
    <body>
  
      <section name="Avalon Logging">
        <subsection name="Logging System API">
          <p>
          The logging API is divided into two sections - one dealing with 
          meta data directives, and the second dealing with the logging
          system service interface.  The logging metadata addresses the 
          desription of a logging channel by a client.  The description is 
          encapsulated in the 
          <a href="../api/org/apache/avalon/logging/data/CategoriesDirective.html">
          CategoriesDirective</a> and 
          <a href="../api/org/apache/avalon/logging/data/CategoryDirective.html">
          CategoryDirective</a> immutable directives.
          </p>
          <p>
          Category directives describe the logging channel requirements, 
          including channel name, priority, and a named logging target.
          </p>
          <p>
          A logging manager is responsible for fulling the the requirements 
          expressed by a caregory directive.  This capability is defined by the 
          <a href="../api/org/apache/avalon/logging/provider/LoggingManager.html">
          LoggingManager</a> interface.  Implementations such as the 
          <a href="../api/org/apache/avalon/logging/logkit/DefaultLoggingFactory.html">LogKit</a>
          factory plugin are established via the avalon repository system and 
          can be parameterized using the  
          <a href="../api/org/apache/avalon/logging/provider/LoggingCriteria.html">
          LoggingCriteria</a> interface.
          </p>
        </subsection>
        <subsection name="Standard Properties">
          <p>
          The following table details the set of standard properties 
          supported by Logging System.
          </p>
          <table>
            <tr><th>Property</th><th>Default Value</th><th>Description</th></tr>
            <tr>
              <td>avalon.logging.configuration</td>
              <td></td>
              <td>URL referencing an external logging system configuration.</td>
            </tr>
            <tr>
              <td>avalon.logging.bootstrap</td>
              <td></td>
              <td>A logging channel to be used during the bootstrapping phase. Classic
              logging priority values of DEBUG, INFO, WARN, ERROR may be assigned and 
              will be resolved to a console logger with an equivalent priority.</td>
            </tr>
            <tr>
              <td>avalon.logging.basedir</td>
              <td></td>
              <td>The base directory to use when constructing file based log targets.
              Defaults to the initial working directory declared by the repository
              initial context.</td>
            </tr>
            <tr>
              <td>avalon.logging.debug</td>
              <td>false</td>
              <td>Debug flag used to override all logging channels to debug priority.</td>
            </tr>
          </table>
        </subsection>
      </section>
  
    </body>
  
  </document>
  
  
  
  
  
  1.1                  avalon/logging/site/xdocs/spec/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <!-- 
   Copyright 2004 Apache Software Foundation
   Licensed  under the  Apache License,  Version 2.0  (the "License");
   you may not use  this file  except in  compliance with the License.
   You may obtain a copy of the License at 
   
     http://www.apache.org/licenses/LICENSE-2.0
   
   Unless required by applicable law or agreed to in writing, software
   distributed  under the  License is distributed on an "AS IS" BASIS,
   WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
   implied.
   
   See the License for the specific language governing permissions and
   limitations under the License.
  -->
  
  <project>
  
   <title>Merlin</title>
  
   <body>
  
      <links>
        <item name="Apache" href="http://apache.org/"/>
        <item name="Avalon" href="http://avalon.apache.org/"/>
        <item name="Framework" href="http://avalon.apache.org/product/framework/"/>
        <item name="Containers" href="http://avalon.apache.org/product/containers/"/>
        <item name="Components" href="http://avalon.apache.org/product/components/"/>
      </links>
  
      <menu name="About Avalon Logging">
        <item name="Overview" href="/index.html"/>
        <item name="Specification" href="/spec/index.html"/>
        <item name="Implementations" href="/impl/index.html"/>
      </menu>
  
      <menu name="Resources">
        <item name="Javadoc" href="/api/index.html"/>
        <item name="Download" href="/download.html"/>
      </menu>
  
      <menu name="Related Projects">
        <item name="Merlin" href="http://avalon.apache.org/merlin"/>
        <item name="Repository" href="http://avalon.apache.org/repository"/>
        <item name="Utilities" href="http://avalon.apache.org/util"/>
      </menu>
   
   </body>
  
  </project>
  
  
  
  1.1                  avalon/merlin/kernel/impl/conf/merlin.template
  
  Index: merlin.template
  ===================================================================
  
  #----------------------------------------------------------------------
  # static defaults for the merlin platform
  #----------------------------------------------------------------------
  
  #
  # The default avalon repository root directory. 
  #
  avalon.home = ${user.home}/.avalon
  
  #
  # merlin system implementation
  merlin.implementation = @MERLIN_IMPLEMENTATION@
  
  #
  # logging implementation
  merlin.logging.implementation = @LOGGING_IMPLEMENTATION@
  
  #
  # runtime implementation
  merlin.runtime.standard.implementation = @STANDARD_RUNTIME@
  
  #
  # runtime code secure implementation
  merlin.runtime.csi.implementation = @SECURE_RUNTIME@
  
  #
  # EOF
  #
  
  
  
  1.1                  avalon/merlin/platform/tutorials/simple-web/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  target
  maven.log
  velocity.log
  build.xml
  
  
  
  1.1                  avalon/util/defaults/src/test/org/apache/avalon/util/defaults/test/DefaultsBuilderTestCase.java
  
  Index: DefaultsBuilderTestCase.java
  ===================================================================
  
  package org.apache.avalon.util.defaults.test;
  
  import java.util.Properties;
  import java.io.File;
  import java.io.IOException;
  
  import junit.framework.TestCase ;
  
  import org.apache.avalon.util.defaults.DefaultsBuilder;
  
  /**
   * DefaultsBuilderTestCase
   * 
   * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
   * @version $Revision: 1.1 $
   */
  public class DefaultsBuilderTestCase extends TestCase
  {
      private static final String KEY = "test";
  
      private DefaultsBuilder m_builder;
  
      protected void setUp() throws Exception
      {
          File base = new File( System.getProperty( "basedir" ) );
          File dir = new File( base, "target/test-classes" );
          System.out.println( "dir: " + dir );
  
          m_builder = new DefaultsBuilder( KEY, dir );
      }
  
      public void testHomeDirectory() throws Exception
      {
          System.out.println( "inst: " + m_builder.getHomeDirectory() );
      }
  
      public void testHomeProperties() throws Exception
      {
          System.out.println( "home: " + m_builder.getHomeProperties() );
      }
  
      public void testUserProperties() throws Exception
      {
          System.out.println( "user: " + m_builder.getUserProperties() );
      }
  
      public void testDirProperties() throws Exception
      {
          System.out.println( "dir: " + m_builder.getDirProperties() );
      }
  
      public void testConsolidatedProperties() throws Exception
      {
          File base = new File( System.getProperty( "basedir" ) );
          File dir = new File( base, "target/test-classes" );
          File props = new File( dir, "test.keys" );
          Properties properties = DefaultsBuilder.getProperties( props );
          String[] keys = (String[]) properties.keySet().toArray( new String[0] );
          Properties defaults = 
            DefaultsBuilder.getProperties(
              DefaultsBuilderTestCase.class.getClassLoader(),
              "static.properties" );
          System.out.println( 
            "con: " 
            + m_builder.getConsolidatedProperties( defaults, keys ) );
      }
  
  }
  
  
  
  1.1                  avalon/util/defaults/src/test/static.properties
  
  Index: static.properties
  ===================================================================
  
  #
  # test application static properties
  #
  
  aaa = Aaaaaaaaaaaa
  xxx = Xxxxxxxxxxxx
  
  
  
  1.1                  avalon/util/defaults/src/test/test.keys
  
  Index: test.keys
  ===================================================================
  
  #
  # test application keys
  #
  
  test.home = 
  aaa = 
  xxx = 
  qqq =
  
  
  
  1.1                  avalon/util/defaults/src/test/test.properties
  
  Index: test.properties
  ===================================================================
  
  #
  # test application properties
  #
  
  aaa = bbb
  
  
  

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


Mime
View raw message