mcconnell 2004/01/13 03:41:31
Modified: merlin INSTALL.TXT LICENSE.txt README.TXT maven.xml
project.properties project.xml
merlin/activation/api project.xml
merlin/activation/api/src/java/org/apache/avalon/activation/appliance
Appliance.java Engine.java
FatalDeploymentException.java
merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle
LifecycleCreateExtension.java
LifecycleDestroyExtension.java
merlin/activation/impl project.xml
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
AbstractAppliance.java AbstractBlock.java
CompositeBlock.java DefaultAppliance.java
DefaultBlockContext.java DefaultServiceManager.java
Deployer.java DeploymentRequest.java
Resources.properties
merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl
AbstractLifestyleHandler.java
TransientLifestyleHandler.java
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
AbstractTestCase.java RuntimeTestCase.java
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/impl
DeploymentTestCase.java
merlin/activation/impl/src/test/org/apache/avalon/playground
ComplexComponent.java SimpleComponent.xinfo
merlin/activation/impl/src/test/org/apache/avalon/playground/basic
BasicComponent.xprofile
merlin/activation/spi project.xml
merlin/activation/spi/src/java/org/apache/avalon/activation/appliance
ApplianceFactory.java BlockContext.java
merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle
Factory.java
merlin/composition/api project.xml
merlin/composition/api/src/java/org/apache/avalon/composition/data
BlockCompositionDirective.java
BlockIncludeDirective.java ContainmentProfile.java
DeploymentProfile.java Mode.java
ProfilePackage.java
merlin/composition/api/src/java/org/apache/avalon/composition/event
CompositionEvent.java ModelEvent.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
ContainmentContext.java ContainmentModel.java
ContextModel.java DependencyModel.java
DeploymentContext.java DeploymentModel.java
ModelFactory.java ModelSelector.java
ProfileSelector.java StageModel.java
SystemContext.java TypeRepository.java
merlin/composition/impl maven.xml project.xml
merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
ProfilePackageBuilder.java
XMLContainmentProfileCreator.java
XMLProfilePackageCreator.java
XMLTargetsCreator.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer
XMLContainmentProfileWriter.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultConstructorModel.java
DefaultContainmentContext.java
DefaultContainmentModel.java DefaultContext.java
DefaultContextModel.java
DefaultDependencyModel.java
DefaultDeploymentContext.java
DefaultDeploymentModel.java DefaultImportModel.java
DefaultModelFactory.java DefaultModelSelector.java
DefaultProfileSelector.java DefaultStageModel.java
DefaultSystemContext.java
DefaultTypeRepository.java Resources.properties
Scanner.java
merlin/composition/impl/src/test/conf block.xml
merlin/composition/impl/src/test/org/apache/avalon/composition/model
AbstractTestCase.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
ContextTestCase.java DependencyTestCase.java
IncludesTestCase.java TargetsTestCase.java
merlin/composition/spi project.xml
merlin/kernel/api project.xml
merlin/kernel/cli project.xml
merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli
Main.java
merlin/kernel/impl maven.xml project.xml
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultFactory.java DefaultKernel.java
merlin/kernel/plugin project.xml
merlin/kernel/servlet project.xml
merlin/kernel/unit maven.xml project.xml
merlin/platform/installer/src/nsis merlin.nsi
merlin/platform/src/bin merlin merlin-server.sh merlin.bat
merlin.sh merlinx.bat merlinx.sh
merlin/platform/src/bin/nt wrapper.conf
merlin/platform/src/config debug.xml kernel.xml
merlin/platform/tutorials/context/strategy project.xml
merlin/platform/tutorials/hello project.xml
merlin/platform/tutorials/lifecycle/activation project.xml
merlin/platform/tutorials/lifecycle/activation/src/java/tutorial
DemonstratableProvider.java
merlin/platform/tutorials/parameterization project.xml
merlin/platform/xdocs/merlin/kernel index.xml
merlin/platform/xdocs/meta/kernel/parameters index.xml
navigation.xml
merlin/platform/xdocs/meta/kernel/repository navigation.xml
merlin/platform/xdocs/resources index.xml
merlin/platform/xdocs/starting/advanced profiles.xml
merlin/platform/xdocs/starting/installation/3.0 index.xml
Added:
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
DefaultBlock.java
merlin/composition/api/src/java/org/apache/avalon/composition/data
ComponentProfile.java NamedComponentProfile.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
AssemblyException.java ComponentContext.java
ComponentModel.java DependencyGraph.java
Dependent.java ModelRepository.java
ServiceModel.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
XMLComponentProfileCreator.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer
XMLComponentProfileWriter.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultComponentContext.java
DefaultComponentModel.java DefaultDependent.java
DefaultModelRepository.java
DefaultServiceModel.java DefaultState.java
DelegatingSystemContext.java
merlin/composition/impl/src/test/conf playground.xml
merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
AssemblyTestCase.java PlaygroundTestCase.java
merlin/platform/installer/src/nsis path.nsh
merlin/composition/api/src/test/org/apache/avalon/composition/data/test
CategoryDirectiveTestCase.java
ComponentProfileTestCase.java
ConstructorDirectiveTestCase.java
ContextDirectiveTestCase.java
ImportDirectiveTestCase.java
MetaDataExceptionTestCase.java
ParameterTestCase.java
merlin/composition/impl/src/test/org/apache/avalon/playground
ComplexComponent.java ComplexComponent.xinfo
ComplexService.java DemoManager.java
DemoManager.xinfo Demonstratable.java
Exploitable.java ExploitationManager.java
ExploitationManager.xinfo InvalidComponent.java
InvalidComponent.xinfo NullService.java
SimpleComponent.java SimpleComponent.xconfig
SimpleComponent.xinfo SimpleService.java
TerminalComponent.java TerminalComponent.xinfo
package.html
merlin/composition/impl/src/test/org/apache/avalon/playground/basic
BasicComponent.java BasicComponent.xconfig
BasicComponent.xinfo BasicComponent.xprofile
BasicContext.java BasicContextImp.java
BasicService.java BasicService.xservice
merlin/kernel/api/src/java/org/apache/avalon/merlin/event
KernelEvent.java KernelEventListener.java
package.html
merlin/kernel/jmx/src/java/org/apache/avalon/merlin/jmx
DefaultKernelMBean.java package.html
Removed: merlin platform.xml
merlin/activation/api/src/java/org/apache/avalon/activation/appliance
Composite.java
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
DefaultApplianceMBean.java
DefaultApplianceRepository.java
DefaultServiceContext.java
merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl
PooledLifestyleHandler.java
merlin/activation/spi/src/java/org/apache/avalon/activation/appliance
ApplianceRepository.java DependencyGraph.java
ServiceContext.java
merlin/composition/api/src/java/org/apache/avalon/composition/data
NamedDeploymentProfile.java Profile.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
DeploymentModelFactory.java Model.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
XMLDeploymentProfileCreator.java
merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer
XMLDeploymentProfileWriter.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultModel.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultKernelMBean.java
merlin/activation/impl/src/etc demo.mf project.mf
merlin/composition/impl/src/java/org/apache/avalon/composition/util
ExceptionHelper.java
merlin/composition/impl/src/test/org/apache/avalon/composition/data/test
CategoryDirectiveTestCase.java
ConstructorDirectiveTestCase.java
ContextDirectiveTestCase.java
DeploymentProfileTestCase.java
ImportDirectiveTestCase.java
MetaDataExceptionTestCase.java
ParameterTestCase.java
merlin/web/http/api .cvsignore maven.xml project.xml
merlin/web/http/api/src/java/org/apache/avalon/merlin/http
SessionManager.java WebServer.java
merlin/web/http/api/src/java/org/apache/avalon/merlin/http/example
ExampleService.java
merlin/web/http/impl .cvsignore maven.xml project.xml
merlin/web/http/impl/conf avalon-http-1.3.block block.xml
merlin/web/http/impl/src/java/org/apache/avalon/merlin/http
AvalonSessionManager.java JettyWebServer.java
merlin/web/http/impl/src/java/org/apache/avalon/merlin/http/example
ExampleServiceImpl.java ExampleServlet.java
ExampleSessionManager.java
merlin/web/http readme.html
Log:
Merge of 3.4 branch to HEAD.
Revision Changes Path
1.6 +5 -5 avalon/merlin/INSTALL.TXT
http://cvs.apache.org/viewcvs/avalon/merlin/INSTALL.TXT.diff?r1=1.5&r2=1.6
1.2 +1 -1 avalon/merlin/LICENSE.txt
http://cvs.apache.org/viewcvs/avalon/merlin/LICENSE.txt.diff?r1=1.1&r2=1.2
1.3 +1 -1 avalon/merlin/README.TXT
http://cvs.apache.org/viewcvs/avalon/merlin/README.TXT.diff?r1=1.2&r2=1.3
1.32 +288 -160 avalon/merlin/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/maven.xml.diff?r1=1.31&r2=1.32
1.6 +1 -0 avalon/merlin/project.properties
http://cvs.apache.org/viewcvs/avalon/merlin/project.properties.diff?r1=1.5&r2=1.6
1.22 +1 -1 avalon/merlin/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/project.xml.diff?r1=1.21&r2=1.22
1.7 +2 -2 avalon/merlin/activation/api/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/activation/api/project.xml.diff?r1=1.6&r2=1.7
1.3 +3 -14
avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java.diff?r1=1.2&r2=1.3
1.4 +8 -51
avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Engine.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Engine.java.diff?r1=1.3&r2=1.4
1.2 +1 -1
avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/FatalDeploymentException.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/FatalDeploymentException.java.diff?r1=1.1&r2=1.2
1.2 +2 -2
avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleCreateExtension.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleCreateExtension.java.diff?r1=1.1&r2=1.2
1.2 +2 -2
avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleDestroyExtension.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleDestroyExtension.java.diff?r1=1.1&r2=1.2
1.14 +25 -13 avalon/merlin/activation/impl/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/project.xml.diff?r1=1.13&r2=1.14
1.3 +12 -19
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java.diff?r1=1.2&r2=1.3
1.12 +83 -578
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java.diff?r1=1.11&r2=1.12
1.6 +4 -202
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java.diff?r1=1.5&r2=1.6
1.18 +87 -254
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java.diff?r1=1.17&r2=1.18
1.4 +4 -61
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java.diff?r1=1.3&r2=1.4
1.5 +16 -5
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java.diff?r1=1.4&r2=1.5
1.4 +62 -28
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java.diff?r1=1.3&r2=1.4
1.3 +12 -9
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DeploymentRequest.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DeploymentRequest.java.diff?r1=1.2&r2=1.3
1.2 +0 -8
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Resources.properties
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Resources.properties.diff?r1=1.1&r2=1.2
1.8 +51 -798
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java.diff?r1=1.7&r2=1.8
1.7 +2 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java.diff?r1=1.6&r2=1.7
1.7 +2 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java.diff?r1=1.6&r2=1.7
1.6 +5 -65
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java.diff?r1=1.5&r2=1.6
1.5 +14 -18
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java.diff?r1=1.4&r2=1.5
1.2 +20 -11
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/impl/DeploymentTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/impl/DeploymentTestCase.java.diff?r1=1.1&r2=1.2
1.2 +26 -2
avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java.diff?r1=1.1&r2=1.2
1.3 +1 -2
avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.xinfo
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.xinfo.diff?r1=1.2&r2=1.3
1.2 +1 -1
avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xprofile
http://cvs.apache.org/viewcvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xprofile.diff?r1=1.1&r2=1.2
1.11 +5 -3 avalon/merlin/activation/spi/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/activation/spi/project.xml.diff?r1=1.10&r2=1.11
1.3 +3 -3
avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java.diff?r1=1.2&r2=1.3
1.3 +2 -25
avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/BlockContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/BlockContext.java.diff?r1=1.2&r2=1.3
1.3 +3 -3
avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle/Factory.java
http://cvs.apache.org/viewcvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/lifecycle/Factory.java.diff?r1=1.2&r2=1.3
1.10 +9 -1 avalon/merlin/composition/api/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/project.xml.diff?r1=1.9&r2=1.10
1.2 +2 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockCompositionDirective.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockCompositionDirective.java.diff?r1=1.1&r2=1.2
1.2 +2 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockIncludeDirective.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/BlockIncludeDirective.java.diff?r1=1.1&r2=1.2
1.3 +11 -11
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java.diff?r1=1.2&r2=1.3
1.8 +38 -289
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java.diff?r1=1.7&r2=1.8
1.2 +2 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Mode.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/Mode.java.diff?r1=1.1&r2=1.2
1.2 +6 -6
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ProfilePackage.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ProfilePackage.java.diff?r1=1.1&r2=1.2
1.2 +400 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java.diff?r1=1.1&r2=1.2
1.2 +119 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/NamedComponentProfile.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/data/NamedComponentProfile.java.diff?r1=1.1&r2=1.2
1.3 +5 -5
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/event/CompositionEvent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/event/CompositionEvent.java.diff?r1=1.2&r2=1.3
1.3 +5 -5
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/event/ModelEvent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/event/ModelEvent.java.diff?r1=1.2&r2=1.3
1.2 +16 -27
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentContext.java.diff?r1=1.1&r2=1.2
1.11 +22 -30
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java.diff?r1=1.10&r2=1.11
1.2 +2 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContextModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContextModel.java.diff?r1=1.1&r2=1.2
1.2 +2 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DependencyModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DependencyModel.java.diff?r1=1.1&r2=1.2
1.3 +25 -97
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java.diff?r1=1.2&r2=1.3
1.8 +84 -137
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java.diff?r1=1.7&r2=1.8
1.3 +2 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelFactory.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelFactory.java.diff?r1=1.2&r2=1.3
1.3 +3 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java.diff?r1=1.2&r2=1.3
1.2 +4 -4
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileSelector.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ProfileSelector.java.diff?r1=1.1&r2=1.2
1.2 +2 -3
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/StageModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/StageModel.java.diff?r1=1.1&r2=1.2
1.3 +1 -2
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/SystemContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/SystemContext.java.diff?r1=1.2&r2=1.3
1.3 +4 -4
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeRepository.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/TypeRepository.java.diff?r1=1.2&r2=1.3
1.2 +84 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/AssemblyException.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/AssemblyException.java.diff?r1=1.1&r2=1.2
1.2 +185 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ComponentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ComponentContext.java.diff?r1=1.1&r2=1.2
1.2 +258 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ComponentModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ComponentModel.java.diff?r1=1.1&r2=1.2
1.2 +388 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DependencyGraph.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DependencyGraph.java.diff?r1=1.1&r2=1.2
1.2 +83 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Dependent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Dependent.java.diff?r1=1.1&r2=1.2
1.2 +136 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelRepository.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelRepository.java.diff?r1=1.1&r2=1.2
1.2 +75 -0
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ServiceModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ServiceModel.java.diff?r1=1.1&r2=1.2
1.3 +2 -0 avalon/merlin/composition/impl/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/maven.xml.diff?r1=1.2&r2=1.3
1.13 +11 -4 avalon/merlin/composition/impl/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/project.xml.diff?r1=1.12&r2=1.13
1.3 +5 -5
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ProfilePackageBuilder.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/ProfilePackageBuilder.java.diff?r1=1.2&r2=1.3
1.4 +13 -13
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java.diff?r1=1.3&r2=1.4
1.2 +6 -6
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfilePackageCreator.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfilePackageCreator.java.diff?r1=1.1&r2=1.2
1.3 +2 -2
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java.diff?r1=1.2&r2=1.3
1.2 +383 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java.diff?r1=1.1&r2=1.2
1.3 +9 -9
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java.diff?r1=1.2&r2=1.3
1.2 +552 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLComponentProfileWriter.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLComponentProfileWriter.java.diff?r1=1.1&r2=1.2
1.3 +4 -4
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java.diff?r1=1.2&r2=1.3
1.3 +70 -77
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java.diff?r1=1.2&r2=1.3
1.17 +742 -275
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java.diff?r1=1.16&r2=1.17
1.3 +4 -4
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContext.java.diff?r1=1.2&r2=1.3
1.5 +22 -19
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java.diff?r1=1.4&r2=1.5
1.5 +12 -12
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java.diff?r1=1.4&r2=1.5
1.4 +64 -253
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java.diff?r1=1.3&r2=1.4
1.10 +84 -655
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java.diff?r1=1.9&r2=1.10
1.3 +4 -4
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultImportModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultImportModel.java.diff?r1=1.2&r2=1.3
1.4 +6 -6
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java.diff?r1=1.3&r2=1.4
1.2 +15 -15
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelSelector.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelSelector.java.diff?r1=1.1&r2=1.2
1.3 +5 -5
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultProfileSelector.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultProfileSelector.java.diff?r1=1.2&r2=1.3
1.3 +4 -4
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java.diff?r1=1.2&r2=1.3
1.6 +26 -16
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java.diff?r1=1.5&r2=1.6
1.4 +29 -10
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java.diff?r1=1.3&r2=1.4
1.4 +12 -1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Resources.properties
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Resources.properties.diff?r1=1.3&r2=1.4
1.4 +8 -4
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java.diff?r1=1.3&r2=1.4
1.2 +386 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java.diff?r1=1.1&r2=1.2
1.2 +953 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java.diff?r1=1.1&r2=1.2
1.2 +124 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependent.java.diff?r1=1.1&r2=1.2
1.2 +297 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelRepository.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelRepository.java.diff?r1=1.1&r2=1.2
1.2 +91 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceModel.java.diff?r1=1.1&r2=1.2
1.2 +94 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultState.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultState.java.diff?r1=1.1&r2=1.2
1.2 +227 -0
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DelegatingSystemContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DelegatingSystemContext.java.diff?r1=1.1&r2=1.2
1.2 +1 -1 avalon/merlin/composition/impl/src/test/conf/block.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/conf/block.xml.diff?r1=1.1&r2=1.2
1.2 +58 -0 avalon/merlin/composition/impl/src/test/conf/playground.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/conf/playground.xml.diff?r1=1.1&r2=1.2
1.3 +98 -4
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java.diff?r1=1.2&r2=1.3
1.3 +2 -2
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java.diff?r1=1.2&r2=1.3
1.3 +4 -4
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/DependencyTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/DependencyTestCase.java.diff?r1=1.2&r2=1.3
1.3 +2 -1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/IncludesTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/IncludesTestCase.java.diff?r1=1.2&r2=1.3
1.3 +8 -5
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java.diff?r1=1.2&r2=1.3
1.2 +46 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java.diff?r1=1.1&r2=1.2
1.2 +46 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/PlaygroundTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/PlaygroundTestCase.java.diff?r1=1.1&r2=1.2
1.11 +2 -2 avalon/merlin/composition/spi/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/project.xml.diff?r1=1.10&r2=1.11
1.4 +3 -3 avalon/merlin/kernel/api/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/project.xml.diff?r1=1.3&r2=1.4
1.5 +1 -1 avalon/merlin/kernel/cli/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/project.xml.diff?r1=1.4&r2=1.5
1.12 +1 -2
avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java.diff?r1=1.11&r2=1.12
1.4 +2 -0 avalon/merlin/kernel/impl/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/maven.xml.diff?r1=1.3&r2=1.4
1.17 +21 -14 avalon/merlin/kernel/impl/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/project.xml.diff?r1=1.16&r2=1.17
1.12 +307 -246
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java.diff?r1=1.11&r2=1.12
1.2 +62 -236
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java.diff?r1=1.1&r2=1.2
1.17 +1 -1 avalon/merlin/kernel/plugin/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/plugin/project.xml.diff?r1=1.16&r2=1.17
1.4 +4 -4 avalon/merlin/kernel/servlet/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/servlet/project.xml.diff?r1=1.3&r2=1.4
1.8 +1 -0 avalon/merlin/kernel/unit/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/maven.xml.diff?r1=1.7&r2=1.8
1.22 +1 -1 avalon/merlin/kernel/unit/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/project.xml.diff?r1=1.21&r2=1.22
1.2 +65 -51 avalon/merlin/platform/installer/src/nsis/merlin.nsi
http://cvs.apache.org/viewcvs/avalon/merlin/platform/installer/src/nsis/merlin.nsi.diff?r1=1.1&r2=1.2
1.2 +315 -0 avalon/merlin/platform/installer/src/nsis/path.nsh
http://cvs.apache.org/viewcvs/avalon/merlin/platform/installer/src/nsis/path.nsh.diff?r1=1.1&r2=1.2
1.7 +1 -1 avalon/merlin/platform/src/bin/merlin
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/bin/merlin.diff?r1=1.6&r2=1.7
1.10 +1 -1 avalon/merlin/platform/src/bin/merlin-server.sh
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/bin/merlin-server.sh.diff?r1=1.9&r2=1.10
1.11 +1 -1 avalon/merlin/platform/src/bin/merlin.bat
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/bin/merlin.bat.diff?r1=1.10&r2=1.11
1.14 +1 -1 avalon/merlin/platform/src/bin/merlin.sh
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/bin/merlin.sh.diff?r1=1.13&r2=1.14
1.13 +1 -1 avalon/merlin/platform/src/bin/merlinx.bat
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/bin/merlinx.bat.diff?r1=1.12&r2=1.13
1.13 +1 -1 avalon/merlin/platform/src/bin/merlinx.sh
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/bin/merlinx.sh.diff?r1=1.12&r2=1.13
1.10 +1 -1 avalon/merlin/platform/src/bin/nt/wrapper.conf
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/bin/nt/wrapper.conf.diff?r1=1.9&r2=1.10
1.3 +1 -1 avalon/merlin/platform/src/config/debug.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/config/debug.xml.diff?r1=1.2&r2=1.3
1.3 +1 -1 avalon/merlin/platform/src/config/kernel.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/src/config/kernel.xml.diff?r1=1.2&r2=1.3
1.6 +1 -1 avalon/merlin/platform/tutorials/context/strategy/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/tutorials/context/strategy/project.xml.diff?r1=1.5&r2=1.6
1.13 +1 -1 avalon/merlin/platform/tutorials/hello/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/tutorials/hello/project.xml.diff?r1=1.12&r2=1.13
1.6 +2 -2
avalon/merlin/platform/tutorials/lifecycle/activation/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/tutorials/lifecycle/activation/project.xml.diff?r1=1.5&r2=1.6
1.2 +2 -2
avalon/merlin/platform/tutorials/lifecycle/activation/src/java/tutorial/DemonstratableProvider.java
http://cvs.apache.org/viewcvs/avalon/merlin/platform/tutorials/lifecycle/activation/src/java/tutorial/DemonstratableProvider.java.diff?r1=1.1&r2=1.2
1.7 +1 -1 avalon/merlin/platform/tutorials/parameterization/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/tutorials/parameterization/project.xml.diff?r1=1.6&r2=1.7
1.3 +1 -1 avalon/merlin/platform/xdocs/merlin/kernel/index.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/merlin/kernel/index.xml.diff?r1=1.2&r2=1.3
1.4 +2 -2 avalon/merlin/platform/xdocs/meta/kernel/parameters/index.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/meta/kernel/parameters/index.xml.diff?r1=1.3&r2=1.4
1.4 +1 -1
avalon/merlin/platform/xdocs/meta/kernel/parameters/navigation.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/meta/kernel/parameters/navigation.xml.diff?r1=1.3&r2=1.4
1.6 +1 -1
avalon/merlin/platform/xdocs/meta/kernel/repository/navigation.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/meta/kernel/repository/navigation.xml.diff?r1=1.5&r2=1.6
1.2 +1 -1 avalon/merlin/platform/xdocs/resources/index.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/resources/index.xml.diff?r1=1.1&r2=1.2
1.5 +1 -1 avalon/merlin/platform/xdocs/starting/advanced/profiles.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/starting/advanced/profiles.xml.diff?r1=1.4&r2=1.5
1.2 +1 -1 avalon/merlin/platform/xdocs/starting/installation/3.0/index.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/starting/installation/3.0/index.xml.diff?r1=1.1&r2=1.2
1.2 +146 -0
avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/CategoryDirectiveTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/CategoryDirectiveTestCase.java.diff?r1=1.1&r2=1.2
1.2 +119 -0
avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ComponentProfileTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ComponentProfileTestCase.java.diff?r1=1.1&r2=1.2
1.2 +145 -0
avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ConstructorDirectiveTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ConstructorDirectiveTestCase.java.diff?r1=1.1&r2=1.2
1.2 +129 -0
avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ContextDirectiveTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ContextDirectiveTestCase.java.diff?r1=1.1&r2=1.2
1.2 +108 -0
avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ImportDirectiveTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ImportDirectiveTestCase.java.diff?r1=1.1&r2=1.2
1.2 +84 -0
avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/MetaDataExceptionTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/MetaDataExceptionTestCase.java.diff?r1=1.1&r2=1.2
1.2 +139 -0
avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ParameterTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/test/org/apache/avalon/composition/data/test/ParameterTestCase.java.diff?r1=1.1&r2=1.2
1.2 +223 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ComplexComponent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ComplexComponent.java.diff?r1=1.1&r2=1.2
1.2 +26 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ComplexComponent.xinfo
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ComplexComponent.xinfo.diff?r1=1.1&r2=1.2
1.2 +65 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ComplexService.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ComplexService.java.diff?r1=1.1&r2=1.2
1.2 +173 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/DemoManager.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/DemoManager.java.diff?r1=1.1&r2=1.2
1.2 +46 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/DemoManager.xinfo
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/DemoManager.xinfo.diff?r1=1.1&r2=1.2
1.2 +69 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/Demonstratable.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/Demonstratable.java.diff?r1=1.1&r2=1.2
1.2 +75 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/Exploitable.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/Exploitable.java.diff?r1=1.1&r2=1.2
1.2 +127 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ExploitationManager.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ExploitationManager.java.diff?r1=1.1&r2=1.2
1.2 +35 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ExploitationManager.xinfo
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/ExploitationManager.xinfo.diff?r1=1.1&r2=1.2
1.2 +65 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/InvalidComponent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/InvalidComponent.java.diff?r1=1.1&r2=1.2
1.2 +27 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/InvalidComponent.xinfo
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/InvalidComponent.xinfo.diff?r1=1.1&r2=1.2
1.2 +65 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/NullService.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/NullService.java.diff?r1=1.1&r2=1.2
1.2 +237 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/SimpleComponent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/SimpleComponent.java.diff?r1=1.1&r2=1.2
1.2 +20 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/SimpleComponent.xconfig
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/SimpleComponent.xconfig.diff?r1=1.1&r2=1.2
1.2 +52 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/SimpleComponent.xinfo
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/SimpleComponent.xinfo.diff?r1=1.1&r2=1.2
1.2 +71 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/SimpleService.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/SimpleService.java.diff?r1=1.1&r2=1.2
1.2 +92 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/TerminalComponent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/TerminalComponent.java.diff?r1=1.1&r2=1.2
1.2 +17 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/TerminalComponent.xinfo
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/TerminalComponent.xinfo.diff?r1=1.1&r2=1.2
1.2 +7 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/package.html
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/package.html.diff?r1=1.1&r2=1.2
1.2 +174 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.java.diff?r1=1.1&r2=1.2
1.2 +20 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xconfig
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xconfig.diff?r1=1.1&r2=1.2
1.2 +38 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xinfo
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xinfo.diff?r1=1.1&r2=1.2
1.2 +34 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xprofile
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xprofile.diff?r1=1.1&r2=1.2
1.2 +80 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicContext.java.diff?r1=1.1&r2=1.2
1.2 +113 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicContextImp.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicContextImp.java.diff?r1=1.1&r2=1.2
1.2 +70 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicService.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicService.java.diff?r1=1.1&r2=1.2
1.2 +27 -0
avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicService.xservice
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/playground/basic/BasicService.xservice.diff?r1=1.1&r2=1.2
1.2 +97 -0
avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/KernelEvent.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/KernelEvent.java.diff?r1=1.1&r2=1.2
1.2 +78 -0
avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/KernelEventListener.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/KernelEventListener.java.diff?r1=1.1&r2=1.2
1.2 +7 -0
avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/package.html
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/event/package.html.diff?r1=1.1&r2=1.2
1.2 +172 -0
avalon/merlin/kernel/jmx/src/java/org/apache/avalon/merlin/jmx/DefaultKernelMBean.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/jmx/src/java/org/apache/avalon/merlin/jmx/DefaultKernelMBean.java.diff?r1=1.1&r2=1.2
1.2 +22 -0
avalon/merlin/kernel/jmx/src/java/org/apache/avalon/merlin/jmx/package.html
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/jmx/src/java/org/apache/avalon/merlin/jmx/package.html.diff?r1=1.1&r2=1.2
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
