niclas      2004/03/08 03:32:02

  Modified:    logging/impl project.xml
               logging/impl/src/java/org/apache/avalon/logging/impl
                        ConfigurationParameter.java
                        DefaultLoggingCriteria.java LoggerParameter.java
               logging/log4j project.xml
               logging/log4j/src/java/org/apache/avalon/logging/log4j
                        Log4JLoggingFactory.java
               logging/logkit/impl project.xml
               logging/logkit/impl/src/java/org/apache/avalon/logging/logkit
                        DefaultFormatterFactory.java
                        DefaultLogTargetFactoryBuilder.java
                        DefaultLogTargetFactoryManager.java
                        DefaultLogTargetManager.java
                        DefaultLoggingFactory.java
                        DefaultLoggingManager.java
               logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/factory
                        FileTargetFactory.java MulticastTargetFactory.java
                        PluginTargetFactory.java
               logging/logkit/plugins/datagram project.xml
               
logging/logkit/plugins/datagram/src/java/org/apache/avalon/logging/logkit/factory/datagram
                        DatagramTargetFactory.java
               logging/logkit/plugins/socket project.xml
               
logging/logkit/plugins/socket/src/java/org/apache/avalon/logging/logkit/factory/socket
                        SocketTargetFactory.java
               logging/logkit/plugins/syslog project.xml
               
logging/logkit/plugins/syslog/src/java/org/apache/avalon/logging/logkit/factory/syslog
                        SyslogTargetFactory.java
               logging/spi project.xml
               logging/test project.xml
  Log:
  Slowly removing excalibur dependencies from Merlin.
  
  Revision  Changes    Path
  1.2       +3 -2      avalon/logging/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/impl/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml       1 Mar 2004 13:39:28 -0000       1.1
  +++ project.xml       8 Mar 2004 11:32:00 -0000       1.2
  @@ -56,8 +56,9 @@
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  
  
  
  1.2       +2 -2      
avalon/logging/impl/src/java/org/apache/avalon/logging/impl/ConfigurationParameter.java
  
  Index: ConfigurationParameter.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/impl/src/java/org/apache/avalon/logging/impl/ConfigurationParameter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigurationParameter.java       1 Mar 2004 13:39:28 -0000       1.1
  +++ ConfigurationParameter.java       8 Mar 2004 11:32:00 -0000       1.2
  @@ -26,8 +26,8 @@
   import org.apache.avalon.util.criteria.Parameter;
   import org.apache.avalon.util.criteria.CriteriaException;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * A parameter descriptor that supports transformation of a 
  
  
  
  1.2       +4 -3      
avalon/logging/impl/src/java/org/apache/avalon/logging/impl/DefaultLoggingCriteria.java
  
  Index: DefaultLoggingCriteria.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/impl/src/java/org/apache/avalon/logging/impl/DefaultLoggingCriteria.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultLoggingCriteria.java       1 Mar 2004 13:39:28 -0000       1.1
  +++ DefaultLoggingCriteria.java       8 Mar 2004 11:32:00 -0000       1.2
  @@ -35,11 +35,12 @@
   import org.apache.avalon.util.criteria.CriteriaException;
   import org.apache.avalon.util.criteria.Criteria;
   import org.apache.avalon.util.criteria.Parameter;
  +
   import org.apache.avalon.util.defaults.Defaults;
   import org.apache.avalon.util.defaults.DefaultsBuilder;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * DefaultLoggingCriteria is a class holding the values supplied by a user 
  
  
  
  1.2       +2 -2      
avalon/logging/impl/src/java/org/apache/avalon/logging/impl/LoggerParameter.java
  
  Index: LoggerParameter.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/impl/src/java/org/apache/avalon/logging/impl/LoggerParameter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoggerParameter.java      1 Mar 2004 13:39:28 -0000       1.1
  +++ LoggerParameter.java      8 Mar 2004 11:32:00 -0000       1.2
  @@ -28,8 +28,8 @@
   import org.apache.avalon.util.criteria.Parameter;
   import org.apache.avalon.util.criteria.CriteriaException;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * A parameter descriptor that supports transformation of a 
  
  
  
  1.5       +3 -2      avalon/logging/log4j/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/log4j/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml       1 Mar 2004 13:39:28 -0000       1.4
  +++ project.xml       8 Mar 2004 11:32:01 -0000       1.5
  @@ -51,8 +51,9 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  
  
  
  1.9       +4 -4      
avalon/logging/log4j/src/java/org/apache/avalon/logging/log4j/Log4JLoggingFactory.java
  
  Index: Log4JLoggingFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/log4j/src/java/org/apache/avalon/logging/log4j/Log4JLoggingFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Log4JLoggingFactory.java  1 Mar 2004 13:39:28 -0000       1.8
  +++ Log4JLoggingFactory.java  8 Mar 2004 11:32:01 -0000       1.9
  @@ -26,9 +26,6 @@
   import java.util.HashMap;
   import java.util.Map;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationUtil;
   
  @@ -40,6 +37,9 @@
   
   import org.apache.avalon.repository.provider.InitialContext;
   import org.apache.avalon.repository.provider.Factory;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log4j.PropertyConfigurator;
   import org.apache.log4j.xml.DOMConfigurator;
  
  
  
  1.7       +3 -2      avalon/logging/logkit/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/impl/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml       1 Mar 2004 13:39:28 -0000       1.6
  +++ project.xml       8 Mar 2004 11:32:01 -0000       1.7
  @@ -56,8 +56,9 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  
  
  
  1.3       +2 -2      
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultFormatterFactory.java
  
  Index: DefaultFormatterFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultFormatterFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultFormatterFactory.java      21 Feb 2004 13:27:03 -0000      1.2
  +++ DefaultFormatterFactory.java      8 Mar 2004 11:32:01 -0000       1.3
  @@ -19,8 +19,8 @@
   
   import org.apache.avalon.framework.configuration.Configuration;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.format.ExtendedPatternFormatter;
   import org.apache.log.format.Formatter;
  
  
  
  1.3       +2 -2      
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetFactoryBuilder.java
  
  Index: DefaultLogTargetFactoryBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetFactoryBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultLogTargetFactoryBuilder.java       29 Feb 2004 22:32:41 -0000      1.2
  +++ DefaultLogTargetFactoryBuilder.java       8 Mar 2004 11:32:01 -0000       1.3
  @@ -41,8 +41,8 @@
   import org.apache.avalon.repository.provider.InitialContext;
   import org.apache.avalon.repository.provider.Factory;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.LogTarget;
   import org.apache.log.output.io.StreamTarget;
  
  
  
  1.2       +7 -6      
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetFactoryManager.java
  
  Index: DefaultLogTargetFactoryManager.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetFactoryManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultLogTargetFactoryManager.java       4 Feb 2004 20:49:06 -0000       1.1
  +++ DefaultLogTargetFactoryManager.java       8 Mar 2004 11:32:01 -0000       1.2
  @@ -22,17 +22,18 @@
   import java.util.Map;
   import java.util.HashMap;
   
  -import org.apache.avalon.logging.provider.LoggingManager;
  -import org.apache.avalon.logging.provider.LoggingException;
  -
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.logger.LogKitLogger;
   import org.apache.avalon.framework.configuration.Configuration;
  +
   import org.apache.avalon.logging.data.CategoryDirective;
   import org.apache.avalon.logging.data.CategoriesDirective;
  +
  +import org.apache.avalon.logging.provider.LoggingManager;
  +import org.apache.avalon.logging.provider.LoggingException;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.Hierarchy;
   import org.apache.log.LogTarget;
  
  
  
  1.2       +6 -6      
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetManager.java
  
  Index: DefaultLogTargetManager.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLogTargetManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultLogTargetManager.java      4 Feb 2004 20:49:06 -0000       1.1
  +++ DefaultLogTargetManager.java      8 Mar 2004 11:32:01 -0000       1.2
  @@ -22,17 +22,17 @@
   import java.util.Map;
   import java.util.HashMap;
   
  -import org.apache.avalon.logging.provider.LoggingManager;
  -import org.apache.avalon.logging.provider.LoggingException;
  -
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.logger.LogKitLogger;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.logging.data.CategoryDirective;
   import org.apache.avalon.logging.data.CategoriesDirective;
  +
  +import org.apache.avalon.logging.provider.LoggingManager;
  +import org.apache.avalon.logging.provider.LoggingException;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.Hierarchy;
   import org.apache.log.LogTarget;
  
  
  
  1.7       +6 -2      
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingFactory.java
  
  Index: DefaultLoggingFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultLoggingFactory.java        1 Mar 2004 13:39:28 -0000       1.6
  +++ DefaultLoggingFactory.java        8 Mar 2004 11:32:01 -0000       1.7
  @@ -36,12 +36,15 @@
   
   import org.apache.avalon.logging.impl.ConsoleLogger;
   import org.apache.avalon.logging.impl.DefaultLoggingCriteria;
  +
   import org.apache.avalon.logging.data.CategoriesDirective;
   import org.apache.avalon.logging.data.CategoryDirective;
  +
   import org.apache.avalon.logging.provider.LoggingCriteria;
   import org.apache.avalon.logging.provider.LoggingFactory;
   import org.apache.avalon.logging.provider.LoggingException;
   import org.apache.avalon.logging.provider.LoggingManager;
  +
   import org.apache.avalon.logging.logkit.factory.FileTargetFactory;
   import org.apache.avalon.logging.logkit.factory.StreamTargetFactory;
   import org.apache.avalon.logging.logkit.factory.MulticastTargetFactory;
  @@ -50,8 +53,9 @@
   import org.apache.avalon.repository.provider.InitialContext;
   import org.apache.avalon.repository.provider.Factory;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
  +
   import org.apache.excalibur.configuration.ConfigurationUtil;
   
   import org.apache.log.LogTarget;
  
  
  
  1.2       +7 -6      
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingManager.java
  
  Index: DefaultLoggingManager.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/DefaultLoggingManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultLoggingManager.java        4 Feb 2004 20:49:05 -0000       1.1
  +++ DefaultLoggingManager.java        8 Mar 2004 11:32:01 -0000       1.2
  @@ -22,17 +22,18 @@
   import java.util.Map;
   import java.util.HashMap;
   
  -import org.apache.avalon.logging.provider.LoggingManager;
  -import org.apache.avalon.logging.provider.LoggingException;
  -
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.configuration.Configuration;
  +
   import org.apache.avalon.logging.data.CategoryDirective;
   import org.apache.avalon.logging.data.CategoriesDirective;
  +
   import org.apache.avalon.logging.provider.LoggingRuntimeException;
  +import org.apache.avalon.logging.provider.LoggingManager;
  +import org.apache.avalon.logging.provider.LoggingException;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.Hierarchy;
   import org.apache.log.LogTarget;
  
  
  
  1.3       +5 -5      
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/factory/FileTargetFactory.java
  
  Index: FileTargetFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/factory/FileTargetFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FileTargetFactory.java    24 Feb 2004 21:55:39 -0000      1.2
  +++ FileTargetFactory.java    8 Mar 2004 11:32:01 -0000       1.3
  @@ -25,11 +25,13 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.ContextException;
   
  +import org.apache.avalon.logging.logkit.DefaultLoggingManager;
  +import org.apache.avalon.logging.logkit.FormatterFactory;
   import org.apache.avalon.logging.logkit.LogTargetFactory;
   import org.apache.avalon.logging.logkit.LogTargetException;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.LogTarget;
   import org.apache.log.format.Formatter;
  @@ -45,8 +47,6 @@
   import org.apache.log.output.io.rotate.RotatingFileTarget;
   import org.apache.log.output.io.rotate.UniqueFileStrategy;
   
  -import org.apache.avalon.logging.logkit.DefaultLoggingManager;
  -import org.apache.avalon.logging.logkit.FormatterFactory;
   
   
   /**
  
  
  
  1.3       +9 -10     
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/factory/MulticastTargetFactory.java
  
  Index: MulticastTargetFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/factory/MulticastTargetFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MulticastTargetFactory.java       24 Feb 2004 21:55:39 -0000      1.2
  +++ MulticastTargetFactory.java       8 Mar 2004 11:32:01 -0000       1.3
  @@ -24,8 +24,14 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.logging.logkit.LogTargetException;
  +import org.apache.avalon.logging.logkit.LogTargetFactory;
  +import org.apache.avalon.logging.logkit.LogTargetManager;
  +import org.apache.avalon.logging.logkit.MissingIdException;
  +import org.apache.avalon.logging.logkit.UnknownLogTargetException;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.LogTarget;
   import org.apache.log.LogEvent;
  @@ -34,13 +40,6 @@
   import org.apache.log.format.PatternFormatter;
   import org.apache.log.format.RawFormatter;
   import org.apache.log.output.net.DatagramOutputTarget;
  -
  -import org.apache.avalon.logging.logkit.LogTargetException;
  -import org.apache.avalon.logging.logkit.LogTargetFactory;
  -import org.apache.avalon.logging.logkit.LogTargetManager;
  -import org.apache.avalon.logging.logkit.MissingIdException;
  -import org.apache.avalon.logging.logkit.UnknownLogTargetException;
  -
   
   /**
    * A log target factory that handles creation of a new multicast log
  
  
  
  1.3       +4 -4      
avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/factory/PluginTargetFactory.java
  
  Index: PluginTargetFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/factory/PluginTargetFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PluginTargetFactory.java  24 Feb 2004 21:55:39 -0000      1.2
  +++ PluginTargetFactory.java  8 Mar 2004 11:32:01 -0000       1.3
  @@ -25,9 +25,6 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.Logger;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.logging.logkit.LogTargetException;
   import org.apache.avalon.logging.logkit.LogTargetFactory;
   import org.apache.avalon.logging.logkit.LogTargetManager;
  @@ -37,6 +34,9 @@
   import org.apache.avalon.repository.provider.InitialContext;
   import org.apache.avalon.repository.provider.Builder;
   import org.apache.avalon.repository.provider.Factory;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.excalibur.configuration.ConfigurationUtil;
   
  
  
  
  1.6       +3 -2      avalon/logging/logkit/plugins/datagram/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/datagram/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml       27 Feb 2004 22:39:35 -0000      1.5
  +++ project.xml       8 Mar 2004 11:32:01 -0000       1.6
  @@ -46,8 +46,9 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
  
  
  
  1.4       +4 -3      
avalon/logging/logkit/plugins/datagram/src/java/org/apache/avalon/logging/logkit/factory/datagram/DatagramTargetFactory.java
  
  Index: DatagramTargetFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/plugins/datagram/src/java/org/apache/avalon/logging/logkit/factory/datagram/DatagramTargetFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DatagramTargetFactory.java        24 Feb 2004 21:55:39 -0000      1.3
  +++ DatagramTargetFactory.java        8 Mar 2004 11:32:01 -0000       1.4
  @@ -25,12 +25,13 @@
   
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +
   import org.apache.avalon.logging.logkit.LogTargetException;
   import org.apache.avalon.logging.logkit.LogTargetFactory;
   import org.apache.avalon.logging.logkit.FormatterFactory;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.LogTarget;
   import org.apache.log.format.ExtendedPatternFormatter;
  
  
  
  1.6       +3 -2      avalon/logging/logkit/plugins/socket/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/socket/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml       27 Feb 2004 22:39:35 -0000      1.5
  +++ project.xml       8 Mar 2004 11:32:01 -0000       1.6
  @@ -46,8 +46,9 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
  
  
  
  1.4       +4 -4      
avalon/logging/logkit/plugins/socket/src/java/org/apache/avalon/logging/logkit/factory/socket/SocketTargetFactory.java
  
  Index: SocketTargetFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/plugins/socket/src/java/org/apache/avalon/logging/logkit/factory/socket/SocketTargetFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SocketTargetFactory.java  24 Feb 2004 21:55:40 -0000      1.3
  +++ SocketTargetFactory.java  8 Mar 2004 11:32:01 -0000       1.4
  @@ -24,11 +24,11 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.logging.logkit.LogTargetFactory;
   import org.apache.avalon.logging.logkit.LogTargetException;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.LogTarget;
   import org.apache.log.output.net.SocketOutputTarget;
  
  
  
  1.6       +3 -2      avalon/logging/logkit/plugins/syslog/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/syslog/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml       27 Feb 2004 22:39:35 -0000      1.5
  +++ project.xml       8 Mar 2004 11:32:01 -0000       1.6
  @@ -46,8 +46,9 @@
       </dependency>
   
       <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
       </dependency>
   
       <dependency>
  
  
  
  1.3       +4 -4      
avalon/logging/logkit/plugins/syslog/src/java/org/apache/avalon/logging/logkit/factory/syslog/SyslogTargetFactory.java
  
  Index: SyslogTargetFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/logging/logkit/plugins/syslog/src/java/org/apache/avalon/logging/logkit/factory/syslog/SyslogTargetFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SyslogTargetFactory.java  24 Feb 2004 21:55:40 -0000      1.2
  +++ SyslogTargetFactory.java  8 Mar 2004 11:32:01 -0000       1.3
  @@ -24,12 +24,12 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.logging.logkit.LogTargetFactory;
   import org.apache.avalon.logging.logkit.LogTargetException;
   import org.apache.avalon.logging.logkit.FormatterFactory;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.apache.log.LogTarget;
   import org.apache.log.format.Formatter;
  
  
  
  1.3       +3 -2      avalon/logging/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/spi/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml       29 Feb 2004 22:32:41 -0000      1.2
  +++ project.xml       8 Mar 2004 11:32:02 -0000       1.3
  @@ -49,8 +49,9 @@
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  
  
  
  1.4       +3 -2      avalon/logging/test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/test/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml       29 Feb 2004 22:32:42 -0000      1.3
  +++ project.xml       8 Mar 2004 11:32:02 -0000       1.4
  @@ -40,8 +40,9 @@
         <version>1.0-SNAPSHOT</version>
       </dependency>
       <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
       </dependency>
     </dependencies>
   </project>
  
  
  

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

Reply via email to