Can someone please apply this patch to fix imports in modeler? See attached diff.txt
Thanks,
dims
=====
Davanum Srinivas - http://webservices.apache.org/~dims/
__________________________________
Do you Yahoo!?
SBC Yahoo! DSL - Now only $29.95 per month!
http://sbc.yahoo.com
Index: src/java/org/apache/commons/modeler/AttributeInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/AttributeInfo.java,v
retrieving revision 1.6
diff -d -u -b -B -w -u -r1.6 AttributeInfo.java
--- src/java/org/apache/commons/modeler/AttributeInfo.java 17 Feb 2003 00:52:45
-0000 1.6
+++ src/java/org/apache/commons/modeler/AttributeInfo.java 20 Jul 2003 02:06:37
-0000
@@ -67,8 +67,8 @@
import javax.management.Descriptor;
import javax.management.modelmbean.ModelMBeanAttributeInfo;
-import java.lang.reflect.Method;
import java.io.Serializable;
+import java.lang.reflect.Method;
/**
Index: src/java/org/apache/commons/modeler/BaseAttributeFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseAttributeFilter.java,v
retrieving revision 1.2
diff -d -u -b -B -w -u -r1.2 BaseAttributeFilter.java
--- src/java/org/apache/commons/modeler/BaseAttributeFilter.java 15 Jun 2002
18:17:02 -0000 1.2
+++ src/java/org/apache/commons/modeler/BaseAttributeFilter.java 20 Jul 2003
02:06:37 -0000
@@ -65,10 +65,10 @@
package org.apache.commons.modeler;
-import java.util.HashSet;
import javax.management.AttributeChangeNotification;
import javax.management.Notification;
import javax.management.NotificationFilter;
+import java.util.HashSet;
/**
Index: src/java/org/apache/commons/modeler/BaseModelMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseModelMBean.java,v
retrieving revision 1.22
diff -d -u -b -B -w -u -r1.22 BaseModelMBean.java
--- src/java/org/apache/commons/modeler/BaseModelMBean.java 17 Apr 2003 04:31:36
-0000 1.22
+++ src/java/org/apache/commons/modeler/BaseModelMBean.java 20 Jul 2003 02:06:39
-0000
@@ -69,12 +69,28 @@
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 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 +99,11 @@
import javax.management.modelmbean.ModelMBeanInfoSupport;
import javax.management.modelmbean.ModelMBeanNotificationInfo;
import javax.management.modelmbean.ModelMBeanOperationInfo;
-import javax.management.*;
-import javax.management.DynamicMBean;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
// TODO: enable ant-like substitutions ? ( or at least discuss it )
Index: src/java/org/apache/commons/modeler/BaseNotificationBroadcaster.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/BaseNotificationBroadcaster.java,v
retrieving revision 1.4
diff -d -u -b -B -w -u -r1.4 BaseNotificationBroadcaster.java
--- src/java/org/apache/commons/modeler/BaseNotificationBroadcaster.java 14 Apr
2003 02:08:16 -0000 1.4
+++ src/java/org/apache/commons/modeler/BaseNotificationBroadcaster.java 20 Jul
2003 02:06:39 -0000
@@ -65,14 +65,14 @@
package org.apache.commons.modeler;
-import java.util.ArrayList;
-import java.util.Iterator;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanNotificationInfo;
import javax.management.Notification;
import javax.management.NotificationBroadcaster;
import javax.management.NotificationFilter;
import javax.management.NotificationListener;
+import java.util.ArrayList;
+import java.util.Iterator;
/**
Index: src/java/org/apache/commons/modeler/FeatureInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/FeatureInfo.java,v
retrieving revision 1.4
diff -d -u -b -B -w -u -r1.4 FeatureInfo.java
--- src/java/org/apache/commons/modeler/FeatureInfo.java 20 Feb 2003 05:56:00
-0000 1.4
+++ src/java/org/apache/commons/modeler/FeatureInfo.java 20 Jul 2003 02:06:39
-0000
@@ -65,11 +65,11 @@
package org.apache.commons.modeler;
+import javax.management.Descriptor;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.management.Descriptor;
/**
Index: src/java/org/apache/commons/modeler/FixedNotificationFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/FixedNotificationFilter.java,v
retrieving revision 1.2
diff -d -u -b -B -w -u -r1.2 FixedNotificationFilter.java
--- src/java/org/apache/commons/modeler/FixedNotificationFilter.java 16 Jan 2003
19:25:06 -0000 1.2
+++ src/java/org/apache/commons/modeler/FixedNotificationFilter.java 20 Jul 2003
02:06:40 -0000
@@ -61,10 +61,9 @@
package org.apache.commons.modeler;
-import java.util.HashSet;
-import javax.management.AttributeChangeNotification;
import javax.management.Notification;
import javax.management.NotificationFilter;
+import java.util.HashSet;
/**
Index: src/java/org/apache/commons/modeler/JndiJmx.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/JndiJmx.java,v
retrieving revision 1.2
diff -d -u -b -B -w -u -r1.2 JndiJmx.java
--- src/java/org/apache/commons/modeler/JndiJmx.java 12 Nov 2002 22:49:12 -0000
1.2
+++ src/java/org/apache/commons/modeler/JndiJmx.java 20 Jul 2003 02:06:40 -0000
@@ -61,19 +61,21 @@
package org.apache.commons.modeler;
-import java.io.*;
-import java.net.URL;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
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.*;
+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 java.util.Enumeration;
+import java.util.Hashtable;
// EXPERIMENTAL. It may fit better in tomcat jndi impl.
Index: src/java/org/apache/commons/modeler/Main.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/Main.java,v
retrieving revision 1.6
diff -d -u -b -B -w -u -r1.6 Main.java
--- src/java/org/apache/commons/modeler/Main.java 13 Apr 2003 17:34:39 -0000
1.6
+++ src/java/org/apache/commons/modeler/Main.java 20 Jul 2003 02:06:40 -0000
@@ -66,7 +66,6 @@
import org.apache.commons.modeler.util.IntrospectionUtils;
-import org.apache.commons.modeler.Registry;
import java.io.File;
import java.net.URL;
Index: src/java/org/apache/commons/modeler/ManagedBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ManagedBean.java,v
retrieving revision 1.8
diff -d -u -b -B -w -u -r1.8 ManagedBean.java
--- src/java/org/apache/commons/modeler/ManagedBean.java 15 Apr 2003 18:19:12
-0000 1.8
+++ src/java/org/apache/commons/modeler/ManagedBean.java 20 Jul 2003 02:06:44
-0000
@@ -65,12 +65,10 @@
package org.apache.commons.modeler;
-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;
@@ -79,6 +77,9 @@
import javax.management.modelmbean.ModelMBeanInfoSupport;
import javax.management.modelmbean.ModelMBeanNotificationInfo;
import javax.management.modelmbean.ModelMBeanOperationInfo;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
Index: src/java/org/apache/commons/modeler/OperationInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/OperationInfo.java,v
retrieving revision 1.5
diff -d -u -b -B -w -u -r1.5 OperationInfo.java
--- src/java/org/apache/commons/modeler/OperationInfo.java 20 Feb 2003 05:56:00
-0000 1.5
+++ src/java/org/apache/commons/modeler/OperationInfo.java 20 Jul 2003 02:06:44
-0000
@@ -65,9 +65,6 @@
package org.apache.commons.modeler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.management.Descriptor;
import javax.management.MBeanParameterInfo;
import javax.management.modelmbean.ModelMBeanOperationInfo;
Index: src/java/org/apache/commons/modeler/ParameterInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ParameterInfo.java,v
retrieving revision 1.4
diff -d -u -b -B -w -u -r1.4 ParameterInfo.java
--- src/java/org/apache/commons/modeler/ParameterInfo.java 20 Feb 2003 05:56:00
-0000 1.4
+++ src/java/org/apache/commons/modeler/ParameterInfo.java 20 Jul 2003 02:06:44
-0000
@@ -65,9 +65,6 @@
package org.apache.commons.modeler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.management.MBeanParameterInfo;
import java.io.Serializable;
Index: src/java/org/apache/commons/modeler/Registry.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/Registry.java,v
retrieving revision 1.31
diff -d -u -b -B -w -u -r1.31 Registry.java
--- src/java/org/apache/commons/modeler/Registry.java 24 Apr 2003 16:16:34 -0000
1.31
+++ src/java/org/apache/commons/modeler/Registry.java 20 Jul 2003 02:06:45 -0000
@@ -61,6 +61,20 @@
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 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.modelmbean.ModelMBean;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -71,19 +85,6 @@
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.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;
/*
Issues:
Index: src/java/org/apache/commons/modeler/RegistryMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/RegistryMBean.java,v
retrieving revision 1.1
diff -d -u -b -B -w -u -r1.1 RegistryMBean.java
--- src/java/org/apache/commons/modeler/RegistryMBean.java 13 Apr 2003 06:04:28
-0000 1.1
+++ src/java/org/apache/commons/modeler/RegistryMBean.java 20 Jul 2003 02:06:46
-0000
@@ -62,8 +62,6 @@
import java.util.List;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
/**
* Interface for modeler MBeans.
Index: src/java/org/apache/commons/modeler/ant/JmxInvoke.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/JmxInvoke.java,v
retrieving revision 1.2
diff -d -u -b -B -w -u -r1.2 JmxInvoke.java
--- src/java/org/apache/commons/modeler/ant/JmxInvoke.java 26 Dec 2002 18:07:04
-0000 1.2
+++ src/java/org/apache/commons/modeler/ant/JmxInvoke.java 20 Jul 2003 02:06:46
-0000
@@ -55,8 +55,9 @@
package org.apache.commons.modeler.ant;
import org.apache.tools.ant.*;
-import javax.management.*;
+
import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
import java.util.Vector;
Index: src/java/org/apache/commons/modeler/ant/JmxSet.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/JmxSet.java,v
retrieving revision 1.7
diff -d -u -b -B -w -u -r1.7 JmxSet.java
--- src/java/org/apache/commons/modeler/ant/JmxSet.java 7 Apr 2003 06:55:21 -0000
1.7
+++ src/java/org/apache/commons/modeler/ant/JmxSet.java 20 Jul 2003 02:06:46 -0000
@@ -54,12 +54,12 @@
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.logging.LogFactory;
import org.apache.commons.modeler.Registry;
+import org.apache.tools.ant.*;
-import javax.management.*;
+import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
Index: src/java/org/apache/commons/modeler/ant/MLETTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/MLETTask.java,v
retrieving revision 1.5
diff -d -u -b -B -w -u -r1.5 MLETTask.java
--- src/java/org/apache/commons/modeler/ant/MLETTask.java 28 Feb 2003 21:24:35
-0000 1.5
+++ src/java/org/apache/commons/modeler/ant/MLETTask.java 20 Jul 2003 02:06:46
-0000
@@ -54,17 +54,18 @@
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.logging.LogFactory;
+import org.apache.tools.ant.*;
-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 java.util.ArrayList;
+import java.util.List;
/**
* Load an MBean. The syntax is similar with the <mlet>, with few
Index: src/java/org/apache/commons/modeler/ant/ModelerTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/ModelerTask.java,v
retrieving revision 1.4
diff -d -u -b -B -w -u -r1.4 ModelerTask.java
--- src/java/org/apache/commons/modeler/ant/ModelerTask.java 28 Feb 2003 04:54:35
-0000 1.4
+++ src/java/org/apache/commons/modeler/ant/ModelerTask.java 20 Jul 2003 02:06:46
-0000
@@ -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 org.apache.commons.logging.LogFactory;
+import org.apache.tools.ant.*;
-import javax.management.*;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
-import javax.management.loading.MLet;
-import java.util.*;
-import java.net.URL;
+import java.util.ArrayList;
/**
* Like MLETTask, but it wraps the bean in a BaseModelMBean.
Index: src/java/org/apache/commons/modeler/ant/RegistryTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/RegistryTask.java,v
retrieving revision 1.6
diff -d -u -b -B -w -u -r1.6 RegistryTask.java
--- src/java/org/apache/commons/modeler/ant/RegistryTask.java 24 Jan 2003 22:38:44
-0000 1.6
+++ src/java/org/apache/commons/modeler/ant/RegistryTask.java 20 Jul 2003 02:06:46
-0000
@@ -61,14 +61,16 @@
package org.apache.commons.modeler.ant;
-import java.io.*;
-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;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.ObjectOutputStream;
+import java.net.URL;
/**
* Load descriptors into registry.
Index: src/java/org/apache/commons/modeler/ant/ServiceTask.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ant/ServiceTask.java,v
retrieving revision 1.2
diff -d -u -b -B -w -u -r1.2 ServiceTask.java
--- src/java/org/apache/commons/modeler/ant/ServiceTask.java 7 Apr 2003 06:54:29
-0000 1.2
+++ src/java/org/apache/commons/modeler/ant/ServiceTask.java 20 Jul 2003 02:06:46
-0000
@@ -54,18 +54,13 @@
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.logging.LogFactory;
import org.apache.commons.modeler.Registry;
+import org.apache.tools.ant.*;
-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 java.util.ArrayList;
+import java.util.List;
/**
* Group a set of mbeans in a service, and perform actions on
Index: src/java/org/apache/commons/modeler/mbeans/MBeanProxy.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/mbeans/MBeanProxy.java,v
retrieving revision 1.2
diff -d -u -b -B -w -u -r1.2 MBeanProxy.java
--- src/java/org/apache/commons/modeler/mbeans/MBeanProxy.java 9 Apr 2003 07:23:11
-0000 1.2
+++ src/java/org/apache/commons/modeler/mbeans/MBeanProxy.java 20 Jul 2003 02:06:46
-0000
@@ -1,21 +1,14 @@
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 org.apache.commons.modeler.BaseModelMBean;
+
+import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.MBeanException;
import javax.management.ReflectionException;
-import javax.management.Attribute;
+import java.util.HashMap;
/** Use the same metadata, except that we replace the attribute
* get/set methods.
Index: src/java/org/apache/commons/modeler/mbeans/SimpleRemoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/mbeans/SimpleRemoteConnector.java,v
retrieving revision 1.6
diff -d -u -b -B -w -u -r1.6 SimpleRemoteConnector.java
--- src/java/org/apache/commons/modeler/mbeans/SimpleRemoteConnector.java 14 Apr
2003 00:58:23 -0000 1.6
+++ src/java/org/apache/commons/modeler/mbeans/SimpleRemoteConnector.java 20 Jul
2003 02:06:47 -0000
@@ -58,6 +58,16 @@
*/
package org.apache.commons.modeler.mbeans;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.modeler.Registry;
+
+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 java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -67,15 +77,6 @@
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;
/**
* Based on jk2 proxy.
Index: src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDOMSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDOMSource.java,v
retrieving revision 1.6
diff -d -u -b -B -w -u -r1.6 MbeansDescriptorsDOMSource.java
--- src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDOMSource.java 24 Jun
2003 22:41:48 -0000 1.6
+++ src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDOMSource.java 20 Jul
2003 02:06:47 -0000
@@ -60,12 +60,19 @@
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 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;
import java.io.InputStream;
import java.util.ArrayList;
Index: src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java,v
retrieving revision 1.5
diff -d -u -b -B -w -u -r1.5 MbeansDescriptorsDigesterSource.java
--- src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java
26 Feb 2003 22:17:32 -0000 1.5
+++ src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java
20 Jul 2003 02:06:48 -0000
@@ -61,14 +61,14 @@
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 org.apache.commons.modeler.Registry;
import java.io.InputStream;
import java.net.URL;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class MbeansDescriptorsDigesterSource extends ModelerSource
{
Index:
src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDynamicMBeanSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDynamicMBeanSource.java,v
retrieving revision 1.1
diff -d -u -b -B -w -u -r1.1 MbeansDescriptorsDynamicMBeanSource.java
---
src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDynamicMBeanSource.java
20 Apr 2003 18:24:50 -0000 1.1
+++
src/java/org/apache/commons/modeler/modules/MbeansDescriptorsDynamicMBeanSource.java
20 Jul 2003 02:06:48 -0000
@@ -1,25 +1,20 @@
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 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;
-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 java.util.ArrayList;
+import java.util.List;
/** Extract metadata from a dynamic mbean.
Index:
src/java/org/apache/commons/modeler/modules/MbeansDescriptorsIntrospectionSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsIntrospectionSource.java,v
retrieving revision 1.8
diff -d -u -b -B -w -u -r1.8 MbeansDescriptorsIntrospectionSource.java
---
src/java/org/apache/commons/modeler/modules/MbeansDescriptorsIntrospectionSource.java
27 Mar 2003 06:18:47 -0000 1.8
+++
src/java/org/apache/commons/modeler/modules/MbeansDescriptorsIntrospectionSource.java
20 Jul 2003 02:06:48 -0000
@@ -1,20 +1,20 @@
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 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;
-import java.io.InputStream;
+import javax.management.ObjectName;
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;
public class MbeansDescriptorsIntrospectionSource extends ModelerSource
Index: src/java/org/apache/commons/modeler/modules/MbeansDescriptorsSerSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsSerSource.java,v
retrieving revision 1.4
diff -d -u -b -B -w -u -r1.4 MbeansDescriptorsSerSource.java
--- src/java/org/apache/commons/modeler/modules/MbeansDescriptorsSerSource.java 26 Feb
2003 22:17:32 -0000 1.4
+++ src/java/org/apache/commons/modeler/modules/MbeansDescriptorsSerSource.java 20 Jul
2003 02:06:48 -0000
@@ -1,15 +1,12 @@
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 org.apache.commons.modeler.ManagedBean;
+import org.apache.commons.modeler.Registry;
import java.io.InputStream;
import java.io.ObjectInputStream;
-import java.io.EOFException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
Index: src/java/org/apache/commons/modeler/modules/MbeansSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansSource.java,v
retrieving revision 1.12
diff -d -u -b -B -w -u -r1.12 MbeansSource.java
--- src/java/org/apache/commons/modeler/modules/MbeansSource.java 14 Apr 2003
01:01:55 -0000 1.12
+++ src/java/org/apache/commons/modeler/modules/MbeansSource.java 20 Jul 2003
02:06:49 -0000
@@ -1,25 +1,27 @@
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 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;
-import javax.management.*;
+import javax.management.Attribute;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
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;
/** This will create mbeans based on a config file.
Index: src/java/org/apache/commons/modeler/modules/MbeansSourceMBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansSourceMBean.java,v
retrieving revision 1.1
diff -d -u -b -B -w -u -r1.1 MbeansSourceMBean.java
--- src/java/org/apache/commons/modeler/modules/MbeansSourceMBean.java 14 Apr 2003
01:01:55 -0000 1.1
+++ src/java/org/apache/commons/modeler/modules/MbeansSourceMBean.java 20 Jul 2003
02:06:49 -0000
@@ -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;
/**
Index: src/java/org/apache/commons/modeler/modules/ModelerSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/ModelerSource.java,v
retrieving revision 1.5
diff -d -u -b -B -w -u -r1.5 ModelerSource.java
--- src/java/org/apache/commons/modeler/modules/ModelerSource.java 14 Apr 2003
01:01:55 -0000 1.5
+++ src/java/org/apache/commons/modeler/modules/ModelerSource.java 20 Jul 2003
02:06:49 -0000
@@ -1,14 +1,14 @@
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 javax.management.ObjectName;
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 javax.management.ObjectName;
+import java.util.List;
/** Source for descriptor data. More sources can be added.
*
Index: src/java/org/apache/commons/modeler/util/DomUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/util/DomUtil.java,v
retrieving revision 1.6
diff -d -u -b -B -w -u -r1.6 DomUtil.java
--- src/java/org/apache/commons/modeler/util/DomUtil.java 14 Apr 2003 01:03:02
-0000 1.6
+++ src/java/org/apache/commons/modeler/util/DomUtil.java 20 Jul 2003 02:06:49
-0000
@@ -58,19 +58,26 @@
*/
package org.apache.commons.modeler.util;
-import java.io.*;
+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;
-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 java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.StringReader;
/**
Index: src/java/org/apache/commons/modeler/util/IntrospectionUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/util/IntrospectionUtils.java,v
retrieving revision 1.3
diff -d -u -b -B -w -u -r1.3 IntrospectionUtils.java
--- src/java/org/apache/commons/modeler/util/IntrospectionUtils.java 23 Jan 2003
19:42:08 -0000 1.3
+++ src/java/org/apache/commons/modeler/util/IntrospectionUtils.java 20 Jul 2003
02:06:50 -0000
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
