avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl DefaultFactory.java
Date Mon, 08 Mar 2004 11:28:37 GMT
niclas      2004/03/08 03:28:37

  Modified:    merlin   INSTALL.TXT
               merlin/activation/impl project.xml
               merlin/activation/impl/src/java/org/apache/avalon/activation/impl
                        AbstractLifestyleManager.java DefaultAppliance.java
                        DefaultBlock.java DefaultComponentFactory.java
                        DefaultRuntime.java DefaultRuntimeFactory.java
                        DefaultServiceManager.java
               merlin/composition/impl project.xml
               merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
                        ContainmentProfileBuilder.java TargetsBuilder.java
                        XMLComponentProfileCreator.java
                        XMLProfileCreator.java
                        XMLProfilePackageCreator.java
               merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
                        DefaultClassLoaderContext.java
                        DefaultClassLoaderModel.java
                        DefaultComponentContext.java
                        DefaultComponentModel.java
                        DefaultConstructorModel.java
                        DefaultContainmentContext.java
                        DefaultContainmentModel.java
                        DefaultContainmentModelAssemblyHelper.java
                        DefaultContainmentModelComponentHelper.java
                        DefaultContainmentModelExportHelper.java
                        DefaultContainmentModelNavigationHelper.java
                        DefaultContext.java DefaultContextModel.java
                        DefaultDependencyModel.java
                        DefaultDeploymentModel.java DefaultImportModel.java
                        DefaultModelFactory.java DefaultStageModel.java
                        DefaultSystemContext.java
                        DefaultSystemContextFactory.java
                        DefaultTypeRepository.java Scanner.java
               merlin/facilities/jmx README.TXT
               merlin/kernel/cli project.xml
               merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli
                        Main.java
               merlin/kernel/impl project.xml
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultFactory.java
  Log:
  Slowly removing excalibur dependencies from Merlin.
  
  Revision  Changes    Path
  1.16      +99 -99    avalon/merlin/INSTALL.TXT
  
  Index: INSTALL.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- INSTALL.TXT	23 Feb 2004 15:03:22 -0000	1.15
  +++ INSTALL.TXT	8 Mar 2004 11:28:35 -0000	1.16
  @@ -1,99 +1,99 @@
  -
  -PROJECT: Merlin @VERSION@
  -====================================================================
  -
  -DESCRIPTION: 
  -------------
  -
  -This directory contains the merlin system installation and related 
  -resources.
  -
  -  /merlin
  -    /bin
  -    /config
  -    /system
  -    README.TXT
  -    LICENSE.TXT
  -    INSTALL.TXT
  -  /plugins
  -    @META_PLUGIN_JAR@
  -    @MERLIN_PLUGIN_JAR@
  -
  -
  -Installing Merlin.
  -------------------
  -
  -To use Merlin command line support or the Merlin NT Service
  -you will need to define the MERLIN_HOME environment
  -variable for your system and include MERLIN_HOME/bin in
  -your system path.  The MERLIN_HOME environment variable
  -should point to the merlin directory.
  -
  -Under Windows you can set environment variables by selecting the 
  -Environment Tab from the System Control Panel.
  -
  -Under Lunix you can do this as follows:
  -
  -  $ echo '
  -  > # set location of merlin
  -  > export MERLIN_HOME=/opt/merlin
  -  > # include it in the path
  -  > export PATH=$PATH:$MERLIN_HOME/bin
  -  > ' >> ~/.bash_profile
  -  $ source ~/.bash_profile
  -
  -Versions of Merlin prior to the 3.2-dev 20031210 build maintained 
  -a local repository of jar files under the %MERLIN_HOME%/repository
  -directory.  As of the 20031210 build the repository is maintained 
  -under AVALON_HOME which defaults to ${user.home}/.avalon.  To 
  -override this behaviour you can either define a AVALON_HOME 
  -environment variable or you can add a merlin.properties file to 
  -${user.home} containing the "merlin.repository" property key and 
  -a value point to you preferred repository location.
  -
  -To confirm that your environment variables are correct, you
  -should open a new command window and invoke the Merlin
  -CLI application.
  -
  -Under DOS:
  -
  -  $ merlin -version
  -
  -Under Lunix:
  -
  -  $ merlin.sh -version
  -
  -The installation of Merlin is now complete, however, two plugins are
  -provided with the installation supporting merlin development under the 
  -Maven platform.  These plugins should be placed in the Maven plugin 
  -directory (${maven.home.local}\plugins).
  -
  -  [YOUR-MAVEN-HOME]\plugins\@META_PLUGIN_JAR@
  -  [YOUR-MAVEN-HOME]\plugins\@MERLIN_PLUGIN_JAR@
  -
  -Please note that if you are upgrading an existing installation you must
  -delete the following two directories:
  -
  -  [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
  -  [YOUR-MAVEN-HOME]\plugins\merlin-plugin-* 
  -
  -Replace the existing avalon-meta and merlin plugin jar files with the supplied
  -versions.  Finally, delete all *.cache files in the Maven plugin directory.
  -
  -You now have everything in place to start using the Merlin Tutorial or 
  -building you own components.  If you have any problems, please subscribe
  -and post a message to users@avalon.apache.org.
  -
  -Special Note for JRE 1.3 and earlier.
  --------------------------------------
  -
  -Some applications assume that XML parsing classes are available withing
  -the JRE.  This is not the case with JDK 1.3 and earlier.  To resolve this
  -you can copy the following files to the JAVAHOME/lib/ext directory or 
  -declare an alternative directory as a JVM argument under the 
  -MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
  -
  -  system/xml-apis/jars/xml-apis-2.0.2.jar
  -  system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
  -  system/xerces/jars/xerces-2.4.0.jar
  -  
  +
  +PROJECT: Merlin @VERSION@
  +====================================================================
  +
  +DESCRIPTION: 
  +------------
  +
  +This directory contains the merlin system installation and related 
  +resources.
  +
  +  /merlin
  +    /bin
  +    /config
  +    /system
  +    README.TXT
  +    LICENSE.TXT
  +    INSTALL.TXT
  +  /plugins
  +    @META_PLUGIN_JAR@
  +    @MERLIN_PLUGIN_JAR@
  +
  +
  +Installing Merlin.
  +------------------
  +
  +To use Merlin command line support or the Merlin NT Service
  +you will need to define the MERLIN_HOME environment
  +variable for your system and include MERLIN_HOME/bin in
  +your system path.  The MERLIN_HOME environment variable
  +should point to the merlin directory.
  +
  +Under Windows you can set environment variables by selecting the 
  +Environment Tab from the System Control Panel.
  +
  +Under Lunix you can do this as follows:
  +
  +  $ echo '
  +  > # set location of merlin
  +  > export MERLIN_HOME=/opt/merlin
  +  > # include it in the path
  +  > export PATH=$PATH:$MERLIN_HOME/bin
  +  > ' >> ~/.bash_profile
  +  $ source ~/.bash_profile
  +
  +Versions of Merlin prior to the 3.2-dev 20031210 build maintained 
  +a local repository of jar files under the %MERLIN_HOME%/repository
  +directory.  As of the 20031210 build the repository is maintained 
  +under AVALON_HOME which defaults to ${user.home}/.avalon.  To 
  +override this behaviour you can either define a AVALON_HOME 
  +environment variable or you can add a merlin.properties file to 
  +${user.home} containing the "merlin.repository" property key and 
  +a value point to you preferred repository location.
  +
  +To confirm that your environment variables are correct, you
  +should open a new command window and invoke the Merlin
  +CLI application.
  +
  +Under DOS:
  +
  +  $ merlin -version
  +
  +Under Lunix:
  +
  +  $ merlin.sh -version
  +
  +The installation of Merlin is now complete, however, two plugins are
  +provided with the installation supporting merlin development under the 
  +Maven platform.  These plugins should be placed in the Maven plugin 
  +directory (${maven.home.local}\plugins).
  +
  +  [YOUR-MAVEN-HOME]\plugins\@META_PLUGIN_JAR@
  +  [YOUR-MAVEN-HOME]\plugins\@MERLIN_PLUGIN_JAR@
  +
  +Please note that if you are upgrading an existing installation you must
  +delete the following two directories:
  +
  +  [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
  +  [YOUR-MAVEN-HOME]\plugins\merlin-plugin-* 
  +
  +Replace the existing avalon-meta and merlin plugin jar files with the supplied
  +versions.  Finally, delete all *.cache files in the Maven plugin directory.
  +
  +You now have everything in place to start using the Merlin Tutorial or 
  +building you own components.  If you have any problems, please subscribe
  +and post a message to users@avalon.apache.org.
  +
  +Special Note for JRE 1.3 and earlier.
  +-------------------------------------
  +
  +Some applications assume that XML parsing classes are available withing
  +the JRE.  This is not the case with JDK 1.3 and earlier.  To resolve this
  +you can copy the following files to the JAVAHOME/lib/ext directory or 
  +declare an alternative directory as a JVM argument under the 
  +MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
  +
  +  system/xml-apis/jars/xml-apis-2.0.2.jar
  +  system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
  +  system/xerces/jars/xerces-2.4.0.jar
  +  
  
  
  
  1.21      +5 -4      avalon/merlin/activation/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- project.xml	29 Feb 2004 22:25:25 -0000	1.20
  +++ project.xml	8 Mar 2004 11:28:35 -0000	1.21
  @@ -82,6 +82,11 @@
         <artifactId>avalon-util-extension-impl</artifactId>
         <version>1.1</version>
       </dependency>
  +    <dependency>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
  +    </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
  @@ -98,10 +103,6 @@
         <groupId>excalibur-lifecycle</groupId>
         <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
  -    </dependency>
  -    <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  
  
  
  1.5       +5 -6      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractLifestyleManager.java
  
  Index: AbstractLifestyleManager.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/AbstractLifestyleManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractLifestyleManager.java	4 Mar 2004 03:42:30 -0000	1.4
  +++ AbstractLifestyleManager.java	8 Mar 2004 11:28:35 -0000	1.5
  @@ -25,22 +25,21 @@
   import org.apache.avalon.activation.LifecycleException;
   import org.apache.avalon.activation.ComponentFactory;
   
  -
   import org.apache.avalon.composition.model.ComponentModel;
   import org.apache.avalon.composition.model.DeploymentModel;
   import org.apache.avalon.composition.model.StageModel;
   import org.apache.avalon.composition.provider.LifestyleManager;
   
  -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.context.Context;
   
   import org.apache.avalon.lifecycle.Accessor;
   
   import org.apache.avalon.meta.info.InfoDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
   
  -import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.context.Context;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * Abstract implentation class for a lifestyle handler.
  
  
  
  1.5       +4 -4      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultAppliance.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultAppliance.java	4 Mar 2004 03:42:30 -0000	1.4
  +++ DefaultAppliance.java	8 Mar 2004 11:28:35 -0000	1.5
  @@ -27,11 +27,11 @@
   import org.apache.avalon.composition.provider.LifestyleManager;
   import org.apache.avalon.composition.util.DefaultState;
   
  -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.logger.Logger;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * Abstract appliance.
  
  
  
  1.2       +4 -4      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultBlock.java
  
  Index: DefaultBlock.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultBlock.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultBlock.java	10 Feb 2004 16:19:15 -0000	1.1
  +++ DefaultBlock.java	8 Mar 2004 11:28:35 -0000	1.2
  @@ -34,11 +34,11 @@
   import org.apache.avalon.composition.provider.SystemContext;
   import org.apache.avalon.composition.util.DefaultState;
   
  -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.logger.Logger;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * Composite appliance.
  
  
  
  1.6       +5 -5      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java
  
  Index: DefaultComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultComponentFactory.java	7 Mar 2004 03:02:42 -0000	1.5
  +++ DefaultComponentFactory.java	8 Mar 2004 11:28:35 -0000	1.6
  @@ -46,9 +46,6 @@
   
   import org.apache.avalon.meta.info.StageDescriptor;
   
  -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.Executable;
  @@ -69,6 +66,9 @@
   
   import org.apache.avalon.repository.Artifact;
   
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
  +
   
   /**
    * A factory enabling the establishment of component instances.
  @@ -841,4 +841,4 @@
               }
           }
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +3 -3      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntime.java
  
  Index: DefaultRuntime.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntime.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultRuntime.java	19 Feb 2004 08:58:04 -0000	1.2
  +++ DefaultRuntime.java	8 Mar 2004 11:28:35 -0000	1.3
  @@ -37,8 +37,8 @@
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.parameters.Parameters;
   
  -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;
   
   /**
    * Implementation of a system context that exposes a system wide set of parameters.
  
  
  
  1.5       +4 -4      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntimeFactory.java
  
  Index: DefaultRuntimeFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultRuntimeFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultRuntimeFactory.java	4 Mar 2004 03:42:30 -0000	1.4
  +++ DefaultRuntimeFactory.java	8 Mar 2004 11:28:35 -0000	1.5
  @@ -37,12 +37,12 @@
   import org.apache.avalon.composition.provider.LifestyleFactory;
   import org.apache.avalon.composition.provider.LifestyleManager;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.repository.Artifact;
   import org.apache.avalon.repository.provider.InitialContext;
   import org.apache.avalon.repository.provider.Builder;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * A factory enabling the establishment of runtime handlers.
  
  
  
  1.4       +3 -3      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultServiceManager.java
  
  Index: DefaultServiceManager.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultServiceManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultServiceManager.java	24 Feb 2004 22:18:21 -0000	1.3
  +++ DefaultServiceManager.java	8 Mar 2004 11:28:35 -0000	1.4
  @@ -30,12 +30,12 @@
   import org.apache.avalon.composition.model.TransientServiceException;
   import org.apache.avalon.composition.model.FatalServiceException;
   
  -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.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * Default implementation of the framework {@link ServiceManager} interface.
  
  
  
  1.19      +6 -4      avalon/merlin/composition/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- project.xml	27 Feb 2004 22:39:36 -0000	1.18
  +++ project.xml	8 Mar 2004 11:28:36 -0000	1.19
  @@ -89,6 +89,12 @@
         <version>1.0</version>
       </dependency>
   
  +    <dependency>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-i18n</artifactId>
  +      <version>1.0</version>
  +    </dependency>
  +    
       <!-- logkit -->
   
       <dependency>
  @@ -102,10 +108,6 @@
         <groupId>excalibur-lifecycle</groupId>
         <artifactId>excalibur-lifecycle-api</artifactId>
         <version>1.0</version>
  -    </dependency>
  -    <dependency>
  -      <id>excalibur-i18n</id>
  -      <version>1.1</version>
       </dependency>
       <dependency>
         <id>excalibur-configuration</id>
  
  
  
  1.5       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ContainmentProfileBuilder.java
  
  Index: ContainmentProfileBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ContainmentProfileBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContainmentProfileBuilder.java	24 Jan 2004 23:25:27 -0000	1.4
  +++ ContainmentProfileBuilder.java	8 Mar 2004 11:28:36 -0000	1.5
  @@ -21,11 +21,11 @@
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
   
  +import org.apache.avalon.composition.data.ContainmentProfile;
   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.meta.ConfigurationBuilder;
  -import org.apache.avalon.composition.data.ContainmentProfile;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.xml.sax.InputSource;
   
  
  
  
  1.5       +8 -5      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/TargetsBuilder.java
  
  Index: TargetsBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/TargetsBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TargetsBuilder.java	24 Jan 2004 23:25:27 -0000	1.4
  +++ TargetsBuilder.java	8 Mar 2004 11:28:36 -0000	1.5
  @@ -19,12 +19,15 @@
   
   import java.io.InputStream;
   
  -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.meta.ConfigurationBuilder;
   import org.apache.avalon.composition.data.Targets;
   import org.apache.avalon.composition.data.builder.TargetsCreator;
  +
  +import org.apache.avalon.framework.configuration.Configuration;
  +
  +import org.apache.avalon.meta.ConfigurationBuilder;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   import org.xml.sax.InputSource;
   
  
  
  
  1.5       +10 -2     avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java
  
  Index: XMLComponentProfileCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLComponentProfileCreator.java	22 Feb 2004 16:12:58 -0000	1.4
  +++ XMLComponentProfileCreator.java	8 Mar 2004 11:28:36 -0000	1.5
  @@ -25,10 +25,18 @@
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +
   import org.apache.avalon.composition.data.ComponentProfile;
  +import org.apache.avalon.composition.data.ConstructorDirective;
  +import org.apache.avalon.composition.data.ContextDirective;
   import org.apache.avalon.composition.data.DependencyDirective;
  +import org.apache.avalon.composition.data.EntryDirective;
  +import org.apache.avalon.composition.data.ImportDirective;
  +import org.apache.avalon.composition.data.Mode;
  +import org.apache.avalon.composition.data.Parameter;
   import org.apache.avalon.composition.data.SelectionDirective;
  -import org.apache.avalon.composition.data.*;
  +import org.apache.avalon.composition.data.StageDirective;
  +
   import org.apache.avalon.meta.info.InfoDescriptor;
   
   import org.apache.excalibur.configuration.ConfigurationUtil;
  
  
  
  1.4       +6 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfileCreator.java
  
  Index: XMLProfileCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfileCreator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLProfileCreator.java	24 Jan 2004 23:25:27 -0000	1.3
  +++ XMLProfileCreator.java	8 Mar 2004 11:28:36 -0000	1.4
  @@ -19,14 +19,16 @@
   
   import java.util.ArrayList;
   
  -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.ConfigurationException;
  +
   import org.apache.avalon.logging.data.CategoriesDirective;
   import org.apache.avalon.logging.data.CategoryDirective;
  -import org.apache.excalibur.configuration.ConfigurationUtil;
   
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
  +
  +import org.apache.excalibur.configuration.ConfigurationUtil;
   
   /**
    *
  
  
  
  1.4       +6 -3      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfilePackageCreator.java
  
  Index: XMLProfilePackageCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfilePackageCreator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLProfilePackageCreator.java	24 Jan 2004 23:25:27 -0000	1.3
  +++ XMLProfilePackageCreator.java	8 Mar 2004 11:28:36 -0000	1.4
  @@ -19,12 +19,15 @@
   
   import java.util.ArrayList;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.composition.data.MetaDataException;
   import org.apache.avalon.composition.data.ComponentProfile;
   import org.apache.avalon.composition.data.ProfilePackage;
  +
   import org.apache.avalon.framework.configuration.Configuration;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
  +
   import org.apache.excalibur.configuration.ConfigurationUtil;
   
   /**
  
  
  
  1.6       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderContext.java
  
  Index: DefaultClassLoaderContext.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultClassLoaderContext.java	10 Feb 2004 16:23:33 -0000	1.5
  +++ DefaultClassLoaderContext.java	8 Mar 2004 11:28:36 -0000	1.6
  @@ -28,14 +28,14 @@
   
   import org.apache.avalon.repository.Repository;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.extension.manager.OptionalPackage;
   import org.apache.avalon.extension.manager.ExtensionManager;
   
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.logger.Logger;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   
   /**
  
  
  
  1.13      +8 -6      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java
  
  Index: DefaultClassLoaderModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultClassLoaderModel.java	29 Feb 2004 22:25:26 -0000	1.12
  +++ DefaultClassLoaderModel.java	8 Mar 2004 11:28:36 -0000	1.13
  @@ -53,19 +53,21 @@
   
   import org.apache.avalon.composition.util.StringHelper;
   
  -import org.apache.avalon.repository.Artifact;
  -import org.apache.avalon.repository.Repository;
  -
   import org.apache.avalon.extension.Extension;
   import org.apache.avalon.extension.manager.ExtensionManager;
   import org.apache.avalon.extension.manager.OptionalPackage;
   import org.apache.avalon.extension.manager.PackageManager;
   import org.apache.avalon.extension.manager.impl.DefaultExtensionManager;
   import org.apache.avalon.extension.manager.impl.DelegatingExtensionManager;
  -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.AbstractLogEnabled;
  +
  +import org.apache.avalon.repository.Artifact;
  +import org.apache.avalon.repository.Repository;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * <p>Implementation of a classloader model within which a 
  
  
  
  1.9       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java
  
  Index: DefaultComponentContext.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultComponentContext.java	29 Feb 2004 22:25:26 -0000	1.8
  +++ DefaultComponentContext.java	8 Mar 2004 11:28:36 -0000	1.9
  @@ -36,13 +36,13 @@
   import org.apache.avalon.framework.context.DefaultContext;
   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.meta.info.Type;
   import org.apache.avalon.meta.info.EntryDescriptor;
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   
   /**
  
  
  
  1.11      +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java
  
  Index: DefaultComponentModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultComponentModel.java	7 Mar 2004 03:02:42 -0000	1.10
  +++ DefaultComponentModel.java	8 Mar 2004 11:28:36 -0000	1.11
  @@ -42,9 +42,6 @@
   
   import org.apache.avalon.logging.data.CategoriesDirective;
   
  -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.DefaultConfiguration;
   import org.apache.avalon.framework.configuration.Configurable;
  @@ -59,6 +56,9 @@
   import org.apache.avalon.meta.info.ReferenceDescriptor;
   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.CascadingConfiguration;
   
  
  
  
  1.7       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java
  
  Index: DefaultConstructorModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultConstructorModel.java	22 Feb 2004 16:12:58 -0000	1.6
  +++ DefaultConstructorModel.java	8 Mar 2004 11:28:36 -0000	1.7
  @@ -26,12 +26,12 @@
   import org.apache.avalon.composition.model.ModelException;
   import org.apache.avalon.composition.provider.ComponentContext;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.framework.context.ContextException;
   
   import org.apache.avalon.meta.info.EntryDescriptor;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   
   /**
  
  
  
  1.7       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java
  
  Index: DefaultContainmentContext.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultContainmentContext.java	29 Feb 2004 22:25:26 -0000	1.6
  +++ DefaultContainmentContext.java	8 Mar 2004 11:28:36 -0000	1.7
  @@ -33,11 +33,11 @@
   import org.apache.avalon.framework.context.DefaultContext;
   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.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   
   /**
  
  
  
  1.40      +3 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
  
  Index: DefaultContainmentModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- DefaultContainmentModel.java	7 Mar 2004 03:02:42 -0000	1.39
  +++ DefaultContainmentModel.java	8 Mar 2004 11:28:36 -0000	1.40
  @@ -82,9 +82,6 @@
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
   import org.apache.avalon.framework.parameters.Parameters;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
  @@ -92,6 +89,8 @@
   import org.apache.avalon.meta.info.Type;
   
   import org.apache.avalon.util.exception.ExceptionHelper;
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   
   /**
  
  
  
  1.6       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
  
  Index: DefaultContainmentModelAssemblyHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultContainmentModelAssemblyHelper.java	7 Mar 2004 22:10:39 -0000	1.5
  +++ DefaultContainmentModelAssemblyHelper.java	8 Mar 2004 11:28:36 -0000	1.6
  @@ -38,14 +38,14 @@
   import org.apache.avalon.composition.model.ProfileSelector;
   import org.apache.avalon.composition.provider.ContainmentContext;
   
  -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.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * A utility class that assists in the location of a model relative
  
  
  
  1.4       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelComponentHelper.java
  
  Index: DefaultContainmentModelComponentHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelComponentHelper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultContainmentModelComponentHelper.java	29 Feb 2004 22:25:26 -0000	1.3
  +++ DefaultContainmentModelComponentHelper.java	8 Mar 2004 11:28:36 -0000	1.4
  @@ -44,15 +44,15 @@
   
   import org.apache.avalon.repository.Repository;
   
  -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.DefaultConfigurationBuilder;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   
   import org.apache.avalon.meta.info.Type;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * A utility class that handles creation of a component model context.
  
  
  
  1.3       +3 -3      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelExportHelper.java
  
  Index: DefaultContainmentModelExportHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelExportHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultContainmentModelExportHelper.java	10 Feb 2004 16:23:33 -0000	1.2
  +++ DefaultContainmentModelExportHelper.java	8 Mar 2004 11:28:36 -0000	1.3
  @@ -27,8 +27,8 @@
   import org.apache.avalon.composition.model.TypeRepository;
   import org.apache.avalon.composition.provider.ContainmentContext;
   
  -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.avalon.meta.info.DependencyDescriptor;
   
  
  
  
  1.3       +3 -3      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelNavigationHelper.java
  
  Index: DefaultContainmentModelNavigationHelper.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelNavigationHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultContainmentModelNavigationHelper.java	10 Feb 2004 16:23:33 -0000	1.2
  +++ DefaultContainmentModelNavigationHelper.java	8 Mar 2004 11:28:36 -0000	1.3
  @@ -21,8 +21,8 @@
   import org.apache.avalon.composition.model.DeploymentModel;
   import org.apache.avalon.composition.provider.ContainmentContext;
   
  -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 utility class that assists in the location of a model relative
  
  
  
  1.8       +3 -3      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContext.java
  
  Index: DefaultContext.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContext.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultContext.java	25 Feb 2004 22:54:09 -0000	1.7
  +++ DefaultContext.java	8 Mar 2004 11:28:36 -0000	1.8
  @@ -25,8 +25,8 @@
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   
  -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;
   
   /**
    * <p>Default implementation of a context object.  The implementation
  
  
  
  1.13      +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java
  
  Index: DefaultContextModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultContextModel.java	22 Feb 2004 17:28:30 -0000	1.12
  +++ DefaultContextModel.java	8 Mar 2004 11:28:36 -0000	1.13
  @@ -32,9 +32,6 @@
   import org.apache.avalon.composition.model.ModelException;
   import org.apache.avalon.composition.provider.ComponentContext;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  @@ -42,6 +39,9 @@
   
   import org.apache.avalon.meta.info.ContextDescriptor;
   import org.apache.avalon.meta.info.EntryDescriptor;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   
   /**
  
  
  
  1.8       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java
  
  Index: DefaultDependencyModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultDependencyModel.java	10 Feb 2004 16:23:33 -0000	1.7
  +++ DefaultDependencyModel.java	8 Mar 2004 11:28:36 -0000	1.8
  @@ -24,14 +24,14 @@
   import org.apache.avalon.composition.data.DependencyDirective;
   import org.apache.avalon.composition.data.SelectionDirective;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   
   import org.apache.avalon.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ServiceDescriptor;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * Default implementation of the deplendency model.
  
  
  
  1.19      +3 -3      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
  
  Index: DefaultDeploymentModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- DefaultDeploymentModel.java	29 Feb 2004 22:25:26 -0000	1.18
  +++ DefaultDeploymentModel.java	8 Mar 2004 11:28:36 -0000	1.19
  @@ -32,8 +32,8 @@
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.parameters.Parameters;
   
  -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.avalon.logging.data.CategoriesDirective;
   
  
  
  
  1.7       +3 -3      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultImportModel.java
  
  Index: DefaultImportModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultImportModel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultImportModel.java	22 Feb 2004 16:12:58 -0000	1.6
  +++ DefaultImportModel.java	8 Mar 2004 11:28:36 -0000	1.7
  @@ -23,8 +23,8 @@
   import org.apache.avalon.composition.model.ContainmentModel;
   import org.apache.avalon.composition.provider.ComponentContext;
   
  -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.avalon.framework.context.ContextException;
   import org.apache.avalon.composition.data.ImportDirective;
  
  
  
  1.13      +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java
  
  Index: DefaultModelFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultModelFactory.java	7 Mar 2004 03:02:42 -0000	1.12
  +++ DefaultModelFactory.java	8 Mar 2004 11:28:36 -0000	1.13
  @@ -57,15 +57,15 @@
   
   import org.apache.avalon.repository.Repository;
   
  -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.DefaultConfigurationBuilder;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   
   import org.apache.avalon.meta.info.Type;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * A factory enabling the establishment of new composition model instances.
  
  
  
  1.6       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java
  
  Index: DefaultStageModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultStageModel.java	10 Feb 2004 16:23:33 -0000	1.5
  +++ DefaultStageModel.java	8 Mar 2004 11:28:36 -0000	1.6
  @@ -24,14 +24,14 @@
   import org.apache.avalon.composition.model.StageModel;
   import org.apache.avalon.composition.model.ModelException;
   
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   
   import org.apache.avalon.meta.info.StageDescriptor;
   import org.apache.avalon.meta.info.ExtensionDescriptor;
  +
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   
   /**
    * Default implementation of the stage model.
  
  
  
  1.28      +3 -3      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
  
  Index: DefaultSystemContext.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- DefaultSystemContext.java	7 Mar 2004 22:10:39 -0000	1.27
  +++ DefaultSystemContext.java	8 Mar 2004 11:28:36 -0000	1.28
  @@ -50,8 +50,8 @@
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.parameters.Parameters;
   
  -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;
   
   /**
    * Implementation of a system context that exposes a system wide set of parameters.
  
  
  
  1.7       +3 -3      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContextFactory.java
  
  Index: DefaultSystemContextFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContextFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultSystemContextFactory.java	7 Mar 2004 22:10:39 -0000	1.6
  +++ DefaultSystemContextFactory.java	8 Mar 2004 11:28:36 -0000	1.7
  @@ -56,8 +56,8 @@
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.parameters.Parameters;
   
  -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;
   
   /**
    * Implementation of a system context that exposes a system wide set of parameters.
  
  
  
  1.9       +4 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java
  
  Index: DefaultTypeRepository.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultTypeRepository.java	21 Feb 2004 23:54:42 -0000	1.8
  +++ DefaultTypeRepository.java	8 Mar 2004 11:28:36 -0000	1.9
  @@ -31,15 +31,15 @@
   import org.apache.avalon.composition.model.TypeUnknownException;
   import org.apache.avalon.composition.model.ProfileUnknownException;
   
  -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.meta.info.DependencyDescriptor;
   import org.apache.avalon.meta.info.ReferenceDescriptor;
   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;
   
   /**
    * A type manager implemetation provides support for the creation,
  
  
  
  1.8       +3 -4      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java
  
  Index: Scanner.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Scanner.java	25 Feb 2004 18:55:40 -0000	1.7
  +++ Scanner.java	8 Mar 2004 11:28:36 -0000	1.8
  @@ -33,9 +33,6 @@
   import org.apache.avalon.composition.data.builder.ProfilePackageBuilder;
   import org.apache.avalon.composition.util.StringHelper;
   
  -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.AbstractLogEnabled;
   
  @@ -47,6 +44,8 @@
   import org.apache.avalon.meta.info.builder.ServiceBuilder;
   import org.apache.avalon.meta.info.verifier.TypeVerifier;
   
  +import org.apache.avalon.util.i18n.ResourceManager;
  +import org.apache.avalon.util.i18n.Resources;
   import org.apache.avalon.util.exception.ExceptionHelper;
   
   /**
  
  
  
  1.2       +34 -4     avalon/merlin/facilities/jmx/README.TXT
  
  Index: README.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/jmx/README.TXT,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README.TXT	13 Jan 2004 12:46:55 -0000	1.1
  +++ README.TXT	8 Mar 2004 11:28:37 -0000	1.2
  @@ -1,4 +1,34 @@
  -
  -Placeholder for an internal JMX listener and server adapter.
  -
  -
  +JMX Facility
  +
  +- Intro -
  +
  +This facility provides JMX MBean generation for components.
  +
  +Currently, component management interfaces are detected by retrieving
  +the implemented interfaces of the component, and matching any that
  +end with "MBean".  Ideally this would occur by inspecting the
  +DeploymentModel for a list of management interfaces, and those
  +management interfaces would be declared using an Avalon Meta
  +javadoc tag.
  +
  +It should be noted, that the component currently has to declare the MBean
  +interface as a service using the @avalon.service meta tag, otherwise the
  +Proxy resolved from the ComponentModel will not expose the management
  +methods.
  +
  +Creating an MBean for a non singleton will likely fail, as the
  +ObjectName generated for the component is only based off the
  +fully qualified name and not an instance id.
  +
  +- Building -
  +
  +The facility is built with Maven.  The 'jmx-facility:build' goal
  +compiles and installs the various jar files in the maven repository,
  +including a test component jar.  The included conf/block.xml will
  +create the components required for the facility, as well as the
  +test component.  The MX4J console should then be visible at:
  +http://localhost:8082
  +
  +$ maven jmx-facility:build
  +$ merlin.sh -repository $MAVEN_REPO_LOCAL conf/block.xml
  +
  
  
  
  1.8       +3 -2      avalon/merlin/kernel/cli/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	22 Feb 2004 19:10:34 -0000	1.7
  +++ project.xml	8 Mar 2004 11:28:37 -0000	1.8
  @@ -25,8 +25,9 @@
         <version>1.0</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>
   
  
  
  
  1.21      +3 -3      avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Main.java	24 Feb 2004 22:18:22 -0000	1.20
  +++ Main.java	8 Mar 2004 11:28:37 -0000	1.21
  @@ -31,8 +31,8 @@
   
   import javax.naming.directory.Attributes;
   
  -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.avalon.repository.Artifact;
   import org.apache.avalon.repository.provider.Builder;
  
  
  
  1.28      +3 -2      avalon/merlin/kernel/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- project.xml	27 Feb 2004 22:39:36 -0000	1.27
  +++ project.xml	8 Mar 2004 11:28:37 -0000	1.28
  @@ -171,8 +171,9 @@
         </properties>
       </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.39      +7 -7      avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- DefaultFactory.java	7 Mar 2004 00:00:59 -0000	1.38
  +++ DefaultFactory.java	8 Mar 2004 11:28:37 -0000	1.39
  @@ -29,10 +29,6 @@
   import java.util.Locale;
   import java.security.cert.CertificateException;
   
  -import org.apache.avalon.logging.data.CategoriesDirective;
  -import org.apache.avalon.logging.provider.LoggingManager;
  -import org.apache.avalon.logging.provider.LoggingCriteria;
  -
   import org.apache.avalon.composition.data.CertsDirective;
   import org.apache.avalon.composition.data.ContainmentProfile;
   import org.apache.avalon.composition.data.GrantDirective;
  @@ -65,9 +61,6 @@
   import org.apache.avalon.composition.provider.ClassLoaderContext;
   import org.apache.avalon.composition.util.StringHelper;
   
  -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.ConsoleLogger;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -79,6 +72,10 @@
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.activity.Disposable;
   
  +import org.apache.avalon.logging.data.CategoriesDirective;
  +import org.apache.avalon.logging.provider.LoggingManager;
  +import org.apache.avalon.logging.provider.LoggingCriteria;
  +
   import org.apache.avalon.merlin.Kernel;
   import org.apache.avalon.merlin.KernelException;
   import org.apache.avalon.merlin.KernelRuntimeException;
  @@ -91,6 +88,9 @@
   import org.apache.avalon.repository.provider.RepositoryCriteria;
   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.excalibur.configuration.ConfigurationUtil;
   
  
  
  

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


Mime
View raw message