djencks 2003/11/11 08:37:31
Modified: modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service
MBeanMetadata.java
Log:
use GeronimoMBeanInfo directly or a descriptor
Revision Changes Path
1.3 +21 -2 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service/MBeanMetadata.java
Index: MBeanMetadata.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service/MBeanMetadata.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MBeanMetadata.java 11 Nov 2003 04:36:51 -0000 1.2
+++ MBeanMetadata.java 11 Nov 2003 16:37:31 -0000 1.3
@@ -64,6 +64,8 @@
import java.util.Set;
import javax.management.ObjectName;
+import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
+
/**
* Metadata about an MBean that is use during deployment.
*
@@ -72,6 +74,8 @@
public class MBeanMetadata {
private String code;
private String geronimoMBeanDescriptor;
+
+ private GeronimoMBeanInfo geronimoMBeanInfo;
private ObjectName name;
private ObjectName loaderName;
private ObjectName parentName;
@@ -107,6 +111,13 @@
this.parentName = parentName;
}
+ public MBeanMetadata(ObjectName name, GeronimoMBeanInfo geronimoMBeanInfo, ObjectName
loaderName, ObjectName parentName) {
+ this.name = name;
+ this.geronimoMBeanInfo = geronimoMBeanInfo;
+ this.loaderName = loaderName;
+ this.parentName = parentName;
+ }
+
public String getCode() {
return code;
}
@@ -116,7 +127,7 @@
}
public boolean isGeronimoMBean() {
- return geronimoMBeanDescriptor != null;
+ return geronimoMBeanDescriptor != null || geronimoMBeanInfo != null;
}
public String getGeronimoMBeanDescriptor() {
@@ -125,6 +136,14 @@
public void setGeronimoMBeanDescriptor(String geronimoMBeanDescriptor) {
this.geronimoMBeanDescriptor = geronimoMBeanDescriptor;
+ }
+
+ public GeronimoMBeanInfo getGeronimoMBeanInfo() {
+ return geronimoMBeanInfo;
+ }
+
+ public void setGeronimoMBeanInfo(GeronimoMBeanInfo geronimoMBeanInfo) {
+ this.geronimoMBeanInfo = geronimoMBeanInfo;
}
public ObjectName getName() {
|