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/05/05 15:38:06 UTC
cvs commit: avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath fileset.xml
mcconnell 2004/05/05 06:38:06
Modified: merlin/site/xdocs/extensions/facilities index.xml
merlin/site/xdocs/extensions/platform nt.xml
merlin/site/xdocs/merlin/embedded navigation.xml
merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset
index.xml navigation.xml
merlin/site/xdocs/reference/containment/directives/include
index.xml
merlin/site/xdocs/reference/system/kernel index.xml
navigation.xml
merlin/site/xdocs/reference/system/kernel/repository
navigation.xml
merlin/site/xdocs/starting/advanced index.xml
Removed: merlin/site/xdocs/merlin/embedded unit.xml
merlin/site/xdocs/reference/containment/directives/classloader/classpath
fileset.xml
Log:
general doc updates in preparation for a 3.3 release
Revision Changes Path
1.4 +15 -2 avalon/merlin/site/xdocs/extensions/facilities/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/extensions/facilities/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 4 Apr 2004 06:30:54 -0000 1.3
+++ index.xml 5 May 2004 13:38:05 -0000 1.4
@@ -20,12 +20,25 @@
<document>
<properties>
- <title>JMX Extension</title>
+ <title>Facilities</title>
<author email="dev@avalon.apache.org">Avalon Development Team</author>
</properties>
<body>
<section name="Facilities">
+
+ <subsection name="Warning">
+
+ <p>
+ All facilities listed below should be considered as experimental.
+ In general facilities represent a powerful mechanism through components
+ can interact with the cointainer meta model. APIs are subject to change.
+ Facilities described here are available in CVS. They are not production
+ ready at this time.
+ </p>
+
+ </subsection>
+
<subsection name="Index">
<table>
<tr><th>Topic</th><th>Summary</th></tr>
1.2 +2 -2 avalon/merlin/site/xdocs/extensions/platform/nt.xml
Index: nt.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/extensions/platform/nt.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nt.xml 3 Apr 2004 05:34:14 -0000 1.1
+++ nt.xml 5 May 2004 13:38:05 -0000 1.2
@@ -38,7 +38,7 @@
<p>Installation of the service is achieved using the following
command:</p>
<source>
- $ cd %MERLIN_HOME%\bin
+ $ cd %MERLIN_HOME%\bin\nt
$ InstallService-NT.bat
</source>
<p>
@@ -64,7 +64,7 @@
<p>Deinstallation of the service is achieved using the following
command:</p>
<source>
- $ cd %MERLIN_HOME%\bin
+ $ cd %MERLIN_HOME%\bin\nt
$ UninstallService-NT.bat
</source>
</subsection>
1.5 +0 -1 avalon/merlin/site/xdocs/merlin/embedded/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/merlin/embedded/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 4 Apr 2004 15:49:06 -0000 1.4
+++ navigation.xml 5 May 2004 13:38:05 -0000 1.5
@@ -41,7 +41,6 @@
<item name="CLI" href="/merlin/embedded/cli.html"/>
<item name="Application" href="/merlin/embedded/main.html"/>
<item name="Servlet" href="/merlin/embedded/servlet.html"/>
- <item name="Unit" href="/merlin/embedded/unit.html"/>
</item>
</item>
<item name="Extensions" href="/extensions/index.html"/>
1.3 +2 -4 avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 29 Apr 2004 21:58:49 -0000 1.2
+++ index.xml 5 May 2004 13:38:05 -0000 1.3
@@ -79,13 +79,11 @@
<subsection name="Sample XML">
This example includes all the jar files in the lib directory and in all
- its subdirectories, includes the my-class.class file in the lib directory,
- and excludes all files in the lib directory that contain the -dev string
- in its filename.
+ its subdirectories, and excludes all files in the lib directory that
+ contain the -dev string in its filename.
<source>
<fileset dir="<font color="darkred">lib</font>">
<include name="<font color="darkred">**/*.jar</font>"/>
- <include name="<font color="darkred">my-class.class</font>"/>
<exclude name="<font color="darkred">*-dev*</font>"/>
</fileset>
</source>
1.3 +2 -2 avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/containment/directives/classloader/classpath/fileset/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 29 Apr 2004 21:58:49 -0000 1.2
+++ navigation.xml 5 May 2004 13:38:05 -0000 1.3
@@ -51,9 +51,9 @@
href="/reference/containment/directives/classloader/classpath/repository/index.html"/>
<item name="fileset"
href="/reference/containment/directives/classloader/classpath/fileset/index.html">
- <item name="fileset"
+ <item name="include"
href="/reference/containment/directives/classloader/classpath/fileset/include.html"/>
- <item name="fileset"
+ <item name="exclude"
href="/reference/containment/directives/classloader/classpath/fileset/exclude.html"/>
</item>
</item>
1.4 +11 -9 avalon/merlin/site/xdocs/reference/containment/directives/include/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/containment/directives/include/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 7 Apr 2004 16:49:23 -0000 1.3
+++ index.xml 5 May 2004 13:38:06 -0000 1.4
@@ -87,24 +87,26 @@
</p>
<source><![CDATA[
-<container name="tutorial">
+<container name="application">
<classloader>
<classpath>
<repository>
- <resource id="tutorial:composition-api" version="1.0"/>
+ <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="merlin-tutorial:locator-api" version="1.0"/>
+ <resource id="merlin-tutorial:publisher-api" version="1.0"/>
+ <resource id="merlin-tutorial:application-impl" version="1.0"/>
</repository>
</classpath>
</classloader>
- <include name="publisher">
- id="tutorial:composition-publisher" version="1.0"/>
+ <include name="location" id="merlin-tutorial:locator-impl" version="1.0"/>
+ <include name="publisher" id="merlin-tutorial:publisher-impl" version="1.0"/>
- <include name="application">
- id="tutorial:composition-application" version="1.0"/>
-
- <include name="location">
- id="tutorial:composition-location" version="1.0"/>
+ <component name="application"
+ class="tutorial.application.Application">
+ </component>
</container>
]]></source>
1.2 +8 -4 avalon/merlin/site/xdocs/reference/system/kernel/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/system/kernel/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 1 Apr 2004 23:49:12 -0000 1.1
+++ index.xml 5 May 2004 13:38:06 -0000 1.2
@@ -40,15 +40,21 @@
<table>
<tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
+ <!--
<tr>
<td><a href="security/index.html">security</a></td><td>0..1</td>
<td>Defintion of a set of named security profiles.</td>
</tr>
+ -->
<tr>
<td><a href="repository/index.html">repository</a></td><td>0..1</td>
<td>Defintion of the repository sub-system including proxy settings,
cache directory and remote host list.</td>
</tr>
+ <tr>
+ <td><a href="../../containment/directives/index.html">container</a></td><td>0..1</td>
+ <td>Definition of the root container.</td>
+ </tr>
</table>
</subsection>
@@ -58,16 +64,14 @@
<!-- kernel declaration -->
<kernel>
- <logging target="default" priority="INFO">
- <category name="/logger" priority="WARN"/>
- </logging>
-
<repository>
<hosts>
<host>http://dpml.net</host>
<host>http://ibiblio.org/maven/</host>
</hosts>
</repository>
+
+ <container/>
</kernel>
]]></source>
1.5 +2 -1 avalon/merlin/site/xdocs/reference/system/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/system/kernel/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 4 Apr 2004 15:49:07 -0000 1.4
+++ navigation.xml 5 May 2004 13:38:06 -0000 1.5
@@ -48,8 +48,9 @@
<item name="System Specification" href="/reference/system/index.html">
<item name="Properties" href="/reference/system/properties.html"/>
<item name="kernel" href="/reference/system/kernel/index.html">
- <item name="security" href="/reference/system/kernel/security/index.html"/>
+ <!-- <item name="security" href="/reference/system/kernel/security/index.html"/> -->
<item name="repository" href="/reference/system/kernel/repository/index.html"/>
+ <item name="container" href="/reference/containment/directives/index.html"/>
</item>
</item>
</item>
1.5 +2 -1 avalon/merlin/site/xdocs/reference/system/kernel/repository/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/reference/system/kernel/repository/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 4 Apr 2004 15:49:07 -0000 1.4
+++ navigation.xml 5 May 2004 13:38:06 -0000 1.5
@@ -48,12 +48,13 @@
<item name="System Specification" href="/reference/system/index.html">
<item name="Properties" href="/reference/system/properties.html"/>
<item name="kernel" href="/reference/system/kernel/index.html">
- <item name="security" href="/reference/system/kernel/security/index.html"/>
+ <!--<item name="security" href="/reference/system/kernel/security/index.html"/>-->
<item name="repository" href="/reference/system/kernel/repository/index.html">
<item name="cache" href="/reference/system/kernel/repository/cache.html"/>
<item name="proxy" href="/reference/system/kernel/repository/proxy.html"/>
<item name="hosts" href="/reference/system/kernel/repository/hosts.html"/>
</item>
+ <item name="container" href="/reference/containment/directives/index.html"/>
</item>
</item>
</item>
1.11 +2 -0 avalon/merlin/site/xdocs/starting/advanced/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/advanced/index.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- index.xml 3 Apr 2004 08:52:18 -0000 1.10
+++ index.xml 5 May 2004 13:38:06 -0000 1.11
@@ -51,6 +51,7 @@
export statements that isolate a block implementation from the services
it provides.</td>
</tr>
+ <!--
<tr>
<td><a href="security.html">Container Security</a></td>
<td>
@@ -59,6 +60,7 @@
permissions to the code based on where it was loaded from.
</td>
</tr>
+ -->
<tr>
<td><a href="unit/index.html">Unit Tests</a></td>
<td>Setting up unit tests that leverage merlin as the component factory.</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org