mcconnell 2003/07/04 04:31:39
Modified: merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl
AvalonContextualizer.xinfo
merlin/assembly/src/test/config block.xml
merlin/assembly/src/test/org/apache/avalon/playground
ComplexComponent.xinfo DemoManager.xinfo
SimpleComponent.xinfo TerminalComponent.xinfo
merlin/assembly/src/test/org/apache/avalon/playground/basic
BasicComponent.xinfo
merlin/assembly/src/test/org/apache/avalon/playground/factory
CustomAppliance.xinfo
merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl
DefaultContainer.xinfo
merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernel.xinfo
merlin/merlin-extensions/merlin-jmx/src/java/org/apache/avalon/merlin/jmx
DefaultJMXServer.xinfo
merlin/merlin-platform/tutorials/contextualization/src/java/tutorial
StandardComponent.xinfo
merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground
Primary.java Secondary.java
merlin/merlin-platform/xdocs/meta/info/type index.xml
merlin/merlin-platform/xdocs/meta/info/type/dependencies
dependency.xml
merlin/merlin-platform/xdocs/meta/info/type/services
index.xml service.xml
merlin/merlin-platform/xdocs/meta/model/block/export
export.xml
merlin/merlin-platform/xdocs/meta/model/block/import
import.xml index.xml
merlin/merlin-platform/xdocs/starting/examples/james
block.xml
merlin/merlin-platform/xdocs/starting/tutorial
dependencies.xml services.xml
merlin/merlin-platform/xdocs/tools ant.xml
merlin/merlin-platform/xdocs/tools/tags context.xml
dependency.xml entry.xml extension.xml
namespace.xml service.xml stage.xml
merlin/meta/src/java/org/apache/avalon/meta/info/builder
XMLTypeCreator.java
merlin/meta/src/test/org/apache/avalon/meta/classic
Test.xinfo
merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder
XMLTypeWriter.java
merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags
AbstractTag.java ContextTag.java DependencyTag.java
ExtensionTag.java ServicesTag.java
merlin/meta-tools/src/test/org/apache/avalon/playground
Primary.java
merlin/meta-tools/xdocs tags.xml
Log:
Moving the avalon.meta tags suite closer to the ATMAGS proposal.
This includes:
1. replacement of the <type>:<version> syntax with an explicit type="<a-type>"
version="<a-version>" style
2. updates to XML type readers and writers to handle the seperated format (while
maintaining backward compatibility)
3. updates to tag handers to support declaration under the new format
4. Update to test cases.
Revision Changes Path
1.2 +1 -1
avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/AvalonContextualizer.xinfo
Index: AvalonContextualizer.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/AvalonContextualizer.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AvalonContextualizer.xinfo 29 Apr 2003 00:55:46 -0000 1.1
+++ AvalonContextualizer.xinfo 4 Jul 2003 11:31:34 -0000 1.2
@@ -27,7 +27,7 @@
Declaration of the lifecycle support phases that this manager provides.
-->
<extensions>
- <extension type="org.apache.avalon.framework.context.Contextualizable:4.1"
phase="CONTEXT" />
+ <extension type="org.apache.avalon.framework.context.Contextualizable"
version="4.1" phase="CONTEXT" />
</extensions>
</type>
1.6 +1 -1 avalon-sandbox/merlin/assembly/src/test/config/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/test/config/block.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- block.xml 18 Jun 2003 11:16:15 -0000 1.5
+++ block.xml 4 Jul 2003 11:31:34 -0000 1.6
@@ -10,7 +10,7 @@
</info>
<services>
- <service type="org.apache.avalon.playground.basic.BasicService:1.1"/>
+ <service type="org.apache.avalon.playground.basic.BasicService" version="1.1"/>
</services>
<dependencies/>
1.2 +1 -1
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ComplexComponent.xinfo
Index: ComplexComponent.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/ComplexComponent.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComplexComponent.xinfo 13 Mar 2003 01:04:24 -0000 1.1
+++ ComplexComponent.xinfo 4 Jul 2003 11:31:34 -0000 1.2
@@ -28,7 +28,7 @@
</services>
<dependencies>
- <dependency type="org.apache.avalon.playground.basic.BasicService:1.1"
role="basic"/>
+ <dependency type="org.apache.avalon.playground.basic.BasicService"
version="1.1" role="basic"/>
<dependency type="org.apache.avalon.playground.SimpleService" role="simple"/>
</dependencies>
1.2 +1 -1
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/DemoManager.xinfo
Index: DemoManager.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/DemoManager.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DemoManager.xinfo 13 Mar 2003 01:04:26 -0000 1.1
+++ DemoManager.xinfo 4 Jul 2003 11:31:35 -0000 1.2
@@ -34,7 +34,7 @@
attributes.
-->
- <extension type="org.apache.avalon.playground.Demonstratable:1.0">
+ <extension type="org.apache.avalon.playground.Demonstratable">
<attributes>
<attribute key="status" value="experimental"/>
</attributes>
1.3 +1 -1
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/SimpleComponent.xinfo
Index: SimpleComponent.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/SimpleComponent.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleComponent.xinfo 26 Apr 2003 12:37:48 -0000 1.2
+++ SimpleComponent.xinfo 4 Jul 2003 11:31:35 -0000 1.3
@@ -33,7 +33,7 @@
Declaration of the services that this component type is
dependent on.
-->
- <dependency type="org.apache.avalon.playground.basic.BasicService:1.1"
role="basic"/>
+ <dependency type="org.apache.avalon.playground.basic.BasicService"
version="1.1" role="basic"/>
</dependencies>
1.2 +1 -1
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/TerminalComponent.xinfo
Index: TerminalComponent.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/TerminalComponent.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TerminalComponent.xinfo 13 Mar 2003 01:04:27 -0000 1.1
+++ TerminalComponent.xinfo 4 Jul 2003 11:31:35 -0000 1.2
@@ -10,7 +10,7 @@
</info>
<services>
- <service type="org.apache.avalon.playground.basic.BasicService:1.1"/>
+ <service type="org.apache.avalon.playground.basic.BasicService" version="1.1"/>
</services>
</type>
1.3 +1 -1
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicComponent.xinfo
Index: BasicComponent.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/basic/BasicComponent.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicComponent.xinfo 29 Mar 2003 03:25:57 -0000 1.2
+++ BasicComponent.xinfo 4 Jul 2003 11:31:36 -0000 1.3
@@ -29,7 +29,7 @@
</context>
<services>
- <service type="org.apache.avalon.playground.basic.BasicService:1.1"/>
+ <service type="org.apache.avalon.playground.basic.BasicService" version="1.1"/>
<service type="org.apache.avalon.playground.NullService"/>
</services>
1.6 +1 -1
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomAppliance.xinfo
Index: CustomAppliance.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/playground/factory/CustomAppliance.xinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CustomAppliance.xinfo 22 Jun 2003 00:33:05 -0000 1.5
+++ CustomAppliance.xinfo 4 Jul 2003 11:31:36 -0000 1.6
@@ -52,7 +52,7 @@
</services>
<dependencies>
- <dependency role="basic"
type="org.apache.avalon.playground.basic.BasicService:1.1"/>
+ <dependency role="basic" type="org.apache.avalon.playground.basic.BasicService"
version="1.1"/>
</dependencies>
</type>
1.6 +1 -1
avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.xinfo
Index: DefaultContainer.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.xinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultContainer.xinfo 22 Jun 2003 00:35:33 -0000 1.5
+++ DefaultContainer.xinfo 4 Jul 2003 11:31:36 -0000 1.6
@@ -25,7 +25,7 @@
</info>
<services>
- <service type="org.apache.avalon.merlin.container.Container:1.0"/>
+ <service type="org.apache.avalon.merlin.container.Container"/>
</services>
</type>
1.4 +1 -1
avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.xinfo
Index: DefaultKernel.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.xinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultKernel.xinfo 6 Apr 2003 19:24:52 -0000 1.3
+++ DefaultKernel.xinfo 4 Jul 2003 11:31:36 -0000 1.4
@@ -32,7 +32,7 @@
</context>
<services>
- <service type="org.apache.avalon.merlin.kernel.Kernel" version="1.0"/>
+ <service type="org.apache.avalon.merlin.kernel.Kernel"/>
</services>
</type>
1.2 +1 -2
avalon-sandbox/merlin/merlin-extensions/merlin-jmx/src/java/org/apache/avalon/merlin/jmx/DefaultJMXServer.xinfo
Index: DefaultJMXServer.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jmx/src/java/org/apache/avalon/merlin/jmx/DefaultJMXServer.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultJMXServer.xinfo 4 Jul 2003 08:54:58 -0000 1.1
+++ DefaultJMXServer.xinfo 4 Jul 2003 11:31:36 -0000 1.2
@@ -4,10 +4,9 @@
<type>
<info>
<name>jmx</name>
- <version>1.0.0</version>
<lifestyle>singleton</lifestyle>
</info>
<services>
- <service type="javax.management.MBeanServer:1.0.0"/>
+ <service type="javax.management.MBeanServer"/>
</services>
</type>
1.2 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/contextualization/src/java/tutorial/StandardComponent.xinfo
Index: StandardComponent.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/contextualization/src/java/tutorial/StandardComponent.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StandardComponent.xinfo 10 Jun 2003 02:12:21 -0000 1.1
+++ StandardComponent.xinfo 4 Jul 2003 11:31:36 -0000 1.2
@@ -35,7 +35,7 @@
</context>
<services>
- <service type="tutorial.StandardService:1.1" />
+ <service type="tutorial.StandardService" version="1.1" />
</services>
</type>
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/Primary.java
Index: Primary.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/Primary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Primary.java 12 Jun 2003 07:44:41 -0000 1.1
+++ Primary.java 4 Jul 2003 11:31:37 -0000 1.2
@@ -10,8 +10,7 @@
* @avalon.meta.version 1.3
* @avalon.meta.name primary-component
* @avalon.meta.lifestyle singleton
- * @avalon.meta.service type="org.apache.avalon.playground.PrimaryService:9.8"
- * @todo Verify class level todo.
+ * @avalon.meta.service type="org.apache.avalon.playground.PrimaryService"
version="9.8"
*/
public class Primary extends AbstractLogEnabled
implements PrimaryService, Contextualizable
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/Secondary.java
Index: Secondary.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/Secondary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Secondary.java 12 Jun 2003 07:44:41 -0000 1.1
+++ Secondary.java 4 Jul 2003 11:31:37 -0000 1.2
@@ -10,7 +10,7 @@
/**
* @avalon.meta.name secondary-component
* @avalon.meta.version 2.4
- * @avalon.meta.service type="org.apache.avalon.playground.SecondaryService:0.1"
+ * @avalon.meta.service type="org.apache.avalon.playground.SecondaryService"
version="0.1"
*/
public class Secondary extends AbstractLogEnabled
implements Serviceable, SecondaryService
@@ -34,7 +34,7 @@
/**
* Supply of dependent services to this component by the container.
* @param manager the service manager
- * @avalon.meta.dependency
type="org.apache.avalon.playground.PrimaryService:9.8" key="primary"
+ * @avalon.meta.dependency type="org.apache.avalon.playground.PrimaryService"
version="9.8" key="primary"
*/
public void service( ServiceManager manager ) throws ServiceException
{
1.3 +4 -3
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 21 Jun 2003 17:10:02 -0000 1.2
+++ index.xml 4 Jul 2003 11:31:37 -0000 1.3
@@ -210,8 +210,9 @@
<dependency optional="<font color="darkred">FALSE</font>"
- role="<font color="darkred">my-transformer</font>"
- type="<font
color="darkred">org.apache.cocoon.api.Transformer:1.1</font>">
+ key="<font color="darkred">my-transformer</font>"
+ type="<font color="darkred">org.apache.cocoon.api.Transformer</font>
+ version="<font color="darkred">1.1</font>">
<font color="gray"><i><!-- the set of attributes associated with the
dependency --></i></font>
1.2 +10 -4
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/dependencies/dependency.xml
Index: dependency.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/dependencies/dependency.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dependency.xml 10 Jun 2003 02:14:16 -0000 1.1
+++ dependency.xml 4 Jul 2003 11:31:37 -0000 1.2
@@ -26,8 +26,13 @@
<tr>
<td>type</td><td>yes</td>
<td>
- Declaration of an interface and version seperated by the ":" character.
- If the ":" seperator is not included, a version of 1.0 is assumed.
+ Declaration of an interface classname.
+ </td>
+ </tr>
+ <tr>
+ <td>version</td><td>no</td>
+ <td>
+ Declaration of service version. If not declarared a version of 1.0 is
assumed.
</td>
</tr>
<tr>
@@ -64,7 +69,8 @@
<source>
<dependency optional="<font color="darkred">FALSE</font>"
key="<font color="darkred">my-transformer</font>"
- type="<font
color="darkred">org.apache.cocoon.api.Transformer:1.1</font>"/>
+ type="<font color="darkred">org.apache.cocoon.api.Transformer</font>"
+ version="<font color="darkred">1.1</font>"/>
</source>
</subsection>
1.2 +5 -5
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/services/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/services/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 02:14:17 -0000 1.1
+++ index.xml 4 Jul 2003 11:31:37 -0000 1.2
@@ -32,7 +32,7 @@
of supplying. Each service declarared under the services element
may be referenced by other component types as service dependecies
or lifecycle stage depedencies. A container is responsible for
- the assembaly of component types based on the connection of
+ the assembly of component types based on the connection of
supply components to consumer components via a common service
description.
</p>
@@ -46,11 +46,11 @@
<font color="gray"><i><!--
The service type is the classname of an interface and the
- version identifier qualifes the interface version. The
- default version value is 1.0.
+ version identifier qualifes the interface version.
--></i></font>
- <service type="<font
color="darkred">org.apache.SimpleService:3.2</font>">
+ <service type="<font color="darkred">org.apache.SimpleService</font>"
+ version="<font color="darkred">3.2</font>">
<attributes>
<font color="gray"><i><!--
Attribute declarations may be included to qualify the
1.2 +12 -4
avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/services/service.xml
Index: service.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/info/type/services/service.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- service.xml 10 Jun 2003 02:14:17 -0000 1.1
+++ service.xml 4 Jul 2003 11:31:37 -0000 1.2
@@ -17,8 +17,16 @@
<tr>
<td>type</td><td>yes</td>
<td>
- Declaration of an interface and version seperated by the ":" character.
- If the ":" seperator is not included, a version of 1.0 is assumed.
+ Declaration of an interface classname.
+ </td>
+ </tr>
+ </table>
+ <table>
+ <tr><th>Attribute</th><th>Required</th><th>Description</th></tr>
+ <tr>
+ <td>version</td><td>no</td>
+ <td>
+ Declaration of an service version.
</td>
</tr>
</table>
@@ -45,7 +53,7 @@
<subsection name="Example XML">
<source>
-<service type="<font color="darkred">org.apache.SimpleService:3.2</font>"/>
+<service type="<font color="darkred">org.apache.SimpleService</font>"
version="<font color="darkred">3.2</font>"/>
</source>
</subsection>
1.2 +10 -5
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/export/export.xml
Index: export.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/export/export.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- export.xml 10 Jun 2003 02:14:23 -0000 1.1
+++ export.xml 4 Jul 2003 11:31:37 -0000 1.2
@@ -16,8 +16,13 @@
<tr>
<td>type</td><td>yes</td>
<td>
- Declaration of an interface and version seperated by the ":" character.
- If the ":" seperator is not included, a version of 1.0 is assumed.
+ Declaration of an interface classname.
+ </td>
+ </tr>
+ <tr>
+ <td>version</td><td>no</td>
+ <td>
+ Declaration of the service version.
</td>
</tr>
</table>
@@ -51,7 +56,7 @@
<subsection name="Sample XML">
<source>
-<service type="<font color="darkred">org.apache.SimpleService:3.2</font>">
+<service type="<font color="darkred">org.apache.SimpleService</font>"
version="<font color="darkred">3.2</font>">
<source>playground/simple</source>
</service>
</source>
@@ -63,7 +68,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.2 +9 -4
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/import/import.xml
Index: import.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/import/import.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.xml 10 Jun 2003 02:14:23 -0000 1.1
+++ import.xml 4 Jul 2003 11:31:37 -0000 1.2
@@ -18,8 +18,13 @@
<tr>
<td>type</td><td>yes</td>
<td>
- Declaration of an interface and version seperated by the ":" character.
- If the ":" seperator is not included, a version of 1.0 is assumed.
+ Declaration of an service classname.
+ </td>
+ </tr>
+ <tr>
+ <td>version</td><td>no</td>
+ <td>
+ Declaration of the service version.
</td>
</tr>
<tr>
@@ -55,7 +60,7 @@
<source>
<dependency optional="<font color="darkred">FALSE</font>"
- type="<font color="darkred">org.apache.cocoon.api.Transformer:1.1</font>"/>
+ type="<font color="darkred">org.apache.cocoon.api.Transformer</font>"
version="<font color="darkred">1.1</font>"/>
</source>
</subsection>
1.2 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/import/index.xml
Index: index.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/block/import/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 02:14:23 -0000 1.1
+++ index.xml 4 Jul 2003 11:31:37 -0000 1.2
@@ -46,7 +46,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.3 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/block.xml
Index: block.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/examples/james/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 22 Jun 2003 13:57:58 -0000 1.2
+++ block.xml 4 Jul 2003 11:31:37 -0000 1.3
@@ -50,10 +50,10 @@
-->
<!--
<services>
- <service type="org.apache.james.services.MailServer:1.0">
+ <service type="org.apache.james.services.MailServer">
<source>/james</source>
</service>
- <service type="org.apache.mailet.MailetContext:1.0">
+ <service type="org.apache.mailet.MailetContext">
<source>/james</source>
</service>
</services>
1.4 +2 -2
avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies.xml
Index: dependencies.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/dependencies.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dependencies.xml 21 Jun 2003 17:10:02 -0000 1.3
+++ dependencies.xml 4 Jul 2003 11:31:38 -0000 1.4
@@ -53,7 +53,7 @@
*
* @param manager the service manager
* @avalon.meta.dependency
- * type="tutorial.RandomGenerator:1.0"
+ * type="tutorial.RandomGenerator"
* key="random"
*/
public void service( ServiceManager manager )
@@ -80,7 +80,7 @@
<lifestyle>singleton</lifestyle>
</info>
<dependencies>
- <dependency key="random" type="tutorial.RandomGenerator:1.0.0"/>
+ <dependency key="random" type="tutorial.RandomGenerator" version="1.0.0"/>
</dependencies>
</type>
]]></source>
1.2 +1 -1
avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/services.xml
Index: services.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/services.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- services.xml 10 Jun 2003 02:14:34 -0000 1.1
+++ services.xml 4 Jul 2003 11:31:38 -0000 1.2
@@ -93,7 +93,7 @@
<version>1.0</version>
</info>
<services>
- <service type="tutorial.RandomGenerator:1.0"/>
+ <service type="tutorial.RandomGenerator"/>
</services>
</type>
]]></source>
1.4 +3 -3 avalon-sandbox/merlin/merlin-platform/xdocs/tools/ant.xml
Index: ant.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/ant.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ant.xml 21 Jun 2003 17:10:02 -0000 1.3
+++ ant.xml 4 Jul 2003 11:31:38 -0000 1.4
@@ -116,7 +116,7 @@
/**
* Supply of dependent services to this component by the container.
* @param manager the service manager
- * @avalon.meta.dependency type="PrimaryService:1.3" key="primary"
+ * @avalon.meta.dependency type="PrimaryService" version="1.3" key="primary"
*/
public void service( ServiceManager manager ) throws ServiceException
{
@@ -145,10 +145,10 @@
<entry key="home" type="java.io.File"/>
</context>
<services>
- <service type="SecondaryService:0.1.0"/>
+ <service type="SecondaryService" version="0.1.0"/>
</services>
<dependencies>
- <dependency key="primary" type="PrimaryService:1.3.0"/>
+ <dependency key="primary" type="PrimaryService" version="1.3.0"/>
</dependencies>
</type>
]]></source>
1.2 +3 -3
avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/context.xml
Index: context.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/context.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- context.xml 10 Jun 2003 02:14:38 -0000 1.1
+++ context.xml 4 Jul 2003 11:31:38 -0000 1.2
@@ -44,7 +44,7 @@
<version>1.3.0</version>
<name>primary-component</name>
</info>
- <context type="net.osm.CustomComponent:1.0.0">
+ <context type="net.osm.CustomComponent" version="1.0.0">
</context>
</type>
]]></source>
@@ -54,7 +54,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.2 +6 -6
avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/dependency.xml
Index: dependency.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/dependency.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dependency.xml 10 Jun 2003 02:14:38 -0000 1.1
+++ dependency.xml 4 Jul 2003 11:31:38 -0000 1.2
@@ -30,8 +30,8 @@
* Supply of dependent services to this component by
* the container.
* @param manager the service manager
- * @avalon.meta.dependency key="home" type="Home:1.3"
- * @avalon.meta.dependency type="Resource:5" optional="true"
+ * @avalon.meta.dependency key="home" type="Home" version="1.3"
+ * @avalon.meta.dependency type="Resource" version="5" optional="true"
*/
public void service( ServiceManager manager )
throws ServiceException
@@ -59,8 +59,8 @@
<name>demo</name>
</info>
<dependencies>
- <dependency key="home" type="Home:1.3.0"/>
- <dependency type="Resource:5.0.0" optional="true"/>
+ <dependency key="home" type="Home" version="1.3.0"/>
+ <dependency type="Resource" version="5.0.0" optional="true"/>
</dependencies>
</type>
]]></source>
@@ -70,7 +70,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/entry.xml
Index: entry.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/entry.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- entry.xml 10 Jun 2003 02:14:38 -0000 1.1
+++ entry.xml 4 Jul 2003 11:31:38 -0000 1.2
@@ -69,7 +69,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.2 +3 -3
avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/extension.xml
Index: extension.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/extension.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extension.xml 10 Jun 2003 02:14:38 -0000 1.1
+++ extension.xml 4 Jul 2003 11:31:38 -0000 1.2
@@ -39,7 +39,7 @@
<name>handler</name>
</info>
<extensions>
- <extension type="org.apache.avalon.plyground.Demonstratable:1.0.0"/>
+ <extension type="org.apache.avalon.plyground.Demonstratable" version="1.0.0"/>
</extensions>
</type>
]]></source>
@@ -50,7 +50,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.2 +3 -3
avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/namespace.xml
Index: namespace.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/namespace.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- namespace.xml 10 Jun 2003 02:14:38 -0000 1.1
+++ namespace.xml 4 Jul 2003 11:31:38 -0000 1.2
@@ -26,7 +26,7 @@
* @xx.version 1.3
* @xx.name primary-component
* @xx.lifestyle singleton
- * @xx.service type="org.apache.avalon.playground.PrimaryService:9.8"
+ * @xx.service type="org.apache.avalon.playground.PrimaryService" version="9.8"
*/
public class MyComponent
{
@@ -39,7 +39,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.2 +5 -5
avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/service.xml
Index: service.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/service.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- service.xml 10 Jun 2003 02:14:39 -0000 1.1
+++ service.xml 4 Jul 2003 11:31:38 -0000 1.2
@@ -23,7 +23,7 @@
* @avalon.meta.version 5.1
* @avalon.meta.name vault
* @avalon.meta.service type="net.osm.vault.Vault;
- * @avalon.meta.service type="net.osm.vault.KeystoreHandler:2.1.1;
+ * @avalon.meta.service type="net.osm.vault.KeystoreHandler" version="2.1.1;
*/
public class DefaultVault implements Vault, KeystoreHandler
{
@@ -40,8 +40,8 @@
<name>vault</name>
</info>
<services>
- <service type="net.osm.vault.Vault:1.0.0"/>
- <service type="net.osm.vault.KeystoreHandler:2.1.1"/>
+ <service type="net.osm.vault.Vault" version="1.0.0"/>
+ <service type="net.osm.vault.KeystoreHandler" version="2.1.1"/>
</services>
</type>
]]></source>
@@ -52,7 +52,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.2 +3 -3 avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/stage.xml
Index: stage.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/tools/tags/stage.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stage.xml 10 Jun 2003 02:14:39 -0000 1.1
+++ stage.xml 4 Jul 2003 11:31:38 -0000 1.2
@@ -40,7 +40,7 @@
<name>extended-component</name>
</info>
<stages>
- <stage type="org.apache.avalon.plyground.Demonstratable:1.0.0"/>
+ <stage type="org.apache.avalon.plyground.Demonstratable" version="1.0.0"/>
</stages>
</type>
]]></source>
@@ -52,7 +52,7 @@
<footer>
<legal>
- Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
+ Copyright (c) @year@ The Avalon Apache Project All rights reserved.
$Revision$ $Date$
</legal>
</footer>
1.10 +33 -7
avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLTypeCreator.java 1 Jul 2003 04:44:56 -0000 1.9
+++ XMLTypeCreator.java 4 Jul 2003 11:31:38 -0000 1.10
@@ -206,7 +206,7 @@
protected StageDescriptor buildPhase( Configuration config )
throws ConfigurationException
{
- ReferenceDescriptor reference = createReference( config.getAttribute(
"type" ) );
+ ReferenceDescriptor reference = buildReferenceDescriptor( config );
final Properties attributes =
buildAttributes( config.getChild( "attributes" ) );
return new StageDescriptor( reference, attributes );
@@ -224,7 +224,33 @@
protected ReferenceDescriptor buildReferenceDescriptor( final Configuration
service )
throws ConfigurationException
{
- final String type = service.getAttribute("type");
+ return buildReferenceDescriptor( service, null );
+ }
+
+ /**
+ * A utility method to build a [EMAIL PROTECTED] ReferenceDescriptor}
+ * object from specified configuration data.
+ *
+ * @param service the service Configuration
+ * @param classname the default type classname
+ * @return the created ReferenceDescriptor
+ * @throws ConfigurationException if an error occurs
+ */
+ protected ReferenceDescriptor buildReferenceDescriptor( final Configuration
service, String classname )
+ throws ConfigurationException
+ {
+ final String type = service.getAttribute("type", classname );
+ if( type == null )
+ {
+ final String error =
+ "Missing 'type' attribute in configuration: "
+ + ConfigurationUtil.list( service );
+ throw new ConfigurationException( error );
+ }
+ if( type.indexOf( ":" ) > -1 )
+ {
+ return createReference( type );
+ }
final String versionString = service.getAttribute( "version", "1.0" );
final Version version = buildVersion( versionString );
return new ReferenceDescriptor( type, version );
@@ -311,7 +337,7 @@
role = dependency.getAttribute( "key", null );
}
ReferenceDescriptor reference =
- createReference( dependency.getAttribute( "type" ) );
+ buildReferenceDescriptor( dependency );
final boolean optional =
dependency.getAttributeAsBoolean( "optional", false );
@@ -348,7 +374,7 @@
buildAttributes( context.getChild( "attributes" ) );
ReferenceDescriptor reference =
- createReference( context.getAttribute( "type", Context.class.getName() )
);
+ buildReferenceDescriptor( context, Context.class.getName() );
return new ContextDescriptor( reference, entrys, attributes );
}
@@ -388,7 +414,7 @@
public ServiceDescriptor buildService( final Configuration service )
throws ConfigurationException
{
- ReferenceDescriptor reference = createReference( service.getAttribute(
"type" ) );
+ ReferenceDescriptor reference = buildReferenceDescriptor( service );
final Properties attributes =
buildAttributes( service.getChild( "attributes" ) );
return new ServiceDescriptor( reference, attributes );
@@ -470,7 +496,7 @@
throws ConfigurationException
{
ReferenceDescriptor reference =
- createReference( config.getAttribute( "type" ) );
+ buildReferenceDescriptor( config );
final Properties attributes =
buildAttributes( config.getChild( "attributes" ) );
return new ExtensionDescriptor( reference, attributes );
1.2 +1 -1
avalon-sandbox/merlin/meta/src/test/org/apache/avalon/meta/classic/Test.xinfo
Index: Test.xinfo
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta/src/test/org/apache/avalon/meta/classic/Test.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Test.xinfo 21 Jun 2003 17:42:32 -0000 1.1
+++ Test.xinfo 4 Jul 2003 11:31:38 -0000 1.2
@@ -8,6 +8,6 @@
<lifestyle>singleton</lifestyle>
</info>
<services>
- <service type="org.apache.avalon.merlin.test.Hello:1.0.0"/>
+ <service type="org.apache.avalon.merlin.test.Hello" version="1.0.0"/>
</services>
</type>
1.7 +14 -5
avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/XMLTypeWriter.java
Index: XMLTypeWriter.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/XMLTypeWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLTypeWriter.java 21 Jun 2003 17:10:02 -0000 1.6
+++ XMLTypeWriter.java 4 Jul 2003 11:31:38 -0000 1.7
@@ -313,7 +313,9 @@
{
final ServiceDescriptor service = services[ i ];
writer.write( "\n <service type=\"" );
- writer.write( service.getReference().toString() );
+ writer.write( service.getReference().getClassname() );
+ writer.write( "\" version=\"" );
+ writer.write( service.getReference().getVersion().toString() );
final int count = service.getAttributeNames().length;
if( 0 == count )
{
@@ -359,7 +361,9 @@
}
writer.write( "type=\"" );
- writer.write( dependency.getReference().toString() );
+ writer.write( dependency.getReference().getClassname() );
+ writer.write( "\" version=\"" );
+ writer.write( dependency.getReference().getVersion().toString() );
if( dependency.isOptional() )
{
@@ -444,7 +448,9 @@
final StageDescriptor stage = stages[ i ];
writer.write( "\n <stage " );
writer.write( "type=\"" );
- writer.write( stage.getReference().toString() );
+ writer.write( stage.getReference().getClassname() );
+ writer.write( "\" version=\"" );
+ writer.write( stage.getReference().getVersion().toString() );
final int count = stage.getAttributeNames().length;
if( 0 == count )
@@ -481,9 +487,12 @@
for( int i = 0; i < extensions.length; i++ )
{
final ExtensionDescriptor extension = extensions[ i ];
+
writer.write( "\n <extension " );
writer.write( "type=\"" );
- writer.write( extension.getReference().toString() );
+ writer.write( extension.getReference().getClassname() );
+ writer.write( "\" version=\"" );
+ writer.write( extension.getReference().getVersion().toString() );
final int count = extension.getAttributeNames().length;
if( 0 == count )
1.8 +31 -1
avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/AbstractTag.java
Index: AbstractTag.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/AbstractTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractTag.java 12 Jun 2003 18:56:20 -0000 1.7
+++ AbstractTag.java 4 Jul 2003 11:31:39 -0000 1.8
@@ -68,6 +68,16 @@
*/
public class AbstractTag
{
+ /**
+ * The dependency tag type parameter name.
+ */
+ public static final String TYPE_PARAM = "type";
+
+ /**
+ * The dependency tag version parameter name.
+ */
+ public static final String VERSION_PARAM = "version";
+
private JavaClass m_class;
@@ -184,6 +194,26 @@
throw new IllegalArgumentException( message );
}
return value;
+ }
+
+ /**
+ * Resolve a version form the supplied string.
+ *
+ * @param version the explicit version
+ * @param type the unresolved type in the classname:version format
+ * @return the version or null if no version specified
+ */
+ protected Version resolveVersion( final String version, final String type )
+ {
+ if( version != null )
+ {
+ return Version.getVersion( version );
+ }
+ if( type.indexOf(":") > -1 )
+ {
+ return Version.getVersion( type.substring( type.indexOf(":") + 1 ) );
+ }
+ return null;
}
/**
1.5 +1 -6
avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ContextTag.java
Index: ContextTag.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ContextTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextTag.java 4 Jun 2003 09:28:45 -0000 1.4
+++ ContextTag.java 4 Jul 2003 11:31:39 -0000 1.5
@@ -81,11 +81,6 @@
public static final String KEY = "context";
/**
- * The javadoc context tag type parameter.
- */
- public static final String TYPE_PARAM = "type";
-
- /**
* The javadoc context tag key parameter.
*/
public static final String KEY_PARAM = "key";
1.7 +3 -7
avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/DependencyTag.java
Index: DependencyTag.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/DependencyTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DependencyTag.java 4 Jun 2003 09:28:45 -0000 1.6
+++ DependencyTag.java 4 Jul 2003 11:31:39 -0000 1.7
@@ -75,11 +75,6 @@
public static final String KEY = "dependency";
/**
- * The dependency tag type parameter name.
- */
- public static final String TYPE_PARAM = "type";
-
- /**
* The dependency tag key parameter name.
*/
public static final String KEY_PARAM = "key";
@@ -147,7 +142,8 @@
{
final String value = getNamedParameter( tag, TYPE_PARAM );
final String type = resolveType( value );
- final Version version = resolveVersion( value );
+ final String versionString = getNamedParameter( tag, VERSION_PARAM, null );
+ final Version version = resolveVersion( versionString, value );
final String key = getNamedParameter( tag, KEY_PARAM, type );
final String optional = getNamedParameter( tag, OPTIONAL_PARAM, "false" );
final boolean isOptional = "true".equals( optional.toLowerCase() );
1.4 +1 -6
avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ExtensionTag.java
Index: ExtensionTag.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ExtensionTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtensionTag.java 16 Apr 2003 14:19:42 -0000 1.3
+++ ExtensionTag.java 4 Jul 2003 11:31:39 -0000 1.4
@@ -71,11 +71,6 @@
public static final String KEY = "extension";
/**
- * The extension type parameter name.
- */
- public static final String TYPE_PARAM = "type";
-
- /**
* The extension tag constructor.
* @param clazz the javadoc class descriptor.
*/
1.4 +3 -7
avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ServicesTag.java
Index: ServicesTag.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-tools/src/java/org/apache/avalon/meta/info/builder/tags/ServicesTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServicesTag.java 16 Apr 2003 14:19:42 -0000 1.3
+++ ServicesTag.java 4 Jul 2003 11:31:39 -0000 1.4
@@ -72,11 +72,6 @@
public static final String KEY = "service";
/**
- * The service export type parameter name.
- */
- public static final String TYPE_PARAM = "type";
-
- /**
* The service tag constructor.
* @param clazz the javadoc class descriptor
*/
@@ -104,7 +99,8 @@
{
final String value = getNamedParameter( tag, TYPE_PARAM );
final String type = resolveType( value );
- final Version version = resolveVersion( value );
+ final String versionString = getNamedParameter( tag, VERSION_PARAM, null );
+ final Version version = resolveVersion( versionString, value );
final ReferenceDescriptor ref = new ReferenceDescriptor( type, version );
return new ServiceDescriptor( ref, null );
}
1.2 +7 -6
avalon-sandbox/merlin/meta-tools/src/test/org/apache/avalon/playground/Primary.java
Index: Primary.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-tools/src/test/org/apache/avalon/playground/Primary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Primary.java 29 Mar 2003 03:13:11 -0000 1.1
+++ Primary.java 4 Jul 2003 11:31:39 -0000 1.2
@@ -10,17 +10,18 @@
* export, version, type name, lifestyle, context entries, and the use
* of the namespace compating mechanism.
*
- * @avalon.meta.namespace x
*
- * @x.version 1.3
- * @x.name primary-component
- * @x.lifestyle singleton
- * @x.service type="org.apache.avalon.playground.PrimaryService:9.8"
+ * @avalon.meta.version 1.3
+ * @avalon.meta.name primary-component
+ * @avalon.meta.lifestyle singleton
+ * @avalon.meta.service
+ * type="org.apache.avalon.playground.PrimaryService"
+ * version="9.8"
*/
public class Primary implements PrimaryService, Contextualizable
{
/**
- * @x.entry key="home" type="java.io.File"
+ * @avalon.meta.entry key="home" type="java.io.File"
*/
public void contextualize( Context context ) throws ContextException
{
1.4 +1 -3 avalon-sandbox/merlin/meta-tools/xdocs/tags.xml
Index: tags.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta-tools/xdocs/tags.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tags.xml 21 Jun 2003 17:10:03 -0000 1.3
+++ tags.xml 4 Jul 2003 11:31:39 -0000 1.4
@@ -18,8 +18,6 @@
<subsection name="Tag List">
<table>
<tr><th>Tag</th><th>Scope</th><th>Description</th></tr>
- <tr><td><a href="#Namespace Tag">@avalon.meta.namespace</a></td>
- <td>class</td><td>Enables client modification of the tag namespace.</td></tr>
<tr><td><a href="#Version Tag">@avalon.meta.version</a></td>
<td>class</td><td>Identifies a class or interface are a Type or
Service.</td></tr>
<tr><td><a href="#Attribute Tag">@avalon.meta.attribute</a></td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
