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/12/08 16:37:14 UTC
cvs commit: avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/test MerlinTestCaseTest.java
mcconnell 2003/12/08 07:37:14
Modified: merlin maven.xml platform.xml
merlin/kernel/impl .cvsignore project.xml
merlin/kernel/impl/conf kernel.xml
merlin/kernel/plugin maven.xml plugin.jelly
plugin.properties project.xml
merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
merlin/kernel/unit .cvsignore maven.xml project.xml
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
AbstractMerlinTestCase.java
Added: merlin/kernel/api .cvsignore maven.xml project.xml
merlin/kernel/api/src/java/org/apache/avalon/merlin
Kernel.java KernelController.java
KernelCriteria.java KernelException.java
KernelRuntimeException.java
merlin/kernel/cli .cvsignore maven.xml merlin.properties
project.properties project.xml
merlin/kernel/cli/conf hello.block override.xml test-2.block
test.block
merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli
Main.java Resources.properties
merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test
MerlinCLITest.java
merlin/kernel/impl maven.xml project.properties
merlin/kernel/impl/conf avalon.properties merlin.properties
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultCriteria.java DefaultFactory.java
DefaultKernel.java DefaultKernelMBean.java
Resources.properties package.html
merlin/kernel/unit merlin.properties
merlin/kernel/unit/conf hello.block override.xml
test-2.block test.block
merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/test
MerlinTestCaseTest.java
Removed: merlin/kernel/bootstrap .cvsignore maven.xml project.xml
merlin/kernel/bootstrap/src/etc merlin.properties project.mf
merlin/kernel/bootstrap/src/java BootstrapHelper.java
BootstrapRuntimeException.java Merlin.java
Resources.properties Resources_de.properties
Resources_fr.properties package.html
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel
KernelContext.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
CLIKernelLoader.java DefaultKernel.java
DefaultKernelContext.java DefaultKernelMBean.java
DefaultLoader.java JRMPKernelAdaptor.java
Resources.properties package.html
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/doc-files
DefaultKernel.gif
merlin/kernel/plugin/xdocs goals.xml navigation.xml
properties.xml
merlin/kernel/spi .cvsignore project.xml
merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel
Controller.java Kernel.java KernelException.java
KernelRuntimeException.java Loader.java
package.html
merlin/kernel/spi/src/java/org/apache/avalon/merlin/kernel/doc-files
kernel.gif
merlin/kernel/unit/conf block.xml config.xml
merlin/kernel/unit/src/etc merlin.properties
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
DefaultEmbeddedKernel.java UnitException.java
UnitHelper.java UnitRuntimeException.java
merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit
Hello.java HelloComponent.java HelloComponent.xinfo
StandardTestCase.java
Log:
Merlin 3.2 rollup from avalon-sandbox/kernel to avalon/merlin/kernel.
Revision Changes Path
1.13 +6 -11 avalon/merlin/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/maven.xml.diff?r1=1.12&r2=1.13
1.14 +10 -10 avalon/merlin/platform.xml
http://cvs.apache.org/viewcvs/avalon/merlin/platform.xml.diff?r1=1.13&r2=1.14
1.1 avalon/merlin/kernel/api/.cvsignore
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/.cvsignore?rev=1.1
1.1 avalon/merlin/kernel/api/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/maven.xml?rev=1.1
1.1 avalon/merlin/kernel/api/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/project.xml?rev=1.1
1.1 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/Kernel.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/Kernel.java?rev=1.1
1.1 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelController.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelController.java?rev=1.1
1.1 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelCriteria.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelCriteria.java?rev=1.1
1.1 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelException.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelException.java?rev=1.1
1.1 avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelRuntimeException.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelRuntimeException.java?rev=1.1
1.1 avalon/merlin/kernel/cli/.cvsignore
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/.cvsignore?rev=1.1
1.1 avalon/merlin/kernel/cli/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/maven.xml?rev=1.1
1.1 avalon/merlin/kernel/cli/merlin.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/merlin.properties?rev=1.1
1.1 avalon/merlin/kernel/cli/project.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/project.properties?rev=1.1
1.1 avalon/merlin/kernel/cli/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/project.xml?rev=1.1
1.1 avalon/merlin/kernel/cli/conf/hello.block
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/conf/hello.block?rev=1.1
1.1 avalon/merlin/kernel/cli/conf/override.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/conf/override.xml?rev=1.1
1.1 avalon/merlin/kernel/cli/conf/test-2.block
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/conf/test-2.block?rev=1.1
1.1 avalon/merlin/kernel/cli/conf/test.block
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/conf/test.block?rev=1.1
1.1 avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java?rev=1.1
1.1 avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Resources.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Resources.properties?rev=1.1
1.1 avalon/merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITest.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITest.java?rev=1.1
1.3 +2 -3 avalon/merlin/kernel/impl/.cvsignore
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/.cvsignore.diff?r1=1.2&r2=1.3
1.12 +40 -71 avalon/merlin/kernel/impl/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/project.xml.diff?r1=1.11&r2=1.12
1.1 avalon/merlin/kernel/impl/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/maven.xml?rev=1.1
1.1 avalon/merlin/kernel/impl/project.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/project.properties?rev=1.1
1.2 +0 -3 avalon/merlin/kernel/impl/conf/kernel.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/conf/kernel.xml.diff?r1=1.1&r2=1.2
1.1 avalon/merlin/kernel/impl/conf/avalon.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/conf/avalon.properties?rev=1.1
1.1 avalon/merlin/kernel/impl/conf/merlin.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/conf/merlin.properties?rev=1.1
1.1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java?rev=1.1
1.1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java?rev=1.1
1.1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernel.java?rev=1.1
1.1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernelMBean.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultKernelMBean.java?rev=1.1
1.1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/Resources.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/Resources.properties?rev=1.1
1.1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/package.html
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/package.html?rev=1.1
1.2 +1 -11 avalon/merlin/kernel/plugin/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/plugin/maven.xml.diff?r1=1.1&r2=1.2
1.3 +19 -8 avalon/merlin/kernel/plugin/plugin.jelly
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/plugin/plugin.jelly.diff?r1=1.2&r2=1.3
1.2 +57 -25 avalon/merlin/kernel/plugin/plugin.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/plugin/plugin.properties.diff?r1=1.1&r2=1.2
1.12 +7 -234 avalon/merlin/kernel/plugin/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/plugin/project.xml.diff?r1=1.11&r2=1.12
1.4 +146 -296 avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java.diff?r1=1.3&r2=1.4
1.3 +0 -1 avalon/merlin/kernel/unit/.cvsignore
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/.cvsignore.diff?r1=1.2&r2=1.3
1.4 +7 -9 avalon/merlin/kernel/unit/maven.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/maven.xml.diff?r1=1.3&r2=1.4
1.15 +17 -105 avalon/merlin/kernel/unit/project.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/project.xml.diff?r1=1.14&r2=1.15
1.1 avalon/merlin/kernel/unit/merlin.properties
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/merlin.properties?rev=1.1
1.1 avalon/merlin/kernel/unit/conf/hello.block
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/conf/hello.block?rev=1.1
1.1 avalon/merlin/kernel/unit/conf/override.xml
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/conf/override.xml?rev=1.1
1.1 avalon/merlin/kernel/unit/conf/test-2.block
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/conf/test-2.block?rev=1.1
1.1 avalon/merlin/kernel/unit/conf/test.block
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/conf/test.block?rev=1.1
1.17 +221 -337 avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java.diff?r1=1.16&r2=1.17
1.1 avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java
http://cvs.apache.org/viewcvs/avalon/merlin/kernel/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java?rev=1.1
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org