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/03/13 02:06:35 UTC
cvs commit: avalon-sandbox/merlin - Imported sources
mcconnell 2003/03/12 17:06:35
Log:
Initial import of the consolidation of the Merlin, Assembly and Meta packages.
Status:
Vendor Tag: ASF
Release Tags: MERLIN_1
C avalon-sandbox/merlin/.cvsignore
N avalon-sandbox/merlin/maven.xml
N avalon-sandbox/merlin/project.xml
N avalon-sandbox/merlin/WARNING.txt
N avalon-sandbox/merlin/assembly/.cvsignore
N avalon-sandbox/merlin/assembly/project.xml
N avalon-sandbox/merlin/assembly/src/etc/checkstyle.properties
N avalon-sandbox/merlin/assembly/src/etc/demo.mf
N avalon-sandbox/merlin/assembly/src/etc/project.mf
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/ApplianceHolder.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/ApplianceURLConnection.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/ContextBuilder.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceContext.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceFactory.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceRepository.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceSelector.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/Handler.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/MappedServiceManager.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/DefaultRepositoryManager.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/EngineClassLoader.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/Resources.properties
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/model/EngineConfigurationHelper.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/model/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/model/Resources.properties
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/profile/DefaultProfileSelector.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/profile/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/profile/StandardProfileManager.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/service/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/service/StandardServiceManager.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/type/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/type/StandardTypeManager.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/AssemblyException.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/AssemblyService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/DefaultAssemblyService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/DefaultDeploymentService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/DeploymentException.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/DeploymentService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/LifecycleException.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/LifecycleRuntimeException.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/UnresolvedManagerException.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/UnresolvedProviderException.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/ConfigurationService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/DefaultConfigurationService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/AbstractContextualizer.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/AvalonContextualizer.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/AvalonContextualizer.xinfo
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/AvalonServiceManager.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/ComponentInvocationHandler.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/Contextualization.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/ContextualizationService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/DefaultCompositionService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/DefaultContextualizationService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/DefaultContextualizer.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/DefaultContextualizer.xinfo
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/WrapperComponentManager.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/context/WrapperComponentSelector.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/DefaultDisposalService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/DisposalService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/ExtendedDisposalService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization/DefaultInitializationService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization/ExtendedInitializationService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization/InitializationService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/logging/DefaultLoggingService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/logging/LoggingService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/logging/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/AbstractLifestyleHandler.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/DefaultLifestyleService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/LifestyleException.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/LifestyleHandler.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/LifestyleRuntimeException.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/LifestyleService.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/PooledLifestyleHandler.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/SingletonLifestyleHandler.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/ThreadLocalLifestyleHandler.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/TransientLifestyleHandler.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/locator/DefaultLocator.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/locator/Dictionary.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/locator/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/logging/DefaultLoggingManager.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/logging/FileTargetProvider.java
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/logging/package.html
N avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/logging/Resources.properties
N avalon-sandbox/merlin/assembly/src/test/config/block.xml
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/TestBase.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/EngineTestCase.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/FactoryTestCase.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/profile/ProfileManagerTestCase.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/service/ServiceManagerTestCase.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/type/TypeManagerTestCase.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ComplexComponent.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ComplexComponent.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ComplexService.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/DemoManager.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/DemoManager.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/Demonstratable.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/Exploitable.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ExploitationManager.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ExploitationManager.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/InvalidComponent.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/InvalidComponent.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/NullService.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/package.html
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/SimpleComponent.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/SimpleComponent.xconfig
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/SimpleComponent.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/SimpleService.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/TerminalComponent.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/TerminalComponent.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicComponent.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicComponent.xconfig
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicComponent.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicComponent.xprofile
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicContext.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicContextImp.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicService.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicService.xservice
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomAppliance.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomAppliance.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomApplianceFactory.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomApplianceFactory.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomComponent.java
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomComponent.xinfo
N avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomService.java
N avalon-sandbox/merlin/assembly-spi/.cvsignore
N avalon-sandbox/merlin/assembly-spi/project.xml
N avalon-sandbox/merlin/assembly-spi/src/etc/project.mf
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceFactory.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceRepository.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceRuntimeException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceSelector.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/DependencyGraph.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/DuplicateApplianceException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/package.html
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/Engine.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/EngineException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/EngineRuntimeException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/package.html
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/RepositoryManager.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/Classpath.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/ClasspathDescriptor.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/ClasspathRuntimeException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/FilesetDescriptor.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/IncludeDescriptor.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/LibraryDescriptor.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/package.html
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/Resources.properties
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/profile/DuplicateProfileException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/profile/package.html
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/profile/ProfileException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/profile/ProfileManager.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/profile/ProfileSelector.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/profile/UnknownProfileException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/service/DuplicateServiceException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/service/package.html
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/service/ServiceException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/service/ServiceManager.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/service/ServiceRuntimeException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/service/UnknownServiceException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/type/DuplicateTypeException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/type/package.html
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/type/TypeException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/type/TypeManager.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/type/TypeRuntimeException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/type/UnknownTypeException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator/Contextualizable.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator/Locator.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator/LocatorException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator/package.html
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator/Reclaimable.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/locator/Resolvable.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/LoggerException.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/LoggingDescriptor.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/LoggingManager.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/package.html
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/TargetDescriptor.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/TargetProvider.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/util/ExceptionHelper.java
N avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/util/package.html
N avalon-sandbox/merlin/merlin-cli/.cvsignore
N avalon-sandbox/merlin/merlin-cli/maven.xml
N avalon-sandbox/merlin/merlin-cli/project.xml
N avalon-sandbox/merlin/merlin-cli/installation/lib/system/commons-cli-1.0.jar
N avalon-sandbox/merlin/merlin-cli/installation/lib/system/excalibur-i18n-1.0.jar
N avalon-sandbox/merlin/merlin-cli/src/etc/project.mf
N avalon-sandbox/merlin/merlin-cli/src/java/BootstrapRuntimeException.java
N avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java
N avalon-sandbox/merlin/merlin-cli/src/java/package.html
N avalon-sandbox/merlin/merlin-cli/src/java/Resources.properties
N avalon-sandbox/merlin/merlin-cli/src/java/Resources_de.properties
N avalon-sandbox/merlin/merlin-cli/src/java/Resources_fr.properties
N avalon-sandbox/merlin/merlin-core/.cvsignore
N avalon-sandbox/merlin/merlin-core/project.xml
N avalon-sandbox/merlin/merlin-core/src/etc/demo.mf
N avalon-sandbox/merlin/merlin-core/src/etc/project.mf
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/package.html
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/BlockLoader.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/Library.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/package.html
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlock.xinfo
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/package.html
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/Container.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/ContainerDescriptor.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/ContainerException.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/ContainerRuntimeException.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/package.html
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/StateEvent.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/StateListener.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/ContainerBuilder.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/ContainerCreator.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/package.html
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/Resources.properties
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/builder/XMLContainerCreator.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.xinfo
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/package.html
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/doc-files/DefaultKernel.gif
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/doc-files/Kernel.gif
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.xinfo
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelLoader.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/package.html
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/Resources.properties
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/DefaultRegistry.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/Handler.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/InvalidPathException.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/package.html
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/Registry.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/ServiceException.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/ServiceLocator.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/ServiceManagementContext.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/ServicePublisher.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/ServiceRuntimeException.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/ServiceURLConnection.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/ServiceURLFactory.java
N avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/service/UnknownServiceException.java
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/merlin/kernel/KernelTestCase.java
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/Contextualizable.java
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/ContextualizationHandler.java
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/ContextualizationHandler.xinfo
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardComponent.java
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardComponent.xconfig
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardComponent.xinfo
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardComponent.xprofile
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardContext.java
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardContext.xservice
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardContextImp.java
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardService.java
N avalon-sandbox/merlin/merlin-core/src/test/org/apache/avalon/playground/StandardService.xservice
N avalon-sandbox/merlin/merlin-extensions/merlin-jndi/.cvsignore
N avalon-sandbox/merlin/merlin-extensions/merlin-jndi/project.xml
N avalon-sandbox/merlin/merlin-extensions/merlin-jndi/src/etc/project.mf
N avalon-sandbox/merlin/merlin-extensions/merlin-jndi/src/java/org/apache/avalon/merlin/jndi/ExceptionHelper.java
N avalon-sandbox/merlin/merlin-extensions/merlin-jndi/src/java/org/apache/avalon/merlin/jndi/Service.java
N avalon-sandbox/merlin/merlin-extensions/merlin-jndi/src/java/org/apache/avalon/merlin/jndi/ServiceFactory.java
N avalon-sandbox/merlin/merlin-smp/maven.xml
N avalon-sandbox/merlin/merlin-smp/project.properties
N avalon-sandbox/merlin/merlin-smp/project.xml
N avalon-sandbox/merlin/merlin-smp/README.TXT
N avalon-sandbox/merlin/merlin-smp/lib/Wrapper.dll
N avalon-sandbox/merlin/merlin-smp/lib/wrapper.jar
N avalon-sandbox/merlin/merlin-smp/src/bin/InstallService-NT.bat
N avalon-sandbox/merlin/merlin-smp/src/bin/merlin.bat
N avalon-sandbox/merlin/merlin-smp/src/bin/UninstallService-NT.bat
N avalon-sandbox/merlin/merlin-smp/src/bin/Wrapper.exe
N avalon-sandbox/merlin/merlin-smp/src/config/kernel-service.xml
N avalon-sandbox/merlin/merlin-smp/src/config/kernel.xml
N avalon-sandbox/merlin/merlin-smp/src/config/wrapper.conf
N avalon-sandbox/merlin/merlin-smp/src/etc/LICENSE.txt
N avalon-sandbox/merlin/merlin-smp/src/etc/stylesheet.css
N avalon-sandbox/merlin/merlin-smp/src/java/PLACEHOLDER.TXT
N avalon-sandbox/merlin/merlin-smp/src/repository/README.TXT
N avalon-sandbox/merlin/merlin-smp/src/repository/composite/block.xml
N avalon-sandbox/merlin/merlin-smp/src/repository/demo/block.xml
N avalon-sandbox/merlin/merlin-smp/src/repository/demo/config.xml
N avalon-sandbox/merlin/merlin-smp/src/repository/james/block.xml
N avalon-sandbox/merlin/merlin-smp/src/repository/james/config.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/info/container.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/info/containers.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/info/deployment.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/info/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/info/kernel.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/info/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/starting/dictionary.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/starting/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/starting/installation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/about/starting/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/detail/appliance.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/detail/engine.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/detail/lifecycle.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/detail/lifestyle.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/detail/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/detail/structure.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/info/how.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/info/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/info/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/assembly/info/why.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/extensions/jndi/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/extensions/jndi/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/images/meta.gif
N avalon-sandbox/merlin/merlin-smp/xdocs/images/overview.gif
N avalon-sandbox/merlin/merlin-smp/xdocs/images/packages.gif
N avalon-sandbox/merlin/merlin-smp/xdocs/images/Profile.gif
N avalon-sandbox/merlin/merlin-smp/xdocs/images/ServiceDefinition.gif
N avalon-sandbox/merlin/merlin-smp/xdocs/images/Type.gif
N avalon-sandbox/merlin/merlin-smp/xdocs/merlin/facilities/activation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/merlin/facilities/assembly.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/merlin/facilities/classpath.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/merlin/facilities/export.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/merlin/facilities/extensions.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/merlin/facilities/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/merlin/facilities/logging.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/merlin/facilities/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/context.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/dependencies.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/extensions.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/logging.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/services.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/stages.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/navigation.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/profile.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/service/index.xml
N avalon-sandbox/merlin/merlin-smp/xdocs/meta/service/navigation.xml
N avalon-sandbox/merlin/merlin-spi/project.xml
N avalon-sandbox/merlin/merlin-spi/src/etc/project.mf
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block/Block.java
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block/BlockException.java
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block/BlockRuntimeException.java
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/block/package.html
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/KernelException.java
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/KernelLoader.java
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/KernelRuntimeException.java
N avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/package.html
N avalon-sandbox/merlin/meta/.cvsignore
N avalon-sandbox/merlin/meta/project.xml
N avalon-sandbox/merlin/meta/src/etc/project.mf
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/ConfigurationBuilder.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/DTDInfo.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/DTDResolver.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/package.html
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/BlockBuilder.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/package.html
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/Resources.properties
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/SerializedServiceCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/SerializedTypeCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/ServiceBuilder.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/ServiceCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/TypeCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/TypeFactory.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLBlockCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLServiceCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/doc-files/ServiceBuilder.gif
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/doc-files/TypeBuilder.gif
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/package.html
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/ProfileBuilder.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/ProfileCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/Resources.properties
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/verifier/package.html
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/verifier/ProfileVerifier.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/verifier/Resources.properties
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/verifier/ComponentVerifier.java
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/verifier/package.html
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/verifier/Resources.properties
N avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/verifier/VerifyException.java
N avalon-sandbox/merlin/meta-spi/.cvsignore
N avalon-sandbox/merlin/meta-spi/project.xml
N avalon-sandbox/merlin/meta-spi/src/etc/project.mf
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/blockinfo.dtd
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/package.html
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/service.dtd
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/type.dtd
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/ContextDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/DependencyDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/Descriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/EntryDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/ExtensionDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/InfoDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/LoggerDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/package.html
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/ReferenceDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/Resources.properties
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/Service.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/ServiceDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/StageDescriptor.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/Type.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/doc-files/Type.gif
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Category.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/ContextDirective.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Entry.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Import.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/LoggingDirective.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Mode.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/ModelException.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/ModelRuntimeException.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/package.html
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Parameter.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/README.TXT
N avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/doc-files/uml.gif
1 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jASF:yesterday -jASF avalon-sandbox/merlin
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org