You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/02/24 23:48:24 UTC

cvs commit: avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl DefaultCriteria.java

mcconnell    2004/02/24 14:48:24

  Modified:    logging/logkit/impl/src/java/org/apache/avalon/logging/logkit
                        LoggerParameter.java
               logging/site/xdocs/impl/logkit/plugin syslog.xml
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultCriteria.java
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.3       +1 -2      avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/LoggerParameter.java
  
  Index: LoggerParameter.java
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/LoggerParameter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LoggerParameter.java	24 Feb 2004 21:55:39 -0000	1.2
  +++ LoggerParameter.java	24 Feb 2004 22:48:24 -0000	1.3
  @@ -21,7 +21,6 @@
   import java.net.URL;
   import java.lang.reflect.Constructor;
   import java.util.ArrayList;
  -import java.util.StringTokenizer;
   
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.logger.ConsoleLogger;
  
  
  
  1.2       +20 -19    avalon/logging/site/xdocs/impl/logkit/plugin/syslog.xml
  
  Index: syslog.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/site/xdocs/impl/logkit/plugin/syslog.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- syslog.xml	21 Feb 2004 15:20:20 -0000	1.1
  +++ syslog.xml	24 Feb 2004 22:48:24 -0000	1.2
  @@ -58,47 +58,48 @@
              <th>Keyword</th><th>Description</th></tr>
              <tr>
                <td>kern</td>
  -             <td></td>
  +             <td>kernel messages</td>
              </tr>
              <tr>
                <td>user</td>
  -             <td></td>
  +             <td>generic user-level messages (default)</td>
              </tr>
              <tr>
                <td>mail</td>
  -             <td></td>
  +             <td>mail subsystem</td>
              </tr>
              <tr>
                <td>daemon</td>
  -             <td></td>
  +             <td>other system daemons</td>
              </tr>
              <tr>
                <td>auth</td>
  -             <td></td>
  +             <td>security/authorization messages (DEPRECATED Use
  +LOG_AUTHPRIV instead)</td>
              </tr>
              <tr>
                <td>syslog</td>
  -             <td></td>
  +             <td>messages generated internally by syslogd</td>
              </tr>
              <tr>
                <td>lpr</td>
  -             <td></td>
  +             <td>line printer subsystem</td>
              </tr>
              <tr>
                <td>news</td>
  -             <td></td>
  +             <td>USENET news subsystem</td>
              </tr>
              <tr>
                <td>uucp</td>
  -             <td></td>
  +             <td>UUCP subsystem</td>
              </tr>
              <tr>
                <td>cron</td>
  -             <td></td>
  +             <td>clock daemon (cron and at)</td>
              </tr>
              <tr>
                <td>authpriv</td>
  -             <td></td>
  +             <td>security/authorization messages (private)</td>
              </tr>
              <tr>
                <td>ftp</td>
  @@ -106,35 +107,35 @@
              </tr>
              <tr>
                <td>local0</td>
  -             <td></td>
  +             <td>reserved for local use</td>
              </tr>
              <tr>
                <td>local1</td>
  -             <td></td>
  +             <td>reserved for local use</td>
              </tr>
              <tr>
                <td>local2</td>
  -             <td></td>
  +             <td>reserved for local use</td>
              </tr>
              <tr>
                <td>local3</td>
  -             <td></td>
  +             <td>reserved for local use</td>
              </tr>
              <tr>
                <td>local4</td>
  -             <td></td>
  +             <td>reserved for local use</td>
              </tr>
              <tr>
                <td>local5</td>
  -             <td></td>
  +             <td>reserved for local use</td>
              </tr>
              <tr>
                <td>local6</td>
  -             <td></td>
  +             <td>reserved for local use</td>
              </tr>
              <tr>
                <td>local7</td>
  -             <td></td>
  +             <td>reserved for local use</td>
              </tr>
            </table>
         </subsection>
  
  
  
  1.24      +1 -2      avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
  
  Index: DefaultCriteria.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- DefaultCriteria.java	24 Feb 2004 22:18:22 -0000	1.23
  +++ DefaultCriteria.java	24 Feb 2004 22:48:24 -0000	1.24
  @@ -26,7 +26,6 @@
   import java.util.Hashtable;
   import java.util.Properties;
   import java.util.ArrayList;
  -import java.util.StringTokenizer;
   import java.util.Map;
   
   import org.apache.avalon.merlin.KernelCriteria;
  
  
  

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