mcconnell 2003/09/25 18:46:36
Modified: merlin maven.xml project.properties
merlin/kernel/plugin plugin.jelly
merlin/platform/xdocs/resources download.xml
Log:
Fix broken link on snapshot download location.
Revision Changes Path
1.2 +1 -0 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 24 Sep 2003 09:30:16 -0000 1.1
+++ maven.xml 26 Sep 2003 01:46:36 -0000 1.2
@@ -334,6 +334,7 @@
<path refid="maven.dependency.classpath"/>
</classpath>
<link href="${sun.j2se.link}" />
+ <link href="${sun.j2ee.link}" />
<link href="${avalon.framework.link}" />
<link href="${avalon.meta.link}" />
<link href="${avalon.logkit.link}" />
1.2 +3 -2 avalon/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 24 Sep 2003 09:30:17 -0000 1.1
+++ project.properties 26 Sep 2003 01:46:36 -0000 1.2
@@ -15,8 +15,9 @@
#
sun.j2se.link = http://java.sun.com/j2se/1.4/docs/api/
+sun.j2ee.link = http://java.sun.com/j2ee/1.4/docs/api/
avalon.framework.link = http://avalon.apache.org/framework/api/
-avalon.meta.link = http://avalon.apache.org/avalon/meta/api/
+avalon.meta.link = http://avalon.apache.org/meta/api/
avalon.logkit.link = http://avalon.apache.org/logkit/api/
avalon.lifecycle.link = http://avalon.apache.org/excalibur/lifecycle/api/
excalibur.configuration.link = http://avalon.apache.org/excalibur/configuration/api/
@@ -25,4 +26,4 @@
excalibur.threadcontext.link = http://avalon.apache.org/excalibur/threadcontext/api/
excalibur.event.link = http://avalon.apache.org/excalibur/event/api/
-maven.javadoc.links =
${sun.j2se.link},${avalon.logkit.link},${avalon.framework.link},${avalon.meta.link},${avalon.lifecycle.link},${excalibur.configuration.link},${excalibur.pool.link},${excalibur.thread.link},${excalibur.threadcontext.link},${excalibur.event.link}
+maven.javadoc.links =
${sun.j2se.link},${avalon.logkit.link},${avalon.framework.link},${avalon.meta.link},${avalon.lifecycle.link},${excalibur.configuration.link},${excalibur.pool.link},${excalibur.thread.link},${excalibur.threadcontext.link},${excalibur.event.link},${sun.jmx.link}
1.2 +9 -0 avalon/merlin/kernel/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Sep 2003 09:33:19 -0000 1.1
+++ plugin.jelly 26 Sep 2003 01:46:36 -0000 1.2
@@ -34,6 +34,15 @@
</j:if>
</goal>
+ <goal name="merlin:test" prereqs="test:test"
+ description="Simulated deployment from ${maven.build.dir}/test-classes">
+ <j:set var="merlin.target" value="${maven.build.dir}/test-classes"/>
+ <util:file var="target" name="${merlin.target}"/>
+ <j:if test="${target.exists()}">
+ <attainGoal name="merlin:execute"/>
+ </j:if>
+ </goal>
+
<goal name="merlin:execute" prereqs="merlin:prepare-context">
<merlin:kernel
repository="${merlin.repository.local}"
1.2 +6 -4 avalon/merlin/platform/xdocs/resources/download.xml
Index: download.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/resources/download.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- download.xml 24 Sep 2003 09:35:10 -0000 1.1
+++ download.xml 26 Sep 2003 01:46:36 -0000 1.2
@@ -61,12 +61,14 @@
<p>
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>.
+ related documentation are available at on the following
+ <a href="http://avalon.apache.org/download.cgi";>Avalon Download Mirror</a>.
</p>
-
+
<p>
- The <a href="http://www.apache.org/~mcconnell/dist/merlin-3.0";>Merlin
Binary Distribution</a>
- site contains interim builds and release candidates.
+ <a href="http://www.dpml.net/merlin/distributions/?M=D";>Interim builds</a>
of the
+ Merlin platform are hosted under the DPML. Please note that snapshot
builds are
+ not subject to a formal release review process.
</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
