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/10 09:21:55 UTC
cvs commit: avalon/merlin/platform/xdocs/starting/tutorial/dependencies navigation.xml
mcconnell 2003/12/10 00:21:55
Modified: merlin/platform/xdocs/starting index.xml navigation.xml
merlin/platform/xdocs/starting/advanced navigation.xml
merlin/platform/xdocs/starting/advanced/lifecycle
navigation.xml
merlin/platform/xdocs/starting/advanced/unit index.xml
navigation.xml
merlin/platform/xdocs/starting/examples navigation.xml
merlin/platform/xdocs/starting/examples/afs navigation.xml
merlin/platform/xdocs/starting/examples/afs/simple
navigation.xml
merlin/platform/xdocs/starting/examples/james navigation.xml
merlin/platform/xdocs/starting/tutorial navigation.xml
merlin/platform/xdocs/starting/tutorial/config
navigation.xml
merlin/platform/xdocs/starting/tutorial/context
navigation.xml
merlin/platform/xdocs/starting/tutorial/dependencies
navigation.xml
Added: merlin/platform/xdocs/starting/installation index.xml
navigation.xml
merlin/platform/xdocs/starting/installation/3.0 index.xml
navigation.xml
merlin/platform/xdocs/starting/installation/3.2 binary.xml
cvs.xml index.xml navigation.xml
Removed: merlin/platform/xdocs/starting installation.xml
Log:
Update installation docs (including seperation of 3.0 and 3.2 branches) and update unit test tutorial documentation.
Revision Changes Path
1.2 +1 -1 avalon/merlin/platform/xdocs/starting/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 24 Sep 2003 09:35:13 -0000 1.1
+++ index.xml 10 Dec 2003 08:21:54 -0000 1.2
@@ -60,7 +60,7 @@
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
- <td><a href="installation.html">Installation</a></td>
+ <td><a href="installation/index.html">Installation</a></td>
<td>Installation instructions including build and verification procedures.</td>
</tr>
<tr>
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:50 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:54 -0000 1.3
@@ -65,7 +65,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
</item>
1.8 +1 -1 avalon/merlin/platform/xdocs/starting/advanced/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/navigation.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- navigation.xml 28 Oct 2003 11:41:50 -0000 1.7
+++ navigation.xml 10 Dec 2003 08:21:54 -0000 1.8
@@ -64,7 +64,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html">
<item name="Lifecycle Extensions" href="/starting/advanced/lifecycle/index.html"/>
1.4 +1 -1 avalon/merlin/platform/xdocs/starting/advanced/lifecycle/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 28 Oct 2003 11:41:50 -0000 1.3
+++ navigation.xml 10 Dec 2003 08:21:54 -0000 1.4
@@ -65,7 +65,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html">
<item name="Lifecycle Extensions" href="/starting/advanced/lifecycle/index.html">
1.3 +16 -24 avalon/merlin/platform/xdocs/starting/advanced/unit/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 25 Oct 2003 15:27:07 -0000 1.2
+++ index.xml 10 Dec 2003 08:21:54 -0000 1.3
@@ -71,7 +71,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.1-dev</version>
+ <version>3.2.5-dev</version>
</dependency>
]]></source>
<p>
@@ -123,44 +123,36 @@
<p>
You can now access components established by Merlin via
- the component name. For example, if your block.xml defines
- a component named "hello" you access the component by
- requesting the relative path "hello". Relative paths are
- resolved relative to the container defined by your block
- definition.
+ the component path. For example, if your block.xml defines
+ a component named "hello" in a container named "test" you
+ access the component by requesting the path "/test/hello".
</p>
<p>
The following code fragment demonstrates the usage of the
- resolve method to locate a named component and a convenience
- getLogger() method.
+ resolve method to locate a named component.
</p>
<source><![CDATA[
public void testServiceResolution() throws Exception
{
- Hello hello = (Hello) resolve( "hello" );
- assertTrue( hello != null );
- getLogger().info( "Message from hello service: " + hello.getMessage() );
+ Hello hello = (Hello) resolve( "/test/hello" );
+ assertNotHull( "hello", hello );
}
]]></source>
</subsection>
<subsection name="Customizing Merlin behaviour">
<p>
- The abstract test case includes a constructor that allows
- control over the deployment path, configuration, debugging
- and info generation policies. Please refer to the supporting
- javadoc for more details.
+ You can customize all of the deployment and runtime parameters
+ of the embedded merlin instance by adding a "merlin.properties"
+ file to your basedir.
+ </p>
+ <p>
+ </i>Example merlin.properties</i>
</p>
<source><![CDATA[
-public StandardTestCase( String name )
-{
- super(
- MAVEN_TARGET_TEST_CLASSES_DIR,
- MERLIN_DEFAULT_CONFIG_FILE,
- MERLIN_DEBUG_OFF,
- MERLIN_INFO_OFF,
- name );
- }
+merlin.info = true
+merlin.debug = true
+merlin.override = conf/config.xml
]]></source>
</subsection>
</section>
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/advanced/unit/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:50 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:54 -0000 1.3
@@ -64,7 +64,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html">
<item name="Lifecycle Extensions" href="/starting/advanced/lifecycle/index.html"/>
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/examples/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/examples/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:51 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:54 -0000 1.3
@@ -65,7 +65,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
<!--
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/examples/afs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/examples/afs/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:51 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:54 -0000 1.3
@@ -65,7 +65,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
<!--
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/examples/afs/simple/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/examples/afs/simple/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:51 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:54 -0000 1.3
@@ -64,7 +64,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
</item>
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/examples/james/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/examples/james/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:51 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:54 -0000 1.3
@@ -64,7 +64,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
<!--
1.1 avalon/merlin/platform/xdocs/starting/installation/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see http://www.apache.org/.
-->
<document>
<header>
<title>Installation Procedures</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Installation Procedures">
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
<td><a href="3.2/index.html">Merlin 3.2 Installation</a></td>
<td>Installation instructions for Merlin 3.2.</td>
</tr>
<tr>
<td><a href="3.0/index.html">Merlin 3.0 Installation</a></td>
<td>Installation instructions for Merlin 3.0.</td>
</tr>
</table>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/starting/installation/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see http://www.apache.org/.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/product/framework/"/>
<item name="Containers" href="http://avalon.apache.org/product/containers/"/>
<item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
<item name="Installation" href="/starting/installation/index.html">
<item name="Version 3.2" href="/starting/installation/3.2/index.html"/>
<item name="Version 3.0" href="/starting/installation/3.0/index.html"/>
</item>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
</item>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
</body>
</project>
1.1 avalon/merlin/platform/xdocs/starting/installation/3.0/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see http://www.apache.org/.
-->
<document>
<header>
<title>Installation</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Installation">
<subsection name="Build Procedure">
<p>
To build the Merlin installation you need to checkout the
Merlin project from CVS. The commands in this document
assume a unix-style system; the procedure under windows is
similar, and identical if you have <a
href="http://www.cygwin.com">cygwin</a> installed.
</p>
<source><![CDATA[
$ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login
$ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon/meta/
$ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon/merlin/
]]></source>
<p>
Once checkout is complete you can build Merlin using <a
href="http://maven.apache.org/">Maven</a> as follows:
</p>
<source><![CDATA[
$ cd avalon/meta
$ maven avalon:dist
$ cd ../merlin
$ maven merlin:install
]]></source>
<p>
The above build procedure will create a installation
directory containing the Merlin system at
</p>
<source><![CDATA[
+-- avalon
+-- merlin
+-- target
+-- merlin
]]></source>
</subsection>
<subsection name="Copy the merlin directory to your preferred location.">
<p>
Copy the 'merlin' directory to your preferred location
installation location. For example, you may want to copy
the installation dir to the /opt dir:
</p>
<source><![CDATA[
$ cp -Rf merlin/target/merlin /opt/merlin-SNAPSHOT
$ ln -s /opt/merlin-SNAPSHOT /opt/merlin
]]></source>
</subsection>
<subsection name="Declare 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:
</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="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] [-debug] [-config <file>] [-lang
<code>] [-repository <directory>] [-kernel <file>] [-home
<directory>] [-version] [-help]
...
]]></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>
1.1 avalon/merlin/platform/xdocs/starting/installation/3.0/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see http://www.apache.org/.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/product/framework/"/>
<item name="Containers" href="http://avalon.apache.org/product/containers/"/>
<item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
<item name="Installation" href="/starting/installation/index.html">
<item name="Version 3.2" href="/starting/installation/3.2/index.html"/>
<item name="Version 3.0" href="/starting/installation/3.0/index.html"/>
</item>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
</item>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
</body>
</project>
1.1 avalon/merlin/platform/xdocs/starting/installation/3.2/binary.xml
Index: binary.xml
===================================================================
<?xml version="1.0"?>
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see http://www.apache.org/.
-->
<document>
<header>
<title>Installation - Merlin 3.2</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Installation - Merlin 3.2">
<subsection name="Build Procedure">
<p>
After downloading the Merlin 3.2 binary distribution and
inpacking the archive into you preferred location, you should
have a directory structure that looks like the following:
</p>
<source><![CDATA[
/merlin
/bin
/config
/ext
/system
README.TXT
LICENSE.TXT
/plugins
avalon-meta-plugin-1.2.jar
merlin-plugin-3.2-dev.jar
]]></source>
<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 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>
<p>
Under Windows you can set environment variables by selecting the
Environment Tab from the System Control Panel.
</p>
<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 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.
</p>
<p>
To confirm that your environment variables are correct, you
should open a new command window and invoke the Merlin
CLI application.
</p>
<source><![CDATA[
Under DOS:
$ merlin -version
Under Lunix:
$ merlin.sh -version
]]></source>
<p>
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%\plugins).
</p>
<source><![CDATA[
%MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
%MAVEN_HOME%\plugins\merlin-plugin-3.2-dev.jar
]]></source>
<p>
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%\plugins).
</p>
<source><![CDATA[
%MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
%MAVEN_HOME%\plugins\merlin-plugin-3.2-dev.jar
]]></source>
<p>
Please note that if you are upgrading an existing installation you must
delete the following two directories:
</p>
<source><![CDATA[
%MAVEN_HOME%\plugins\merlin-plugin-*
%MAVEN_HOME%\plugins\avalon-meta-plugin-*
]]></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="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>
1.1 avalon/merlin/platform/xdocs/starting/installation/3.2/cvs.xml
Index: cvs.xml
===================================================================
<?xml version="1.0"?>
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see http://www.apache.org/.
-->
<document>
<header>
<title>Installation - Merlin 3.2</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Installation - Merlin 3.2">
<subsection name="Build Procedure">
<p>
To build the Merlin installation you need to checkout the
Merlin project from CVS. The commands in this document
assume a unix-style system; the procedure under windows is
similar, and identical if you have <a
href="http://www.cygwin.com">cygwin</a> installed.
</p>
<source><![CDATA[
$ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login
$ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon/util
$ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon/meta
$ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon/repository
$ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon/merlin
]]></source>
<p>
Once checkout is complete you can build Merlin using <a
href="http://maven.apache.org/">Maven</a> as follows:
</p>
<source><![CDATA[
$ cd avalon/meta
$ maven avalon:build
$ cd ../util
$ maven avalon:build
$ cd ../repository
$ maven avalon:build
$ cd ../merlin
$ maven merlin:install
]]></source>
<p>
The above build procedure will create a installation
directory containing the Merlin system at
</p>
<source><![CDATA[
+-- avalon
+-- merlin
+-- target
+-- merlin
]]></source>
</subsection>
<subsection name="Copy the merlin directory to your preferred location.">
<p>
Copy the 'merlin' directory to your preferred location
installation location. For example, you may want to copy
the installation dir to the /opt dir:
</p>
<source><![CDATA[
$ cp -Rf merlin/target/merlin /opt/merlin-SNAPSHOT
$ ln -s /opt/merlin-SNAPSHOT /opt/merlin
]]></source>
<p>
Continue with the
<a href="binary.html">binary install instructions</a>
concerning the setup of environment variables to complete
your installation.
</p>
</subsection>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/starting/installation/3.2/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see http://www.apache.org/.
-->
<document>
<header>
<title>Installation Procedures</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Installation Procedures">
<table>
<tr><th>Topic</th><th>Summary</th></tr>
<tr>
<td><a href="cvs.html">CVS Build Instructions</a></td>
<td>Instructions for building Merlin from CVS.</td>
</tr>
<tr>
<td><a href="binary.html">Install Instructions</a></td>
<td>Setting up and validating your Merlin installation.</td>
</tr>
</table>
</section>
</body>
</document>
1.1 avalon/merlin/platform/xdocs/starting/installation/3.2/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see http://www.apache.org/.
-->
<project>
<title>Merlin</title>
<body>
<links>
<item name="Apache" href="http://apache.org/"/>
<item name="Avalon" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/product/framework/"/>
<item name="Containers" href="http://avalon.apache.org/product/containers/"/>
<item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
<item name="Installation" href="/starting/installation/index.html">
<item name="Version 3.2" href="/starting/installation/3.2/index.html">
<item name="CVS Build" href="/starting/installation/3.2/cvs.html"/>
<item name="Installation" href="/starting/installation/3.2/binary.html"/>
</item>
<item name="Version 3.0" href="/starting/installation/3.0/index.html"/>
</item>
<item name="Using Merlin" href="/starting/tutorial/index.html"/>
<item name="Advanced Features" href="/starting/advanced/index.html"/>
</item>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html"/>
<item name="Tools" href="/tools/index.html"/>
</menu>
<menu name="Resources">
<item name="Javadoc" href="/api/index.html"/>
<item name="Download" href="/resources/download.html"/>
<item name="Roadmap" href="/resources/roadmap/index.html"/>
<item name="DPML" href="/dpml/index.html"/>
</menu>
</body>
</project>
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/tutorial/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:51 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:55 -0000 1.3
@@ -64,7 +64,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html">
<item name="Hello Block" href="/starting/tutorial/creation.html"/>
<item name="Running Hello" href="/starting/tutorial/execution.html"/>
1.4 +1 -1 avalon/merlin/platform/xdocs/starting/tutorial/config/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/config/navigation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation.xml 28 Oct 2003 11:41:51 -0000 1.3
+++ navigation.xml 10 Dec 2003 08:21:55 -0000 1.4
@@ -64,7 +64,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html">
<item name="Hello Block" href="/starting/tutorial/creation.html"/>
<item name="Running Hello" href="/starting/tutorial/execution.html"/>
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/tutorial/context/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/context/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:51 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:55 -0000 1.3
@@ -64,7 +64,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html">
<item name="Hello Block" href="/starting/tutorial/creation.html"/>
<item name="Running Hello" href="/starting/tutorial/execution.html"/>
1.3 +1 -1 avalon/merlin/platform/xdocs/starting/tutorial/dependencies/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/dependencies/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 28 Oct 2003 11:41:51 -0000 1.2
+++ navigation.xml 10 Dec 2003 08:21:55 -0000 1.3
@@ -64,7 +64,7 @@
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html">
- <item name="Installation" href="/starting/installation.html"/>
+ <item name="Installation" href="/starting/installation/index.html"/>
<item name="Using Merlin" href="/starting/tutorial/index.html">
<item name="Hello Block" href="/starting/tutorial/creation.html"/>
<item name="Running Hello" href="/starting/tutorial/execution.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org