mcconnell 2003/07/15 12:03:28
Modified: merlin-test/merlin-jmx-demo README.TXT maven.xml
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:
Update source to use avalon meta.
Revision Changes Path
1.4 +2 -2 avalon-sandbox/merlin-test/merlin-jmx-demo/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/README.TXT,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.TXT 29 Jun 2003 09:22:41 -0000 1.3
+++ README.TXT 15 Jul 2003 19:03:28 -0000 1.4
@@ -6,9 +6,9 @@
- a JRMP connector
- a series of manageble components
-To execute the demo:
+To execute the demo you muyst have the avalon-meta-plugin-1.1-RC1.jar installed in
[MAVEN-HOME]/plugins/ directory.
- $ maven clean jar
+ $ maven jar
$ merlin target\merlin-jmx-demo-1.0.jar
Launch a JMX client (using either HTTP or RMI to see the components).
1.2 +1 -1 avalon-sandbox/merlin-test/merlin-jmx-demo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin-test/merlin-jmx-demo/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 29 Jun 2003 09:16:20 -0000 1.1
+++ maven.xml 15 Jul 2003 19:03:28 -0000 1.2
@@ -1,7 +1,7 @@
<project default="java:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="java:compile">
- <attainGoal name="merlin:meta"/>
+ <attainGoal name="avalon:meta"/>
</preGoal>
</project>
1.2 +2 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTTPAdaptorWrapper.java 29 Jun 2003 09:16:20 -0000 1.1
+++ HTTPAdaptorWrapper.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -19,9 +19,7 @@
/**
* Wrapper of the mx4j HttpAdaptor to use it in the Avalon Framework.
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name jmx-http
- * @avalon.meta.lifestyle singleton
+ * @avalon.type version="1.0" name="jmx-http" lifestyle="singleton"
*/
public class HTTPAdaptorWrapper extends AbstractLogEnabled implements Serviceable,
Configurable, Startable {
private HttpAdaptor wrapped_;
@@ -38,7 +36,7 @@
* can be resolved using the supplied service manager.
*
* @param manager the service manager
- * @avalon.meta.dependency key="jmx-server" type="javax.management.MBeanServer"
+ * @avalon.dependency key="jmx-server" type="javax.management.MBeanServer"
*/
public void service(ServiceManager manager) throws ServiceException {
jmxServer_ = (MBeanServer) manager.lookup("jmx-server");
1.2 +2 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMXServerProxy.java 29 Jun 2003 09:16:20 -0000 1.1
+++ JMXServerProxy.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -13,10 +13,8 @@
/**
* JMXServerProxy is a proxy to a MBeanServer (adpater MBeanServer to Avalon).
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name jmx-server
- * @avalon.meta.service type="javax.management.MBeanServer"
- * @avalon.meta.lifestyle singleton
+ * @avalon.type version="1.0" name="jmx-server" lifestyle="singleton"
+ * @avalon.service type="javax.management.MBeanServer"
*/
public class JMXServerProxy extends AbstractLogEnabled implements Initializable,
MBeanServer {
private MBeanServer server_;
1.2 +4 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JRMPAdaptorWrapper.java 29 Jun 2003 09:16:20 -0000 1.1
+++ JRMPAdaptorWrapper.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -22,11 +22,10 @@
/**
* Wrapper of the mx4j RMIAdaptor to use it in the Avalon Framework.
*
- * @avalon.meta.version 1.0
- * @avalon.meta.name jmx-rmi
- * @avalon.meta.lifestyle singleton
+ * @avalon.type version="1.0" name="jmx-rmi" lifestyle="singleton"
*/
-public class JRMPAdaptorWrapper extends AbstractLogEnabled implements Serviceable,
Configurable, Startable {
+public class JRMPAdaptorWrapper extends AbstractLogEnabled implements Serviceable,
Configurable, Startable
+{
private MBeanServer jmxServer_;
private JRMPAdaptor wrapped_;
private ObjectName jmxName_;
@@ -40,7 +39,7 @@
* can be resolved using the supplied service manager.
*
* @param manager the service manager
- * @avalon.meta.dependency key="jmx-server" type="javax.management.MBeanServer"
+ * @avalon.dependency key="jmx-server" type="javax.management.MBeanServer"
*/
public void service(ServiceManager manager) throws ServiceException {
jmxServer_ = (MBeanServer) manager.lookup("jmx-server");
1.2 +3 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MBeanableHandler.java 29 Jun 2003 09:16:20 -0000 1.1
+++ MBeanableHandler.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -76,9 +76,8 @@
* 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.meta.version 1.0
- * @avalon.meta.name jmx-handler
- * @avalon.meta.extension type="my.avalon.jmx.MBeanable"
+ * @avalon.type version="1.0" name="jmx-handler"
+ * @avalon.extension type="my.avalon.jmx.MBeanable"
*/
public class MBeanableHandler extends AbstractLogEnabled implements Accessor,
Serviceable {
private MBeanServer jmxServer_;
@@ -89,7 +88,7 @@
* can be resolved using the supplied service manager.
*
* @param manager the service manager
- * @avalon.meta.dependency key="jmx-server" type="javax.management.MBeanServer"
optional="true"
+ * @avalon.dependency key="jmx-server" type="javax.management.MBeanServer"
optional="true"
*/
public void service(ServiceManager manager) throws ServiceException {
if (manager.hasService("jmx-server")) {
1.2 +2 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloSample.java 29 Jun 2003 09:16:20 -0000 1.1
+++ HelloSample.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -80,8 +80,7 @@
* </ul>
*
* @jmx.mbean
- * @avalon.meta.version 1.0
- * @avalon.meta.name jmx-hello
+ * @avalon.type version="1.0" name="jmx-hello"
*/
public class HelloSample extends AbstractLogEnabled implements HelloSampleMBean,
Serviceable, Configurable, Initializable, Executable, Disposable {
private MBeanServer jmxServer_;
@@ -93,7 +92,7 @@
* can be resolved using the supplied service manager.
*
* @param manager the service manager
- * @avalon.meta.dependency key="jmx-server" type="javax.management.MBeanServer"
+ * @avalon.dependency key="jmx-server" type="javax.management.MBeanServer"
*/
public void service(ServiceManager manager) throws ServiceException {
jmxServer_ = (MBeanServer) manager.lookup("jmx-server");
1.2 +2 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloSample2.java 29 Jun 2003 09:16:20 -0000 1.1
+++ HelloSample2.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -65,9 +65,8 @@
* This component include stage "my.avalon.jmx.MBeanable" and implements MBeanable
interface.
*
* @jmx.mbean
- * @avalon.meta.version 1.0
- * @avalon.meta.name jmx-hello2
- * @avalon.meta.stage type="my.avalon.jmx.MBeanable"
+ * @avalon.type version="1.0" name="jmx-hello2"
+ * @avalon.stage type="my.avalon.jmx.MBeanable"
*/
public class HelloSample2 extends AbstractLogEnabled implements HelloSample2MBean,
MBeanable, Executable {
public String getName() {
1.2 +2 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloSample3.java 29 Jun 2003 09:16:20 -0000 1.1
+++ HelloSample3.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -66,9 +66,8 @@
* "a meta.verifier.VerifyException" is throw, but Component is accessible.
*
* @jmx.mbean
- * @avalon.meta.version 1.0
- * @avalon.meta.name jmx-hello3
- * @avalon.meta.stage type="my.avalon.jmx.MBeanable"
+ * @avalon.type version="1.0" name="jmx-hello3"
+ * @avalon.stage type="my.avalon.jmx.MBeanable"
*/
public class HelloSample3 extends AbstractLogEnabled implements HelloSample3MBean,
Executable {
/**
1.2 +2 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloSample4.java 29 Jun 2003 09:16:20 -0000 1.1
+++ HelloSample4.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -66,9 +66,8 @@
* but return null as getName(), so MBeanableHandler used "urn:avalon:name".
*
* @jmx.mbean
- * @avalon.meta.version 1.0
- * @avalon.meta.name jmx-hello2
- * @avalon.meta.stage type="my.avalon.jmx.MBeanable"
+ * @avalon.type version="1.0" name="jmx-hello2"
+ * @avalon.stage type="my.avalon.jmx.MBeanable"
*/
public class HelloSample4 extends AbstractLogEnabled
implements HelloSample4MBean, MBeanable, Executable
1.2 +2 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SystemInfo.java 29 Jun 2003 09:16:21 -0000 1.1
+++ SystemInfo.java 15 Jul 2003 19:03:28 -0000 1.2
@@ -67,9 +67,8 @@
* Useness for monitoring.
*
* @jmx.mbean
- * @avalon.meta.version 1.0
- * @avalon.meta.name system-info
- * @avalon.meta.stage type="my.avalon.jmx.MBeanable"
+ * @avalon.type version="1.0" name="system-info"
+ * @avalon.stage type="my.avalon.jmx.MBeanable"
*/
public class SystemInfo extends AbstractLogEnabled implements Initializable,
SystemInfoMBean, MBeanable {
private ThreadGroup rootThreadGroup_;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
