mcconnell 2003/07/22 01:58:00
Modified:
merlin/merlin-extensions/merlin-jmx/src/java/org/apache/avalon/merlin/jmx
DefaultJMXServer.java
merlin/merlin-platform/tutorials/composition/src/java/tutorial
LocationService.java PublisherService.java
merlin/merlin-platform/tutorials/composition/src/java/tutorial/application
Application.java
merlin/merlin-platform/tutorials/composition/src/java/tutorial/location
LocationComponent.java
merlin/merlin-platform/tutorials/composition/src/java/tutorial/publisher
PublisherComponent.java
merlin/merlin-platform/tutorials/configuration/block/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/configuration/defaults/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/configuration/override/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/configuration/simple/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/dependencies/src/java/tutorial
HelloComponent.java RandomGeneratorProvider.java
merlin/merlin-platform/tutorials/hello/src/java/tutorial
HelloComponent.java
merlin/merlin-platform/tutorials/includes/src/java/tutorial
TestComponent.java
merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground
Primary.java PrimaryService.java Secondary.java
SecondaryService.java
merlin/merlin-platform/tutorials/mixed/src/java/tutorial
HelloComponent.java
Log:
Udating examples to use @avalon.component.
Revision Changes Path
1.2 +1 -3
avalon-sandbox/merlin/merlin-extensions/merlin-jmx/src/java/org/apache/avalon/merlin/jmx/DefaultJMXServer.java
Index: DefaultJMXServer.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jmx/src/java/org/apache/avalon/merlin/jmx/DefaultJMXServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultJMXServer.java 4 Jul 2003 08:54:58 -0000 1.1
+++ DefaultJMXServer.java 22 Jul 2003 08:57:57 -0000 1.2
@@ -92,9 +92,7 @@
* resources are defined by a configuration. Secondly, a lot of
* method documentation is needed.
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name jmx
- * @avalon.meta.lifestyle singleton
+ * @avalon.component name="jmx" version="1.0" lifestyle="singleton"
* @avalon.meta.service type="javax.management.MBeanServer:1.0"
*/
public class DefaultJMXServer extends AbstractLogEnabled implements Initializable,
MBeanServer
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/LocationService.java
Index: LocationService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/LocationService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocationService.java 10 Jun 2003 02:12:19 -0000 1.1
+++ LocationService.java 22 Jul 2003 08:57:57 -0000 1.2
@@ -3,8 +3,7 @@
/**
* LocationService from Merlin's Composition Tutorial
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name location
+ * @avalon.service version="1.0" name="location"
* @author Stephen McConnell
*/
public interface LocationService
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/PublisherService.java
Index: PublisherService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/PublisherService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PublisherService.java 10 Jun 2003 02:12:19 -0000 1.1
+++ PublisherService.java 22 Jul 2003 08:57:57 -0000 1.2
@@ -3,8 +3,7 @@
/**
* HelloComponent from Merlin's Tutorial
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name location
+ * @avalon.service version="1.0" name="location"
* @author Stephen McConnell
*/
public interface PublisherService
1.2 +3 -4
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/application/Application.java
Index: Application.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/application/Application.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Application.java 10 Jun 2003 02:12:19 -0000 1.1
+++ Application.java 22 Jul 2003 08:57:57 -0000 1.2
@@ -14,8 +14,7 @@
/**
* PublisherComponent from Merlin's Composition Tutorial
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name test
+ * @avalon.component version="1.0" name="test"
* @author Stephen McConnell
*/
public class Application extends AbstractLogEnabled implements Serviceable,
Disposable
@@ -29,8 +28,8 @@
* message exposing a location.
*
* @param manager the service manager
- * @avalon.meta.dependency key="locator" type="tutorial.locator.LocationService"
- * @avalon.meta.dependency key="publisher"
type="tutorial.locator.PublisherService"
+ * @avalon.dependency key="locator" type="tutorial.locator.LocationService"
+ * @avalon.dependency key="publisher" type="tutorial.locator.PublisherService"
*/
public void service( ServiceManager manager ) throws ServiceException
{
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/location/LocationComponent.java
Index: LocationComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/location/LocationComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocationComponent.java 10 Jun 2003 02:12:20 -0000 1.1
+++ LocationComponent.java 22 Jul 2003 08:57:57 -0000 1.2
@@ -13,8 +13,7 @@
/**
* HelloComponent from Merlin's Tutorial
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name test
+ * @avalon.component version="1.0" name="test"
* @author Stephen McConnell
*/
public class LocationComponent extends AbstractLogEnabled implements
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/publisher/PublisherComponent.java
Index: PublisherComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/src/java/tutorial/publisher/PublisherComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PublisherComponent.java 10 Jun 2003 02:12:20 -0000 1.1
+++ PublisherComponent.java 22 Jul 2003 08:57:57 -0000 1.2
@@ -14,8 +14,7 @@
/**
* PublisherComponent from Merlin's Composition Tutorial
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name publisher
+ * @avalon.component version="1.0" name="publisher"
* @author Stephen McConnell
*/
public class PublisherComponent extends AbstractLogEnabled implements
PublisherService, Disposable
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloComponent.java 14 Jun 2003 08:45:58 -0000 1.1
+++ HelloComponent.java 22 Jul 2003 08:57:57 -0000 1.2
@@ -10,8 +10,7 @@
/**
* A configurable component.
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name simple
+ * @avalon.component version="1.0" name="simple"
*/
public class HelloComponent extends AbstractLogEnabled
implements Configurable, Initializable
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloComponent.java 14 Jun 2003 08:45:59 -0000 1.1
+++ HelloComponent.java 22 Jul 2003 08:57:57 -0000 1.2
@@ -10,8 +10,7 @@
/**
* A configurable component.
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name simple
+ * @avalon.component version="1.0" name="simple"
*/
public class HelloComponent extends AbstractLogEnabled
implements Configurable, Initializable
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloComponent.java 14 Jun 2003 08:45:59 -0000 1.1
+++ HelloComponent.java 22 Jul 2003 08:57:58 -0000 1.2
@@ -10,8 +10,7 @@
/**
* A configurable component.
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name simple
+ * @avalon.component version="1.0" name="simple"
*/
public class HelloComponent extends AbstractLogEnabled
implements Configurable, Initializable
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloComponent.java 14 Jun 2003 08:45:59 -0000 1.1
+++ HelloComponent.java 22 Jul 2003 08:57:58 -0000 1.2
@@ -10,8 +10,7 @@
/**
* A configurable component.
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name simple
+ * @avalon.component version="1.0" name="simple"
*/
public class HelloComponent extends AbstractLogEnabled
implements Configurable, Initializable
1.3 +1 -3
avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloComponent.java 18 Jun 2003 11:19:28 -0000 1.2
+++ HelloComponent.java 22 Jul 2003 08:57:58 -0000 1.3
@@ -7,9 +7,7 @@
/**
* The HelloComponent is dependent on a RandomGenerator service.
- * @avalon.meta.version 1.0
- * @avalon.meta.name hello
- * @avalon.meta.lifestyle singleton
+ * @avalon.component version="1.0" name="simple" lifestyle="singleton"
*/
public class HelloComponent extends AbstractLogEnabled
implements Serviceable
1.3 +2 -4
avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/src/java/tutorial/RandomGeneratorProvider.java
Index: RandomGeneratorProvider.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/src/java/tutorial/RandomGeneratorProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RandomGeneratorProvider.java 18 Jun 2003 11:19:28 -0000 1.2
+++ RandomGeneratorProvider.java 22 Jul 2003 08:57:58 -0000 1.3
@@ -6,10 +6,8 @@
/**
* An implementation of a random number generator.
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name random
- * @avalon.meta.service type="tutorial.RandomGenerator:1.0"
- * @avalon.meta.lifestyle singleton
+ * @avalon.component version="1.0" name="random" lifestyle="singleton"
+ * @avalon.service type="tutorial.RandomGenerator" version="1.0"
*/
public class RandomGeneratorProvider implements RandomGenerator
{
1.4 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/hello/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HelloComponent.java 24 Jun 2003 20:50:19 -0000 1.3
+++ HelloComponent.java 22 Jul 2003 08:57:59 -0000 1.4
@@ -16,8 +16,7 @@
* (initialization of the component), Executable (component
* execution), and Disposable (componet disposal).
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name hello
+ * @avalon.component version="1.0" name="hello"
*/
public class HelloComponent
implements LogEnabled, Initializable, Executable, Disposable
1.3 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/includes/src/java/tutorial/TestComponent.java
Index: TestComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/includes/src/java/tutorial/TestComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestComponent.java 15 Jun 2003 17:44:46 -0000 1.2
+++ TestComponent.java 22 Jul 2003 08:57:59 -0000 1.3
@@ -17,8 +17,7 @@
/**
* HelloComponent from Merlin's Tutorial
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name test
+ * @avalon.component version="1.0" name="test"
* @author Stephen McConnell
*/
public class TestComponent extends AbstractLogEnabled implements
1.3 +2 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Primary.java 4 Jul 2003 11:31:37 -0000 1.2
+++ Primary.java 22 Jul 2003 08:57:59 -0000 1.3
@@ -7,10 +7,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
- * @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"
+ * @avalon.component version="1.3" name="primary-component" lifestyle="singleton"
+ * @avalon.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/PrimaryService.java
Index: PrimaryService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/PrimaryService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PrimaryService.java 12 Jun 2003 07:44:41 -0000 1.1
+++ PrimaryService.java 22 Jul 2003 08:57:59 -0000 1.2
@@ -4,8 +4,8 @@
/**
* An interface representing a service.
*
- * @avalon.meta.version 9.8
- * @avalon.meta.attribute key="status" value="test"
+ * @avalon.service version="9.8"
+ * @avalon.attribute key="status" value="test"
*/
public interface PrimaryService
{
1.3 +2 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Secondary.java 4 Jul 2003 11:31:37 -0000 1.2
+++ Secondary.java 22 Jul 2003 08:57:59 -0000 1.3
@@ -8,9 +8,8 @@
import org.apache.avalon.framework.service.ServiceException;
/**
- * @avalon.meta.name secondary-component
- * @avalon.meta.version 2.4
- * @avalon.meta.service type="org.apache.avalon.playground.SecondaryService"
version="0.1"
+ * @avalon.component version="2.4" name="secondary-component"
+ * @avalon.service type="org.apache.avalon.playground.SecondaryService"
version="0.1"
*/
public class Secondary extends AbstractLogEnabled
implements Serviceable, SecondaryService
1.2 +1 -1
avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/SecondaryService.java
Index: SecondaryService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/src/java/org/apache/avalon/playground/SecondaryService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecondaryService.java 12 Jun 2003 07:44:41 -0000 1.1
+++ SecondaryService.java 22 Jul 2003 08:57:59 -0000 1.2
@@ -3,7 +3,7 @@
/**
* An interface representing a service.
- * @avalon.meta.version 0.1
+ * @avalon.service version="0.1"
*/
public interface SecondaryService
{
1.2 +1 -2
avalon-sandbox/merlin/merlin-platform/tutorials/mixed/src/java/tutorial/HelloComponent.java
Index: HelloComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/mixed/src/java/tutorial/HelloComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloComponent.java 10 Jun 2003 02:12:25 -0000 1.1
+++ HelloComponent.java 22 Jul 2003 08:57:59 -0000 1.2
@@ -17,8 +17,7 @@
/**
* HelloComponent from Merlin's Tutorial
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name hello
+ * @avalon.component version="1.0" name="hello"
* @author David BERNARD mailto:[EMAIL PROTECTED]
*/
public class HelloComponent extends AbstractLogEnabled implements
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
