mcconnell 2003/07/22 01:58:21
Modified: merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx
HTTPAdaptorWrapper.java JMXServerProxy.java
JRMPAdaptorWrapper.java MBeanableHandler.java
merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples
HelloSample.java HelloSample2.java
HelloSample3.java HelloSample4.java
merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/tools
SystemInfo.java
Log:
Udating examples to use @avalon.component.
Revision Changes Path
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/HTTPAdaptorWrapper.java
Index: HTTPAdaptorWrapper.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/HTTPAdaptorWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTTPAdaptorWrapper.java 15 Jul 2003 19:03:28 -0000 1.2
+++ HTTPAdaptorWrapper.java 22 Jul 2003 08:58:20 -0000 1.3
@@ -19,7 +19,7 @@
/**
* Wrapper of the mx4j HttpAdaptor to use it in the Avalon Framework.
*
- * @avalon.type version="1.0" name="jmx-http" lifestyle="singleton"
+ * @avalon.component version="1.0" name="jmx-http" lifestyle="singleton"
*/
public class HTTPAdaptorWrapper extends AbstractLogEnabled implements Serviceable,
Configurable, Startable {
private HttpAdaptor wrapped_;
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/JMXServerProxy.java
Index: JMXServerProxy.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/JMXServerProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMXServerProxy.java 15 Jul 2003 19:03:28 -0000 1.2
+++ JMXServerProxy.java 22 Jul 2003 08:58:20 -0000 1.3
@@ -13,7 +13,7 @@
/**
* JMXServerProxy is a proxy to a MBeanServer (adpater MBeanServer to Avalon).
*
- * @avalon.type version="1.0" name="jmx-server" lifestyle="singleton"
+ * @avalon.component version="1.0" name="jmx-server" lifestyle="singleton"
* @avalon.service type="javax.management.MBeanServer"
*/
public class JMXServerProxy extends AbstractLogEnabled implements Initializable,
MBeanServer {
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/JRMPAdaptorWrapper.java
Index: JRMPAdaptorWrapper.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/JRMPAdaptorWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JRMPAdaptorWrapper.java 15 Jul 2003 19:03:28 -0000 1.2
+++ JRMPAdaptorWrapper.java 22 Jul 2003 08:58:20 -0000 1.3
@@ -22,7 +22,7 @@
/**
* Wrapper of the mx4j RMIAdaptor to use it in the Avalon Framework.
*
- * @avalon.type version="1.0" name="jmx-rmi" lifestyle="singleton"
+ * @avalon.component version="1.0" name="jmx-rmi" lifestyle="singleton"
*/
public class JRMPAdaptorWrapper extends AbstractLogEnabled implements Serviceable,
Configurable, Startable
{
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/MBeanableHandler.java
Index: MBeanableHandler.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/MBeanableHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MBeanableHandler.java 15 Jul 2003 19:03:28 -0000 1.2
+++ MBeanableHandler.java 22 Jul 2003 08:58:20 -0000 1.3
@@ -76,7 +76,7 @@
* To be auto-registered a MBean component need to include the stage
"my.avalon.jmx.MBeanable".
* The implementation of the interface my.avalon.jmx.MBeanable is optional (only if
you want to choose your name).
*
- * @avalon.type version="1.0" name="jmx-handler"
+ * @avalon.component version="1.0" name="jmx-handler"
* @avalon.extension type="my.avalon.jmx.MBeanable"
*/
public class MBeanableHandler extends AbstractLogEnabled implements Accessor,
Serviceable {
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples/HelloSample.java
Index: HelloSample.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples/HelloSample.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloSample.java 15 Jul 2003 19:03:28 -0000 1.2
+++ HelloSample.java 22 Jul 2003 08:58:20 -0000 1.3
@@ -80,7 +80,7 @@
* </ul>
*
* @jmx.mbean
- * @avalon.type version="1.0" name="jmx-hello"
+ * @avalon.component version="1.0" name="jmx-hello"
*/
public class HelloSample extends AbstractLogEnabled implements HelloSampleMBean,
Serviceable, Configurable, Initializable, Executable, Disposable {
private MBeanServer jmxServer_;
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples/HelloSample2.java
Index: HelloSample2.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples/HelloSample2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloSample2.java 15 Jul 2003 19:03:28 -0000 1.2
+++ HelloSample2.java 22 Jul 2003 08:58:20 -0000 1.3
@@ -65,7 +65,7 @@
* This component include stage "my.avalon.jmx.MBeanable" and implements MBeanable
interface.
*
* @jmx.mbean
- * @avalon.type version="1.0" name="jmx-hello2"
+ * @avalon.component version="1.0" name="jmx-hello2"
* @avalon.stage type="my.avalon.jmx.MBeanable"
*/
public class HelloSample2 extends AbstractLogEnabled implements HelloSample2MBean,
MBeanable, Executable {
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples/HelloSample3.java
Index: HelloSample3.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples/HelloSample3.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloSample3.java 15 Jul 2003 19:03:28 -0000 1.2
+++ HelloSample3.java 22 Jul 2003 08:58:20 -0000 1.3
@@ -66,7 +66,7 @@
* "a meta.verifier.VerifyException" is throw, but Component is accessible.
*
* @jmx.mbean
- * @avalon.type version="1.0" name="jmx-hello3"
+ * @avalon.component version="1.0" name="jmx-hello3"
* @avalon.stage type="my.avalon.jmx.MBeanable"
*/
public class HelloSample3 extends AbstractLogEnabled implements HelloSample3MBean,
Executable {
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples/HelloSample4.java
Index: HelloSample4.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/samples/HelloSample4.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloSample4.java 15 Jul 2003 19:03:28 -0000 1.2
+++ HelloSample4.java 22 Jul 2003 08:58:20 -0000 1.3
@@ -66,7 +66,7 @@
* but return null as getName(), so MBeanableHandler used "urn:avalon:name".
*
* @jmx.mbean
- * @avalon.type version="1.0" name="jmx-hello2"
+ * @avalon.component version="1.0" name="jmx-hello2"
* @avalon.stage type="my.avalon.jmx.MBeanable"
*/
public class HelloSample4 extends AbstractLogEnabled
1.3 +1 -1
avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/tools/SystemInfo.java
Index: SystemInfo.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/src/main/my/avalon/jmx/tools/SystemInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SystemInfo.java 15 Jul 2003 19:03:28 -0000 1.2
+++ SystemInfo.java 22 Jul 2003 08:58:21 -0000 1.3
@@ -67,7 +67,7 @@
* Useness for monitoring.
*
* @jmx.mbean
- * @avalon.type version="1.0" name="system-info"
+ * @avalon.component version="1.0" name="system-info"
* @avalon.stage type="my.avalon.jmx.MBeanable"
*/
public class SystemInfo extends AbstractLogEnabled implements Initializable,
SystemInfoMBean, MBeanable {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
