avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: avalon/meta/impl/src/java/org/apache/avalon/meta/info/verifier TypeVerifier.java
Date Mon, 08 Mar 2004 11:24:53 GMT
niclas      2004/03/08 03:24:53

  Modified:    meta/impl project.xml
               meta/impl/src/java/org/apache/avalon/meta/info/builder
                        ServiceBuilder.java TypeBuilder.java
                        XMLLegacyCreator.java XMLServiceCreator.java
                        XMLTypeCreator.java
               meta/impl/src/java/org/apache/avalon/meta/info/verifier
                        TypeVerifier.java
  Log:
  Slowly removing excalibur dependencies from Merlin.
  
  Revision  Changes    Path
  1.8       +3 -2      avalon/meta/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	10 Feb 2004 16:30:16 -0000	1.7
  +++ project.xml	8 Mar 2004 11:24:52 -0000	1.8
  @@ -39,8 +39,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       +5 -3      avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/ServiceBuilder.java
  
  Index: ServiceBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/ServiceBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceBuilder.java	24 Jan 2004 23:20:46 -0000	1.2
  +++ ServiceBuilder.java	8 Mar 2004 11:24:52 -0000	1.3
  @@ -18,9 +18,11 @@
   package org.apache.avalon.meta.info.builder;
   
   import java.io.InputStream;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +
   import org.apache.avalon.meta.info.Service;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * A ServiceBuilder is responsible for building {@link Service}
  
  
  
  1.5       +8 -4      avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java
  
  Index: TypeBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TypeBuilder.java	24 Jan 2004 23:20:46 -0000	1.4
  +++ TypeBuilder.java	8 Mar 2004 11:24:52 -0000	1.5
  @@ -18,13 +18,17 @@
   package org.apache.avalon.meta.info.builder;
   
   import java.io.InputStream;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.meta.info.Type;
  +
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +
   import org.apache.avalon.meta.ConfigurationBuilder;
  +import org.apache.avalon.meta.info.Type;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
  +
   import org.xml.sax.InputSource;
   
   /**
  
  
  
  1.5       +8 -3      avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java
  
  Index: XMLLegacyCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLLegacyCreator.java	24 Jan 2004 23:20:46 -0000	1.4
  +++ XMLLegacyCreator.java	8 Mar 2004 11:24:52 -0000	1.5
  @@ -20,10 +20,10 @@
   import java.io.InputStream;
   import java.util.ArrayList;
   import java.util.Properties;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +
   import org.apache.avalon.framework.Version;
   import org.apache.avalon.framework.configuration.Configuration;
  +
   import org.apache.avalon.meta.ConfigurationBuilder;
   import org.apache.avalon.meta.info.InfoDescriptor;
   import org.apache.avalon.meta.info.ContextDescriptor;
  @@ -35,7 +35,12 @@
   import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
   import org.apache.avalon.meta.info.Type;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
  +
   import org.apache.excalibur.configuration.ConfigurationUtil;
  +
   import org.xml.sax.InputSource;
   
   /**
  
  
  
  1.3       +8 -3      avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLServiceCreator.java
  
  Index: XMLServiceCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLServiceCreator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLServiceCreator.java	24 Jan 2004 23:20:46 -0000	1.2
  +++ XMLServiceCreator.java	8 Mar 2004 11:24:52 -0000	1.3
  @@ -20,17 +20,22 @@
   import java.io.InputStream;
   import java.util.Properties;
   import java.util.ArrayList;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +
   import org.apache.avalon.framework.Version;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +
   import org.apache.avalon.meta.ConfigurationBuilder;
   import org.apache.avalon.meta.info.Service;
   import org.apache.avalon.meta.info.EntryDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
   import org.apache.avalon.meta.info.builder.BuildException;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
  +
   import org.apache.excalibur.configuration.ConfigurationUtil;
  +
   import org.xml.sax.InputSource;
   
   /**
  
  
  
  1.11      +7 -3      avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
  
  Index: XMLTypeCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XMLTypeCreator.java	24 Feb 2004 22:32:46 -0000	1.10
  +++ XMLTypeCreator.java	8 Mar 2004 11:24:52 -0000	1.11
  @@ -20,11 +20,11 @@
   import java.io.InputStream;
   import java.util.ArrayList;
   import java.util.Properties;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +
   import org.apache.avalon.framework.Version;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +
   import org.apache.avalon.meta.ConfigurationBuilder;
   import org.apache.avalon.meta.info.InfoDescriptor;
   import org.apache.avalon.meta.info.ContextDescriptor;
  @@ -38,6 +38,10 @@
   import org.apache.avalon.meta.info.SecurityDescriptor;
   import org.apache.avalon.meta.info.PermissionDescriptor;
   import org.apache.avalon.meta.info.Type;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
  +
   import org.apache.excalibur.configuration.ConfigurationUtil;
   import org.xml.sax.InputSource;
   
  
  
  
  1.4       +5 -3      avalon/meta/impl/src/java/org/apache/avalon/meta/info/verifier/TypeVerifier.java
  
  Index: TypeVerifier.java
  ===================================================================
  RCS file: /home/cvs/avalon/meta/impl/src/java/org/apache/avalon/meta/info/verifier/TypeVerifier.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TypeVerifier.java	10 Feb 2004 16:30:16 -0000	1.3
  +++ TypeVerifier.java	8 Mar 2004 11:24:53 -0000	1.4
  @@ -19,8 +19,7 @@
   
   import java.lang.reflect.Constructor;
   import java.lang.reflect.Modifier;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  +
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
  @@ -35,6 +34,9 @@
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Reparameterizable;
   import org.apache.avalon.framework.service.Serviceable;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * Utility class to help verify that component respects the
  
  
  

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


Mime
View raw message