mcconnell 2004/02/10 08:23:35
Modified: merlin/composition/api project.xml
merlin/composition/api/src/java/org/apache/avalon/composition/model
ClassLoaderModel.java ComponentModel.java
DeploymentModel.java
merlin/composition/impl maven.xml project.xml
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultClassLoaderContext.java
DefaultClassLoaderModel.java
DefaultComponentContext.java
DefaultComponentModel.java
DefaultConstructorModel.java
DefaultContainmentContext.java
DefaultContainmentModel.java
DefaultContainmentModelAssemblyHelper.java
DefaultContainmentModelComponentHelper.java
DefaultContainmentModelExportHelper.java
DefaultContainmentModelNavigationHelper.java
DefaultContext.java DefaultContextModel.java
DefaultDependencyModel.java DefaultDependent.java
DefaultDeploymentContext.java
DefaultDeploymentModel.java DefaultEntryModel.java
DefaultImportModel.java DefaultModelSelector.java
DefaultProfileSelector.java
DefaultServiceModel.java
DefaultServiceRepository.java
DefaultStageModel.java DefaultTypeRepository.java
Resources.properties
merlin/composition/impl/src/test/conf logging.xml
playground.xml
merlin/composition/impl/src/test/org/apache/avalon/playground
ComplexComponent.java ComplexComponent.xinfo
merlin/composition/spi project.xml
Added: merlin/composition/api/src/java/org/apache/avalon/composition/model
Commissionable.java CommissioningException.java
CompositionException.java
ContextualizationHandler.java
FatalCommissioningException.java
LifecycleCreateExtension.java
LifecycleDestroyExtension.java Resolver.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
CommissionRequest.java Commissioner.java
SimpleFIFO.java StandardModelFactory.java
merlin/composition/impl/src/java/org/apache/avalon/composition/util
DefaultState.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl
CommissionerTestCase.java CustomError.java
CustomErrorDeployable.java CustomException.java
CustomExceptionDeployable.java
InterruptableCommissionable.java
SimpleCommissionable.java
SimpleDeploymentModel.java
UninterruptableCommissionable.java
merlin/composition/spi/src/java/org/apache/avalon/composition/provider
ClassLoaderContext.java ComponentContext.java
ContainmentContext.java DeploymentContext.java
ModelFactory.java Runtime.java SystemContext.java
SystemException.java package.html
Removed: merlin/composition/api/src/java/org/apache/avalon/composition/model
ClassLoaderContext.java ComponentContext.java
ContainmentContext.java DeploymentContext.java
ModelFactory.java SystemContext.java
merlin/composition/api/src/java/org/apache/avalon/composition/runtime
Commissionable.java Resolver.java
RuntimeFactory.java package.html
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultModelFactory.java DefaultSystemContext.java
merlin/composition/impl/src/java/org/apache/avalon/composition/runtime/impl
DefaultRuntimeFactory.java Resources.properties
package.html
merlin/composition/impl/src/java/org/apache/avalon/composition/util
SystemContextBuilder.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model
AbstractTestCase.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
AssemblyTestCase.java ContextTestCase.java
DependencyTestCase.java IncludesTestCase.java
PlaygroundTestCase.java SecurityTestCase.java
TargetsTestCase.java
Log:
Updating APIs and implemetation to enable seperation of the runtime aspects from
model aspects anabling full model-driven control.
Revision Changes Path
1.13 +1 -1 avalon/merlin/composition/api/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/project.xml.diff?r1=1.12&r2=1.13
1.5 +5 -5
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ClassLoaderModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ClassLoaderModel.java.diff?r1=1.4&r2=1.5
1.4 +4 -5
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.3&r2=1.4
1.13 +4 -15
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.12&r2=1.13
1.1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Commissionable.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Commissionable.java?rev=1.1
1.1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/CommissioningException.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/CommissioningException.java?rev=1.1
1.1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/CompositionException.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/CompositionException.java?rev=1.1
1.1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContextualizationHandler.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContextualizationHandler.java?rev=1.1
1.1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/FatalCommissioningException.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/FatalCommissioningException.java?rev=1.1
1.1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/LifecycleCreateExtension.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/LifecycleCreateExtension.java?rev=1.1
1.1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/LifecycleDestroyExtension.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/LifecycleDestroyExtension.java?rev=1.1
1.1
avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Resolver.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Resolver.java?rev=1.1
1.5 +1 -4 avalon/merlin/composition/impl/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/maven.xml.diff?r1=1.4&r2=1.5
1.16 +3 -3 avalon/merlin/composition/impl/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/project.xml.diff?r1=1.15&r2=1.16
1.5 +8 -3
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderContext.java.diff?r1=1.4&r2=1.5
1.9 +38 -19
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java.diff?r1=1.8&r2=1.9
1.6 +5 -6
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.5&r2=1.6
1.6 +11 -8
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.5&r2=1.6
1.5 +7 -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.4&r2=1.5
1.5 +4 -5
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.4&r2=1.5
1.31 +107 -11
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.30&r2=1.31
1.2 +2 -2
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java.diff?r1=1.1&r2=1.2
1.2 +6 -6
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelComponentHelper.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelComponentHelper.java.diff?r1=1.1&r2=1.2
1.2 +2 -2
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelExportHelper.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelExportHelper.java.diff?r1=1.1&r2=1.2
1.2 +2 -2
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelNavigationHelper.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelNavigationHelper.java.diff?r1=1.1&r2=1.2
1.5 +4 -2
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.4&r2=1.5
1.9 +10 -6
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.8&r2=1.9
1.7 +4 -1
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.6&r2=1.7
1.4 +2 -1
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.3&r2=1.4
1.6 +3 -3
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.5&r2=1.6
1.15 +57 -6
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.14&r2=1.15
1.4 +2 -1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultEntryModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultEntryModel.java.diff?r1=1.3&r2=1.4
1.5 +5 -2
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.4&r2=1.5
1.4 +4 -2
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.3&r2=1.4
1.5 +4 -3
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.4&r2=1.5
1.5 +2 -2
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.4&r2=1.5
1.4 +3 -1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceRepository.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceRepository.java.diff?r1=1.3&r2=1.4
1.5 +6 -3
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.4&r2=1.5
1.7 +8 -5
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.6&r2=1.7
1.6 +6 -2
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.5&r2=1.6
1.1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/CommissionRequest.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/CommissionRequest.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Commissioner.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Commissioner.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/SimpleFIFO.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/SimpleFIFO.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/StandardModelFactory.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/StandardModelFactory.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/util/DefaultState.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/util/DefaultState.java?rev=1.1
1.3 +1 -1 avalon/merlin/composition/impl/src/test/conf/logging.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/conf/logging.xml.diff?r1=1.2&r2=1.3
1.5 +6 -1 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.4&r2=1.5
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CommissionerTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CommissionerTestCase.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CustomError.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CustomError.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CustomErrorDeployable.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CustomErrorDeployable.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CustomException.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CustomException.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CustomExceptionDeployable.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/CustomExceptionDeployable.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/InterruptableCommissionable.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/InterruptableCommissionable.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/SimpleCommissionable.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/SimpleCommissionable.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/SimpleDeploymentModel.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/SimpleDeploymentModel.java?rev=1.1
1.1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/UninterruptableCommissionable.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/impl/UninterruptableCommissionable.java?rev=1.1
1.4 +25 -4
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.3&r2=1.4
1.3 +1 -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.2&r2=1.3
1.13 +18 -0 avalon/merlin/composition/spi/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/project.xml.diff?r1=1.12&r2=1.13
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ClassLoaderContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ClassLoaderContext.java?rev=1.1
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ComponentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ComponentContext.java?rev=1.1
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ContainmentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ContainmentContext.java?rev=1.1
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/DeploymentContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/DeploymentContext.java?rev=1.1
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ModelFactory.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/ModelFactory.java?rev=1.1
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/Runtime.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/Runtime.java?rev=1.1
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemContext.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemContext.java?rev=1.1
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemException.java
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/SystemException.java?rev=1.1
1.1
avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/package.html
http://cvs.apache.org/viewcvs/avalon/merlin/composition/spi/src/java/org/apache/avalon/composition/provider/package.html?rev=1.1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]