avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello internal.xml
Date Tue, 29 Apr 2003 14:22:20 GMT
mcconnell    2003/04/29 07:22:20

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
                        DefaultApplianceFactory.java
               merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
                        EngineClassLoader.java
               merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl
                        DefaultDeploymentService.java
               merlin/assembly/src/test/org/apache/avalon/assembly/engine
                        EngineTestCase.java FactoryTestCase.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
                        StandardBlockLoader.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder
                        XMLContainerCreator.java
               merlin/merlin-core/src/test/org/apache/avalon/playground
                        ContextualizationHandler.java
               merlin/merlin-smp maven.xml
               merlin/merlin-smp/xdocs/starting/hello internal.xml
  Log:
  Moved lifecycle.context into lifecycle.impl.
  
  Revision  Changes    Path
  1.3       +1 -3      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceFactory.java
  
  Index: DefaultApplianceFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultApplianceFactory.java	28 Apr 2003 21:19:42 -0000	1.2
  +++ DefaultApplianceFactory.java	29 Apr 2003 14:22:19 -0000	1.3
  @@ -439,8 +439,6 @@
               throw new NullPointerException( "logging" );
           }
   
  -System.out.println( "CREATING A NEW DEPOLYMENT SERVICE USING: " + logging + ", under key:
" + LoggingManager.KEY );
  -
           try
           {
               DefaultDeploymentService deployment = new DefaultDeploymentService();
  
  
  
  1.2       +1 -2      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java
  
  Index: EngineClassLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/EngineClassLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EngineClassLoader.java	26 Apr 2003 12:37:43 -0000	1.1
  +++ EngineClassLoader.java	29 Apr 2003 14:22:19 -0000	1.2
  @@ -78,7 +78,6 @@
   import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
   import org.apache.avalon.assembly.engine.model.IncludeDescriptor;
   import org.apache.avalon.assembly.engine.model.LibraryDescriptor;
  -import org.apache.avalon.assembly.engine.model.impl.DefaultClasspath;
   import org.apache.avalon.assembly.engine.profile.ProfileRepository;
   import org.apache.avalon.assembly.engine.type.TypeRepository;
   import org.apache.avalon.assembly.locator.Contextualizable;
  
  
  
  1.5       +1 -6      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/DefaultDeploymentService.java
  
  Index: DefaultDeploymentService.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/DefaultDeploymentService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultDeploymentService.java	29 Apr 2003 00:55:46 -0000	1.4
  +++ DefaultDeploymentService.java	29 Apr 2003 14:22:19 -0000	1.5
  @@ -53,11 +53,6 @@
   import org.apache.avalon.assembly.appliance.Appliance;
   import org.apache.avalon.assembly.lifecycle.DeploymentException;
   import org.apache.avalon.assembly.lifecycle.DeploymentService;
  -import org.apache.avalon.assembly.lifecycle.impl.ContextualizationService;
  -import org.apache.avalon.assembly.lifecycle.impl.DefaultCompositionService;
  -//import org.apache.avalon.assembly.lifecycle.initialization.DefaultInitializationService;
  -//import org.apache.avalon.assembly.lifecycle.initialization.ExtendedInitializationService;
  -//import org.apache.avalon.assembly.lifecycle.initialization.InitializationService;
   import org.apache.avalon.assembly.locator.Contextualizable;
   import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
  
  
  
  1.7       +1 -1      avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/EngineTestCase.java
  
  Index: EngineTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/EngineTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EngineTestCase.java	26 Apr 2003 12:37:47 -0000	1.6
  +++ EngineTestCase.java	29 Apr 2003 14:22:19 -0000	1.7
  @@ -104,7 +104,7 @@
           final String exploitation = "org.apache.avalon.playground.ExploitationManager";
           final String simple = "org.apache.avalon.playground.SimpleComponent";
           final String basic = "org.apache.avalon.playground.basic.BasicComponent";
  -        final String context = "org.apache.avalon.assembly.lifecycle.context.AvalonContextualizer";
  +        final String context = "org.apache.avalon.assembly.lifecycle.impl.AvalonContextualizer";
   
           final String[] classnames = new String[]{
               complex, demo, exploitation, simple, basic, context};
  
  
  
  1.7       +2 -2      avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/FactoryTestCase.java
  
  Index: FactoryTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/FactoryTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FactoryTestCase.java	26 Apr 2003 12:37:47 -0000	1.6
  +++ FactoryTestCase.java	29 Apr 2003 14:22:19 -0000	1.7
  @@ -96,13 +96,13 @@
   
       public void testDirect()
       {
  -        final String locator = "org.apache.avalon.assembly.lifecycle.context.DefaultContextualizer";
  +        final String locator = "org.apache.avalon.assembly.lifecycle.impl.DefaultContextualizer";
           final String factory = "org.apache.avalon.playground.factory.CustomApplianceFactory";
           final String app = "org.apache.avalon.playground.factory.CustomAppliance";
           final String classname = "org.apache.avalon.playground.factory.CustomComponent";
           final String basic = "org.apache.avalon.playground.basic.BasicComponent";
           final String terminal = "org.apache.avalon.playground.TerminalComponent";
  -        final String avalon = "org.apache.avalon.assembly.lifecycle.context.AvalonContextualizer";
  +        final String avalon = "org.apache.avalon.assembly.lifecycle.impl.AvalonContextualizer";
   
           try
           {
  
  
  
  1.5       +6 -6      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java
  
  Index: StandardBlockLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StandardBlockLoader.java	27 Apr 2003 09:28:50 -0000	1.4
  +++ StandardBlockLoader.java	29 Apr 2003 14:22:19 -0000	1.5
  @@ -63,18 +63,18 @@
   import java.util.jar.JarFile;
   import java.util.zip.ZipEntry;
   
  -import org.apache.avalon.assembly.logging.LoggingManager;
   import org.apache.avalon.assembly.appliance.impl.DefaultApplianceContext;
  -import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.assembly.engine.EngineException;
  +import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
  +import org.apache.avalon.assembly.engine.impl.DefaultClasspath;
   import org.apache.avalon.assembly.engine.model.Classpath;
   import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
  -import org.apache.avalon.assembly.engine.model.impl.DefaultClasspath;
   import org.apache.avalon.assembly.engine.model.LibraryDescriptor;
   import org.apache.avalon.assembly.engine.type.UnknownTypeException;
   import org.apache.avalon.assembly.locator.Contextualizable;
   import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
  +import org.apache.avalon.assembly.logging.LoggingManager;
   import org.apache.avalon.assembly.repository.Repository;
   import org.apache.avalon.framework.Version;
   import org.apache.avalon.framework.activity.Disposable;
  @@ -435,9 +435,9 @@
               try
               {
                   engine.register(
  -                  "org.apache.avalon.assembly.lifecycle.context.DefaultContextualizer"
);
  +                  "org.apache.avalon.assembly.lifecycle.impl.DefaultContextualizer" );
                   engine.register(
  -                  "org.apache.avalon.assembly.lifecycle.context.AvalonContextualizer" );
  +                  "org.apache.avalon.assembly.lifecycle.impl.AvalonContextualizer" );
                   engine.register(
                     "org.apache.avalon.merlin.container.impl.DefaultContainer" );
                   engine.register(
  
  
  
  1.11      +3 -3      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java
  
  Index: XMLContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XMLContainerCreator.java	26 Apr 2003 12:37:48 -0000	1.10
  +++ XMLContainerCreator.java	29 Apr 2003 14:22:19 -0000	1.11
  @@ -66,13 +66,13 @@
   import java.net.MalformedURLException;
   
   import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
  +import org.apache.avalon.assembly.engine.impl.DefaultClasspath;
  +import org.apache.avalon.assembly.engine.impl.EngineConfigurationHelper;
   import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
   import org.apache.avalon.assembly.engine.model.Classpath;
   import org.apache.avalon.assembly.engine.model.FilesetDescriptor;
   import org.apache.avalon.assembly.engine.model.IncludeDescriptor;
   import org.apache.avalon.assembly.engine.model.LibraryDescriptor;
  -import org.apache.avalon.assembly.engine.model.impl.DefaultClasspath;
  -import org.apache.avalon.assembly.engine.model.impl.EngineConfigurationHelper;
   import org.apache.avalon.assembly.engine.type.UnknownTypeException;
   import org.apache.avalon.assembly.repository.Repository;
   import org.apache.avalon.framework.context.DefaultContext;
  
  
  
  1.4       +1 -1      avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/ContextualizationHandler.java
  
  Index: ContextualizationHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/ContextualizationHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContextualizationHandler.java	24 Apr 2003 12:39:15 -0000	1.3
  +++ ContextualizationHandler.java	29 Apr 2003 14:22:20 -0000	1.4
  @@ -58,7 +58,7 @@
   import java.lang.reflect.Constructor;
   import java.util.Map;
   
  -import org.apache.avalon.assembly.lifecycle.context.Contextualization;
  +import org.apache.avalon.assembly.lifecycle.impl.Contextualization;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.meta.model.ContextDirective;
   
  
  
  
  1.5       +1 -1      avalon-sandbox/merlin/merlin-smp/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- maven.xml	28 Apr 2003 21:19:43 -0000	1.4
  +++ maven.xml	29 Apr 2003 14:22:20 -0000	1.5
  @@ -26,6 +26,7 @@
     Merlin system.
     -->
   
  +  <!--
     <path id="merlin.path">
       <pathelement location="${basedir}/../meta-spi/src/java/"/>
       <pathelement location="${basedir}/../meta/src/java/"/>
  @@ -37,7 +38,6 @@
     </path>
   
     <maven:addPath id="maven.compile.src.set" refid="merlin.path"/>
  -  <!--
     -->
   
   
  
  
  
  1.3       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/internal.xml
  
  Index: internal.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/internal.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- internal.xml	20 Apr 2003 12:52:30 -0000	1.2
  +++ internal.xml	29 Apr 2003 14:22:20 -0000	1.3
  @@ -54,9 +54,9 @@
   [DEBUG  ] (sys): scanning: file:/F:/system/merlin/lib/shared/avalon-meta-spi-1.0.jar
   [DEBUG  ] (sys): scanning: file:/F:/system/merlin/lib/shared/merlin-spi-1.0.jar
   [DEBUG  ] (sys): scanning: file:/F:/system/merlin/lib/system/avalon-assembly-1.0.jar
  -[DEBUG  ] (sys.types): add: [context] org.apache.avalon.assembly.lifecycle.context.AvalonContextuali
  +[DEBUG  ] (sys.types): add: [context] org.apache.avalon.assembly.lifecycle.impl.AvalonContextuali
   zer:1.0.0
  -[DEBUG  ] (sys.types): add: [context] org.apache.avalon.assembly.lifecycle.context.DefaultContextual
  +[DEBUG  ] (sys.types): add: [context] org.apache.avalon.assembly.lifecycle.impl.DefaultContextual
   izer:1.0.0
   [DEBUG  ] (sys.profiles): add: [context] IMPLICIT
   [DEBUG  ] (sys.profiles): add: [context] IMPLICIT
  
  
  

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


Mime
View raw message