You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/09/11 04:35:08 UTC
cvs commit: avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags attribute.xml context.xml dependency.xml entry.xml extension.xml index.xml lifestyle.xml logger.xml name.xml namespace.xml navigation.xml service.xml stage.xml version.xml
mcconnell 2003/09/10 19:35:08
Modified: merlin/kernel/bootstrap/src/java BootstrapHelper.java
merlin/merlin-platform/src/config debug.xml kernel.xml
merlin/merlin-platform/tutorials/composition/application/impl/src/java/tutorial/application
Application.java
merlin/merlin-platform/tutorials/composition/location/api/src/java/tutorial/location
LocationService.java
merlin/merlin-platform/tutorials/composition/location/impl/src/java/tutorial/location
LocationComponent.java
merlin/merlin-platform/tutorials/composition/publisher/api/src/java/tutorial/publisher
PublisherService.java
merlin/merlin-platform/tutorials/composition/publisher/impl/src/java/tutorial/publisher
PublisherComponent.java
merlin/merlin-platform/tutorials/configuration/defaults/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/configuration/override/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/context/avalon/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/context/casting/src/java/tutorial
DemoContext.java DemoContextProvider.java
HelloComponent.java
merlin/merlin-platform/tutorials/context/custom/src/java/tutorial
HelloComponent.java NumberCruncher.java
merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial
Contextualizable.java
DemoContextualizationHandler.java
StandardComponent.java StandardContext.java
StandardContextImp.java StandardService.java
merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial
HelloComponent.java Identifiable.java
IdentifiableComponent.java RandomGenerator.java
RandomGeneratorProvider.java
merlin/merlin-platform/tutorials/dependencies/manual/src/java/tutorial
HelloComponent.java Identifiable.java
IdentifiableComponent.java
merlin/merlin-platform/tutorials/hello/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/lifecycle/activation/src/java/tutorial
Demonstratable.java DemonstratableProvider.java
HelloComponent.java
merlin/merlin-platform/tutorials/lifecycle/excalibur/src/java/tutorial
Demonstratable.java DemonstratableProvider.java
HelloComponent.java
merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground
Primary.java PrimaryService.java Secondary.java
SecondaryService.java
merlin/merlin-platform/xdocs index.xml navigation.xml
merlin/merlin-platform/xdocs/about benefits.xml features.xml
index.xml navigation.xml purpose.xml
merlin/merlin-platform/xdocs/extensions/jndi index.xml
navigation.xml
merlin/merlin-platform/xdocs/extensions/servlet index.xml
navigation.xml
merlin/merlin-platform/xdocs/merlin index.xml navigation.xml
merlin/merlin-platform/xdocs/merlin/appliance assembly.xml
index.xml lifecycle.xml lifestyle.xml
navigation.xml
merlin/merlin-platform/xdocs/merlin/block index.xml
navigation.xml
merlin/merlin-platform/xdocs/merlin/kernel cli.xml index.xml
navigation.xml nt.xml
merlin/merlin-platform/xdocs/meta index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/block categories.xml
components.xml includes.xml index.xml
navigation.xml
merlin/merlin-platform/xdocs/meta/block/classloader
extensions.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/block/classloader/classpath
fileset.xml index.xml navigation.xml repository.xml
merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository
index.xml navigation.xml resource.xml
merlin/merlin-platform/xdocs/meta/block/components
configuration.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/block/components/categories
category.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/block/components/context
index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/block/components/context/entry
import.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/block/components/context/entry/constructor
index.xml navigation.xml param.xml
merlin/merlin-platform/xdocs/meta/block/components/dependencies
dependency.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/block/components/parameters
index.xml navigation.xml parameter.xml
merlin/merlin-platform/xdocs/meta/block/include index.xml
navigation.xml resource.xml source.xml
merlin/merlin-platform/xdocs/meta/block/services index.xml
navigation.xml service.xml
merlin/merlin-platform/xdocs/meta/config index.xml
navigation.xml
merlin/merlin-platform/xdocs/meta/config/target
configuration.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/config/target/categories
category.xml index.xml navigation.xml
merlin/merlin-platform/xdocs/meta/kernel index.xml
navigation.xml
merlin/merlin-platform/xdocs/meta/kernel/logging
category.xml index.xml navigation.xml target.xml
merlin/merlin-platform/xdocs/meta/kernel/repository
cache.xml hosts.xml index.xml navigation.xml
proxy.xml
merlin/merlin-platform/xdocs/resources ccm.xml download.xml
index.xml navigation.xml notebook.xml
merlin/merlin-platform/xdocs/starting index.xml
installation.xml navigation.xml
merlin/merlin-platform/xdocs/starting/advanced appliance.xml
block.xml composite.xml containers.xml context.xml
export.xml import.xml includes.xml index.xml
navigation.xml profiles.xml selectors.xml
merlin/merlin-platform/xdocs/starting/advanced/lifecycle
example.xml extension.xml index.xml interfaces.xml
navigation.xml
merlin/merlin-platform/xdocs/starting/examples index.xml
navigation.xml
merlin/merlin-platform/xdocs/starting/examples/afs index.xml
navigation.xml
merlin/merlin-platform/xdocs/starting/examples/afs/simple
build.xml implementation.xml index.xml
interfaces.xml navigation.xml servlet.xml
merlin/merlin-platform/xdocs/starting/examples/james
about.xml block.xml index.xml navigation.xml
resources.xml runtime.xml
merlin/merlin-platform/xdocs/starting/tutorial creation.xml
dependencies.xml execution.xml index.xml
internal.xml navigation.xml services.xml
merlin/merlin-platform/xdocs/starting/tutorial/config
block.xml configurable.xml defaults.xml index.xml
navigation.xml override.xml
merlin/merlin-platform/xdocs/starting/tutorial/context
casting.xml entries.xml index.xml navigation.xml
standard.xml
merlin/merlin-platform/xdocs/starting/tutorial/dependencies
auto.xml index.xml manual.xml navigation.xml
merlin/merlin-platform/xdocs/tools ant.xml index.xml
navigation.xml
merlin/merlin-platform/xdocs/tools/maven deploy.xml
index.xml meta.xml navigation.xml properties.xml
replicate.xml
merlin/merlin-platform/xdocs/tools/tags attribute.xml
context.xml dependency.xml entry.xml extension.xml
index.xml lifestyle.xml logger.xml name.xml
namespace.xml navigation.xml service.xml stage.xml
version.xml
Added: merlin/merlin-platform/xdocs/dpml index.xml navigation.xml
Log:
Documentation updates - removal of incomplete examples, general content polishing and corrections. Addition of ASL 1.1 to tutorial sources and xdoc sources.
Revision Changes Path
1.2 +49 -54 avalon-sandbox/merlin/kernel/bootstrap/src/java/BootstrapHelper.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/kernel/bootstrap/src/java/BootstrapHelper.java.diff?r1=1.1&r2=1.2
1.3 +0 -4 avalon-sandbox/merlin/merlin-platform/src/config/debug.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/src/config/debug.xml.diff?r1=1.2&r2=1.3
1.12 +0 -4 avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml.diff?r1=1.11&r2=1.12
1.2 +50 -0 avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/src/java/tutorial/application/Application.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/src/java/tutorial/application/Application.java.diff?r1=1.1&r2=1.2
1.2 +50 -0 avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/src/java/tutorial/location/LocationService.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/src/java/tutorial/location/LocationService.java.diff?r1=1.1&r2=1.2
1.2 +50 -0 avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/src/java/tutorial/location/LocationComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/src/java/tutorial/location/LocationComponent.java.diff?r1=1.1&r2=1.2
1.2 +50 -0 avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/src/java/tutorial/publisher/PublisherService.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/src/java/tutorial/publisher/PublisherService.java.diff?r1=1.1&r2=1.2
1.2 +50 -0 avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/src/java/tutorial/publisher/PublisherComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/src/java/tutorial/publisher/PublisherComponent.java.diff?r1=1.1&r2=1.2
1.3 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/src/java/tutorial/HelloComponent.java.diff?r1=1.2&r2=1.3
1.3 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/src/java/tutorial/HelloComponent.java.diff?r1=1.2&r2=1.3
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/src/java/tutorial/HelloComponent.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/src/java/tutorial/DemoContext.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/src/java/tutorial/DemoContext.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/src/java/tutorial/DemoContextProvider.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/src/java/tutorial/DemoContextProvider.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/src/java/tutorial/HelloComponent.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/src/java/tutorial/HelloComponent.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/src/java/tutorial/NumberCruncher.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/src/java/tutorial/NumberCruncher.java.diff?r1=1.1&r2=1.2
1.2 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/Contextualizable.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/Contextualizable.java.diff?r1=1.1&r2=1.2
1.2 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/DemoContextualizationHandler.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/DemoContextualizationHandler.java.diff?r1=1.1&r2=1.2
1.3 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/StandardComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/StandardComponent.java.diff?r1=1.2&r2=1.3
1.2 +48 -54 avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/StandardContext.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/StandardContext.java.diff?r1=1.1&r2=1.2
1.2 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/StandardContextImp.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/StandardContextImp.java.diff?r1=1.1&r2=1.2
1.2 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/StandardService.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/src/java/tutorial/StandardService.java.diff?r1=1.1&r2=1.2
1.3 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/HelloComponent.java.diff?r1=1.2&r2=1.3
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/Identifiable.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/Identifiable.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/IdentifiableComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/IdentifiableComponent.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/RandomGenerator.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/RandomGenerator.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/RandomGeneratorProvider.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/src/java/tutorial/RandomGeneratorProvider.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/src/java/tutorial/HelloComponent.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/src/java/tutorial/Identifiable.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/src/java/tutorial/Identifiable.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/src/java/tutorial/IdentifiableComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/src/java/tutorial/IdentifiableComponent.java.diff?r1=1.1&r2=1.2
1.6 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/hello/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/src/java/tutorial/HelloComponent.java.diff?r1=1.5&r2=1.6
1.2 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/src/java/tutorial/Demonstratable.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/src/java/tutorial/Demonstratable.java.diff?r1=1.1&r2=1.2
1.2 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/src/java/tutorial/DemonstratableProvider.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/src/java/tutorial/DemonstratableProvider.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/src/java/tutorial/HelloComponent.java.diff?r1=1.1&r2=1.2
1.2 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/src/java/tutorial/Demonstratable.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/src/java/tutorial/Demonstratable.java.diff?r1=1.1&r2=1.2
1.2 +49 -54 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/src/java/tutorial/DemonstratableProvider.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/src/java/tutorial/DemonstratableProvider.java.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/src/java/tutorial/HelloComponent.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/src/java/tutorial/HelloComponent.java.diff?r1=1.1&r2=1.2
1.5 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/Primary.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/Primary.java.diff?r1=1.4&r2=1.5
1.3 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/PrimaryService.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/PrimaryService.java.diff?r1=1.2&r2=1.3
1.5 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/Secondary.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/Secondary.java.diff?r1=1.4&r2=1.5
1.3 +49 -0 avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/SecondaryService.java
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/SecondaryService.java.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/index.xml.diff?r1=1.1&r2=1.2
1.2 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/about/benefits.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/about/benefits.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/about/features.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/about/features.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/about/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/about/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/about/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/about/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/about/purpose.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/about/purpose.xml.diff?r1=1.1&r2=1.2
1.1 avalon-sandbox/merlin/merlin-platform/xdocs/dpml/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/dpml/index.xml?rev=1.1
1.1 avalon-sandbox/merlin/merlin-platform/xdocs/dpml/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/dpml/navigation.xml?rev=1.1
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/extensions/jndi/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/extensions/jndi/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/extensions/jndi/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/extensions/jndi/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/extensions/servlet/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/extensions/servlet/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/extensions/servlet/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/extensions/servlet/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +51 -0 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/assembly.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/assembly.xml.diff?r1=1.1&r2=1.2
1.2 +50 -0 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/index.xml.diff?r1=1.1&r2=1.2
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/lifecycle.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/lifecycle.xml.diff?r1=1.1&r2=1.2
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/lifestyle.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/lifestyle.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/appliance/navigation.xml.diff?r1=1.1&r2=1.2
1.4 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/block/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/block/index.xml.diff?r1=1.3&r2=1.4
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/block/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/block/navigation.xml.diff?r1=1.1&r2=1.2
1.3 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/cli.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/cli.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/nt.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/merlin/kernel/nt.xml.diff?r1=1.1&r2=1.2
1.5 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/index.xml.diff?r1=1.4&r2=1.5
1.5 +5 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/navigation.xml.diff?r1=1.4&r2=1.5
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/categories.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/categories.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/includes.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/includes.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/extensions.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/extensions.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/fileset.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/fileset.xml.diff?r1=1.1&r2=1.2
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/index.xml.diff?r1=1.1&r2=1.2
1.2 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository/resource.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/classloader/classpath/repository/resource.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/configuration.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/configuration.xml.diff?r1=1.1&r2=1.2
1.3 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/index.xml.diff?r1=1.2&r2=1.3
1.3 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/categories/category.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/categories/category.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/categories/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/categories/index.xml.diff?r1=1.1&r2=1.2
1.3 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/categories/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/categories/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/index.xml.diff?r1=1.1&r2=1.2
1.3 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/import.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/import.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/constructor/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/constructor/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/constructor/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/constructor/param.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/context/entry/constructor/param.xml.diff?r1=1.1&r2=1.2
1.3 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/dependency.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/dependency.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/index.xml.diff?r1=1.1&r2=1.2
1.3 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/navigation.xml.diff?r1=1.2&r2=1.3
1.3 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/parameter.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/parameters/parameter.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/include/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/include/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/include/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/include/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/include/resource.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/include/resource.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/include/source.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/include/source.xml.diff?r1=1.1&r2=1.2
1.2 +50 -1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/services/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/services/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/services/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/services/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +51 -1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/services/service.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/services/service.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/configuration.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/configuration.xml.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/categories/category.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/categories/category.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/categories/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/categories/index.xml.diff?r1=1.1&r2=1.2
1.2 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/categories/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/config/target/categories/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/logging/category.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/logging/category.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/logging/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/logging/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/logging/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/logging/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/logging/target.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/logging/target.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/cache.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/cache.xml.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/hosts.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/hosts.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/index.xml.diff?r1=1.1&r2=1.2
1.2 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/navigation.xml.diff?r1=1.1&r2=1.2
1.2 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/proxy.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/kernel/repository/proxy.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/resources/ccm.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/resources/ccm.xml.diff?r1=1.1&r2=1.2
1.5 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/resources/download.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/resources/download.xml.diff?r1=1.4&r2=1.5
1.4 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/resources/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/resources/index.xml.diff?r1=1.3&r2=1.4
1.2 +55 -9 avalon-sandbox/merlin/merlin-platform/xdocs/resources/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/resources/navigation.xml.diff?r1=1.1&r2=1.2
1.11 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/resources/notebook.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/resources/notebook.xml.diff?r1=1.10&r2=1.11
1.4 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/index.xml.diff?r1=1.3&r2=1.4
1.3 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/installation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/installation.xml.diff?r1=1.2&r2=1.3
1.3 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/appliance.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/appliance.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/block.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/block.xml.diff?r1=1.1&r2=1.2
1.6 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/composite.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/composite.xml.diff?r1=1.5&r2=1.6
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/containers.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/containers.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/context.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/context.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/export.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/export.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/import.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/import.xml.diff?r1=1.1&r2=1.2
1.8 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/includes.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/includes.xml.diff?r1=1.7&r2=1.8
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/index.xml.diff?r1=1.1&r2=1.2
1.4 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/navigation.xml.diff?r1=1.3&r2=1.4
1.3 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/profiles.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/profiles.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/selectors.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/selectors.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/example.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/example.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/extension.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/extension.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/index.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/interfaces.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/interfaces.xml.diff?r1=1.1&r2=1.2
1.4 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/lifecycle/navigation.xml.diff?r1=1.3&r2=1.4
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/index.xml.diff?r1=1.1&r2=1.2
1.3 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/index.xml.diff?r1=1.1&r2=1.2
1.3 +55 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/build.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/build.xml.diff?r1=1.1&r2=1.2
1.3 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/implementation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/implementation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/index.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/interfaces.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/interfaces.xml.diff?r1=1.1&r2=1.2
1.3 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/servlet.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/afs/simple/servlet.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/about.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/about.xml.diff?r1=1.1&r2=1.2
1.5 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/block.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/block.xml.diff?r1=1.4&r2=1.5
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/index.xml.diff?r1=1.1&r2=1.2
1.3 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/resources.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/resources.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/runtime.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/runtime.xml.diff?r1=1.1&r2=1.2
1.6 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/creation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/creation.xml.diff?r1=1.5&r2=1.6
1.6 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies.xml.diff?r1=1.5&r2=1.6
1.5 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/execution.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/execution.xml.diff?r1=1.4&r2=1.5
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/index.xml.diff?r1=1.1&r2=1.2
1.5 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/internal.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/internal.xml.diff?r1=1.4&r2=1.5
1.4 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/navigation.xml.diff?r1=1.3&r2=1.4
1.4 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/services.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/services.xml.diff?r1=1.3&r2=1.4
1.5 +49 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/block.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/block.xml.diff?r1=1.4&r2=1.5
1.4 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/configurable.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/configurable.xml.diff?r1=1.3&r2=1.4
1.4 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/defaults.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/defaults.xml.diff?r1=1.3&r2=1.4
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/index.xml.diff?r1=1.1&r2=1.2
1.5 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/navigation.xml.diff?r1=1.4&r2=1.5
1.4 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/override.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/config/override.xml.diff?r1=1.3&r2=1.4
1.6 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/casting.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/casting.xml.diff?r1=1.5&r2=1.6
1.6 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/entries.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/entries.xml.diff?r1=1.5&r2=1.6
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/index.xml.diff?r1=1.1&r2=1.2
1.4 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/navigation.xml.diff?r1=1.3&r2=1.4
1.4 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/standard.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/standard.xml.diff?r1=1.3&r2=1.4
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/auto.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/auto.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/index.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/manual.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/manual.xml.diff?r1=1.1&r2=1.2
1.3 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies/navigation.xml.diff?r1=1.2&r2=1.3
1.5 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/tools/ant.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/ant.xml.diff?r1=1.4&r2=1.5
1.4 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/tools/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/index.xml.diff?r1=1.3&r2=1.4
1.4 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/tools/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/navigation.xml.diff?r1=1.3&r2=1.4
1.3 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/deploy.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/deploy.xml.diff?r1=1.2&r2=1.3
1.3 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/index.xml.diff?r1=1.2&r2=1.3
1.3 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/meta.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/meta.xml.diff?r1=1.2&r2=1.3
1.3 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/navigation.xml.diff?r1=1.2&r2=1.3
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/properties.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/properties.xml.diff?r1=1.1&r2=1.2
1.2 +48 -0 avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/replicate.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/maven/replicate.xml.diff?r1=1.1&r2=1.2
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/attribute.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/attribute.xml.diff?r1=1.1&r2=1.2
1.3 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/context.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/context.xml.diff?r1=1.2&r2=1.3
1.3 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/dependency.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/dependency.xml.diff?r1=1.2&r2=1.3
1.3 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/entry.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/entry.xml.diff?r1=1.2&r2=1.3
1.3 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/extension.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/extension.xml.diff?r1=1.2&r2=1.3
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/index.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/index.xml.diff?r1=1.1&r2=1.2
1.3 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/lifestyle.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/lifestyle.xml.diff?r1=1.2&r2=1.3
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/logger.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/logger.xml.diff?r1=1.1&r2=1.2
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/name.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/name.xml.diff?r1=1.1&r2=1.2
1.3 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/namespace.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/namespace.xml.diff?r1=1.2&r2=1.3
1.3 +54 -4 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/navigation.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/navigation.xml.diff?r1=1.2&r2=1.3
1.3 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/service.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/service.xml.diff?r1=1.2&r2=1.3
1.3 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/stage.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/stage.xml.diff?r1=1.2&r2=1.3
1.2 +49 -1 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/version.xml
http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/version.xml.diff?r1=1.1&r2=1.2
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org