Changelog Report

Date Author File/Message
2004-01-12 07:14:31 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.17

Correct assignability test.
2004-01-12 07:12:01 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.4.3

Correct assignability test.
2004-01-12 06:24:44 Stephen McConnell platform/tutorials/lifecycle/activation/project.xml v 1.5.4.1

Sync. totorial dependencies.
2004-01-12 06:22:52 Stephen McConnell platform.xml v 1.20.4.4

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java v 1.2.4.4

activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java v 1.1.1.1.4.1

composition/api/project.xml v 1.9.4.1

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.4.1

composition/api/src/java/org/apache/avalon/composition/model/ServiceModel.java v 1.1.4.1

composition/impl/project.xml v 1.12.4.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.4.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceModel.java v 1.1.4.1

composition/spi/project.xml v 1.10.4.1

kernel/impl/project.xml v 1.16.4.3

kernel/servlet/project.xml v 1.3.4.3

Update the meta model to formally handle binding of a service export directive with the implementing class (resolves bug concerning selection of a supplier within a composite when the invoking method is against a derived interface - bug identified by Timothy Bennett). Commit includes related version bumps.
2004-01-12 05:41:05 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ServiceModel.java v 1.1

branches: 1.1.2; 1.1.4; file ServiceModel.java was initially added on branch Ver_3_4.
2004-01-12 05:41:05 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceModel.java v 1.1

branches: 1.1.2; 1.1.4; file DefaultServiceModel.java was initially added on branch Ver_3_4.
2004-01-12 05:41:05 Stephen McConnell maven.xml v 1.31.2.5

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10.2.8

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java v 1.7.2.7

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java v 1.3.2.4

activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java v 1.1.1.1.2.3

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.9

composition/api/src/java/org/apache/avalon/composition/model/ServiceModel.java v 1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.16

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultServiceModel.java v 1.1.2.1

kernel/unit/maven.xml v 1.7.2.1

Update the meta model to formally handle binding of a service export directive with the implementing class.
2004-01-12 02:13:04 Stephen McConnell project.xml v 1.21

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java v 1.5

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.17

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.16

Add null provider check and note re. existing bug.
2004-01-12 02:12:12 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java v 1.2.4.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.4.1

platform/tutorials/composition/application/impl/maven.xml v 1.1.1.1.4.1

Add null provider check and not re. existing bug.
2004-01-12 02:11:24 Stephen McConnell maven.xml v 1.31.2.4

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java v 1.7.2.6

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.15

Correct filtering error in dist goals.
2004-01-12 01:12:10 Stephen McConnell INSTALL.TXT v 1.5.4.1

maven.xml v 1.31.4.2

platform.xml v 1.20.4.3

project.xml v 1.18.4.3

activation/impl/project.xml v 1.13.4.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java v 1.2.4.2

kernel/cli/project.xml v 1.4.4.2

kernel/impl/project.xml v 1.16.4.2

kernel/plugin/project.xml v 1.16.4.2

kernel/servlet/project.xml v 1.3.4.2

kernel/unit/project.xml v 1.21.4.2

platform/src/bin/merlin v 1.6.4.2

platform/src/bin/merlin-server.sh v 1.9.4.2

platform/src/bin/merlin.bat v 1.10.4.2

platform/src/bin/merlin.sh v 1.13.4.2

platform/src/bin/merlinx.bat v 1.12.4.2

platform/src/bin/merlinx.sh v 1.12.4.2

platform/src/bin/nt/wrapper.conf v 1.9.4.2

platform/tutorials/hello/project.xml v 1.11.4.2

platform/tutorials/parameterization/project.xml v 1.5.4.2

platform/xdocs/starting/installation/3.2/binary.xml v 1.4.4.2

Fix java.lang.Object redirection error in composite block handling (reposrted by Timothy Bennett). Bumped activation impl version and dependants.
2004-01-12 00:17:19 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java v 1.2.2.3

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10.2.7

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.15.2.6

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java v 1.7.2.5

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java v 1.3.2.3

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java v 1.2.2.5

activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java v 1.3.2.4

activation/spi/src/java/org/apache/avalon/activation/appliance/BlockContext.java v 1.2.2.2

composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java v 1.7.2.6

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java v 1.1.2.6

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.14

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java v 1.3.2.5

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.9

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7.2.7

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java v 1.1.2.5

A bunch of updates that address a cleaner seperation between the model related concerns and the runtime concerns.
2004-01-09 23:04:00 Stephen McConnell kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.11

Bug located in 3.2.4, 3.3 and 3.4-DEV - DefaultFactory.criteria.put( "avalon.repository.proxy.host", hosts ) has an incorrect argument - it should be 'host' - error only shows up when ou try to declare an application repo proxy.
2004-01-09 23:03:31 Stephen McConnell kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7.4.1

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7.2.6

Bug located in 3.2.4, 3.3 and 3.4-DEV - DefaultFactory.criteria.put( "avalon.repository.proxy.host", hosts ) has an incorrect argument - it should be 'host' - error only shows up when ou try to declare an application repo proxy.
2004-01-09 21:17:53 Stephen McConnell project.xml v 1.18.4.2

Change version to 3.2.4-bis (this is a packaing concerns - no code change).
2004-01-09 21:16:13 Stephen McConnell platform.xml v 1.20.4.2

Correct packaging bug identified by Timothy (inclrect ref to the kernel impl version).
2004-01-09 20:37:38 Stephen McConnell platform/installer/src/nsis/path.nsh v 1.1

branches: 1.1.2; file path.nsh was initially added on branch Ver_3_4.
2004-01-09 20:37:38 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLComponentProfileWriter.java v 1.1

branches: 1.1.2; file XMLComponentProfileWriter.java was initially added on branch Ver_3_4.
2004-01-09 20:37:38 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java v 1.1

branches: 1.1.2; file XMLComponentProfileCreator.java was initially added on branch Ver_3_4.
2004-01-09 20:37:38 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/data/NamedComponentProfile.java v 1.1

branches: 1.1.2; file NamedComponentProfile.java was initially added on branch Ver_3_4.
2004-01-09 20:37:38 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java v 1.1

branches: 1.1.2; file ComponentProfile.java was initially added on branch Ver_3_4.
2004-01-09 20:37:38 Stephen McConnell activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java v 1.2.2.1

activation/spi/src/java/org/apache/avalon/activation/appliance/DependencyGraph.java v 1.3.2.1

activation/spi/src/java/org/apache/avalon/activation/appliance/ServiceContext.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java v 1.1.2.1

composition/api/src/java/org/apache/avalon/composition/data/NamedComponentProfile.java v 1.1.2.1

composition/api/src/java/org/apache/avalon/composition/data/NamedDeploymentProfile.java v 1.1.2.1

composition/api/src/java/org/apache/avalon/composition/data/Profile.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java v 1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLDeploymentProfileCreator.java v 1.7.2.1

composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLComponentProfileWriter.java v 1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLDeploymentProfileWriter.java v 1.4.2.1

platform/installer/src/nsis/path.nsh v 1.1.2.1

Sync file deletions/additions resulting from class renaming.
2004-01-09 20:29:48 Stephen McConnell INSTALL.TXT v 1.5.2.2

maven.xml v 1.31.2.3

platform.xml v 1.20.2.2

project.properties v 1.5.2.1

project.xml v 1.18.2.2

activation/impl/project.xml v 1.13.2.3

composition/api/src/java/org/apache/avalon/composition/data/BlockCompositionDirective.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/data/BlockIncludeDirective.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/data/ContainmentProfile.java v 1.2.2.1

composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java v 1.7.2.1

composition/api/src/java/org/apache/avalon/composition/data/Mode.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/data/ProfilePackage.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/ComponentContext.java v 1.1.2.4

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.8

composition/api/src/java/org/apache/avalon/composition/model/ProfileSelector.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/TypeRepository.java v 1.2.2.1

composition/impl/project.xml v 1.12.2.2

composition/impl/src/java/org/apache/avalon/composition/data/builder/ProfilePackageBuilder.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java v 1.3.2.1

composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLProfilePackageCreator.java v 1.1.1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLTargetsCreator.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java v 1.1.2.5

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.13

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultProfileSelector.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java v 1.3.2.2

kernel/impl/project.xml v 1.16.2.2

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7.2.5

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java v 1.1.2.4

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernelMBean.java v 1.1.2.1

platform/installer/src/nsis/merlin.nsi v 1.1.2.1

platform/src/bin/merlin v 1.6.2.1

platform/src/bin/merlin-server.sh v 1.9.2.1

platform/src/bin/merlin.bat v 1.10.2.1

platform/src/bin/merlin.sh v 1.13.2.1

platform/src/bin/merlinx.bat v 1.12.2.1

platform/src/bin/merlinx.sh v 1.12.2.1

platform/src/bin/nt/wrapper.conf v 1.9.2.1

platform/tutorials/hello/project.xml v 1.11.2.1

platform/tutorials/parameterization/project.xml v 1.5.2.1

web/http/readme.html v 1.1.2.1

web/http/api/.cvsignore v 1.1.1.1.2.1

web/http/api/maven.xml v 1.1.1.1.2.1

web/http/api/project.xml v 1.1.1.1.2.2

web/http/api/src/java/org/apache/avalon/merlin/http/SessionManager.java v 1.1.1.1.2.1

web/http/api/src/java/org/apache/avalon/merlin/http/WebServer.java v 1.1.1.1.2.1

web/http/api/src/java/org/apache/avalon/merlin/http/example/ExampleService.java v 1.1.1.1.2.1

web/http/impl/.cvsignore v 1.1.2.1

web/http/impl/maven.xml v 1.1.2.1

web/http/impl/project.xml v 1.1.2.2

web/http/impl/conf/avalon-http-1.3.block v 1.1.2.1

web/http/impl/conf/block.xml v 1.1.2.1

web/http/impl/src/java/org/apache/avalon/merlin/http/AvalonSessionManager.java v 1.1.2.1

web/http/impl/src/java/org/apache/avalon/merlin/http/JettyWebServer.java v 1.4.2.1

web/http/impl/src/java/org/apache/avalon/merlin/http/example/ExampleServiceImpl.java v 1.1.2.1

web/http/impl/src/java/org/apache/avalon/merlin/http/example/ExampleServlet.java v 1.1.2.1

web/http/impl/src/java/org/apache/avalon/merlin/http/example/ExampleSessionManager.java v 1.1.2.1

General update the synchronize the kernel with the activation/composition refactoring. This commit brings 3.4 to a buildable and runnable state although there is still of lot of updates to make to the kernel implementation including completion of a seperated kernel jmx adapter, exposure of a shutdown timeout parameter in the composition api, caching of timeout references, assembly and disassembly events, linking these events to runtime deployment and decommissioning cycles, probably extraction of the logging api and impl to a peer package, and incorporation of code level security policy handling.
2004-01-09 15:08:00 Stephen McConnell platform/src/bin/nt/wrapper.conf v 1.9.4.1

platform/tutorials/hello/project.xml v 1.11.4.1

platform/tutorials/parameterization/project.xml v 1.5.4.1

platform/xdocs/starting/installation/3.2/binary.xml v 1.4.4.1

Update to the 3.2.3 candidate release to include correct handling of a UndeclaredThrowableException raised by the composite proxy (bug reported by Timothy Bennett). Update applies to the activation impl package - version bumped from 1.2.4 -> 1.2.5. Cascading bumps include kernel imp 3.2.2->3.2.3, CLI 2.3.2->3.2.3, plugin 3.2.3->3.2.4, unit 3.2.8->3.2.9.
2004-01-09 15:07:57 Stephen McConnell maven.xml v 1.31.4.1

platform.xml v 1.20.4.1

project.xml v 1.18.4.1

activation/impl/project.xml v 1.13.4.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java v 1.2.4.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.15.4.1

kernel/cli/project.xml v 1.4.4.1

kernel/impl/project.xml v 1.16.4.1

kernel/plugin/project.xml v 1.16.4.1

kernel/servlet/project.xml v 1.3.4.1

kernel/unit/project.xml v 1.21.4.1

platform/src/bin/merlin v 1.6.4.1

platform/src/bin/merlin-server.sh v 1.9.4.1

platform/src/bin/merlin.bat v 1.10.4.1

platform/src/bin/merlin.sh v 1.13.4.1

platform/src/bin/merlinx.bat v 1.12.4.1

platform/src/bin/merlinx.sh v 1.12.4.1

Update to the 3.2.3 candidate release to include correct handling of a UndeclaredThrowableException raised by the composite proxy (bug reported by Timothy Bennett). Update applies to the activation impl package - version bumped from 1.2.4 -> 1.2.5. Cascading bumps include kernel imp 3.2.2->3.2.3, CLI 2.3.2->3.2.3, plugin 3.2.3->3.2.4, unit 3.2.8->3.2.9.
2004-01-09 14:13:00 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.16

Sync. with 3.2.3-bis and 3.4.
2004-01-09 12:00:36 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.15

platform/src/config/debug.xml v 1.2

platform/src/config/kernel.xml v 1.2

Change the system property from "deployment-timeout" to urn:avalon:composition.deployment.timeout", increase the default timeout value, and add example kernel confiuration to the bundles kernel definitions.
2004-01-09 02:06:21 Stephen McConnell platform/tutorials/hello/project.xml v 1.12

platform/tutorials/parameterization/project.xml v 1.6

Bunp dependency version to 3.2.8.
2004-01-08 16:48:12 Stephen McConnell project.xml v 1.20

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java v 1.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/NullComponent.java v 1.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/NullComponent.xinfo v 1.2

Correct missplaced update (change to 3-4 branch applied to 3.2 by mistake).
2004-01-08 16:35:37 Stephen McConnell activation/api/src/java/org/apache/avalon/activation/appliance/Block.java v 1.4

Remove cruft.
2004-01-08 12:51:16 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10.2.6

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java v 1.2.2.4

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DeploymentRequest.java v 1.2.2.2

activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java v 1.3.2.3

composition/api/src/java/org/apache/avalon/composition/model/ContainmentContext.java v 1.1.1.1.2.5

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.7

composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java v 1.2.2.3

composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java v 1.7.2.5

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java v 1.1.2.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java v 1.2.2.5

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.12

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java v 1.2.2.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.8

composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java v 1.2.2.3

Include a scalable deployment timout approach that is based on the aggregation of the timout of contained components. This is a first step and needs to be extended to support customization of deployment timouts on individual components at the type and profile levels.
2004-01-08 10:40:53 Stephen McConnell INSTALL.TXT v 1.5.2.1

LICENSE.txt v 1.1.1.1.2.1

README.TXT v 1.2.2.1

maven.xml v 1.31.2.2

activation/impl/project.xml v 1.13.2.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.15.2.5

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java v 1.7.2.4

activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java v 1.1.1.1.2.2

activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.xinfo v 1.2.2.1

platform/src/config/debug.xml v 1.1.1.1.2.1

platform/src/config/kernel.xml v 1.1.1.1.2.1

Addition of support for the disabling of proxy based isolation, and some additions to simplfy install documentation.
2004-01-08 09:45:14 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java v 1.3

Update docs.
2004-01-08 09:44:57 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java v 1.3

Fix UndeclaredThrowableException handling in block proxy (reported by Timothy Bennet).
2004-01-08 09:43:45 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java v 1.7.2.3

Fix UndeclaredThrowableException handling in block proxy (reported by Timothy Bennet).
2004-01-08 09:42:58 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.15.2.4

Trial support for declaration on a non-proxied service.
2004-01-07 20:34:42 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10.2.5

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.15.2.3

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java v 1.3.2.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java v 1.4.2.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java v 1.2.2.3

activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java v 1.3.2.2

composition/api/src/java/org/apache/avalon/composition/model/ComponentModelFactory.java v 1.1.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/Scanner.java v 1.3.2.1

composition/impl/src/java/org/apache/avalon/composition/util/ExceptionHelper.java v 1.1.1.1.2.1

composition/impl/src/test/org/apache/avalon/composition/model/test/IncludesTestCase.java v 1.2.2.1

composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java v 1.2.2.3

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java v 1.1.2.3

Update sources to use the avalon util ExceptionHelper class in favour of the componention equivalent and some additional housekeeping.
2004-01-07 16:07:17 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10.2.4

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java v 1.2.2.2

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7.2.4

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java v 1.1.2.2

Synchronize merlin kernel with activation.
2004-01-07 14:51:06 Stephen McConnell activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java v 1.4.2.2

Housekeeping.
2004-01-07 14:50:17 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java v 1.4.2.1

Housekeeping.
2004-01-07 13:58:11 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java v 1.7.2.2

Housekeeping.
2004-01-07 12:57:25 Stephen McConnell activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java v 1.2.2.2

activation/api/src/java/org/apache/avalon/activation/appliance/Composite.java v 1.1.2.1

activation/api/src/java/org/apache/avalon/activation/appliance/DeploymentException.java v 1.1.1.1.2.1

activation/api/src/java/org/apache/avalon/activation/appliance/Engine.java v 1.3.2.1

activation/api/src/java/org/apache/avalon/activation/appliance/FatalDeploymentException.java v 1.1.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java v 1.2.2.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10.2.3

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/BlockThread.java v 1.1.1.1.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java v 1.2.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.15.2.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceMBean.java v 1.3.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java v 1.4.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java v 1.7.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java v 1.3.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceContext.java v 1.1.1.1.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java v 1.2.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DeploymentRequest.java v 1.2.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Resources.properties v 1.1.1.1.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/SimpleFIFO.java v 1.1.2.1

activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/PooledLifestyleHandler.java v 1.4.2.1

activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java v 1.4.2.1

activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java v 1.3.2.1

activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java v 1.1.1.1.2.1

activation/impl/src/test/org/apache/avalon/playground/basic/BasicComponent.xprofile v 1.1.1.1.2.1

activation/spi/src/java/org/apache/avalon/activation/appliance/BlockContext.java v 1.2.2.1

Refactoring the activation package to leverage model-based assembly.
2004-01-07 12:49:14 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.11

Add support for ./ and ../ path references during relative address resolution.
2004-01-07 12:49:42 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.7

Add handler assignment implementation.
2004-01-07 12:48:12 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java v 1.1.2.6

Addition of convinience operations support access to dependency and service provider models by descriptor.
2004-01-07 12:45:41 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java v 1.7.2.4

Addition of runtime handler assignment.
2004-01-07 12:45:08 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ComponentModel.java v 1.1.2.3

Addition of convinience operations support access to fependency and service provider models by descriptor.
2004-01-07 12:44:00 Stephen McConnell composition/impl/src/test/conf/playground.xml v 1.1

branches: 1.1.2; file playground.xml was initially added on branch Ver_3_4.
2004-01-07 12:44:00 Stephen McConnell composition/impl/src/test/conf/playground.xml v 1.1.2.1

Addition of a more comprehensive assembly scenario.
2004-01-07 12:42:49 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DelegatingSystemContext.java v 1.1

branches: 1.1.2; file DelegatingSystemContext.java was initially added on branch Ver_3_4.
2004-01-07 12:42:49 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DelegatingSystemContext.java v 1.1.2.1

Delegating system context implementation (simplifies handling of system context between system and application scenarios).
2004-01-06 23:22:28 Stephen McConnell composition/impl/src/test/org/apache/avalon/composition/model/test/PlaygroundTestCase.java v 1.1

branches: 1.1.2; file PlaygroundTestCase.java was initially added on branch Ver_3_4.
2004-01-06 23:22:28 Stephen McConnell composition/impl/src/test/org/apache/avalon/composition/model/test/PlaygroundTestCase.java v 1.1.2.1

Add comprehensive assembly testcase that generates a full assemmbly decomposition.
2004-01-06 23:16:49 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ComponentContext.java v 1.1.2.3

composition/api/src/java/org/apache/avalon/composition/model/ContainmentContext.java v 1.1.1.1.2.4

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.6

composition/api/src/java/org/apache/avalon/composition/model/DependencyGraph.java v 1.1.2.4

composition/api/src/java/org/apache/avalon/composition/model/ModelRepository.java v 1.1.2.3

composition/api/src/java/org/apache/avalon/composition/model/SystemContext.java v 1.1.1.1.2.1

composition/impl/maven.xml v 1.1.1.1.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java v 1.1.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java v 1.1.2.5

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java v 1.2.2.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.10

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java v 1.2.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.6

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelRepository.java v 1.1.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java v 1.4.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java v 1.3.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/Resources.properties v 1.2.2.3

composition/impl/src/test/conf/block.xml v 1.1.1.1.2.1

composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java v 1.2.2.2

composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java v 1.1.2.5

Enhancing the dependency resolution model so that we can resolve consumers and providers relative to a particular deployment model.
2004-01-04 21:29:00 Stephen McConnell composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java v 1.1.2.4

composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java v 1.2.2.2

Rename Model to DeploymentModel and DefaultModel to DefaultDeploymentModel.
2004-01-04 21:28:59 Stephen McConnell activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java v 1.2.2.1

activation/api/src/java/org/apache/avalon/activation/appliance/Block.java v 1.3.2.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java v 1.2.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10.2.2

activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java v 1.2.2.1

composition/api/src/java/org/apache/avalon/composition/event/CompositionEvent.java v 1.2.2.1

composition/api/src/java/org/apache/avalon/composition/event/ModelEvent.java v 1.2.2.1

composition/api/src/java/org/apache/avalon/composition/model/ComponentModel.java v 1.1.2.2

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.5

composition/api/src/java/org/apache/avalon/composition/model/DependencyGraph.java v 1.1.2.3

composition/api/src/java/org/apache/avalon/composition/model/Dependent.java v 1.1.2.2

composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java v 1.2.2.2

composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java v 1.7.2.3

composition/api/src/java/org/apache/avalon/composition/model/Model.java v 1.1.1.1.2.3

composition/api/src/java/org/apache/avalon/composition/model/ModelRepository.java v 1.1.2.2

composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java v 1.1.2.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.9

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java v 1.3.2.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java v 1.4.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependent.java v 1.1.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java v 1.2.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.5

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModel.java v 1.1.1.1.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelRepository.java v 1.1.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelSelector.java v 1.1.1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java v 1.2.2.2

Rename Model to DeploymentModel and DefaultModel to DefaultDeploymentModel.
2004-01-04 20:20:52 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java v 1.1.2.3

Housekeeping.
2004-01-04 20:19:27 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ComponentContext.java v 1.1.2.2

composition/api/src/java/org/apache/avalon/composition/model/ContainmentContext.java v 1.1.1.1.2.3

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.4

composition/api/src/java/org/apache/avalon/composition/model/Model.java v 1.1.1.1.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java v 1.1.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java v 1.1.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java v 1.2.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.8

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java v 1.3.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependent.java v 1.1.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModel.java v 1.1.1.1.2.2

composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java v 1.2.2.1

Refactoring of ComponentContext and ContainmentContext to derive from DeploymentContext.
2004-01-04 17:23:16 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java v 1.1

branches: 1.1.2; file DefaultComponentModel.java was initially added on branch Ver_3_4.
2004-01-04 17:23:16 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java v 1.1

branches: 1.1.2; file DefaultComponentContext.java was initially added on branch Ver_3_4.
2004-01-04 17:23:16 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ComponentModelFactory.java v 1.1

branches: 1.1.2; file ComponentModelFactory.java was initially added on branch Ver_3_4.
2004-01-04 17:23:16 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ComponentModel.java v 1.1

branches: 1.1.2; file ComponentModel.java was initially added on branch Ver_3_4.
2004-01-04 17:23:16 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ComponentContext.java v 1.1

branches: 1.1.2; file ComponentContext.java was initially added on branch Ver_3_4.
2004-01-04 17:23:16 Stephen McConnell activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleCreateExtension.java v 1.1.1.1.2.1

activation/api/src/java/org/apache/avalon/activation/lifecycle/LifecycleDestroyExtension.java v 1.1.1.1.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10.2.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.15.2.1

activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java v 1.6.2.1

activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java v 1.6.2.1

activation/spi/src/java/org/apache/avalon/activation/lifecycle/Factory.java v 1.2.2.1

composition/api/src/java/org/apache/avalon/composition/model/ComponentContext.java v 1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/ComponentModel.java v 1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/ComponentModelFactory.java v 1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/Composite.java v 1.1.2.3

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.3

composition/api/src/java/org/apache/avalon/composition/model/DependencyGraph.java v 1.1.2.2

composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java v 1.2.2.1

composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java v 1.7.2.2

composition/api/src/java/org/apache/avalon/composition/model/DeploymentModelFactory.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/Model.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/ModelFactory.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentContext.java v 1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultComponentModel.java v 1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.7

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContext.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java v 1.3.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultImportModel.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java v 1.3.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/NullComponent.java v 1.1.1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/NullComponent.xinfo v 1.1.1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/Resources.properties v 1.2.2.2

composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java v 1.1.2.3

composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java v 1.2.2.1

composition/impl/src/test/org/apache/avalon/composition/model/test/DependencyTestCase.java v 1.2.2.1

composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java v 1.2.2.1

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7.2.3

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java v 1.1.2.1

platform/tutorials/lifecycle/activation/src/java/tutorial/DemonstratableProvider.java v 1.1.1.1.2.1

Rename DeploymentModel to ComponentModel and DeploymentContext to ComponentContext
2004-01-04 15:23:01 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java v 1.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DeploymentRequest.java v 1.2

branches: 1.2.2; Update exception message related to deployment timeout errors, update code format, remove on-line requirement from composition testcase, and bump HEAD build version to 3.3.
2004-01-04 15:23:01 Stephen McConnell project.xml v 1.19

composition/impl/maven.xml v 1.2

Update exception message related to deployment timeout errors, update code format, remove on-line requirement from composition testcase, and bump HEAD build version to 3.3.
2004-01-04 14:04:20 Stephen McConnell platform/xdocs/meta/kernel/navigation.xml v 1.6

Add missing /
2004-01-04 13:59:02 Stephen McConnell kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.10

Sync. changes from Niclas with changes from Steve.
2004-01-04 13:38:17 Stephen McConnell kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.9

Addition of standard system context entries.
2004-01-04 13:37:42 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java v 1.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java v 1.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/Resources.properties v 1.3

System context handling additions.
2004-01-04 12:09:08 niclas platform/xdocs/meta/kernel/index.xml v 1.2

platform/xdocs/meta/kernel/navigation.xml v 1.5

platform/xdocs/meta/kernel/logging/navigation.xml v 1.5

Updated the documentatin with information about setting kernel parameters.
2004-01-04 12:07:08 niclas platform/xdocs/merlin/kernel/index.xml v 1.2

Formatting.
2004-01-04 12:07:40 niclas platform/xdocs/meta/kernel/repository/cache.xml v 1.2

platform/xdocs/meta/kernel/repository/navigation.xml v 1.5

Formatting and small fixes.
2004-01-04 12:06:29 niclas kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.8

Changes to support generic Parameters for the kernel, via kernel.xml. One such parameter 'DeploymentTimeout' exposed in the ContainmentModel for the new deployment handling.
2004-01-04 12:05:21 niclas composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.10

composition/api/src/java/org/apache/avalon/composition/model/SystemContext.java v 1.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.14

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java v 1.5

Changes to support generic Parameters for the kernel, via kernel.xml. One such parameter 'DeploymentTimeout' exposed in the ContainmentModel for the new deployment handling.
2004-01-04 12:03:00 niclas activation/api/src/java/org/apache/avalon/activation/appliance/FatalDeploymentException.java v 1.1

branches: 1.1.2; New Deployment system, which doesn't create an additional threads, and is somewhat immune to components that hangs during deployment. If the thread can be interrupted, the Deployer will throw a DeploymentException (for the rest of the activation to handle). If the thread can not be interrupted, it throws a FatalDeploymentException, which the activation system should signal upwards to kill the JVM, as there probably is a uncontrollable thread running. Any Exceptions or Errors thrown at the component level is still passed on, untampered with.
2004-01-04 12:03:00 niclas activation/api/src/java/org/apache/avalon/activation/appliance/DeploymentException.java v 1.2

New Deployment system, which doesn't create an additional threads, and is somewhat immune to components that hangs during deployment. If the thread can be interrupted, the Deployer will throw a DeploymentException (for the rest of the activation to handle). If the thread can not be interrupted, it throws a FatalDeploymentException, which the activation system should signal upwards to kill the JVM, as there probably is a uncontrollable thread running. Any Exceptions or Errors thrown at the component level is still passed on, untampered with.
2004-01-04 12:01:06 niclas activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java v 1.5

activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java v 1.4

Testcases for the new deployment system.
2004-01-04 12:00:28 niclas activation/impl/src/java/org/apache/avalon/activation/appliance/impl/SimpleFIFO.java v 1.1

branches: 1.1.2; New Deployment system, which doesn't create an additional threads, and is somewhat immune to components that hangs during deployment. If the thread can be interrupted, the Deployer will throw a DeploymentException (for the rest of the activation to handle). If the thread can not be interrupted, it throws a FatalDeploymentException, which the activation system should signal upwards to kill the JVM, as there probably is a uncontrollable thread running. Any Exceptions or Errors thrown at the component level is still passed on, untampered with.
2004-01-04 12:00:28 niclas activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.11

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/BlockThread.java v 1.2

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Deployer.java v 1.1

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DeploymentRequest.java v 1.1

New Deployment system, which doesn't create an additional threads, and is somewhat immune to components that hangs during deployment. If the thread can be interrupted, the Deployer will throw a DeploymentException (for the rest of the activation to handle). If the thread can not be interrupted, it throws a FatalDeploymentException, which the activation system should signal upwards to kill the JVM, as there probably is a uncontrollable thread running. Any Exceptions or Errors thrown at the component level is still passed on, untampered with.
2004-01-04 01:19:28 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/Composite.java v 1.1.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.6

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.3

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModel.java v 1.1.1.1.2.1

composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java v 1.1.2.2

Improve assembly test case reporting.
2004-01-03 23:18:55 Stephen McConnell composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java v 1.1

branches: 1.1.2; file AssemblyTestCase.java was initially added on branch Ver_3_4.
2004-01-03 23:18:55 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.2

composition/impl/maven.xml v 1.1.1.1.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.5

composition/impl/src/test/org/apache/avalon/composition/model/test/AssemblyTestCase.java v 1.1.2.1

Add startup and shutdown sequence retrival to containment model.
2004-01-03 22:30:59 Stephen McConnell composition/impl/src/test/org/apache/avalon/composition/data/test/CategoryDirectiveTestCase.java v 1.1.1.1.2.1

composition/impl/src/test/org/apache/avalon/composition/data/test/ConstructorDirectiveTestCase.java v 1.2.2.1

composition/impl/src/test/org/apache/avalon/composition/data/test/ContextDirectiveTestCase.java v 1.1.1.1.2.1

composition/impl/src/test/org/apache/avalon/composition/data/test/DeploymentProfileTestCase.java v 1.4.2.1

composition/impl/src/test/org/apache/avalon/composition/data/test/ImportDirectiveTestCase.java v 1.2.2.1

composition/impl/src/test/org/apache/avalon/composition/data/test/MetaDataExceptionTestCase.java v 1.1.1.1.2.1

composition/impl/src/test/org/apache/avalon/composition/data/test/ParameterTestCase.java v 1.2.2.1

Move data test cases up to api from impl package.
2004-01-03 22:29:49 Stephen McConnell composition/api/project.xml v 1.9.2.2

Move data test cases up to api from impl package. CVS: If you have not had it reviewed then delete this line.
2004-01-03 22:08:21 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/Dependent.java v 1.1

branches: 1.1.2; file Dependent.java was initially added on branch Ver_3_4.
2004-01-03 22:08:21 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/DependencyGraph.java v 1.1

branches: 1.1.2; file DependencyGraph.java was initially added on branch Ver_3_4.
2004-01-03 22:08:21 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultState.java v 1.1

branches: 1.1.2; file DefaultState.java was initially added on branch Ver_3_4.
2004-01-03 22:08:21 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelRepository.java v 1.1

branches: 1.1.2; file DefaultModelRepository.java was initially added on branch Ver_3_4.
2004-01-03 22:08:21 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependent.java v 1.1

branches: 1.1.2; file DefaultDependent.java was initially added on branch Ver_3_4.
2004-01-03 22:08:21 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/Composite.java v 1.1

branches: 1.1.2; file Composite.java was initially added on branch Ver_3_4.
2004-01-03 22:08:21 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/Composite.java v 1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/ContainmentContext.java v 1.1.1.1.2.2

composition/api/src/java/org/apache/avalon/composition/model/DependencyGraph.java v 1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/Dependent.java v 1.1.2.1

composition/impl/maven.xml v 1.1.1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java v 1.2.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.4

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependent.java v 1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java v 1.3.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelRepository.java v 1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultState.java v 1.1.2.1

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7.2.2

Incorporate dependecy graph management within the main meta model.
2004-01-03 18:14:58 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ContextModel.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/DependencyModel.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/StageModel.java v 1.1.1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java v 1.3.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java v 1.4.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.2

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/Resources.properties v 1.2.2.1

Incorporate assembly logic into DeploymentModel.
2004-01-03 16:12:19 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.3

Add model expansion.
2004-01-03 16:01:32 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.2

Completion of assembly logic in DefaultContainmentModel.
2004-01-03 15:38:50 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ModelRepository.java v 1.1

branches: 1.1.2; file ModelRepository.java was initially added on branch Ver_3_4.
2004-01-03 15:38:49 Stephen McConnell activation/api/src/java/org/apache/avalon/activation/appliance/Block.java v 1.3.2.1

composition/api/src/java/org/apache/avalon/composition/model/AssemblyException.java v 1.1.2.2

composition/api/src/java/org/apache/avalon/composition/model/ContainmentContext.java v 1.1.1.1.2.1

composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9.2.1

composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java v 1.7.2.1

composition/api/src/java/org/apache/avalon/composition/model/ModelRepository.java v 1.1.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java v 1.2.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9.2.1

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java v 1.3.2.1

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7.2.1

Move assembly content up to model layer.
2004-01-03 13:28:37 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/AssemblyException.java v 1.1

branches: 1.1.2; file AssemblyException.java was initially added on branch Ver_3_4.
2004-01-03 13:28:37 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/AssemblyException.java v 1.1.2.1

First step in moving assembly from activation to the model.
2004-01-03 13:19:26 Stephen McConnell kernel/impl/maven.xml v 1.3.2.1

Replicate the kernel impl meta desriptor to the maven repository.
2004-01-03 13:10:48 Stephen McConnell maven.xml v 1.31.2.1

platform.xml v 1.20.2.1

project.xml v 1.18.2.1

activation/api/project.xml v 1.6.2.1

activation/impl/project.xml v 1.13.2.1

activation/spi/project.xml v 1.10.2.1

composition/api/project.xml v 1.9.2.1

composition/impl/project.xml v 1.12.2.1

composition/spi/project.xml v 1.10.2.1

kernel/api/project.xml v 1.3.2.1

kernel/cli/project.xml v 1.4.2.1

kernel/impl/project.xml v 1.16.2.1

kernel/plugin/project.xml v 1.16.2.1

kernel/servlet/project.xml v 1.3.2.1

kernel/unit/project.xml v 1.21.2.1

web/http/api/project.xml v 1.1.1.1.2.1

web/http/impl/project.xml v 1.1.2.1

Bump activation and composition to 2.0-DEV, and merlin (and related subsystems) to 3.4-DEV.
2004-01-01 23:45:41 Stephen McConnell platform.xml v 1.20

branches: 1.20.2; 1.20.4; Housekeeping.
2004-01-01 23:34:45 Stephen McConnell platform/src/bin/merlin-server.sh v 1.9

platform/src/bin/nt/wrapper.conf v 1.9

branches: 1.9.2; 1.9.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLDeploymentProfileCreator.java v 1.7

branches: 1.7.2; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell platform/src/bin/merlin v 1.6

branches: 1.6.2; 1.6.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell INSTALL.TXT v 1.5

branches: 1.5.2; 1.5.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell platform/xdocs/starting/installation/3.2/binary.xml v 1.4

branches: 1.4.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell kernel/cli/project.xml v 1.4

branches: 1.4.2; 1.4.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell maven.xml v 1.31

branches: 1.31.2; 1.31.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell kernel/servlet/project.xml v 1.3

branches: 1.3.2; 1.3.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java v 1.3

branches: 1.3.2; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell kernel/unit/project.xml v 1.21

branches: 1.21.2; 1.21.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell project.xml v 1.18

branches: 1.18.2; 1.18.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell kernel/impl/project.xml v 1.16

kernel/plugin/project.xml v 1.16

branches: 1.16.2; 1.16.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell activation/impl/project.xml v 1.13

platform/src/bin/merlin.sh v 1.13

branches: 1.13.2; 1.13.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell composition/impl/project.xml v 1.12

platform/src/bin/merlinx.bat v 1.12

platform/src/bin/merlinx.sh v 1.12

branches: 1.12.2; 1.12.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell platform/src/bin/merlin.bat v 1.10

branches: 1.10.2; 1.10.4; Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 23:34:45 Stephen McConnell platform.xml v 1.19

composition/impl/src/test/org/apache/avalon/composition/data/DataTestCase.java v 1.3

Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
2004-01-01 16:27:38 Stephen McConnell web/http/impl/src/java/org/apache/avalon/merlin/http/JettyWebServer.java v 1.4

branches: 1.4.2; Clean up formatting.
2004-01-01 13:08:56 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.13

branches: 1.13.2; 1.13.4; Add support for relative source references when including blocks.
2004-01-01 13:07:37 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLDeploymentProfileCreator.java v 1.6

Add exception handling for a component that is missing a class attribute.
2004-01-01 13:06:13 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java v 1.7

branches: 1.7.2; Add a null check on the classname parameter.
2004-01-01 13:06:54 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/event/CompositionEvent.java v 1.2

composition/api/src/java/org/apache/avalon/composition/event/ModelEvent.java v 1.2

branches: 1.2.2; Javadoc corrections.
2004-01-01 13:05:05 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.10

branches: 1.10.2; Remove cruft.
2003-12-29 22:56:18 Stephen McConnell composition/api/project.xml v 1.9

branches: 1.9.2; 1.9.4; Bump minor versions to reflect block add/remove resolution.
2003-12-29 22:56:18 Stephen McConnell activation/api/project.xml v 1.6

branches: 1.6.2; Bump minor versions to reflect block add/remove resolution.
2003-12-29 22:56:19 Stephen McConnell platform/tutorials/lifecycle/activation/project.xml v 1.5

branches: 1.5.4; Bump minor versions to reflect block add/remove resolution.
2003-12-29 22:56:19 Stephen McConnell platform/tutorials/parameterization/project.xml v 1.5

branches: 1.5.2; 1.5.4; Bump minor versions to reflect block add/remove resolution.
2003-12-29 22:56:18 Stephen McConnell kernel/api/project.xml v 1.3

branches: 1.3.2; Bump minor versions to reflect block add/remove resolution.
2003-12-29 22:56:19 Stephen McConnell platform/tutorials/hello/project.xml v 1.11

branches: 1.11.2; 1.11.4; Bump minor versions to reflect block add/remove resolution.
2003-12-29 22:56:18 Stephen McConnell composition/spi/project.xml v 1.10

branches: 1.10.2; 1.10.4; Bump minor versions to reflect block add/remove resolution.
2003-12-29 22:56:18 Stephen McConnell activation/spi/project.xml v 1.10

branches: 1.10.2; Bump minor versions to reflect block add/remove resolution.
2003-12-29 22:56:18 Stephen McConnell INSTALL.TXT v 1.4

maven.xml v 1.30

platform.xml v 1.18

project.xml v 1.17

activation/impl/project.xml v 1.12

composition/impl/project.xml v 1.11

kernel/cli/project.xml v 1.3

kernel/impl/project.xml v 1.15

kernel/plugin/project.xml v 1.15

kernel/servlet/project.xml v 1.2

kernel/unit/project.xml v 1.20

platform/src/bin/merlin v 1.5

platform/src/bin/merlin-server.sh v 1.8

platform/src/bin/merlin.bat v 1.9

platform/src/bin/merlin.sh v 1.12

platform/src/bin/merlinx.bat v 1.11

platform/src/bin/merlinx.sh v 1.11

platform/src/bin/nt/wrapper.conf v 1.8

platform/tutorials/context/strategy/project.xml v 1.5

platform/xdocs/starting/installation/3.2/binary.xml v 1.3

Bump minor versions to reflect block add/remove resolution.
2003-12-29 14:31:21 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.9

branches: 1.9.2; 1.9.4; Resolution of the model removal/addition issue raised by Fernando Padilla (refer users@avalon). The issue concerned the addition of a child appliance following a prior removal. The problem was related to a reference held by the parent block in its deployment graph. The solution covered by this commit invokes the retraction of the block level methods in favour of explicit reactive modification of the block composition structure using events propergated by the meta model.
2003-12-29 14:31:21 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java v 1.4

branches: 1.4.2; Resolution of the model removal/addition issue raised by Fernando Padilla (refer users@avalon). The issue concerned the addition of a child appliance following a prior removal. The problem was related to a reference held by the parent block in its deployment graph. The solution covered by this commit invokes the retraction of the block level methods in favour of explicit reactive modification of the block composition structure using events propergated by the meta model.
2003-12-29 14:31:21 Stephen McConnell activation/api/src/java/org/apache/avalon/activation/appliance/Block.java v 1.3

branches: 1.3.2; Resolution of the model removal/addition issue raised by Fernando Padilla (refer users@avalon). The issue concerned the addition of a child appliance following a prior removal. The problem was related to a reference held by the parent block in its deployment graph. The solution covered by this commit invokes the retraction of the block level methods in favour of explicit reactive modification of the block composition structure using events propergated by the meta model.
2003-12-29 14:31:21 Stephen McConnell project.xml v 1.16

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.9

composition/api/src/java/org/apache/avalon/composition/data/package.html v 1.2

composition/api/src/java/org/apache/avalon/composition/event/CompositionEvent.java v 1.1

composition/api/src/java/org/apache/avalon/composition/event/CompositionEventListener.java v 1.1

composition/api/src/java/org/apache/avalon/composition/event/ContainmentEvent.java v 1.1

composition/api/src/java/org/apache/avalon/composition/event/ModelEvent.java v 1.1

composition/api/src/java/org/apache/avalon/composition/event/package.html v 1.1

composition/impl/project.xml v 1.10

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.12

kernel/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java v 1.2

Resolution of the model removal/addition issue raised by Fernando Padilla (refer users@avalon). The issue concerned the addition of a child appliance following a prior removal. The problem was related to a reference held by the parent block in its deployment graph. The solution covered by this commit invokes the retraction of the block level methods in favour of explicit reactive modification of the block composition structure using events propergated by the meta model.
2003-12-29 09:16:24 Stephen McConnell kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java v 1.3

Remove debug trace.
2003-12-29 02:24:44 niclas platform/src/bin/internal-cygwin.sh v 1.4

platform/src/bin/internal-unix.sh v 1.4

platform/src/bin/merlin v 1.4

Added that the scripts output the 'uname' platform identifier.
2003-12-29 02:16:51 niclas platform/src/bin/internal-unix.sh v 1.3

Fixed a reported problem with the script (yet again) when multiple arguments are used. This was forgotten during the 'space' solving last week. Spaces in dir/files are now required to be entered on the command-line with double backslashes. I can't find any other solution.
2003-12-28 22:47:52 Stephen McConnell platform/installer/build.properties v 1.2

platform/installer/build.xml v 1.3

Ant scripts no longer required.
2003-12-28 22:40:08 Stephen McConnell platform/installer/izpack.xml v 1.3

platform/installer/src/LICENSE.txt v 1.2

Housekeeping.
2003-12-28 22:30:18 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java v 1.8

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java v 1.11

Add interface and implemetation updates to support model removal.
2003-12-28 22:04:18 Stephen McConnell platform/installer/src/nsis/merlin.nsi v 1.1

branches: 1.1.2; Housekeeping.
2003-12-28 22:04:18 Stephen McConnell platform/installer/izpack.xml v 1.2

platform/installer/maven.xml v 1.4

platform/installer/src/LICENSE.txt v 1.1

platform/installer/src/etc/LICENSE.txt v 1.1

platform/installer/src/izpack/izpack.xml v 1.1

Housekeeping.
2003-12-28 14:38:55 Stephen McConnell README.TXT v 1.2

branches: 1.2.2; Correct URL links.
2003-12-28 10:26:08 Stephen McConnell platform/installer/maven.xml v 1.3

Housekeeping.
2003-12-28 10:21:59 Stephen McConnell platform/installer/maven.xml v 1.2

woops
2003-12-28 10:14:46 Stephen McConnell platform/installer/maven.xml v 1.1

platform/installer/project.xml v 1.1

Mavenize content.
2003-12-28 09:07:55 niclas platform/installer/build.xml v 1.2

Forgot to add the 'all' target.
2003-12-28 09:01:10 niclas platform/installer/build.properties v 1.1

platform/installer/build.xml v 1.1

platform/installer/izpack.xml v 1.1

Installer declaration for IzPack. Need to download IzPack from http://www.izforge.com/izpack
2003-12-26 09:24:25 Stephen McConnell maven.xml v 1.29

project.xml v 1.15

Markup for release tag.
2003-12-25 01:12:20 Stephen McConnell INSTALL.TXT v 1.3

maven.xml v 1.28

project.xml v 1.14

platform/tutorials/hello/merlin.properties v 1.5

Update project.xml before tagging.
2003-12-23 23:15:27 niclas platform/src/bin/internal-cygwin.sh v 1.3

platform/src/bin/merlin v 1.3

platform/src/bin/merlinx v 1.3

Sanity checks made on CygWin, and some adjustments made to make it work.
2003-12-23 22:48:59 niclas platform/src/bin/internal-cygwin.sh v 1.2

platform/src/bin/internal-unix.sh v 1.2

platform/src/bin/merlin v 1.2

platform/src/bin/merlinx v 1.2

I think I have managed to fix the space problem on Linux/Unix system. Need to check if it works on CygWin.
2003-12-23 21:46:33 niclas INSTALL.TXT v 1.2

maven.xml v 1.27

platform/src/bin/README.TXT v 1.2

platform/src/bin/internal-cygwin.sh v 1.1

platform/src/bin/internal-unix.sh v 1.1

platform/src/bin/merlin v 1.1

platform/src/bin/merlinx v 1.1

A new launch system for Linux/Unix/CygWin...
2003-12-23 17:30:29 Stephen McConnell platform/xdocs/navigation.xml v 1.4

platform/xdocs/about/navigation.xml v 1.4

platform/xdocs/dpml/navigation.xml v 1.4

platform/xdocs/extensions/jndi/navigation.xml v 1.4

platform/xdocs/extensions/servlet/navigation.xml v 1.4

platform/xdocs/merlin/navigation.xml v 1.4

platform/xdocs/merlin/appliance/navigation.xml v 1.4

platform/xdocs/merlin/block/navigation.xml v 1.4

platform/xdocs/merlin/kernel/navigation.xml v 1.6

platform/xdocs/merlin/kernel/embedding/navigation.xml v 1.3

platform/xdocs/meta/navigation.xml v 1.4

platform/xdocs/meta/block/navigation.xml v 1.5

platform/xdocs/meta/block/classloader/navigation.xml v 1.5

platform/xdocs/meta/block/classloader/classpath/navigation.xml v 1.5

platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml v 1.5

platform/xdocs/meta/block/components/navigation.xml v 1.5

platform/xdocs/meta/block/components/categories/navigation.xml v 1.5

platform/xdocs/meta/block/components/context/navigation.xml v 1.5

platform/xdocs/meta/block/components/context/entry/navigation.xml v 1.5

platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml v 1.5

platform/xdocs/meta/block/components/dependencies/navigation.xml v 1.5

platform/xdocs/meta/block/components/parameters/navigation.xml v 1.5

platform/xdocs/meta/block/include/navigation.xml v 1.5

platform/xdocs/meta/block/services/navigation.xml v 1.6

platform/xdocs/meta/config/navigation.xml v 1.6

platform/xdocs/meta/config/target/navigation.xml v 1.5

platform/xdocs/meta/config/target/categories/navigation.xml v 1.5

platform/xdocs/meta/kernel/navigation.xml v 1.4

platform/xdocs/meta/kernel/logging/navigation.xml v 1.4

platform/xdocs/meta/kernel/repository/navigation.xml v 1.4

platform/xdocs/resources/navigation.xml v 1.4

platform/xdocs/resources/roadmap/navigation.xml v 1.4

platform/xdocs/starting/navigation.xml v 1.5

platform/xdocs/starting/advanced/navigation.xml v 1.10

platform/xdocs/starting/advanced/lifecycle/navigation.xml v 1.6

platform/xdocs/starting/advanced/unit/navigation.xml v 1.5

platform/xdocs/starting/examples/navigation.xml v 1.5

platform/xdocs/starting/examples/afs/navigation.xml v 1.5

platform/xdocs/starting/examples/afs/simple/navigation.xml v 1.5

platform/xdocs/starting/examples/james/navigation.xml v 1.5

platform/xdocs/starting/installation/navigation.xml v 1.3

platform/xdocs/starting/installation/3.0/navigation.xml v 1.3

platform/xdocs/starting/installation/3.2/navigation.xml v 1.3

platform/xdocs/starting/tutorial/navigation.xml v 1.5

platform/xdocs/starting/tutorial/config/navigation.xml v 1.6

platform/xdocs/starting/tutorial/context/navigation.xml v 1.5

platform/xdocs/starting/tutorial/dependencies/navigation.xml v 1.5

platform/xdocs/tools/navigation.xml v 1.5

platform/xdocs/tools/maven/navigation.xml v 1.5

platform/xdocs/tools/tags/navigation.xml v 1.4

Update related project links.
2003-12-23 17:12:54 Stephen McConnell INSTALL.TXT v 1.1

INSTALLATION.TXT v 1.10

maven.xml v 1.26

platform/tutorials/hello/merlin.properties v 1.4

platform/xdocs/navigation.xml v 1.3

platform/xdocs/about/navigation.xml v 1.3

platform/xdocs/dpml/navigation.xml v 1.3

platform/xdocs/extensions/jndi/navigation.xml v 1.3

platform/xdocs/extensions/servlet/navigation.xml v 1.3

platform/xdocs/merlin/navigation.xml v 1.3

platform/xdocs/merlin/appliance/navigation.xml v 1.3

platform/xdocs/merlin/block/navigation.xml v 1.3

platform/xdocs/merlin/kernel/navigation.xml v 1.5

platform/xdocs/merlin/kernel/embedding/navigation.xml v 1.2

platform/xdocs/meta/navigation.xml v 1.3

platform/xdocs/meta/block/navigation.xml v 1.4

platform/xdocs/meta/block/classloader/navigation.xml v 1.4

platform/xdocs/meta/block/classloader/classpath/navigation.xml v 1.4

platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml v 1.4

platform/xdocs/meta/block/components/navigation.xml v 1.4

platform/xdocs/meta/block/components/categories/navigation.xml v 1.4

platform/xdocs/meta/block/components/context/navigation.xml v 1.4

platform/xdocs/meta/block/components/context/entry/navigation.xml v 1.4

platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml v 1.4

platform/xdocs/meta/block/components/dependencies/navigation.xml v 1.4

platform/xdocs/meta/block/components/parameters/navigation.xml v 1.4

platform/xdocs/meta/block/include/navigation.xml v 1.4

platform/xdocs/meta/block/services/navigation.xml v 1.5

platform/xdocs/meta/config/navigation.xml v 1.5

platform/xdocs/meta/config/target/navigation.xml v 1.4

platform/xdocs/meta/config/target/categories/navigation.xml v 1.4

platform/xdocs/meta/kernel/navigation.xml v 1.3

platform/xdocs/meta/kernel/logging/navigation.xml v 1.3

platform/xdocs/meta/kernel/repository/navigation.xml v 1.3

platform/xdocs/resources/navigation.xml v 1.3

platform/xdocs/resources/roadmap/navigation.xml v 1.3

platform/xdocs/starting/navigation.xml v 1.4

platform/xdocs/starting/advanced/navigation.xml v 1.9

platform/xdocs/starting/advanced/lifecycle/navigation.xml v 1.5

platform/xdocs/starting/advanced/unit/navigation.xml v 1.4

platform/xdocs/starting/examples/navigation.xml v 1.4

platform/xdocs/starting/examples/afs/navigation.xml v 1.4

platform/xdocs/starting/examples/afs/simple/navigation.xml v 1.4

platform/xdocs/starting/examples/james/navigation.xml v 1.4

platform/xdocs/starting/installation/navigation.xml v 1.2

platform/xdocs/starting/installation/3.0/navigation.xml v 1.2

platform/xdocs/starting/installation/3.2/navigation.xml v 1.2

platform/xdocs/starting/tutorial/navigation.xml v 1.4

platform/xdocs/starting/tutorial/config/navigation.xml v 1.5

platform/xdocs/starting/tutorial/context/navigation.xml v 1.4

platform/xdocs/starting/tutorial/dependencies/navigation.xml v 1.4

platform/xdocs/tools/navigation.xml v 1.4

platform/xdocs/tools/maven/navigation.xml v 1.4

platform/xdocs/tools/tags/navigation.xml v 1.3

Replace INSTALLATION.TXT with INSTALL.TXT
2003-12-23 15:07:01 Stephen McConnell platform/src/bin/merlin.sh v 1.11

platform/src/bin/merlinx.sh v 1.10

Applying Cygwin support patch from Jörg Schaible
2003-12-22 22:41:59 Stephen McConnell project.xml v 1.13

Upgrade Niclas Hedhman from contributor to developer.
2003-12-22 22:32:37 Stephen McConnell INSTALLATION.TXT v 1.9

Correct install instructions.
2003-12-22 21:46:02 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java v 1.4

branches: 1.4.2; Remove redundant traces.
2003-12-22 21:28:09 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java v 1.15

branches: 1.15.2; 1.15.4; Fix two bugs - one in composition and another in activation dealing with relative references to blocks.
2003-12-22 21:28:09 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.8

composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java v 1.3

kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java v 1.11

kernel/cli/src/java/org/apache/avalon/merlin/cli/Resources_pt.properties v 1.2

Fix two bugs - one in composition and another in activation dealing with relative references to blocks.
2003-12-22 13:57:53 niclas platform/src/bin/merlin-server.sh v 1.7

platform/src/bin/merlin.bat v 1.8

platform/src/bin/merlin.sh v 1.10

platform/src/bin/merlinx.bat v 1.10

platform/src/bin/merlinx.sh v 1.9

Introduction of MERLIN_JVM_OPTS for users to be able to set any JVM options they like prior to invoking the command-line start.
2003-12-22 09:06:41 niclas activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java v 1.7

activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultApplianceRepository.java v 1.3

Added a little bit logging in the DefaultApplianceRepository, so one can see what happens if the lookup fails.
2003-12-22 01:19:11 hammett kernel/cli/src/java/org/apache/avalon/merlin/cli/Resources.properties v 1.3

kernel/cli/src/java/org/apache/avalon/merlin/cli/Resources_pt.properties v 1.1

Translation to portuguese. Small correction.
2003-12-21 23:41:41 Stephen McConnell platform/tutorials/hello/merlin.properties v 1.3

platform/tutorials/parameterization/src/test/tutorial/StandardTestCase.java v 1.4

Correct testcase bug in the parameters tutorial.
2003-12-21 23:40:06 Stephen McConnell INSTALLATION.TXT v 1.8

Update install instructions to reference MERLIN_JVMARGS env variable.
2003-12-21 23:40:38 Stephen McConnell maven.xml v 1.25

Housekeeping.
2003-12-21 23:36:55 Stephen McConnell platform/src/bin/merlin.bat v 1.7

platform/src/bin/merlinx.bat v 1.9

Update the windows bat files to remove the java extensions directory override and add a generic MERLIN_JVMARGS value.
2003-12-21 23:14:49 Stephen McConnell kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java v 1.2

kernel/servlet/src/webapp/WEB-INF/web.xml v 1.2

kernel/servlet/src/webapp/css/merlin.css v 1.2

Add listing of the kernel parameters as part of the default behaviour of the merlin servlet.
2003-12-21 23:13:43 Stephen McConnell kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java v 1.10

Improve handling of command line args on boolean switches - prev version was setting debug, info, and server modes and in doing so, overriding defaults resolved from properties. Update changes this so that the explicit declaration of a -info, -debug or -server switch is required before setting the criteria value.
2003-12-21 23:11:39 Stephen McConnell kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java v 1.12

Set the default server mode to true.
2003-12-21 01:43:47 Stephen McConnell kernel/servlet/.cvsignore v 1.1

kernel/servlet/maven.xml v 1.1

kernel/servlet/project.properties v 1.1

kernel/servlet/project.xml v 1.1

kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java v 1.1

kernel/servlet/src/webapp/WEB-INF/web.xml v 1.1

kernel/servlet/src/webapp/css/merlin.css v 1.1

kernel/servlet/src/webapp/images/Paper.gif v 1.1

Addition of an embedded kernel in a servlet.
2003-12-20 23:59:14 Stephen McConnell kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java v 1.12

Ad a null test so that if the deployment path is null - we fall back to defaults derived from properties.
2003-12-20 22:38:18 Stephen McConnell platform/xdocs/merlin/kernel/properties.xml v 1.3

Correct some property references to include the system seach path.
2003-12-20 22:29:59 Stephen McConnell INSTALLATION.TXT v 1.7

maven.xml v 1.24

kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java v 1.11

platform/xdocs/merlin/kernel/cli.xml v 1.3

platform/xdocs/merlin/kernel/navigation.xml v 1.4

platform/xdocs/merlin/kernel/embedding/index.xml v 1.1

platform/xdocs/merlin/kernel/embedding/navigation.xml v 1.1

Doc updates and housekeeping.
2003-12-20 18:41:18 Alex Karasulu platform/src/bin/merlin.sh v 1.9

Added line to make sure the -jar argument is set appropriately when runing the merlin.sh within the Cygwin shell environment on windows systems.
2003-12-20 09:07:15 niclas INSTALLATION.TXT v 1.6

platform/src/bin/merlin.sh v 1.8

This is the only thing I believe will work on all platforms. The "exec $RUN_CMD" does not work... Verified that the provided solution works both for spaces in the Java command, as well as in the MERLIN_HOME. It is still important that the JAVA_HOME and MERLIN_HOME is not set with the backslash-space "\\ " construct, used in "pwd", but a plain space. Ex; JAVA_HOME="/java/jdk 1.4/"
2003-12-20 00:16:00 Stephen McConnell platform/src/bin/merlinx.bat v 1.8

platform/src/bin/merlinx.sh v 1.8

Properly correct merlinx command line parmeters.
2003-12-19 23:40:04 Stephen McConnell platform/src/bin/merlinx.bat v 1.7

platform/src/bin/merlinx.sh v 1.7

Corredct merlinx command line parmeters.
2003-12-19 17:41:21 Stephen McConnell platform/src/bin/merlin-server.sh v 1.6

platform/src/bin/merlin.sh v 1.7

platform/src/bin/merlinx.bat v 1.6

platform/src/bin/merlinx.sh v 1.6

Sync. with repo RC4 and include Cygen scripts.
2003-12-18 01:33:52 Stephen McConnell platform/src/bin/merlin-server.sh v 1.5

platform/src/bin/merlin.bat v 1.6

platform/src/bin/merlin.sh v 1.6

platform/src/bin/merlinx.bat v 1.5

platform/src/bin/merlinx.sh v 1.5

platform/src/bin/nt/wrapper.conf v 1.7

Remove merlinx as the merlin scripts make this easy.
2003-12-18 01:11:43 Stephen McConnell kernel/api/src/java/org/apache/avalon/merlin/package.html v 1.1

package docs
2003-12-18 01:11:07 Stephen McConnell activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java v 1.4

branches: 1.4.2; Version bump.
2003-12-18 01:11:07 Stephen McConnell maven.xml v 1.23

platform.xml v 1.17

activation/api/project.xml v 1.5

activation/impl/project.xml v 1.11

activation/spi/project.xml v 1.9

composition/api/project.xml v 1.8

composition/impl/project.xml v 1.9

composition/impl/src/test/conf/includes.xml v 1.2

composition/spi/project.xml v 1.9

kernel/api/project.xml v 1.2

kernel/cli/maven.xml v 1.3

kernel/cli/project.properties v 1.2

kernel/cli/project.xml v 1.2

kernel/impl/project.xml v 1.14

kernel/plugin/project.xml v 1.14

kernel/unit/project.xml v 1.19

platform/tutorials/hello/project.xml v 1.10

platform/tutorials/parameterization/project.xml v 1.4

Version bump.
2003-12-18 01:04:27 Stephen McConnell kernel/cli/src/java/org/apache/avalon/merlin/cli/package.html v 1.1

kernel/plugin/src/java/org/apache/avalon/merlin/tools/package.html v 1.1

package docs
2003-12-17 14:50:57 Stephen McConnell maven.xml v 1.22

Update avalon:build to build the replicable kit.
2003-12-16 08:26:17 Stephen McConnell kernel/plugin/plugin.jelly v 1.5

Correct merlin:simulate goal prerequisites to include java:jar-resources.
2003-12-16 01:34:55 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java v 1.4

Add check for null manifest.
2003-12-15 22:46:23 Stephen McConnell platform.xml v 1.16

activation/impl/project.xml v 1.10

activation/spi/project.xml v 1.8

composition/api/project.xml v 1.7

composition/impl/project.xml v 1.8

composition/spi/project.xml v 1.8

extension/impl/project.xml v 1.2

kernel/impl/project.xml v 1.13

Update refeences to consumers of the extension api to reference version 1.1.
2003-12-15 18:06:33 Stephen McConnell extension/spi/project.xml v 1.2

extension/spi/src/java/org/apache/avalon/extension/Extension.java v 1.3

Add check for a null manifest and bump package version.
2003-12-14 23:09:03 Stephen McConnell kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.7

branches: 1.7.2; 1.7.4; Add a System.runFinalization(); request to the shutdown hook.
2003-12-14 20:07:45 Stephen McConnell kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java v 1.9

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java v 1.11

kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java v 1.10

kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java v 1.22

Add additional system level in property resolution.
2003-12-14 14:09:59 Stephen McConnell composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java v 1.9

branches: 1.9.2; Housekeeping.
2003-12-14 14:09:59 Stephen McConnell composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java v 1.7

branches: 1.7.2; Housekeeping.
2003-12-14 14:09:59 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java v 1.6

activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/TransientLifestyleHandler.java v 1.6

branches: 1.6.2; Housekeeping.
2003-12-14 14:09:59 Stephen McConnell activation/impl/src/java/org/apache/avalon/activation/lifestyle/impl/ThreadLifestyleHandler.java v 1.5

composition/api/src/java/org/apache/avalon/composition/data/DeploymentProfile.java v 1.6

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java v 1.10

Housekeeping.
2003-12-14 12:58:00 Stephen McConnell kernel/impl/conf/merlin.properties v 1.5

Resource not required.
2003-12-14 12:41:06 Stephen McConnell maven.xml v 1.21

project.xml v 1.12

Housekeeping.
2003-12-14 12:01:44 Stephen McConnell maven.xml v 1.20

Remove artifact meta generation - we only need this for factories.
2003-12-14 12:00:12 Stephen McConnell kernel/impl/maven.xml v 1.3

branches: 1.3.2; Remove out-of-date jelly scripts and update to use improved handling of avalon home resolution.
2003-12-14 12:00:12 Stephen McConnell kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java v 1.9

Remove out-of-date jelly scripts and update to use improved handling of avalon home resolution.
2003-12-14 11:58:26 Stephen McConnell kernel/cli/maven.xml v 1.2

kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java v 1.8

Sync. with repository updates (specifically dealing with the handling of inital properties).
2003-12-14 10:54:50 Stephen McConnell kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java v 1.8

Correct bug in directory resolution.
2003-12-14 10:29:47 Stephen McConnell kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java v 1.9

Change to default to the maven repository for applications.
2003-12-14 09:56:08 Stephen McConnell kernel/unit/maven.xml v 1.7

branches: 1.7.2; Refactory to use the DefaultBuilder as the basis for implementation artifact resolution.
2003-12-14 09:56:08 Stephen McConnell kernel/unit/project.xml v 1.18

kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java v 1.21

Refactory to use the DefaultBuilder as the basis for implementation artifact resolution.
2003-12-14 09:55:19 Stephen McConnell kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java v 1.8

Move resolution of the impl artifact to the DefaultBuilder.
2003-12-13 21:12:49 Stephen McConnell kernel/impl/maven.xml v 1.2

kernel/impl/project.properties v 1.2

Housekeeping on properties generation.
2003-12-13 21:08:31 Stephen McConnell kernel/plugin/maven.xml v 1.6

Cleanup jelly.
2003-12-13 21:07:01 Stephen McConnell kernel/unit/maven.xml v 1.6

kernel/unit/merlin.properties v 1.3

Remove snapshot link.
2003-12-13 21:05:56 Stephen McConnell kernel/plugin/maven.xml v 1.5

kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java v 1.7

Cleanup property reference.
2003-12-13 20:59:22 Stephen McConnell kernel/plugin/maven.xml v 1.4

Link to implementation properties.
2003-12-13 18:25:54 Stephen McConnell maven.xml v 1.19

kernel/impl/conf/kernel.xml v 1.3

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java v 1.7

kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java v 1.6

kernel/plugin/maven.xml v 1.3

kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java v 1.6

kernel/unit/maven.xml v 1.5

kernel/unit/merlin.properties v 1.2

kernel/unit/project.xml v 1.17

kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java v 1.20

Addition of a kernel builder utility that provides support for the handling of property file inspection for a merlin.implemetation property that can be used to switch in alternative implementation of the kernel based on client property settings.
2003-12-13 17:45:35 Stephen McConnell project.xml v 1.11

Correct abstract test exclusion.