mcconnell 2002/07/12 13:35:11
Modified: assembly build.xml
assembly/src/etc merlin.gif
assembly/src/java/org/apache/excalibur/merlin package.html
Log:
javadoc
Revision Changes Path
1.17 +3 -3 jakarta-avalon-excalibur/assembly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 12 Jul 2002 15:11:56 -0000 1.16
+++ build.xml 12 Jul 2002 20:35:11 -0000 1.17
@@ -268,9 +268,9 @@
<target name="patch">
<replace
- token="org.apache.excalibur.merlin.meta.data"
- value="org.apache.excalibur.merlin.model" dir="src/java">
- <include name="org/apache/excalibur/merlin/**/*.*"/>
+ token="getContextDescriptor"
+ value="getContext" dir="src/java">
+ <include name="org/apache/excalibur/**/*.*"/>
</replace>
</target>
1.3 +18 -16 jakarta-avalon-excalibur/assembly/src/etc/merlin.gif
<<Binary file>>
1.2 +4 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 12 Jul 2002 10:16:19 -0000 1.1
+++ package.html 12 Jul 2002 20:35:11 -0000 1.2
@@ -1,5 +1,8 @@
<body>
-<p>Merlin is a component container that provides support for automatics assembly
and deployment of services based on the explicit assembly information together with
implicit and packaged information associated with compoent types.
+<p>Merlin is a component container that provides support for automatics assembly
and deployment of services based on the explicit assembly information together with
implicit and packaged information associated with component types.</p>
+<h3>Package Structure (UML)</h3>
+<p><img src="doc-files/merlin.gif" border=0></p>
+
</body>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
