ggregory 2003/07/20 00:35:14
Modified: modeler/src/java/org/apache/commons/modeler/modules
MbeansSource.java MbeansDescriptorsSerSource.java
ModelerSource.java
MbeansDescriptorsDynamicMBeanSource.java
MbeansSourceMBean.java
MbeansDescriptorsIntrospectionSource.java
MbeansDescriptorsDOMSource.java
MbeansDescriptorsDigesterSource.java
modeler/src/java/org/apache/commons/modeler
BaseAttributeFilter.java ConstructorInfo.java
AttributeInfo.java BaseModelMBean.java
RegistryMBean.java FixedNotificationFilter.java
ParameterInfo.java Registry.java ManagedBean.java
JndiJmx.java FeatureInfo.java NotificationInfo.java
BaseNotificationBroadcaster.java OperationInfo.java
Main.java
modeler/src/java/org/apache/commons/modeler/util
IntrospectionUtils.java DomUtil.java
modeler/src/java/org/apache/commons/modeler/ant
RegistryTask.java JmxInvoke.java JmxSet.java
MLETTask.java ServiceTask.java ModelerTask.java
modeler/src/java/org/apache/commons/modeler/mbeans
MBeanProxy.java SimpleRemoteConnector.java
Log:
Organzie import statements.
Revision Changes Path
1.13 +19 -16
jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansSource.java
Index: MbeansSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansSource.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MbeansSource.java 14 Apr 2003 01:01:55 -0000 1.12
+++ MbeansSource.java 20 Jul 2003 07:35:12 -0000 1.13
@@ -1,25 +1,28 @@
package org.apache.commons.modeler.modules;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.apache.commons.modeler.util.DomUtil;
-import org.apache.commons.modeler.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.management.*;
-import javax.management.loading.MLet;
-import javax.xml.transform.TransformerException;
-import java.io.InputStream;
-import java.io.FileOutputStream;
import java.io.FileNotFoundException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
-import java.util.List;
import java.util.HashMap;
+import java.util.List;
+
+import javax.management.Attribute;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.loading.MLet;
+import javax.xml.transform.TransformerException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.AttributeInfo;
+import org.apache.commons.modeler.BaseModelMBean;
+import org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.Registry;
+import org.apache.commons.modeler.util.DomUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/** This will create mbeans based on a config file.
1.5 +5 -8
jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsSerSource.java
Index: MbeansDescriptorsSerSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsSerSource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MbeansDescriptorsSerSource.java 26 Feb 2003 22:17:32 -0000 1.4
+++ MbeansDescriptorsSerSource.java 20 Jul 2003 07:35:12 -0000 1.5
@@ -1,18 +1,15 @@
package org.apache.commons.modeler.modules;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.apache.commons.modeler.util.DomUtil;
-import org.apache.commons.modeler.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.InputStream;
import java.io.ObjectInputStream;
-import java.io.EOFException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.Registry;
public class MbeansDescriptorsSerSource extends ModelerSource
1.6 +6 -5
jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/ModelerSource.java
Index: ModelerSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/ModelerSource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ModelerSource.java 14 Apr 2003 01:01:55 -0000 1.5
+++ ModelerSource.java 20 Jul 2003 07:35:12 -0000 1.6
@@ -1,14 +1,15 @@
package org.apache.commons.modeler.modules;
-import org.apache.commons.modeler.Registry;
-import java.util.List;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
-import javax.management.MalformedObjectNameException;
+import java.util.List;
+
import javax.management.ObjectName;
+
+import org.apache.commons.modeler.Registry;
/** Source for descriptor data. More sources can be added.
*
1.2 +10 -14
jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDynamicMBeanSource.java
Index: MbeansDescriptorsDynamicMBeanSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDynamicMBeanSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MbeansDescriptorsDynamicMBeanSource.java 20 Apr 2003 18:24:50 -0000 1.1
+++ MbeansDescriptorsDynamicMBeanSource.java 20 Jul 2003 07:35:12 -0000 1.2
@@ -1,25 +1,21 @@
package org.apache.commons.modeler.modules;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.apache.commons.modeler.util.DomUtil;
-import org.apache.commons.modeler.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Hashtable;
-import java.util.Enumeration;
import java.util.ArrayList;
import java.util.List;
-import javax.management.ObjectName;
+
import javax.management.DynamicMBean;
-import javax.management.MBeanInfo;
import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanInfo;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.AttributeInfo;
+import org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.OperationInfo;
+import org.apache.commons.modeler.ParameterInfo;
+import org.apache.commons.modeler.Registry;
/** Extract metadata from a dynamic mbean.
1.2 +0 -16
jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansSourceMBean.java
Index: MbeansSourceMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansSourceMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MbeansSourceMBean.java 14 Apr 2003 01:01:55 -0000 1.1
+++ MbeansSourceMBean.java 20 Jul 2003 07:35:12 -0000 1.2
@@ -1,22 +1,6 @@
package org.apache.commons.modeler.modules;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.apache.commons.modeler.util.DomUtil;
-import org.apache.commons.modeler.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.management.*;
-import javax.management.loading.MLet;
-import javax.xml.transform.TransformerException;
-import java.io.InputStream;
-import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.util.ArrayList;
import java.util.List;
-import java.util.HashMap;
/**
1.9 +11 -10
jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsIntrospectionSource.java
Index: MbeansDescriptorsIntrospectionSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsIntrospectionSource.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MbeansDescriptorsIntrospectionSource.java 27 Mar 2003 06:18:47 -0000 1.8
+++ MbeansDescriptorsIntrospectionSource.java 20 Jul 2003 07:35:12 -0000 1.9
@@ -1,20 +1,21 @@
package org.apache.commons.modeler.modules;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.apache.commons.modeler.util.DomUtil;
-import org.apache.commons.modeler.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.InputStream;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.Hashtable;
-import java.util.Enumeration;
import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.List;
+
import javax.management.ObjectName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.AttributeInfo;
+import org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.OperationInfo;
+import org.apache.commons.modeler.ParameterInfo;
+import org.apache.commons.modeler.Registry;
public class MbeansDescriptorsIntrospectionSource extends ModelerSource
1.7 +14 -7
jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDOMSource.java
Index: MbeansDescriptorsDOMSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDOMSource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MbeansDescriptorsDOMSource.java 24 Jun 2003 22:41:48 -0000 1.6
+++ MbeansDescriptorsDOMSource.java 20 Jul 2003 07:35:12 -0000 1.7
@@ -60,16 +60,23 @@
package org.apache.commons.modeler.modules;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.apache.commons.modeler.util.DomUtil;
-import org.apache.commons.modeler.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.AttributeInfo;
+import org.apache.commons.modeler.ConstructorInfo;
+import org.apache.commons.modeler.FieldInfo;
+import org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.NotificationInfo;
+import org.apache.commons.modeler.OperationInfo;
+import org.apache.commons.modeler.ParameterInfo;
+import org.apache.commons.modeler.Registry;
+import org.apache.commons.modeler.util.DomUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
public class MbeansDescriptorsDOMSource extends ModelerSource
1.6 +6 -6
jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java
Index: MbeansDescriptorsDigesterSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MbeansDescriptorsDigesterSource.java 26 Feb 2003 22:17:32 -0000 1.5
+++ MbeansDescriptorsDigesterSource.java 20 Jul 2003 07:35:12 -0000 1.6
@@ -60,15 +60,15 @@
package org.apache.commons.modeler.modules;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.modeler.Registry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.InputStream;
import java.net.URL;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.digester.Digester;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.Registry;
public class MbeansDescriptorsDigesterSource extends ModelerSource
{
1.3 +5 -4
jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseAttributeFilter.java
Index: BaseAttributeFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseAttributeFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseAttributeFilter.java 15 Jun 2002 18:17:02 -0000 1.2
+++ BaseAttributeFilter.java 20 Jul 2003 07:35:12 -0000 1.3
@@ -66,6 +66,7 @@
import java.util.HashSet;
+
import javax.management.AttributeChangeNotification;
import javax.management.Notification;
import javax.management.NotificationFilter;
1.6 +6 -5
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ConstructorInfo.java
Index: ConstructorInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ConstructorInfo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConstructorInfo.java 20 Feb 2003 05:56:00 -0000 1.5
+++ ConstructorInfo.java 20 Jul 2003 07:35:12 -0000 1.6
@@ -65,10 +65,11 @@
package org.apache.commons.modeler;
+import java.io.Serializable;
+
import javax.management.Descriptor;
import javax.management.MBeanParameterInfo;
import javax.management.modelmbean.ModelMBeanConstructorInfo;
-import java.io.Serializable;
/**
1.7 +7 -6
jakarta-commons/modeler/src/java/org/apache/commons/modeler/AttributeInfo.java
Index: AttributeInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/AttributeInfo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AttributeInfo.java 17 Feb 2003 00:52:45 -0000 1.6
+++ AttributeInfo.java 20 Jul 2003 07:35:12 -0000 1.7
@@ -65,10 +65,11 @@
package org.apache.commons.modeler;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
import javax.management.Descriptor;
import javax.management.modelmbean.ModelMBeanAttributeInfo;
-import java.lang.reflect.Method;
-import java.io.Serializable;
/**
1.23 +32 -12
jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseModelMBean.java
Index: BaseModelMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseModelMBean.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- BaseModelMBean.java 17 Apr 2003 04:31:36 -0000 1.22
+++ BaseModelMBean.java 20 Jul 2003 07:35:12 -0000 1.23
@@ -65,16 +65,34 @@
package org.apache.commons.modeler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.modules.ModelerSource;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.Hashtable;
import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import javax.management.Attribute;
+import javax.management.AttributeChangeNotification;
+import javax.management.AttributeList;
+import javax.management.AttributeNotFoundException;
+import javax.management.Descriptor;
+import javax.management.DynamicMBean;
+import javax.management.InstanceNotFoundException;
+import javax.management.InvalidAttributeValueException;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanNotificationInfo;
+import javax.management.MBeanRegistration;
+import javax.management.MBeanServer;
+import javax.management.Notification;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import javax.management.RuntimeErrorException;
+import javax.management.RuntimeOperationsException;
+import javax.management.ServiceNotFoundException;
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBean;
@@ -83,8 +101,10 @@
import javax.management.modelmbean.ModelMBeanInfoSupport;
import javax.management.modelmbean.ModelMBeanNotificationInfo;
import javax.management.modelmbean.ModelMBeanOperationInfo;
-import javax.management.*;
-import javax.management.DynamicMBean;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.modules.ModelerSource;
// TODO: enable ant-like substitutions ? ( or at least discuss it )
1.2 +0 -2
jakarta-commons/modeler/src/java/org/apache/commons/modeler/RegistryMBean.java
Index: RegistryMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/RegistryMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegistryMBean.java 13 Apr 2003 06:04:28 -0000 1.1
+++ RegistryMBean.java 20 Jul 2003 07:35:12 -0000 1.2
@@ -62,8 +62,6 @@
import java.util.List;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
/**
* Interface for modeler MBeans.
1.3 +1 -1
jakarta-commons/modeler/src/java/org/apache/commons/modeler/FixedNotificationFilter.java
Index: FixedNotificationFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/FixedNotificationFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FixedNotificationFilter.java 16 Jan 2003 19:25:06 -0000 1.2
+++ FixedNotificationFilter.java 20 Jul 2003 07:35:12 -0000 1.3
@@ -62,7 +62,7 @@
import java.util.HashSet;
-import javax.management.AttributeChangeNotification;
+
import javax.management.Notification;
import javax.management.NotificationFilter;
1.5 +5 -7
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ParameterInfo.java
Index: ParameterInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ParameterInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParameterInfo.java 20 Feb 2003 05:56:00 -0000 1.4
+++ ParameterInfo.java 20 Jul 2003 07:35:12 -0000 1.5
@@ -65,11 +65,9 @@
package org.apache.commons.modeler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.Serializable;
import javax.management.MBeanParameterInfo;
-import java.io.Serializable;
/**
1.32 +3 -1
jakarta-commons/modeler/src/java/org/apache/commons/modeler/Registry.java
Index: Registry.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/Registry.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Registry.java 24 Apr 2003 16:16:34 -0000 1.31
+++ Registry.java 20 Jul 2003 07:35:12 -0000 1.32
@@ -71,16 +71,18 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
+
import javax.management.DynamicMBean;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanInfo;
import javax.management.MBeanOperationInfo;
+import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import javax.management.MBeanRegistration;
import javax.management.modelmbean.ModelMBean;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.modeler.modules.ModelerSource;
1.9 +9 -7
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ManagedBean.java
Index: ManagedBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ManagedBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ManagedBean.java 15 Apr 2003 18:19:12 -0000 1.8
+++ ManagedBean.java 20 Jul 2003 07:35:13 -0000 1.9
@@ -66,11 +66,13 @@
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import javax.management.*;
+
+import javax.management.Descriptor;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.RuntimeOperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBean;
import javax.management.modelmbean.ModelMBeanAttributeInfo;
1.3 +13 -10
jakarta-commons/modeler/src/java/org/apache/commons/modeler/JndiJmx.java
Index: JndiJmx.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/JndiJmx.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JndiJmx.java 12 Nov 2002 22:49:12 -0000 1.2
+++ JndiJmx.java 20 Jul 2003 07:35:13 -0000 1.3
@@ -61,19 +61,22 @@
package org.apache.commons.modeler;
-import java.io.*;
-import java.net.URL;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import javax.management.AttributeChangeNotification;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerNotification;
+import javax.management.Notification;
+import javax.management.NotificationBroadcaster;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+import javax.naming.Context;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-// Depends on JNDI - if a DirContext is provided we'll push info into it.
-import javax.naming.*;
-import javax.naming.directory.*;
-
-import javax.management.*;
// EXPERIMENTAL. It may fit better in tomcat jndi impl.
1.5 +5 -4
jakarta-commons/modeler/src/java/org/apache/commons/modeler/FeatureInfo.java
Index: FeatureInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/FeatureInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FeatureInfo.java 20 Feb 2003 05:56:00 -0000 1.4
+++ FeatureInfo.java 20 Jul 2003 07:35:13 -0000 1.5
@@ -69,6 +69,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import javax.management.Descriptor;
1.5 +6 -5
jakarta-commons/modeler/src/java/org/apache/commons/modeler/NotificationInfo.java
Index: NotificationInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/NotificationInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NotificationInfo.java 20 Feb 2003 05:56:00 -0000 1.4
+++ NotificationInfo.java 20 Jul 2003 07:35:13 -0000 1.5
@@ -65,9 +65,10 @@
package org.apache.commons.modeler;
+import java.io.Serializable;
+
import javax.management.Descriptor;
import javax.management.modelmbean.ModelMBeanNotificationInfo;
-import java.io.Serializable;
/**
1.5 +4 -3
jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseNotificationBroadcaster.java
Index: BaseNotificationBroadcaster.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseNotificationBroadcaster.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseNotificationBroadcaster.java 14 Apr 2003 02:08:16 -0000 1.4
+++ BaseNotificationBroadcaster.java 20 Jul 2003 07:35:13 -0000 1.5
@@ -67,6 +67,7 @@
import java.util.ArrayList;
import java.util.Iterator;
+
import javax.management.ListenerNotFoundException;
import javax.management.MBeanNotificationInfo;
import javax.management.Notification;
1.6 +5 -7
jakarta-commons/modeler/src/java/org/apache/commons/modeler/OperationInfo.java
Index: OperationInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/OperationInfo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OperationInfo.java 20 Feb 2003 05:56:00 -0000 1.5
+++ OperationInfo.java 20 Jul 2003 07:35:13 -0000 1.6
@@ -65,13 +65,11 @@
package org.apache.commons.modeler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.Serializable;
import javax.management.Descriptor;
import javax.management.MBeanParameterInfo;
import javax.management.modelmbean.ModelMBeanOperationInfo;
-import java.io.Serializable;
/**
1.7 +5 -6
jakarta-commons/modeler/src/java/org/apache/commons/modeler/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Main.java 13 Apr 2003 17:34:39 -0000 1.6
+++ Main.java 20 Jul 2003 07:35:13 -0000 1.7
@@ -65,12 +65,11 @@
package org.apache.commons.modeler;
-import org.apache.commons.modeler.util.IntrospectionUtils;
-import org.apache.commons.modeler.Registry;
-
import java.io.File;
import java.net.URL;
import java.util.List;
+
+import org.apache.commons.modeler.util.IntrospectionUtils;
/**
1.4 +12 -4
jakarta-commons/modeler/src/java/org/apache/commons/modeler/util/IntrospectionUtils.java
Index: IntrospectionUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/util/IntrospectionUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IntrospectionUtils.java 23 Jan 2003 19:42:08 -0000 1.3
+++ IntrospectionUtils.java 20 Jul 2003 07:35:13 -0000 1.4
@@ -60,10 +60,18 @@
package org.apache.commons.modeler.util;
-import java.lang.reflect.*;
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
// Depends:
// JDK1.1
1.7 +15 -7
jakarta-commons/modeler/src/java/org/apache/commons/modeler/util/DomUtil.java
Index: DomUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/util/DomUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DomUtil.java 14 Apr 2003 01:03:02 -0000 1.6
+++ DomUtil.java 20 Jul 2003 07:35:13 -0000 1.7
@@ -58,19 +58,27 @@
*/
package org.apache.commons.modeler.util;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.StringReader;
-import javax.xml.parsers.*;
-import javax.xml.transform.TransformerFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
-import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
1.7 +5 -3
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/RegistryTask.java
Index: RegistryTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/RegistryTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RegistryTask.java 24 Jan 2003 22:38:44 -0000 1.6
+++ RegistryTask.java 20 Jul 2003 07:35:13 -0000 1.7
@@ -61,13 +61,15 @@
package org.apache.commons.modeler.ant;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.ObjectOutputStream;
import java.net.URL;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.Registry;
import org.apache.tools.ant.BuildException;
/**
1.3 +5 -3
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/JmxInvoke.java
Index: JmxInvoke.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/JmxInvoke.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JmxInvoke.java 26 Dec 2002 18:07:04 -0000 1.2
+++ JmxInvoke.java 20 Jul 2003 07:35:13 -0000 1.3
@@ -54,11 +54,13 @@
package org.apache.commons.modeler.ant;
-import org.apache.tools.ant.*;
-import javax.management.*;
+import java.util.Vector;
+
import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
-import java.util.Vector;
+
+import org.apache.tools.ant.Task;
/**
* Set mbean properties.
1.8 +6 -6
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/JmxSet.java
Index: JmxSet.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/JmxSet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JmxSet.java 7 Apr 2003 06:55:21 -0000 1.7
+++ JmxSet.java 20 Jul 2003 07:35:13 -0000 1.8
@@ -54,14 +54,14 @@
package org.apache.commons.modeler.ant;
-import org.apache.tools.ant.*;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.modeler.Registry;
-
-import javax.management.*;
+import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.Registry;
+import org.apache.tools.ant.Task;
/**
* Set mbean properties.
1.6 +10 -7
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/MLETTask.java
Index: MLETTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/MLETTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MLETTask.java 28 Feb 2003 21:24:35 -0000 1.5
+++ MLETTask.java 20 Jul 2003 07:35:13 -0000 1.6
@@ -54,17 +54,20 @@
package org.apache.commons.modeler.ant;
-import org.apache.tools.ant.*;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
-import javax.management.*;
-import javax.management.ObjectName;
+import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
import javax.management.loading.MLet;
-import java.util.*;
-import java.net.URL;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
/**
* Load an MBean. The syntax is similar with the <mlet>, with few
1.3 +6 -10
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/ServiceTask.java
Index: ServiceTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/ServiceTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceTask.java 7 Apr 2003 06:54:29 -0000 1.2
+++ ServiceTask.java 20 Jul 2003 07:35:13 -0000 1.3
@@ -54,18 +54,14 @@
package org.apache.commons.modeler.ant;
-import org.apache.tools.ant.*;
-import org.apache.commons.logging.LogFactory;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.commons.modeler.Registry;
-
-import javax.management.*;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.loading.MLet;
-import java.util.*;
-import java.net.URL;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
/**
* Group a set of mbeans in a service, and perform actions on
1.5 +4 -9
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/ModelerTask.java
Index: ModelerTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/ModelerTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ModelerTask.java 28 Feb 2003 04:54:35 -0000 1.4
+++ ModelerTask.java 20 Jul 2003 07:35:13 -0000 1.5
@@ -54,16 +54,11 @@
package org.apache.commons.modeler.ant;
-import org.apache.tools.ant.*;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
+import java.util.ArrayList;
-import javax.management.*;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
-import javax.management.loading.MLet;
-import java.util.*;
-import java.net.URL;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.tools.ant.BuildException;
/**
* Like MLETTask, but it wraps the bean in a BaseModelMBean.
1.3 +6 -12
jakarta-commons/modeler/src/java/org/apache/commons/modeler/mbeans/MBeanProxy.java
Index: MBeanProxy.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/mbeans/MBeanProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MBeanProxy.java 9 Apr 2003 07:23:11 -0000 1.2
+++ MBeanProxy.java 20 Jul 2003 07:35:13 -0000 1.3
@@ -1,21 +1,15 @@
package org.apache.commons.modeler.mbeans;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.AttributeInfo;
-import org.apache.commons.modeler.OperationInfo;
-import org.apache.commons.modeler.Registry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import java.util.List;
import java.util.HashMap;
-import java.io.InputStream;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
+
+import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.MBeanException;
import javax.management.ReflectionException;
-import javax.management.Attribute;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.BaseModelMBean;
/** Use the same metadata, except that we replace the attribute
* get/set methods.
1.7 +2 -0
jakarta-commons/modeler/src/java/org/apache/commons/modeler/mbeans/SimpleRemoteConnector.java
Index: SimpleRemoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/mbeans/SimpleRemoteConnector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleRemoteConnector.java 14 Apr 2003 00:58:23 -0000 1.6
+++ SimpleRemoteConnector.java 20 Jul 2003 07:35:13 -0000 1.7
@@ -67,12 +67,14 @@
import java.util.Map;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
+
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.ReflectionException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.modeler.Registry;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
