mcconnell 2003/08/26 04:54:24
Modified: cscontainer/bin log4net-net-1.1.dll log4net-sdk-net-1.1.chm
csframework/bin log4net-sdk-net-1.1.chm
framework project.xml
merlin INSTALLATION.TXT
merlin/merlin-platform/xdocs/meta/model/block/container/include
index.xml navigation.xml
merlin/merlin-plugin plugin.jelly
Log:
Plugin update - was not correctly locating the meven repository.
Revision Changes Path
1.2 +1 -3294 avalon-sandbox/cscontainer/bin/log4net-net-1.1.dll
<<Binary file>>
1.2 +1 -2612 avalon-sandbox/cscontainer/bin/log4net-sdk-net-1.1.chm
<<Binary file>>
1.2 +1 -2612 avalon-sandbox/csframework/bin/log4net-sdk-net-1.1.chm
<<Binary file>>
1.3 +1 -1 avalon-sandbox/framework/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/framework/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 22 Aug 2003 12:49:47 -0000 1.2
+++ project.xml 26 Aug 2003 11:54:23 -0000 1.3
@@ -5,7 +5,7 @@
<name>Avalon Framework</name>
<groupId>avalon-framework</groupId>
<id>avalon-framework</id>
- <currentVersion>4.1.5-RC3</currentVersion>
+ <currentVersion>4.1.5</currentVersion>
<inceptionYear>2000</inceptionYear>
<organization>
1.4 +1 -1 avalon-sandbox/merlin/INSTALLATION.TXT
Index: INSTALLATION.TXT
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/INSTALLATION.TXT,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- INSTALLATION.TXT 23 Aug 2003 17:20:41 -0000 1.3
+++ INSTALLATION.TXT 26 Aug 2003 11:54:24 -0000 1.4
@@ -1,5 +1,5 @@
-PROJECT: Merlin
+PROJECT: merlin-3.0-dist-XXXXXXXX.jar
====================================================================
DESCRIPTION:
1.6 +20 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/index.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.xml 17 Aug 2003 04:19:15 -0000 1.5
+++ index.xml 26 Aug 2003 11:54:24 -0000 1.6
@@ -16,9 +16,9 @@
<table>
<tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
- <td><a href="resource.html">resource</a></td><td>1*</td>
+ <td><a href="targets/target.html">target</a></td><td>*</td>
<td>
- A repository references from which a block descriptor will be resolved.
+ A set of target directives scoped relative to the container
establihsed by the include.
</td>
</tr>
</table>
@@ -33,6 +33,24 @@
<td>
A name to assign to the container created by the block include.
Will default to the name of the included block.
+ </td>
+ </tr>
+ <tr>
+ <td>id</td><td>yes</td>
+ <td>
+ The resource repository identifier.
+ </td>
+ </tr>
+ <tr>
+ <td>version</td><td>no</td>
+ <td>
+ The resource version.
+ </td>
+ </tr>
+ <tr>
+ <td>type</td><td>no</td>
+ <td>
+ A resource type such as 'jar' or 'xml'. Tge default value is 'jar'.
</td>
</tr>
</table>
1.6 +2 -10
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/navigation.xml
Index: navigation.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/container/include/navigation.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- navigation.xml 24 Aug 2003 15:10:25 -0000 1.5
+++ navigation.xml 26 Aug 2003 11:54:24 -0000 1.6
@@ -22,19 +22,11 @@
<item name="Kernel" href="/meta/model/kernel/index.html"/>
<item name="Container" href="/meta/model/block/container/index.html">
<item name="Services"
href="/meta/model/block/container/services/index.html"/>
- <item name="Classloader"
href="/meta/model/block/container/engine/index.html">
- <item name="Classpath"
href="/meta/model/block/container/engine/classpath/index.html">
- <item name="Repository"
href="/meta/model/block/container/engine/classpath/repository/index.html">
- <item name="Resource"
href="/meta/model/block/container/engine/classpath/repository/resource.html"/>
- </item>
- <item name="Fileset"
href="/meta/model/block/container/engine/classpath/fileset.html"/>
- </item>
- <item name="Library"
href="/meta/model/block/container/engine/extensions.html"/>
- </item>
+ <item name="Classloader"
href="/meta/model/block/container/engine/index.html"/>
<item name="Component"
href="/meta/model/block/container/components/index.html"/>
<item name="Container"
href="/meta/model/block/container/containers.html"/>
<item name="Include"
href="/meta/model/block/container/include/index.html">
- <item name="Resource"
href="/meta/model/block/container/include/resource.html"/>
+ <item name="Include"
href="/meta/model/block/container/include/resource.html"/>
</item>
</item>
</item>
1.27 +1 -1 avalon-sandbox/merlin/merlin-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- plugin.jelly 25 Aug 2003 22:30:59 -0000 1.26
+++ plugin.jelly 26 Aug 2003 11:54:24 -0000 1.27
@@ -68,7 +68,7 @@
Set the repository path.
-->
<j:set var="merlin.repository.local" value="${maven.home.local}"/>
- <j:set var="merlin.repository.local" value="${maven.home}"/>
+ <j:set var="merlin.repository.local" value="${user.dir}/.maven"/>
<!--
If a kernel configuration has been declared the use it otherwise
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
