Return-Path: Delivered-To: apmail-avalon-cvs-archive@www.apache.org Received: (qmail 86679 invoked from network); 20 Dec 2003 22:30:00 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 20 Dec 2003 22:30:00 -0000 Received: (qmail 89095 invoked by uid 500); 20 Dec 2003 22:29:47 -0000 Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 89038 invoked by uid 500); 20 Dec 2003 22:29:47 -0000 Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list cvs@avalon.apache.org Received: (qmail 89024 invoked from network); 20 Dec 2003 22:29:47 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 20 Dec 2003 22:29:47 -0000 Received: (qmail 86611 invoked by uid 1438); 20 Dec 2003 22:29:59 -0000 Date: 20 Dec 2003 22:29:59 -0000 Message-ID: <20031220222959.86610.qmail@minotaur.apache.org> From: mcconnell@apache.org To: avalon-cvs@apache.org Subject: cvs commit: avalon/merlin/platform/xdocs/merlin/kernel/embedding index.xml navigation.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mcconnell 2003/12/20 14:29:59 Modified: merlin INSTALLATION.TXT maven.xml merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools MerlinBean.java merlin/platform/xdocs/merlin/kernel cli.xml navigation.xml Added: merlin/platform/xdocs/merlin/kernel/embedding index.xml navigation.xml Log: Doc updates and housekeeping. Revision Changes Path 1.7 +86 -86 avalon/merlin/INSTALLATION.TXT Index: INSTALLATION.TXT =================================================================== RCS file: /home/cvs/avalon/merlin/INSTALLATION.TXT,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- INSTALLATION.TXT 20 Dec 2003 09:07:15 -0000 1.6 +++ INSTALLATION.TXT 20 Dec 2003 22:29:59 -0000 1.7 @@ -1,86 +1,86 @@ - -PROJECT: Merlin 3.2-dev -==================================================================== - -DESCRIPTION: ------------- - -This directory contains the merlin system installation and related -resources. - - /merlin - /bin - /config - /ext - /system - README.TXT - LICENSE.TXT - INSTALLATION.TXT - /plugins - avalon-meta-plugin-1.2.jar - merlin-plugin-3.2.1-dev.jar - - -Installing Merlin. ------------------- - -To use Merlin command line support or the Merlin NT Service -you will need to define the MERLIN_HOME environment -variable for your system and include MERLIN_HOME/bin in -your system path. The MERLIN_HOME environment variable -should point to the merlin directory. - -Under Lunix you can do this as follows: - - $ echo ' - > # set location of merlin - > export MERLIN_HOME=/opt/merlin - > # include it in the path - > export PATH=$PATH:$MERLIN_HOME/bin - > ' >> ~/.bash_profile - $ source ~/.bash_profile - -Under Windows you can set environment variables by selecting the -Environment Tab from the System Control Panel. - -Versions of Merlin prior to the 3.2-dev 20031210 build maintained -a local repository of jar files under the %MERLIN_HOME%/repository -directory. As of the 20031210 build the repository is maintained -under AVALON_HOME which defaults to ${user.home}/.avalon. To -override this behaviour you can either define a AVALON_HOME -environment variable or you can add a merlin.properties file to -${user.home} containing the "merlin.repository" property key and -a value point to you preferred repository location. - -To confirm that your environment variables are correct, you -should open a new command window and invoke the Merlin -CLI application. - -Under DOS: - - $ merlin -version - -Under Lunix: - - $ merlin.sh -version - -The installation of Merlin is now complete, however, two plugins are -provided with the installation supporting merlin development under the -Maven platform. These plugins should be placed in the Maven plugin -directory (${maven.home.local}\plugins). - - [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.2.jar - [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.1-dev.jar - -Please note that if you are upgrading an existing installation you must -delete the following two directories: - - [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-* - [YOUR-MAVEN-HOME]\plugins\merlin-plugin-* - -Replace the existing avalon-meta and merlin plugin jar files with the supplied -versions. Finally, delete all *.cache files in the Maven plugin directory. - -You now have everything in place to start using the Merlin Tutorial or -building you own components. If you have any problems, please subscribe -and post a message to users@avalon.apache.org. + +PROJECT: Merlin 3.2-dev +==================================================================== + +DESCRIPTION: +------------ + +This directory contains the merlin system installation and related +resources. + + /merlin + /bin + /config + /ext + /system + README.TXT + LICENSE.TXT + INSTALLATION.TXT + /plugins + avalon-meta-plugin-1.2.jar + merlin-plugin-3.2.1-dev.jar + + +Installing Merlin. +------------------ + +To use Merlin command line support or the Merlin NT Service +you will need to define the MERLIN_HOME environment +variable for your system and include MERLIN_HOME/bin in +your system path. The MERLIN_HOME environment variable +should point to the merlin directory. + +Under Lunix you can do this as follows: + + $ echo ' + > # set location of merlin + > export MERLIN_HOME=/opt/merlin + > # include it in the path + > export PATH=$PATH:$MERLIN_HOME/bin + > ' >> ~/.bash_profile + $ source ~/.bash_profile + +Under Windows you can set environment variables by selecting the +Environment Tab from the System Control Panel. + +Versions of Merlin prior to the 3.2-dev 20031210 build maintained +a local repository of jar files under the %MERLIN_HOME%/repository +directory. As of the 20031210 build the repository is maintained +under AVALON_HOME which defaults to ${user.home}/.avalon. To +override this behaviour you can either define a AVALON_HOME +environment variable or you can add a merlin.properties file to +${user.home} containing the "merlin.repository" property key and +a value point to you preferred repository location. + +To confirm that your environment variables are correct, you +should open a new command window and invoke the Merlin +CLI application. + +Under DOS: + + $ merlin -version + +Under Lunix: + + $ merlin.sh -version + +The installation of Merlin is now complete, however, two plugins are +provided with the installation supporting merlin development under the +Maven platform. These plugins should be placed in the Maven plugin +directory (${maven.home.local}\plugins). + + [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.2.jar + [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.1-dev.jar + +Please note that if you are upgrading an existing installation you must +delete the following two directories: + + [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-* + [YOUR-MAVEN-HOME]\plugins\merlin-plugin-* + +Replace the existing avalon-meta and merlin plugin jar files with the supplied +versions. Finally, delete all *.cache files in the Maven plugin directory. + +You now have everything in place to start using the Merlin Tutorial or +building you own components. If you have any problems, please subscribe +and post a message to users@avalon.apache.org. 1.24 +1 -0 avalon/merlin/maven.xml Index: maven.xml =================================================================== RCS file: /home/cvs/avalon/merlin/maven.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- maven.xml 18 Dec 2003 01:11:07 -0000 1.23 +++ maven.xml 20 Dec 2003 22:29:59 -0000 1.24 @@ -389,6 +389,7 @@ + 1.11 +6 -6 avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java Index: MerlinBean.java =================================================================== RCS file: /home/cvs/avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- MerlinBean.java 14 Dec 2003 20:07:45 -0000 1.10 +++ MerlinBean.java 20 Dec 2003 22:29:59 -0000 1.11 @@ -150,6 +150,11 @@ try { + InitialContext context = + new DefaultInitialContext( + getMavenRepositoryDirectory(), + m_hosts ); + Artifact artifact = DefaultBuilder.createImplementationArtifact( classloader, @@ -157,11 +162,6 @@ getBaseDirectory(), MERLIN_PROPERTIES, IMPLEMENTATION_KEY ); - - InitialContext context = - new DefaultInitialContext( - getMavenRepositoryDirectory(), - m_hosts ); Builder builder = new DefaultBuilder( context, artifact ); 1.3 +56 -39 avalon/merlin/platform/xdocs/merlin/kernel/cli.xml Index: cli.xml =================================================================== RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/kernel/cli.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cli.xml 10 Dec 2003 09:10:01 -0000 1.2 +++ cli.xml 20 Dec 2003 22:29:59 -0000 1.3 @@ -79,10 +79,10 @@

] [-install ] [-library - ] [-help] [-version] [-home ] [-impl ] +usage: merlin [block] [-lang ] [-library ] + [-help] [-version] [-home ] [-impl ] [-debug] [-info] [-config ] [-context ] [-system - ] [-execute] [-repository ] [-kernel ] + ] [-execute] [-repository ] [-kernel ] ]]> @@ -90,68 +90,85 @@ - - - - + - + + + + + + + + + - - - + + + - + + + + + + - + + + + + + + + + + - + - - + + + - - + + + - - + + -
QualifierParameterDescription
-helpPrints the help message.
-langlang A two letter country code Sets the default language country code to the supplied value.
-versionlibrarydirectoryOverride the default anchor directory for jar extension references + and classpath include relative file references.
helpPrints the help message.
version Prints Merlin version information and exit.
-infoLists deployment parameters on startup.homedirectoryOveride the ${merlin.dir} directory. This is a relative + or absolute path to a working directory. If not suppled, + the system will default to ${user.dir}.
-debugimplartifact-specOverride the ${merlin.implementation} artifact spec. The specification + is the formal of [group]:[artifact];[version] and is used to direct the + boostrap system to load an alternative kernel implementation.
debug Instructs Merlin to issue internal system debug messages.
-homeinfoLists deployment parameters on startup.
configurlA configuration source containing a set of target configuration fragements that will override configuration entries defined under a block. This value overrides any ${merlin.override} property value. If the supplied argument is a file (relative or absolute) Merlin will convert the file to a url. Relative file references are resolved relative to ${merlin.dir}.
context directoryA relative or absolute path to a working home directory. If not suppled, the system will default to ${user.dir}/home.Overide the ${merlin.context} directory. This is a relative + or absolute path to a working context directory. If not suppled, + the system will default to ${merlin.dir}/home.
-kernelurlA url of a kernel configuration overriding the default kernel directive. The value defaults to ${merlin.home}/config/kernel.xml.systemdirectoryOveride the ${merlin.system} directory. This is a relative + or absolute path to the merlin system repository. The default + value resolves to ${merlin.home}/system.
-configurlA configuration source containing a set of target configuration fragements that will override configuration entries defined under a block.executeForces ${merlin.server} to false resulting in the immediate shutdown + of the kernel on completion of the deployment phase. If not included merlin + will apply the default ${merlin.server} mode of 'true'.
-repositoryfileDeclaration of a local repository. If not suppplied Merlin will default to ${avalon.home}.repositoryfileDeclaration of a local repository cache directory. If not + suppplied Merlin will default to ${avalon.home}/repository.
- - - - -

-Non-standard command line arguments should be considered as experimental -and subject to change. Usage without a good understanding of the internals -of the Merlin platform is not recommended. -

- - - - - - + +
QualifierParameterDescription
-installurl -Installation of a block archive (.bar file) into the local repository and exists. The -repository argument may be used to select the destination repository for the installation. Resource will be included relative to the bar file group identifier. Existing resources with a modification date equal to or later than the archived entry will be ignored. - kernelurlA url of a kernel configuration overriding the default kernel + directive. The value defaults to ${merlin.config}/kernel.xml.
- 1.4 +3 -2 avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml Index: navigation.xml =================================================================== RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- navigation.xml 10 Dec 2003 09:10:01 -0000 1.3 +++ navigation.xml 20 Dec 2003 22:29:59 -0000 1.4 @@ -67,9 +67,10 @@ + - - + + 1.1 avalon/merlin/platform/xdocs/merlin/kernel/embedding/index.xml Index: index.xml ===================================================================
Merlin Kernel Embedding

The Merlin Kernel is designed first and foremost as an embeddable container. The 3.2 release introduced several improvements to the embedding strategy through leverage of the avalon-repository boostrapping system, and added comprehensive support for the management of properties anabling complete configuration of a new kernel instance programatically or via property resolution.

//in preparation
1.1 avalon/merlin/platform/xdocs/merlin/kernel/embedding/navigation.xml Index: navigation.xml =================================================================== Merlin --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org