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 2003/07/16 02:05:56 UTC
cvs commit: avalon-sandbox/meta/site/xdocs/tools/tags context.xml dependency.xml entry.xml extension.xml logger.xml service.xml stage.xml version.xml
mcconnell 2003/07/15 17:05:56
Modified: meta/site/xdocs/tools ant.xml
meta/site/xdocs/tools/tags context.xml dependency.xml
entry.xml extension.xml logger.xml service.xml
stage.xml version.xml
Log:
Bringing things into sync.
Revision Changes Path
1.2 +1 -3 avalon-sandbox/meta/site/xdocs/tools/ant.xml
Index: ant.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/ant.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.xml 14 Jul 2003 20:22:19 -0000 1.1
+++ ant.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -80,10 +80,8 @@
/**
* An example component containing meta info under javadoc tags.
*
- * @avalon.name secondary-component
- * @avalon.version 2.4
+ * @avalon.type name="secondary-component" version="2.4" lifestyle="singleton"
* @avalon.service type="SecondaryService:0.1"
- * @avalon.lifestyle singleton
*/
public class Secondary extends AbstractLogEnabled
implements Serviceable, SecondaryService, Contextualizable
1.2 +2 -3 avalon-sandbox/meta/site/xdocs/tools/tags/context.xml
Index: context.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/context.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- context.xml 14 Jul 2003 20:22:20 -0000 1.1
+++ context.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -19,8 +19,7 @@
/**
* Example of a component declaring a custom context argument type.
*
- * @avalon.version 1.3
- * @avalon.name primary-component
+ * @avalon.type version="1.3" name="primary-component"
*/
public class Primary implements Contextualizable
{
1.2 +2 -3 avalon-sandbox/meta/site/xdocs/tools/tags/dependency.xml
Index: dependency.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/dependency.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dependency.xml 14 Jul 2003 20:22:20 -0000 1.1
+++ dependency.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -19,8 +19,7 @@
/**
* Example of a component declaring multiple service dependencies.
*
- * @avalon.version 1.0
- * @avalon.name demo
+ * @avalon.type version="1.0" name="demo"
*/
public class Demo implements Serviceable
{
1.2 +2 -3 avalon-sandbox/meta/site/xdocs/tools/tags/entry.xml
Index: entry.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/entry.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- entry.xml 14 Jul 2003 20:22:21 -0000 1.1
+++ entry.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -20,8 +20,7 @@
/**
* Example of a component declaring a context entry dependencies.
*
- * @avalon.version 1.0
- * @avalon.name entry-demo
+ * @avalon.type version="1.0" name="demo"
*/
public class Primary implements Contextualizable
{
1.2 +2 -3 avalon-sandbox/meta/site/xdocs/tools/tags/extension.xml
Index: extension.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/extension.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extension.xml 14 Jul 2003 20:22:21 -0000 1.1
+++ extension.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -20,8 +20,7 @@
/**
* Example of a component declaring a stage handling capability.
*
- * @avalon.version 0.1
- * @avalon.name handler
+ * @avalon.type version="0.1" name="handler"
* @avalon.extension type="org.apache.avalon.plyground.Demonstratable"
*/
public class DemoExtension
1.2 +2 -3 avalon-sandbox/meta/site/xdocs/tools/tags/logger.xml
Index: logger.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/logger.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logger.xml 14 Jul 2003 20:22:21 -0000 1.1
+++ logger.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -19,8 +19,7 @@
/**
* Example of a component declaring the name of a logging channel.
*
- * @avalon.name component
- * @avalon.version 2.4
+ * @avalon.type name="component" version="2.4"
*/
public class MyComponent extends AbstractLogEnabled
{
1.2 +2 -3 avalon-sandbox/meta/site/xdocs/tools/tags/service.xml
Index: service.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/service.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- service.xml 14 Jul 2003 20:22:21 -0000 1.1
+++ service.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -20,8 +20,7 @@
/**
* Example of a component declaring export of a set of services.
*
- * @avalon.version 5.1
- * @avalon.name vault
+ * @avalon.type version="5.1" name="vault"
* @avalon.service type="net.osm.vault.Vault;
* @avalon.service type="net.osm.vault.KeystoreHandler" version="2.1.1;
*/
1.2 +2 -3 avalon-sandbox/meta/site/xdocs/tools/tags/stage.xml
Index: stage.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/stage.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stage.xml 14 Jul 2003 20:22:21 -0000 1.1
+++ stage.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -21,8 +21,7 @@
/**
* Example of a component declaring a stage dependency.
*
- * @avalon.version 0.1
- * @avalon.name extended-component
+ * @avalon.type version="0.1" name="extended-component"
* @avalon.stage type="org.apache.avalon.playground.Demonstratable"
*/
public class DemoComponent implements Demonstratable
1.2 +3 -3 avalon-sandbox/meta/site/xdocs/tools/tags/version.xml
Index: version.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/site/xdocs/tools/tags/version.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- version.xml 14 Jul 2003 20:22:21 -0000 1.1
+++ version.xml 16 Jul 2003 00:05:55 -0000 1.2
@@ -18,11 +18,11 @@
package net.osm;
/**
- * Example of a version declaration defintion. The version tag is
+ * Example of a version declaration defintion. The service tag is
* required in order to generate a <classname>.xservice definition
* or <classname>.xinfo type descriptor.
*
- * @avalon.version 1.3
+ * @avalon.service version="1.3"
*/
public interface MyService
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org