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 2004/06/15 17:36:14 UTC
svn commit: rev 21288 - in avalon/trunk/central/site/src/xdocs/central/about/installation: . archive
Author: mcconnell
Date: Tue Jun 15 08:36:14 2004
New Revision: 21288
Added:
avalon/trunk/central/site/src/xdocs/central/about/installation/
- copied from rev 21170, avalon/trunk/central/site/src/xdocs/products/runtime/installation/
avalon/trunk/central/site/src/xdocs/central/about/installation/binary.xml
Modified:
avalon/trunk/central/site/src/xdocs/central/about/installation/archive/index.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/index.xml
avalon/trunk/central/site/src/xdocs/central/about/installation/navigation.xml
Log:
move install procedures out of runtime and over near download and tutorial info
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/archive/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/installation/archive/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/archive/index.xml Tue Jun 15 08:36:14 2004
@@ -25,7 +25,7 @@
</properties>
<body>
- <section name="Instalation Instructions for Earlier Versions">
+ <section name="Install Instructions for Earlier Versions">
</section>
</body>
Added: avalon/trunk/central/site/src/xdocs/central/about/installation/binary.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/binary.xml Tue Jun 15 08:36:14 2004
@@ -0,0 +1,166 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2004 Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<document>
+
+ <properties>
+ <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+ <title>Merlin Runtime</title>
+ </properties>
+
+ <body>
+ <section name="Installation - Merlin 3.3">
+
+ <subsection name="Structure">
+
+ <p>
+ After downloading the Merlin 3.3.0 binary distribution and
+ unpacking the archive into you preferred location, you should
+ have a directory structure that looks like the following:
+ </p>
+<source><![CDATA[
+ /merlin
+ /bin
+ /config
+ /plugins
+ /system
+ README.TXT
+ LICENSE.TXT
+ NOTICE.TXT
+]]></source>
+
+ </subsection>
+
+ <subsection name="MERLIN_HOME Environment Variable">
+
+ <p>
+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.
+ </p>
+
+ <p>
+Under Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+ </p>
+
+ <p>
+Under Lunix you can do this as follows:
+ </p>
+
+<source><![CDATA[
+ $ 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
+]]></source>
+
+ </subsection>
+
+ <subsection name="AVALON_HOME Environment Variable">
+
+ <p>
+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/repository where AVALON_HOME defaults to
+${user.home}/.avalon. To override the AVALON_HOME directory 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.
+ </p>
+
+ </subsection>
+
+ <subsection name="Maven Plugin Installation">
+
+ <p>
+The merlin system installation is now complete. Three plugins
+supporting development are provided and can be installed using the
+commands listed below (please check the packaged INSTALL.TXT for
+correct version numbers):
+ </p>
+
+<source><![CDATA[
+$ maven -DgroupId=avalon-util -DartifactId=avalon-util-plugin -Dversion=1.0.dev-0 plugin:download
+$ maven -DgroupId=avalon-meta -DartifactId=avalon-meta-plugin -Dversion=1.4.dev-0 plugin:download
+$ maven -DgroupId=merlin -DartifactId=merlin-plugin -Dversion=3.3.dev-0 plugin:download
+]]></source>
+
+ </subsection>
+
+
+ <subsection name="Validating your installation.">
+
+ <p>
+ The following instructions assume that you have defined the
+ MERLIN_HOME environment variable that points the directory
+ containing the Merlin installation.
+ </p>
+
+ <p>
+ To confirm that you MERLIN_HOME variable is correct, you
+ should open a new command line window and invoke the Merlin
+ CLI application. The following command should list the
+ Merlin CLI help information.
+ </p>
+
+<source><![CDATA[
+$ merlin.sh -help
+usage: merlin [block] [-lang <code>] [-install <url>]
+ [-library <directory>] [-help] [-version] [-home <directory>]
+ [-impl <artifact>] [-debug] [-info] [-config <url>]
+ [-context <directory>] [-system <directory>] [-execute]
+ [-repository <directory>] [-kernel <url>]...
+]]></source>
+
+ </subsection>
+ <subsection name="Cygwin Notes">
+ <p>
+Due to restrictions related to the handling of spaces in filename
+and/or directory names when running under the Cygwin environment you
+will need to quote and escape command line arguments that contain
+references with embedded spaces. </p>
+
+<p>For example:</p>
+
+<source>
+ merlin -home '/My\ Documents/merlin/apps/abc' -execute
+</source>
+
+ </subsection>
+
+ <subsection name="Next Steps">
+ <p>
+ Now that you have installed Merlin on your system you can
+ proceed to the <a href="../tutorial/index.html">Using Merlin</a>
+ tutorial page.
+ </p>
+ </subsection>
+
+ </section>
+ </body>
+
+</document>
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/installation/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/index.xml Tue Jun 15 08:36:14 2004
@@ -1,168 +1,70 @@
-<?xml version="1.0"?>
-
-<!--
- Copyright 2004 Apache Software Foundation
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied.
-
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2004 Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<document>
-
+
<properties>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
<title>Merlin Runtime</title>
</properties>
- <body>
- <section name="Installation - Merlin 3.3">
-
- <subsection name="Structure">
-
- <p>
- After downloading the Merlin 3.3.0 binary distribution and
- unpacking the archive into you preferred location, you should
- have a directory structure that looks like the following:
- </p>
-<source><![CDATA[
- /merlin
- /bin
- /config
- /plugins
- /system
- README.TXT
- LICENSE.TXT
- NOTICE.TXT
-]]></source>
-
- </subsection>
-
- <subsection name="MERLIN_HOME Environment Variable">
-
- <p>
-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.
- </p>
-
- <p>
-Under Windows you can set environment variables by selecting the
-Environment Tab from the System Control Panel.
- </p>
-
- <p>
-Under Lunix you can do this as follows:
- </p>
-
-<source><![CDATA[
- $ 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
-]]></source>
-
- </subsection>
-
- <subsection name="AVALON_HOME Environment Variable">
-
- <p>
-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/repository where AVALON_HOME defaults to
-${user.home}/.avalon. To override the AVALON_HOME directory 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.
- </p>
-
- </subsection>
-
- <subsection name="Maven Plugin Installation">
-
- <p>
-The merlin system installation is now complete. Three plugins
-supporting development are provided and can be installed using the
-commands listed below (please check the packaged INSTALL.TXT for
-correct version numbers):
- </p>
-
-<source><![CDATA[
-$ maven -DgroupId=avalon-util -DartifactId=avalon-util-plugin -Dversion=1.0.dev-0 plugin:download
-$ maven -DgroupId=avalon-meta -DartifactId=avalon-meta-plugin -Dversion=1.4.dev-0 plugin:download
-$ maven -DgroupId=merlin -DartifactId=merlin-plugin -Dversion=3.3.dev-0 plugin:download
-]]></source>
-
- </subsection>
-
-
- <subsection name="Validating your installation.">
-
- <p>
- The following instructions assume that you have defined the
- MERLIN_HOME environment variable that points the directory
- containing the Merlin installation.
- </p>
-
- <p>
- To confirm that you MERLIN_HOME variable is correct, you
- should open a new command line window and invoke the Merlin
- CLI application. The following command should list the
- Merlin CLI help information.
- </p>
-
-<source><![CDATA[
-$ merlin.sh -help
-usage: merlin [block] [-lang <code>] [-install <url>]
- [-library <directory>] [-help] [-version] [-home <directory>]
- [-impl <artifact>] [-debug] [-info] [-config <url>]
- [-context <directory>] [-system <directory>] [-execute]
- [-repository <directory>] [-kernel <url>]...
-]]></source>
-
- </subsection>
- <subsection name="Cygwin Notes">
- <p>
-Due to restrictions related to the handling of spaces in filename
-and/or directory names when running under the Cygwin environment you
-will need to quote and escape command line arguments that contain
-references with embedded spaces. </p>
-
-<p>For example:</p>
-
-<source>
- merlin -home '/My\ Documents/merlin/apps/abc' -execute
-</source>
-
- </subsection>
-
- <subsection name="Next Steps">
- <p>
- Now that you have installed Merlin on your system you can
- proceed to the <a href="../tutorial/index.html">Using Merlin</a>
- tutorial page.
- </p>
- </subsection>
-
- </section>
- </body>
-
-</document>
+ <body>
+ <section name="Installation Produres">
+
+ <subsection name="Index">
+ <table>
+ <tr><th>Topic</th><th>Description</th></tr>
+ <tr>
+ <td><a href="binary.html">Installing Merlin Runtime 3.3.</a></td>
+ <td>
+ <p>
+ Merlin Runtim is Avalon's reference container. It provides
+ complete support for the delivery of service-oriented leveraging
+ component-based-development strategies.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td><a href="nt.html">Merlin NT Service</a></td>
+ <td>
+ <p>
+ Details on how to setup the Merlin system as Windows NT Service.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td><a href="archive/index.html">Older Versions</a></td>
+ <td>
+ <p>
+ Archive of installation procedures for earlier version of the
+ Merlin platfomr and related Avalon technologies.
+ </p>
+ </td>
+ </tr>
+ </table>
+ </subsection>
+ </section>
+ </body>
+
+</document>
+
+
+
Modified: avalon/trunk/central/site/src/xdocs/central/about/installation/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/installation/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/about/installation/navigation.xml Tue Jun 15 08:36:14 2004
@@ -23,10 +23,9 @@
<body>
<menu>
- <item name="Binary" href="index.html"/>
+ <item name="Binary" href="binary.html"/>
<item name="NT Service" href="nt.html"/>
<item name="Other Versions" href="archive/index.html"/>
- <item name="CVS" href="cvs.html"/>
</menu>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org