dain 2003/08/20 21:32:41
Modified: modules/core/src/java/org/apache/geronimo/deployment
DeploymentInfo.java DeploymentInfoMBean.java
modules/core/src/java/org/apache/geronimo/deployment/plan
CreateMBeanInstance.java
modules/core/src/java/org/apache/geronimo/deployment/scanner
DeploymentScanner.java DeploymentScannerMBean.java
Log:
Changed to extend AbstractMangedObject.
Revision Changes Path
1.4 +3 -3
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentInfo.java
Index: DeploymentInfo.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeploymentInfo.java 18 Aug 2003 22:14:26 -0000 1.3
+++ DeploymentInfo.java 21 Aug 2003 04:32:41 -0000 1.4
@@ -62,14 +62,14 @@
import java.util.Set;
import javax.management.ObjectName;
-import org.apache.geronimo.common.AbstractStateManageable;
+import org.apache.geronimo.management.AbstractManagedObject;
/**
*
*
* @version $Revision$ $Date$
*/
-public class DeploymentInfo extends AbstractStateManageable implements
DeploymentInfoMBean {
+public class DeploymentInfo extends AbstractManagedObject implements
DeploymentInfoMBean {
private final URL url;
private final ObjectName name;
private final ObjectName parent;
1.5 +3 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentInfoMBean.java
Index: DeploymentInfoMBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/DeploymentInfoMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeploymentInfoMBean.java 20 Aug 2003 07:13:25 -0000 1.4
+++ DeploymentInfoMBean.java 21 Aug 2003 04:32:41 -0000 1.5
@@ -60,13 +60,14 @@
import javax.management.ObjectName;
import org.apache.geronimo.management.StateManageable;
+import org.apache.geronimo.management.ManagedObject;
/**
*
*
* @version $Revision$ $Date$
*/
-public interface DeploymentInfoMBean extends StateManageable {
+public interface DeploymentInfoMBean extends ManagedObject, StateManageable {
URL getURL();
ObjectName getParent();
1.9 +4 -6
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/CreateMBeanInstance.java
Index: CreateMBeanInstance.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/plan/CreateMBeanInstance.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CreateMBeanInstance.java 20 Aug 2003 22:38:24 -0000 1.8
+++ CreateMBeanInstance.java 21 Aug 2003 04:32:41 -0000 1.9
@@ -57,16 +57,14 @@
import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
+import java.io.File;
import java.lang.reflect.Constructor;
+import java.net.MalformedURLException;
+import java.net.URI;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.net.URL;
-import java.net.URI;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.io.File;
import javax.management.InstanceAlreadyExistsException;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanException;
1.10 +3 -3
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScanner.java
Index: DeploymentScanner.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScanner.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DeploymentScanner.java 20 Aug 2003 22:40:01 -0000 1.9
+++ DeploymentScanner.java 21 Aug 2003 04:32:41 -0000 1.10
@@ -72,8 +72,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.common.AbstractStateManageable;
import org.apache.geronimo.jmx.JMXUtil;
+import org.apache.geronimo.management.AbstractManagedObject;
/**
* An MBean that maintains a list of URLs and periodically invokes a Scanner
@@ -82,7 +82,7 @@
*
* @version $Revision$ $Date$
*/
-public class DeploymentScanner extends AbstractStateManageable implements
DeploymentScannerMBean {
+public class DeploymentScanner extends AbstractManagedObject implements
DeploymentScannerMBean {
private static final Log log =
LogFactory.getLog(DeploymentScanner.class);
private RelationServiceMBean relationService;
private final Map scanners = new HashMap();
1.8 +3 -2
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScannerMBean.java
Index: DeploymentScannerMBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/DeploymentScannerMBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DeploymentScannerMBean.java 20 Aug 2003 07:13:26 -0000 1.7
+++ DeploymentScannerMBean.java 21 Aug 2003 04:32:41 -0000 1.8
@@ -59,6 +59,7 @@
import java.net.URL;
import java.util.Set;
import org.apache.geronimo.management.StateManageable;
+import org.apache.geronimo.management.ManagedObject;
/**
*
@@ -66,7 +67,7 @@
*
* @version $Revision$ $Date$
*/
-public interface DeploymentScannerMBean extends StateManageable {
+public interface DeploymentScannerMBean extends ManagedObject,
StateManageable {
static final String SCAN_COMPLETE =
"org.apache.geronimo.deployment.SCAN_COMPLETE";
long getScanInterval();
