mcconnell 2003/09/15 05:04:49
Modified: merlin INSTALLATION.TXT
merlin/kernel/bootstrap/src/java Merlin.java
merlin/kernel/impl/conf kernel.xml
merlin/merlin-platform/src/config debug.xml kernel.xml
merlin/merlin-platform/src/repository/merlin/xmls kernel.xml
merlin/merlin-platform/xdocs/resources download.xml
Log:
Housekeeping.
Revision Changes Path
1.8 +8 -3 avalon-sandbox/merlin/INSTALLATION.TXT
Index: INSTALLATION.TXT
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/INSTALLATION.TXT,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- INSTALLATION.TXT 14 Sep 2003 13:16:26 -0000 1.7
+++ INSTALLATION.TXT 15 Sep 2003 12:04:48 -0000 1.8
@@ -17,7 +17,7 @@
README.TXT
LICENSE.TXT
/plugins
- avalon-plugin-1.0.jar
+ avalon-plugin-1.1.jar
merlin-plugin-1.0.jar
@@ -28,7 +28,7 @@
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.
+should point to the merlin directory.
Under Lunix you can do this as follows:
@@ -60,8 +60,13 @@
Maven platform. These plugins should be placed in the Maven plugin
directory (%MAVEN_HOME%\plugins).
- %MAVEN_HOME%\plugins\avalon-plugin-1.0.jar
+ %MAVEN_HOME%\plugins\avalon-plugin-1.1.jar
%MAVEN_HOME%\plugins\merlin-plugin-1.0.jar
+
+Please note that if you are upgrading an existing installation you must
+delete the %MAVEN_HOME%\plugins\merlin-plugin-1.0 directory, replace the
+existing plugin jar file, and 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
1.16 +1 -1 avalon-sandbox/merlin/kernel/bootstrap/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/bootstrap/src/java/Merlin.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Merlin.java 15 Sep 2003 08:26:21 -0000 1.15
+++ Merlin.java 15 Sep 2003 12:04:48 -0000 1.16
@@ -80,7 +80,7 @@
//--------------------------------------------------------------------------
private static final String REPOSITORY_PATH =
- "http://dpml.net/repository/,http://www.ibiblio.org/maven/";;
+ "http://dpml.net/,http://www.ibiblio.org/maven/";;
private static final String MERLIN_HOME_KEY =
"merlin.home";
1.5 +1 -1 avalon-sandbox/merlin/kernel/impl/conf/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/impl/conf/kernel.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kernel.xml 12 Sep 2003 16:43:49 -0000 1.4
+++ kernel.xml 15 Sep 2003 12:04:48 -0000 1.5
@@ -8,7 +8,7 @@
<repository>
<hosts>
- <host path="http://dpml.net/repository/"/>
+ <host path="http://dpml.net/"/>
<host path="http://www.ibiblio.org/maven/"/>
</hosts>
</repository>
1.6 +1 -1 avalon-sandbox/merlin/merlin-platform/src/config/debug.xml
Index: debug.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/debug.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- debug.xml 12 Sep 2003 16:43:49 -0000 1.5
+++ debug.xml 15 Sep 2003 12:04:48 -0000 1.6
@@ -7,7 +7,7 @@
<repository>
<hosts>
- <host path="http://dpml.net/repository/"/>
+ <host path="http://dpml.net/"/>
<host path="http://www.ibiblio.org/maven/"/>
</hosts>
</repository>
1.16 +1 -1 avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kernel.xml 12 Sep 2003 21:10:56 -0000 1.15
+++ kernel.xml 15 Sep 2003 12:04:48 -0000 1.16
@@ -8,7 +8,7 @@
<repository>
<hosts>
- <host path="http://dpml.net/repository/"/>
+ <host path="http://dpml.net/"/>
<host path="http://www.ibiblio.org/maven/"/>
</hosts>
</repository>
1.6 +1 -1
avalon-sandbox/merlin/merlin-platform/src/repository/merlin/xmls/kernel.xml
Index: kernel.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/src/repository/merlin/xmls/kernel.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel.xml 12 Sep 2003 16:43:49 -0000 1.5
+++ kernel.xml 15 Sep 2003 12:04:49 -0000 1.6
@@ -8,7 +8,7 @@
<repository>
<hosts>
- <host path="http://dpml.net/repository/"/>
+ <host path="http://dpml.net/"/>
<host path="http://www.ibiblio.org/maven/"/>
</hosts>
</repository>
1.6 +7 -5
avalon-sandbox/merlin/merlin-platform/xdocs/resources/download.xml
Index: download.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/resources/download.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- download.xml 11 Sep 2003 02:35:06 -0000 1.5
+++ download.xml 15 Sep 2003 12:04:49 -0000 1.6
@@ -58,15 +58,17 @@
<body>
<section name="Download">
<subsection name="Binary Downloads">
+
<p>
- Binary downloads of the Merlin installation, tutorials, and
- related documentation are available on the ibiblio site.
+ Binary downloads of the official release of Merlin installation, tutorials,
and
+ related documentation are available at on the following <a
href="http://avalon.apache.org/download.cgi";>Avalon Download Mirror</a>.
</p>
-
+
<p>
- <a href="http://www.ibiblio.org/merlin/distributions";>
- Merlin Binary Distribution</a>
+ The <a href="http://www.apache.org/~mcconnell/dist/merlin-3.0";>Merlin
Binary Distribution</a>
+ site contains interim builds and release candidates.
</p>
+
</subsection>
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
