You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/09/24 11:36:03 UTC

cvs commit: avalon/merlin - Imported sources

mcconnell    2003/09/24 02:36:03

  Log:
  Initial import of merlin 3.0 beta from sandbox.
  
  Status:
  
  Vendor Tag:	MCCONNELL
  Release Tags:	AVALON_MERLIN_3_0_B1
  
  N avalon/merlin/.cvsignore
  N avalon/merlin/INSTALLATION.TXT
  N avalon/merlin/LICENSE.txt
  N avalon/merlin/maven.xml
  N avalon/merlin/platform.xml
  N avalon/merlin/project.properties
  N avalon/merlin/project.xml
  N avalon/merlin/README.TXT
  N avalon/merlin/roadmap.txt
  N avalon/merlin/STRUCTURE.TXT
  N avalon/merlin/activation/api/.cvsignore
  N avalon/merlin/activation/api/project.xml
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/ApplianceEvent.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/ApplianceException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/ApplianceListener.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/ApplianceRuntimeException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/AssemblyException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/CascadingIOException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/DeploymentException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/DuplicateApplianceException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Home.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/NoProviderDefinitionException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/package.html
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/UnknownServiceException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/ContextualizationHandler.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleCreateExtension.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleDestroyExtension.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleRuntimeException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/package.html
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifestyle/LifestyleException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifestyle/LifestyleRuntimeException.java
  N avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifestyle/package.html
  N avalon/merlin/activation/impl/.cvsignore
  N avalon/merlin/activation/impl/project.xml
  N avalon/merlin/activation/impl/src/etc/demo.mf
  N avalon/merlin/activation/impl/src/etc/project.mf
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/BlockThread.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceMBean.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceContext.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultState.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/package.html
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Resources.properties
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/package.html
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/PooledLifestyleHandler.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/SingletonLifestyleHandler.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/ThreadLifestyleHandler.java
  N avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java
  N avalon/merlin/activation/impl/src/test/conf/block.xml
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.xinfo
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ComplexService.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/DemoManager.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/DemoManager.xinfo
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/Demonstratable.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/Exploitable.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ExploitationManager.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ExploitationManager.xinfo
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/InvalidComponent.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/InvalidComponent.xinfo
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/NullService.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/package.html
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.xconfig
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.xinfo
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/SimpleService.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/TerminalComponent.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/TerminalComponent.xinfo
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xconfig
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xinfo
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xprofile
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicContext.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicContextImp.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicService.java
  N avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicService.xservice
  N avalon/merlin/activation/spi/.cvsignore
  N avalon/merlin/activation/spi/project.xml
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/Appliance.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/Block.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/Composite.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/DependencyGraph.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/Deployable.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/Engine.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/package.html
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ServiceContext.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle/Factory.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle/package.html
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifestyle/LifestyleHandler.java
  N avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifestyle/package.html
  N avalon/merlin/composition/api/.cvsignore
  N avalon/merlin/composition/api/project.xml
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockCompositionDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockIncludeDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/CategoriesDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/CategoryDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ClassLoaderDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ClasspathDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ConstructorDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContextDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/DependencyDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/EntryDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/FilesetDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ImportDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/IncludeDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/LibraryDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/MetaDataException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/MetaDataRuntimeException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Mode.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/package.html
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Parameter.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Profile.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ProfilePackage.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/RepositoryDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ResourceDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/SelectionDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ServiceDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/StageDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/TargetDirective.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Targets.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/logging/LoggerException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/logging/LoggingDescriptor.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/logging/LoggingManager.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/logging/package.html
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/logging/TargetDescriptor.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/logging/TargetProvider.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ClassLoaderContext.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ClassLoaderModel.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentContext.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContextModel.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DependencyModel.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModelFactory.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/EntryModel.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Model.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelFactory.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelRuntimeException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/package.html
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileDuplicateException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileSelector.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileUnknownException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ServiceDuplicateException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ServiceException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ServiceRepository.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ServiceUnknownException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/StageModel.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/SystemContext.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeDuplicateException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeRepository.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeRuntimeException.java
  N avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeUnknownException.java
  N avalon/merlin/composition/impl/.cvsignore
  N avalon/merlin/composition/impl/maven.xml
  N avalon/merlin/composition/impl/project.xml
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ContainmentProfileBuilder.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/package.html
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ProfilePackageBuilder.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/Resources.properties
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/SerializedContainmentProfileCreator.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/SerializedProfilePackageCreator.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/SerializedTargetsCreator.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/TargetsBuilder.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLDeploymentProfileCreator.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfileCreator.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfilePackageCreator.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/package.html
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/SerializedContainmentProfileWriter.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLDeploymentProfileWriter.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/logging/impl/DefaultLoggingManager.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/logging/impl/FileTargetProvider.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/logging/impl/package.html
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/logging/impl/Resources.properties
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderContext.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContext.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultEntryModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultImportModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelSelector.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultProfileSelector.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceRepository.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/NullComponent.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/NullComponent.xinfo
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/package.html
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Resources.properties
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/util/ExceptionHelper.java
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/util/package.html
  N avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/util/StringHelper.java
  N avalon/merlin/composition/impl/src/test/conf/block.xml
  N avalon/merlin/composition/impl/src/test/conf/context.xml
  N avalon/merlin/composition/impl/src/test/conf/data-test.xml
  N avalon/merlin/composition/impl/src/test/conf/dependency.xml
  N avalon/merlin/composition/impl/src/test/conf/includes.xml
  N avalon/merlin/composition/impl/src/test/conf/targets-config.xml
  N avalon/merlin/composition/impl/src/test/conf/targets.xml
  N avalon/merlin/composition/impl/src/test/etc/a.mf
  N avalon/merlin/composition/impl/src/test/etc/b.mf
  N avalon/merlin/composition/impl/src/test/etc/c.mf
  N avalon/merlin/composition/impl/src/test/etc/d.mf
  N avalon/merlin/composition/impl/src/test/etc/e.mf
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/DataTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/CategoryDirectiveTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ConstructorDirectiveTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ContextDirectiveTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/DeploymentProfileTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ImportDirectiveTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/MetaDataExceptionTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/data/test/ParameterTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/DependencyTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/IncludesTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testa/A.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testa/ConfigurableComponent.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testa/ConfigurableComponent.xinfo
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testa/DefaultFacade.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testa/Facade.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testa/TestA.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testa/TestA.xinfo
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testa/TestA.xprofile
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testb/B.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testb/TestB.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testb/TestB.xinfo
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testc/C.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testc/TestC.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testc/TestC.xinfo
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testd/D.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testd/TestD.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/testd/TestD.xinfo
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/teste/E.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/teste/TestE.java
  N avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/teste/TestE.xinfo
  N avalon/merlin/composition/spi/.cvsignore
  N avalon/merlin/composition/spi/project.xml
  N avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/data/builder/ContainmentProfileCreator.java
  N avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/data/builder/package.html
  N avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/data/builder/ProfilePackageCreator.java
  N avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/data/builder/TargetsCreator.java
  N avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/data/writer/ContainmentProfileWriter.java
  N avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/data/writer/package.html
  N avalon/merlin/extension/impl/.cvsignore
  N avalon/merlin/extension/impl/project.properties
  N avalon/merlin/extension/impl/project.xml
  N avalon/merlin/extension/impl/src/java/org/apache/avalon/extension/manager/impl/DefaultExtensionManager.java
  N avalon/merlin/extension/impl/src/java/org/apache/avalon/extension/manager/impl/DelegatingExtensionManager.java
  N avalon/merlin/extension/impl/src/java/org/apache/avalon/extension/manager/impl/NoopExtensionManager.java
  N avalon/merlin/extension/impl/src/java/org/apache/avalon/extension/manager/impl/OptionalPackageComparator.java
  N avalon/merlin/extension/impl/src/java/org/apache/avalon/extension/manager/impl/package.html
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/manager/impl/test/ComparatorTestCase.java
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/manager/impl/test/TestExtensionManager.java
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/DeweyDecimalTestCase.java
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/ExtensionTestCase.java
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-1.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-2.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-3.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-4.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-5.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-6.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-7.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-8.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-9.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/manifest-quoted.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/PackageRepositoryTestCase.java
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-1.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-2.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-3.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-4.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-5.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-6.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-7.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-8.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/specification-9.mf
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/SpecificationTestCase.java
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/path1/ajar-1.jar
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/path1/ajar-2.jar
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/path1/ajar-3.jar
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/path1/ajar-4.jar
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/path2/ajar-5.jar
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/path2/ajar-6.jar
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/path2/ajar-7.jar
  N avalon/merlin/extension/impl/src/test/org/apache/avalon/extension/test/path2/ajar-8.jar
  N avalon/merlin/extension/spi/.cvsignore
  N avalon/merlin/extension/spi/project.xml
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/Compatability.java
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/DeweyDecimal.java
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/Extension.java
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/package.html
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/Specification.java
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/manager/ExtensionManager.java
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/manager/OptionalPackage.java
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/manager/package.html
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/manager/PackageManager.java
  N avalon/merlin/extension/spi/src/java/org/apache/avalon/extension/manager/UnsatisfiedExtensionException.java
  N avalon/merlin/kernel/bootstrap/.cvsignore
  N avalon/merlin/kernel/bootstrap/maven.xml
  N avalon/merlin/kernel/bootstrap/project.xml
  N avalon/merlin/kernel/bootstrap/src/etc/merlin.properties
  N avalon/merlin/kernel/bootstrap/src/etc/project.mf
  N avalon/merlin/kernel/bootstrap/src/java/BootstrapHelper.java
  N avalon/merlin/kernel/bootstrap/src/java/BootstrapRuntimeException.java
  N avalon/merlin/kernel/bootstrap/src/java/Merlin.java
  N avalon/merlin/kernel/bootstrap/src/java/package.html
  N avalon/merlin/kernel/bootstrap/src/java/Resources.properties
  N avalon/merlin/kernel/bootstrap/src/java/Resources_de.properties
  N avalon/merlin/kernel/bootstrap/src/java/Resources_fr.properties
  N avalon/merlin/kernel/impl/.cvsignore
  N avalon/merlin/kernel/impl/project.xml
  N avalon/merlin/kernel/impl/conf/kernel.xml
  N avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/CLIKernelLoader.java
  N avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
  N avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
  N avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelMBean.java
  N avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/JRMPKernelAdaptor.java
  N avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/package.html
  N avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/Resources.properties
  N avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/doc-files/DefaultKernel.gif
  N avalon/merlin/kernel/plugin/.cvsignore
  N avalon/merlin/kernel/plugin/maven.xml
  N avalon/merlin/kernel/plugin/plugin.jelly
  N avalon/merlin/kernel/plugin/plugin.properties
  N avalon/merlin/kernel/plugin/project.xml
  N avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
  N avalon/merlin/kernel/plugin/xdocs/goals.xml
  N avalon/merlin/kernel/plugin/xdocs/navigation.xml
  N avalon/merlin/kernel/plugin/xdocs/properties.xml
  N avalon/merlin/kernel/spi/.cvsignore
  N avalon/merlin/kernel/spi/project.xml
  N avalon/merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel/Controller.java
  N avalon/merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java
  N avalon/merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel/KernelContext.java
  N avalon/merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel/KernelException.java
  N avalon/merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel/KernelRuntimeException.java
  N avalon/merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel/package.html
  N avalon/merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel/doc-files/kernel.gif
  N avalon/merlin/platform/.cvsignore
  N avalon/merlin/platform/README.TXT
  N avalon/merlin/platform/src/bin/merlin-server.sh
  N avalon/merlin/platform/src/bin/merlin.bat
  N avalon/merlin/platform/src/bin/merlin.sh
  N avalon/merlin/platform/src/bin/merlinx.bat
  N avalon/merlin/platform/src/bin/merlinx.sh
  N avalon/merlin/platform/src/bin/README.TXT
  N avalon/merlin/platform/src/bin/security.policy
  N avalon/merlin/platform/src/bin/nt/InstallService-NT.bat
  N avalon/merlin/platform/src/bin/nt/TANUKISOFTWARE_LICENSE.txt
  N avalon/merlin/platform/src/bin/nt/UninstallService-NT.bat
  N avalon/merlin/platform/src/bin/nt/wrapper.conf
  N avalon/merlin/platform/src/bin/nt/Wrapper.dll
  N avalon/merlin/platform/src/bin/nt/Wrapper.exe
  N avalon/merlin/platform/src/bin/nt/wrapper.jar
  N avalon/merlin/platform/src/config/debug.xml
  N avalon/merlin/platform/src/config/kernel.xml
  N avalon/merlin/platform/src/etc/site.jsl
  N avalon/merlin/platform/src/etc/stylesheet.css
  N avalon/merlin/platform/src/repository/merlin/jnlps/merlin.jnlp
  N avalon/merlin/platform/src/repository/merlin/xmls/kernel.xml
  N avalon/merlin/platform/tutorials/.cvsignore
  N avalon/merlin/platform/tutorials/maven.xml
  N avalon/merlin/platform/tutorials/project.xml
  N avalon/merlin/platform/tutorials/README.TXT
  N avalon/merlin/platform/tutorials/composition/.cvsignore
  N avalon/merlin/platform/tutorials/composition/README.txt
  N avalon/merlin/platform/tutorials/composition/application/impl/.cvsignore
  N avalon/merlin/platform/tutorials/composition/application/impl/maven.xml
  N avalon/merlin/platform/tutorials/composition/application/impl/project.xml
  N avalon/merlin/platform/tutorials/composition/application/impl/conf/block.xml
  N avalon/merlin/platform/tutorials/composition/application/impl/conf/debug.xml
  N avalon/merlin/platform/tutorials/composition/application/impl/src/java/tutorial/application/Application.java
  N avalon/merlin/platform/tutorials/composition/location/api/.cvsignore
  N avalon/merlin/platform/tutorials/composition/location/api/maven.xml
  N avalon/merlin/platform/tutorials/composition/location/api/project.xml
  N avalon/merlin/platform/tutorials/composition/location/api/src/java/tutorial/location/LocationService.java
  N avalon/merlin/platform/tutorials/composition/location/impl/.cvsignore
  N avalon/merlin/platform/tutorials/composition/location/impl/maven.xml
  N avalon/merlin/platform/tutorials/composition/location/impl/project.xml
  N avalon/merlin/platform/tutorials/composition/location/impl/conf/block.xml
  N avalon/merlin/platform/tutorials/composition/location/impl/src/java/tutorial/location/LocationComponent.java
  N avalon/merlin/platform/tutorials/composition/location/impl/src/java/tutorial/location/LocationComponent.xprofile
  N avalon/merlin/platform/tutorials/composition/publisher/api/.cvsignore
  N avalon/merlin/platform/tutorials/composition/publisher/api/maven.xml
  N avalon/merlin/platform/tutorials/composition/publisher/api/project.xml
  N avalon/merlin/platform/tutorials/composition/publisher/api/src/java/tutorial/publisher/PublisherService.java
  N avalon/merlin/platform/tutorials/composition/publisher/impl/.cvsignore
  N avalon/merlin/platform/tutorials/composition/publisher/impl/maven.xml
  N avalon/merlin/platform/tutorials/composition/publisher/impl/project.xml
  N avalon/merlin/platform/tutorials/composition/publisher/impl/conf/block.xml
  N avalon/merlin/platform/tutorials/composition/publisher/impl/src/java/tutorial/publisher/PublisherComponent.java
  N avalon/merlin/platform/tutorials/configuration/.cvsignore
  N avalon/merlin/platform/tutorials/configuration/README.TXT
  N avalon/merlin/platform/tutorials/configuration/block/.cvsignore
  N avalon/merlin/platform/tutorials/configuration/block/project.xml
  N avalon/merlin/platform/tutorials/configuration/block/README.TXT
  N avalon/merlin/platform/tutorials/configuration/block/conf/block.xml
  N avalon/merlin/platform/tutorials/configuration/block/conf/categories.xml
  N avalon/merlin/platform/tutorials/configuration/block/conf/config.xml
  N avalon/merlin/platform/tutorials/configuration/block/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/configuration/block/src/java/tutorial/HelloComponent.xconfig
  N avalon/merlin/platform/tutorials/configuration/defaults/.cvsignore
  N avalon/merlin/platform/tutorials/configuration/defaults/project.xml
  N avalon/merlin/platform/tutorials/configuration/defaults/README.TXT
  N avalon/merlin/platform/tutorials/configuration/defaults/conf/block.xml
  N avalon/merlin/platform/tutorials/configuration/defaults/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/configuration/defaults/src/java/tutorial/HelloComponent.xconfig
  N avalon/merlin/platform/tutorials/configuration/override/.cvsignore
  N avalon/merlin/platform/tutorials/configuration/override/project.xml
  N avalon/merlin/platform/tutorials/configuration/override/README.TXT
  N avalon/merlin/platform/tutorials/configuration/override/conf/block.xml
  N avalon/merlin/platform/tutorials/configuration/override/conf/config.xml
  N avalon/merlin/platform/tutorials/configuration/override/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/configuration/override/src/java/tutorial/HelloComponent.xconfig
  N avalon/merlin/platform/tutorials/context/README.TXT
  N avalon/merlin/platform/tutorials/context/avalon/.cvsignore
  N avalon/merlin/platform/tutorials/context/avalon/project.xml
  N avalon/merlin/platform/tutorials/context/avalon/README.TXT
  N avalon/merlin/platform/tutorials/context/avalon/conf/block.xml
  N avalon/merlin/platform/tutorials/context/avalon/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/context/casting/.cvsignore
  N avalon/merlin/platform/tutorials/context/casting/project.xml
  N avalon/merlin/platform/tutorials/context/casting/README.TXT
  N avalon/merlin/platform/tutorials/context/casting/conf/block.xml
  N avalon/merlin/platform/tutorials/context/casting/src/java/tutorial/DemoContext.java
  N avalon/merlin/platform/tutorials/context/casting/src/java/tutorial/DemoContextProvider.java
  N avalon/merlin/platform/tutorials/context/casting/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/context/custom/.cvsignore
  N avalon/merlin/platform/tutorials/context/custom/project.xml
  N avalon/merlin/platform/tutorials/context/custom/README.TXT
  N avalon/merlin/platform/tutorials/context/custom/conf/block.xml
  N avalon/merlin/platform/tutorials/context/custom/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/context/custom/src/java/tutorial/NumberCruncher.java
  N avalon/merlin/platform/tutorials/context/strategy/.cvsignore
  N avalon/merlin/platform/tutorials/context/strategy/project.properties
  N avalon/merlin/platform/tutorials/context/strategy/project.xml
  N avalon/merlin/platform/tutorials/context/strategy/README.TXT
  N avalon/merlin/platform/tutorials/context/strategy/conf/block.xml
  N avalon/merlin/platform/tutorials/context/strategy/src/java/tutorial/Contextualizable.java
  N avalon/merlin/platform/tutorials/context/strategy/src/java/tutorial/DemoContextualizationHandler.java
  N avalon/merlin/platform/tutorials/context/strategy/src/java/tutorial/StandardComponent.java
  N avalon/merlin/platform/tutorials/context/strategy/src/java/tutorial/StandardContext.java
  N avalon/merlin/platform/tutorials/context/strategy/src/java/tutorial/StandardContextImp.java
  N avalon/merlin/platform/tutorials/context/strategy/src/java/tutorial/StandardService.java
  N avalon/merlin/platform/tutorials/dependencies/auto/.cvsignore
  N avalon/merlin/platform/tutorials/dependencies/auto/project.xml
  N avalon/merlin/platform/tutorials/dependencies/auto/README.txt
  N avalon/merlin/platform/tutorials/dependencies/auto/conf/block.xml
  N avalon/merlin/platform/tutorials/dependencies/auto/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/dependencies/auto/src/java/tutorial/Identifiable.java
  N avalon/merlin/platform/tutorials/dependencies/auto/src/java/tutorial/IdentifiableComponent.java
  N avalon/merlin/platform/tutorials/dependencies/auto/src/java/tutorial/RandomGenerator.java
  N avalon/merlin/platform/tutorials/dependencies/auto/src/java/tutorial/RandomGeneratorProvider.java
  N avalon/merlin/platform/tutorials/dependencies/manual/.cvsignore
  N avalon/merlin/platform/tutorials/dependencies/manual/project.xml
  N avalon/merlin/platform/tutorials/dependencies/manual/README.txt
  N avalon/merlin/platform/tutorials/dependencies/manual/conf/block.xml
  N avalon/merlin/platform/tutorials/dependencies/manual/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/dependencies/manual/src/java/tutorial/Identifiable.java
  N avalon/merlin/platform/tutorials/dependencies/manual/src/java/tutorial/IdentifiableComponent.java
  N avalon/merlin/platform/tutorials/hello/.cvsignore
  N avalon/merlin/platform/tutorials/hello/project.properties
  N avalon/merlin/platform/tutorials/hello/project.xml
  N avalon/merlin/platform/tutorials/hello/README.txt
  N avalon/merlin/platform/tutorials/hello/conf/bar.xml
  N avalon/merlin/platform/tutorials/hello/conf/block.xml
  N avalon/merlin/platform/tutorials/hello/conf/config.xml
  N avalon/merlin/platform/tutorials/hello/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/lifecycle/activation/.cvsignore
  N avalon/merlin/platform/tutorials/lifecycle/activation/project.xml
  N avalon/merlin/platform/tutorials/lifecycle/activation/README.TXT
  N avalon/merlin/platform/tutorials/lifecycle/activation/conf/block.xml
  N avalon/merlin/platform/tutorials/lifecycle/activation/src/java/tutorial/Demonstratable.java
  N avalon/merlin/platform/tutorials/lifecycle/activation/src/java/tutorial/DemonstratableProvider.java
  N avalon/merlin/platform/tutorials/lifecycle/activation/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/lifecycle/excalibur/.cvsignore
  N avalon/merlin/platform/tutorials/lifecycle/excalibur/project.xml
  N avalon/merlin/platform/tutorials/lifecycle/excalibur/README.TXT
  N avalon/merlin/platform/tutorials/lifecycle/excalibur/conf/block.xml
  N avalon/merlin/platform/tutorials/lifecycle/excalibur/src/java/tutorial/Demonstratable.java
  N avalon/merlin/platform/tutorials/lifecycle/excalibur/src/java/tutorial/DemonstratableProvider.java
  N avalon/merlin/platform/tutorials/lifecycle/excalibur/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/meta/.cvsignore
  N avalon/merlin/platform/tutorials/meta/project.xml
  N avalon/merlin/platform/tutorials/meta/README.TXT
  N avalon/merlin/platform/tutorials/meta/conf/block.xml
  N avalon/merlin/platform/tutorials/meta/src/java/org/apache/avalon/playground/Primary.java
  N avalon/merlin/platform/tutorials/meta/src/java/org/apache/avalon/playground/PrimaryService.java
  N avalon/merlin/platform/tutorials/meta/src/java/org/apache/avalon/playground/Secondary.java
  N avalon/merlin/platform/tutorials/meta/src/java/org/apache/avalon/playground/SecondaryService.java
  N avalon/merlin/platform/tutorials/mixed/build.xml
  N avalon/merlin/platform/tutorials/mixed/README.TXT
  N avalon/merlin/platform/tutorials/mixed/src/config/block.xml
  N avalon/merlin/platform/tutorials/mixed/src/config/config.xml
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/DemoContext.java
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/DemoContextProvider.java
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/HelloComponent.xinfo
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/NumberCruncher.java
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/RandomGenerator.java
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/RandomGeneratorProvider.java
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/RandomGeneratorProvider.xinfo
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/RandomGeneratorProvider.xprofile
  N avalon/merlin/platform/tutorials/mixed/src/java/tutorial/RandomProfileSelector.java
  N avalon/merlin/platform/tutorials/profiles/build.xml
  N avalon/merlin/platform/tutorials/profiles/src/config/block.xml
  N avalon/merlin/platform/tutorials/profiles/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/profiles/src/java/tutorial/HelloComponent.xinfo
  N avalon/merlin/platform/tutorials/profiles/src/java/tutorial/RandomGenerator.java
  N avalon/merlin/platform/tutorials/profiles/src/java/tutorial/RandomGeneratorProvider.java
  N avalon/merlin/platform/tutorials/profiles/src/java/tutorial/RandomGeneratorProvider.xinfo
  N avalon/merlin/platform/tutorials/profiles/src/java/tutorial/RandomGeneratorProvider.xprofile
  N avalon/merlin/platform/tutorials/profile_selection/build.xml
  N avalon/merlin/platform/tutorials/profile_selection/src/config/block.xml
  N avalon/merlin/platform/tutorials/profile_selection/src/java/tutorial/HelloComponent.java
  N avalon/merlin/platform/tutorials/profile_selection/src/java/tutorial/HelloComponent.xinfo
  N avalon/merlin/platform/tutorials/profile_selection/src/java/tutorial/RandomGenerator.java
  N avalon/merlin/platform/tutorials/profile_selection/src/java/tutorial/RandomGeneratorProvider.java
  N avalon/merlin/platform/tutorials/profile_selection/src/java/tutorial/RandomGeneratorProvider.xinfo
  N avalon/merlin/platform/tutorials/profile_selection/src/java/tutorial/RandomGeneratorProvider.xprofile
  N avalon/merlin/platform/tutorials/profile_selection/src/java/tutorial/RandomProfileSelector.java
  N avalon/merlin/platform/xdocs/index.xml
  N avalon/merlin/platform/xdocs/navigation.xml
  N avalon/merlin/platform/xdocs/about/benefits.xml
  N avalon/merlin/platform/xdocs/about/features.xml
  N avalon/merlin/platform/xdocs/about/index.xml
  N avalon/merlin/platform/xdocs/about/navigation.xml
  N avalon/merlin/platform/xdocs/about/purpose.xml
  N avalon/merlin/platform/xdocs/dpml/index.xml
  N avalon/merlin/platform/xdocs/dpml/navigation.xml
  N avalon/merlin/platform/xdocs/extensions/jndi/index.xml
  N avalon/merlin/platform/xdocs/extensions/jndi/navigation.xml
  N avalon/merlin/platform/xdocs/extensions/servlet/index.xml
  N avalon/merlin/platform/xdocs/extensions/servlet/navigation.xml
  N avalon/merlin/platform/xdocs/images/asf_logo_wide.gif
  N avalon/merlin/platform/xdocs/images/cover.gif
  N avalon/merlin/platform/xdocs/images/merlin-service-dialog.gif
  N avalon/merlin/platform/xdocs/images/meta.gif
  N avalon/merlin/platform/xdocs/images/overview.gif
  N avalon/merlin/platform/xdocs/images/packages.gif
  N avalon/merlin/platform/xdocs/images/Profile.gif
  N avalon/merlin/platform/xdocs/images/service-dialog.gif
  N avalon/merlin/platform/xdocs/images/service.gif
  N avalon/merlin/platform/xdocs/images/ServiceDefinition.gif
  N avalon/merlin/platform/xdocs/images/simple-servlet.gif
  N avalon/merlin/platform/xdocs/images/Type.gif
  N avalon/merlin/platform/xdocs/images/uml-top-level.gif
  N avalon/merlin/platform/xdocs/merlin/index.xml
  N avalon/merlin/platform/xdocs/merlin/navigation.xml
  N avalon/merlin/platform/xdocs/merlin/appliance/assembly.xml
  N avalon/merlin/platform/xdocs/merlin/appliance/index.xml
  N avalon/merlin/platform/xdocs/merlin/appliance/lifecycle.xml
  N avalon/merlin/platform/xdocs/merlin/appliance/lifestyle.xml
  N avalon/merlin/platform/xdocs/merlin/appliance/navigation.xml
  N avalon/merlin/platform/xdocs/merlin/block/index.xml
  N avalon/merlin/platform/xdocs/merlin/block/navigation.xml
  N avalon/merlin/platform/xdocs/merlin/kernel/cli.xml
  N avalon/merlin/platform/xdocs/merlin/kernel/index.xml
  N avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml
  N avalon/merlin/platform/xdocs/merlin/kernel/nt.xml
  N avalon/merlin/platform/xdocs/meta/index.xml
  N avalon/merlin/platform/xdocs/meta/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/categories.xml
  N avalon/merlin/platform/xdocs/meta/block/components.xml
  N avalon/merlin/platform/xdocs/meta/block/includes.xml
  N avalon/merlin/platform/xdocs/meta/block/index.xml
  N avalon/merlin/platform/xdocs/meta/block/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/extensions.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/index.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/classpath/fileset.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/classpath/index.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/classpath/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/classpath/repository.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/classpath/repository/index.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/classloader/classpath/repository/resource.xml
  N avalon/merlin/platform/xdocs/meta/block/components/configuration.xml
  N avalon/merlin/platform/xdocs/meta/block/components/index.xml
  N avalon/merlin/platform/xdocs/meta/block/components/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/components/categories/category.xml
  N avalon/merlin/platform/xdocs/meta/block/components/categories/index.xml
  N avalon/merlin/platform/xdocs/meta/block/components/categories/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/components/context/index.xml
  N avalon/merlin/platform/xdocs/meta/block/components/context/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/components/context/entry/import.xml
  N avalon/merlin/platform/xdocs/meta/block/components/context/entry/index.xml
  N avalon/merlin/platform/xdocs/meta/block/components/context/entry/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/components/context/entry/constructor/index.xml
  N avalon/merlin/platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/components/context/entry/constructor/param.xml
  N avalon/merlin/platform/xdocs/meta/block/components/dependencies/dependency.xml
  N avalon/merlin/platform/xdocs/meta/block/components/dependencies/index.xml
  N avalon/merlin/platform/xdocs/meta/block/components/dependencies/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/components/parameters/index.xml
  N avalon/merlin/platform/xdocs/meta/block/components/parameters/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/components/parameters/parameter.xml
  N avalon/merlin/platform/xdocs/meta/block/include/index.xml
  N avalon/merlin/platform/xdocs/meta/block/include/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/include/resource.xml
  N avalon/merlin/platform/xdocs/meta/block/include/source.xml
  N avalon/merlin/platform/xdocs/meta/block/services/index.xml
  N avalon/merlin/platform/xdocs/meta/block/services/navigation.xml
  N avalon/merlin/platform/xdocs/meta/block/services/service.xml
  N avalon/merlin/platform/xdocs/meta/config/index.xml
  N avalon/merlin/platform/xdocs/meta/config/navigation.xml
  N avalon/merlin/platform/xdocs/meta/kernel/index.xml
  N avalon/merlin/platform/xdocs/meta/kernel/navigation.xml
  N avalon/merlin/platform/xdocs/meta/kernel/logging/category.xml
  N avalon/merlin/platform/xdocs/meta/kernel/logging/index.xml
  N avalon/merlin/platform/xdocs/meta/kernel/logging/navigation.xml
  N avalon/merlin/platform/xdocs/meta/kernel/logging/target.xml
  N avalon/merlin/platform/xdocs/meta/kernel/repository/cache.xml
  N avalon/merlin/platform/xdocs/meta/kernel/repository/hosts.xml
  N avalon/merlin/platform/xdocs/meta/kernel/repository/index.xml
  N avalon/merlin/platform/xdocs/meta/kernel/repository/navigation.xml
  N avalon/merlin/platform/xdocs/meta/kernel/repository/proxy.xml
  N avalon/merlin/platform/xdocs/resources/ccm.xml
  N avalon/merlin/platform/xdocs/resources/download.xml
  N avalon/merlin/platform/xdocs/resources/index.xml
  N avalon/merlin/platform/xdocs/resources/navigation.xml
  N avalon/merlin/platform/xdocs/resources/notebook.xml
  N avalon/merlin/platform/xdocs/resources/roadmap/evolution.xml
  N avalon/merlin/platform/xdocs/resources/roadmap/index.xml
  N avalon/merlin/platform/xdocs/resources/roadmap/navigation.xml
  N avalon/merlin/platform/xdocs/resources/roadmap/technical.xml
  N avalon/merlin/platform/xdocs/starting/index.xml
  N avalon/merlin/platform/xdocs/starting/installation.xml
  N avalon/merlin/platform/xdocs/starting/navigation.xml
  N avalon/merlin/platform/xdocs/starting/advanced/appliance.xml
  N avalon/merlin/platform/xdocs/starting/advanced/block.xml
  N avalon/merlin/platform/xdocs/starting/advanced/composite.xml
  N avalon/merlin/platform/xdocs/starting/advanced/containers.xml
  N avalon/merlin/platform/xdocs/starting/advanced/context.xml
  N avalon/merlin/platform/xdocs/starting/advanced/export.xml
  N avalon/merlin/platform/xdocs/starting/advanced/import.xml
  N avalon/merlin/platform/xdocs/starting/advanced/includes.xml
  N avalon/merlin/platform/xdocs/starting/advanced/index.xml
  N avalon/merlin/platform/xdocs/starting/advanced/navigation.xml
  N avalon/merlin/platform/xdocs/starting/advanced/profiles.xml
  N avalon/merlin/platform/xdocs/starting/advanced/selectors.xml
  N avalon/merlin/platform/xdocs/starting/advanced/lifecycle/example.xml
  N avalon/merlin/platform/xdocs/starting/advanced/lifecycle/extension.xml
  N avalon/merlin/platform/xdocs/starting/advanced/lifecycle/index.xml
  N avalon/merlin/platform/xdocs/starting/advanced/lifecycle/interfaces.xml
  N avalon/merlin/platform/xdocs/starting/advanced/lifecycle/navigation.xml
  N avalon/merlin/platform/xdocs/starting/examples/index.xml
  N avalon/merlin/platform/xdocs/starting/examples/navigation.xml
  N avalon/merlin/platform/xdocs/starting/examples/afs/index.xml
  N avalon/merlin/platform/xdocs/starting/examples/afs/navigation.xml
  N avalon/merlin/platform/xdocs/starting/examples/afs/simple/build.xml
  N avalon/merlin/platform/xdocs/starting/examples/afs/simple/implementation.xml
  N avalon/merlin/platform/xdocs/starting/examples/afs/simple/index.xml
  N avalon/merlin/platform/xdocs/starting/examples/afs/simple/interfaces.xml
  N avalon/merlin/platform/xdocs/starting/examples/afs/simple/navigation.xml
  N avalon/merlin/platform/xdocs/starting/examples/afs/simple/servlet.xml
  N avalon/merlin/platform/xdocs/starting/examples/james/about.xml
  N avalon/merlin/platform/xdocs/starting/examples/james/block.xml
  N avalon/merlin/platform/xdocs/starting/examples/james/index.xml
  N avalon/merlin/platform/xdocs/starting/examples/james/navigation.xml
  N avalon/merlin/platform/xdocs/starting/examples/james/resources.xml
  N avalon/merlin/platform/xdocs/starting/examples/james/runtime.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/creation.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/dependencies.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/execution.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/index.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/internal.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/navigation.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/services.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/config/block.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/config/configurable.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/config/defaults.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/config/index.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/config/navigation.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/config/override.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/context/casting.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/context/entries.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/context/index.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/context/navigation.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/context/standard.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/dependencies/auto.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/dependencies/index.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/dependencies/manual.xml
  N avalon/merlin/platform/xdocs/starting/tutorial/dependencies/navigation.xml
  N avalon/merlin/platform/xdocs/tools/ant.xml
  N avalon/merlin/platform/xdocs/tools/index.xml
  N avalon/merlin/platform/xdocs/tools/navigation.xml
  N avalon/merlin/platform/xdocs/tools/maven/deploy.xml
  N avalon/merlin/platform/xdocs/tools/maven/index.xml
  N avalon/merlin/platform/xdocs/tools/maven/meta.xml
  N avalon/merlin/platform/xdocs/tools/maven/navigation.xml
  N avalon/merlin/platform/xdocs/tools/maven/properties.xml
  N avalon/merlin/platform/xdocs/tools/maven/replicate.xml
  N avalon/merlin/platform/xdocs/tools/tags/attribute.xml
  N avalon/merlin/platform/xdocs/tools/tags/context.xml
  N avalon/merlin/platform/xdocs/tools/tags/dependency.xml
  N avalon/merlin/platform/xdocs/tools/tags/entry.xml
  N avalon/merlin/platform/xdocs/tools/tags/extension.xml
  N avalon/merlin/platform/xdocs/tools/tags/index.xml
  N avalon/merlin/platform/xdocs/tools/tags/lifestyle.xml
  N avalon/merlin/platform/xdocs/tools/tags/logger.xml
  N avalon/merlin/platform/xdocs/tools/tags/name.xml
  N avalon/merlin/platform/xdocs/tools/tags/namespace.xml
  N avalon/merlin/platform/xdocs/tools/tags/navigation.xml
  N avalon/merlin/platform/xdocs/tools/tags/service.xml
  N avalon/merlin/platform/xdocs/tools/tags/stage.xml
  N avalon/merlin/platform/xdocs/tools/tags/version.xml
  N avalon/merlin/repository/impl/.cvsignore
  N avalon/merlin/repository/impl/project.xml
  N avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultAuthenticator.java
  N avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultBlockManifest.java
  N avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFileRepository.java
  N avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/HttpController.java
  N avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/package.html
  N avalon/merlin/repository/impl/src/test/org/apache/avalon/repository/LocalRepositoryTestCase.java
  N avalon/merlin/repository/spi/.cvsignore
  N avalon/merlin/repository/spi/project.xml
  N avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/BlockManifest.java
  N avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/package.html
  N avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/ProxyContext.java
  N avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/Repository.java
  N avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryException.java
  
  No conflicts created by this import

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