mc4j-cvs Mailing List for MC4J JMX Console
Brought to you by:
ghinkl
Menu
▾
▴
mc4j-cvs — Mailing list for CVS commit notices.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(7) |
Apr
(135) |
May
(32) |
Jun
(34) |
Jul
|
Aug
|
Sep
(7) |
Oct
(139) |
Nov
(11) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(34) |
Feb
(1) |
Mar
(12) |
Apr
|
May
(87) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(27) |
Nov
(49) |
Dec
(13) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(252) |
May
(16) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(2) |
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(3) |
Oct
|
Nov
(1) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
(2) |
Jul
(15) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(6) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
|
From: <ian...@us...> - 2011-10-28 21:44:35
|
Revision: 629
http://mc4j.svn.sourceforge.net/mc4j/?rev=629&view=rev
Author: ianpspringer
Date: 2011-10-28 21:44:26 +0000 (Fri, 28 Oct 2011)
Log Message:
-----------
fix so cached defunct MBeanInfos are nulled out after connection is re-established to a restarted MBeanServer; bump up version to 1.3
Modified Paths:
--------------
trunk/mc4j/modules/ems/build.xml
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/access/Lookup.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/EmsConnection.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/LoadException.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/MBeanRegistrationEvent.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/MBeanRegistrationListener.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotificationEvent.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/operation/EmsOperation.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVMFinder.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVirtualMachine.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/persistence/ConnectionSettingPersistence.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/persistence/ConnectionSettingsStore.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/DeepClassLoader.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/DeepClassLoaderOrig.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/NestedJarClassLoader.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/deepjar/Handler.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/AbstractConnectionTypeDescriptor.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/JBossConnectionTypeDescriptor.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/store/CompleteValueHistory.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/PooledConnectionTracker.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DAdvancedBean.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/notification/DNotification.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/operation/DOperation.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/parameter/DParameter.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/LocalVMProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/Oc4jConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/PramatiConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WeblogicConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/jaas/JBossCallbackHandler.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/jaas/JBossConfiguration.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/local/LocalVMConnector.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/JMXRemotingMBeanServerProxy.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/JSR77ManagementMBeanServerProxy.java
trunk/mc4j/modules/ems/src/test/org/mc4j/ems/test/ConnectionTest.java
trunk/mc4j/modules/ems/src/test/org/mc4j/ems/test/LoaderTest.java
trunk/mc4j/modules/ems/src/test/org/mc4j/ems/test/MultiConnectionTest.java
trunk/mc4j/modules/ems/src/test/org/mc4j/ems/test/beans/BeanTest.java
trunk/mc4j/modules/ems/src/test/org/mc4j/ems/test/beans/MyTestBean.java
trunk/mc4j/modules/ems/src/test/org/mc4j/ems/test/notifications/NotificationTest.java
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/build.xml 2011-10-28 21:44:26 UTC (rev 629)
@@ -29,7 +29,7 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.16"/>
+ <property name="release.version" value="1.3"/>
<target name="init" description="Initializes the MC4J-EMS build system.">
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/access/Lookup.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/access/Lookup.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/access/Lookup.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,12 +16,12 @@
package org.mc4j.ems.access;
+import java.util.HashMap;
+import java.util.Map;
+
import ognl.Ognl;
import ognl.OgnlException;
-import java.util.Map;
-import java.util.HashMap;
-
/**
* @author Greg Hinkle (gh...@us...), Apr 12, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -26,6 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.mc4j.ems.connection.settings.ConnectionSettings;
import org.mc4j.ems.connection.support.ConnectionProvider;
import org.mc4j.ems.connection.support.classloader.ClassLoaderFactory;
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/EmsConnection.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/EmsConnection.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/EmsConnection.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Greg Hinkle
+ * Copyright 2002-2011 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,15 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.mc4j.ems.connection;
+import java.util.List;
+import java.util.SortedSet;
+
import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.connection.support.ConnectionProvider;
-import java.util.List;
-import java.util.SortedSet;
-
/**
* TODO GH: Decide exception handling strategy (runtime?)
*
@@ -30,13 +29,24 @@
*/
public interface EmsConnection extends Refreshable {
-
ConnectionTracker getTracker();
void close();
+ /**
+ * Does a *:* load of all MBean names and caches them as EmsBeans.
+ *
+ * @param deep if true, also loads the MBeanInfo for each MBean and caches it in the corresponding EmsBean
+ */
void loadSynchronous(boolean deep);
+ /**
+ * Unloads all cached metadata associated with this connection - MBeanInfos, etc.
+ *
+ * @since 1.3
+ */
+ void unload();
+
void addRegistrationListener(MBeanRegistrationListener registrationListener);
void removeRegistrationListener(MBeanRegistrationListener registrationListener);
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/LoadException.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/LoadException.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/LoadException.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,8 +16,6 @@
package org.mc4j.ems.connection;
-import org.mc4j.ems.connection.EmsException;
-
/**
* @author Greg Hinkle (gh...@us...), Apr 12, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/MBeanRegistrationEvent.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/MBeanRegistrationEvent.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/MBeanRegistrationEvent.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,10 +16,10 @@
package org.mc4j.ems.connection;
+import java.util.Set;
+
import org.mc4j.ems.connection.bean.EmsBean;
-import java.util.Set;
-
/**
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/MBeanRegistrationListener.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/MBeanRegistrationListener.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/MBeanRegistrationListener.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -1,7 +1,5 @@
package org.mc4j.ems.connection;
-import org.mc4j.ems.connection.MBeanRegistrationEvent;
-
/**
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 Greg Hinkle
+ * Copyright 2002-2011 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
*/
package org.mc4j.ems.connection.bean;
+import java.util.List;
+import java.util.SortedSet;
+
import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.mc4j.ems.connection.bean.notification.EmsNotification;
import org.mc4j.ems.connection.bean.operation.EmsOperation;
import org.mc4j.ems.connection.support.ConnectionProvider;
-import java.util.List;
-import java.util.SortedSet;
-
/**
* An MBean.
*
@@ -59,9 +59,22 @@
*/
<T> T getProxy(Class<T> beanInterface);
+ /**
+ * Loads local representations of this MBean's attributes, operations and notifications if not already loaded.
+ * Current attribute values are not retrieved.
+ */
void loadSynchronous() ;
/**
+ * Unloads any cached metadata associated with this MBean. This is useful for handling dynamic mbeans with changing
+ * descriptors or corner case situations where an MBean is unregistered and then another MBean with a non-equivalent
+ * MBeanInfo is registered with the same ObjectName.
+ *
+ * @since 1.3
+ */
+ void unload();
+
+ /**
* Returns the set of all attributes for this MBean; never null.
*
* @return the set of all attributes for this MBean; never null
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotificationEvent.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotificationEvent.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotificationEvent.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -15,10 +15,10 @@
*/
package org.mc4j.ems.connection.bean.notification;
+import java.util.Date;
+
import org.mc4j.ems.connection.bean.EmsBean;
-import java.util.Date;
-
/**
* @author Greg Hinkle (gh...@us...), Nov 10, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/operation/EmsOperation.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/operation/EmsOperation.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/operation/EmsOperation.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,15 +16,15 @@
package org.mc4j.ems.connection.bean.operation;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.mc4j.ems.connection.EmsInvocationException;
import org.mc4j.ems.connection.bean.parameter.EmsParameter;
-import org.mc4j.ems.connection.EmsInvocationException;
-import java.util.List;
-import java.util.Collections;
-import java.util.Arrays;
-import java.io.Serializable;
-import java.io.ObjectStreamException;
-
/**
* An MBean operation.
*
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVMFinder.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVMFinder.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVMFinder.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -22,14 +22,14 @@
package org.mc4j.ems.connection.local;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import org.mc4j.ems.connection.EmsException;
import org.mc4j.ems.connection.settings.ConnectionSettings;
import org.mc4j.ems.connection.support.classloader.ClassLoaderFactory;
import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor;
-import org.mc4j.ems.connection.EmsException;
-import java.lang.reflect.Method;
-import java.util.Map;
-
public class LocalVMFinder {
public static Map<Integer, LocalVirtualMachine> getManageableVirtualMachines() {
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVirtualMachine.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVirtualMachine.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVirtualMachine.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,14 +16,7 @@
package org.mc4j.ems.connection.local;
-import com.sun.tools.attach.AgentInitializationException;
-import com.sun.tools.attach.AgentLoadException;
-import com.sun.tools.attach.AttachNotSupportedException;
-import com.sun.tools.attach.VirtualMachine;
-
import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
public class LocalVirtualMachine {
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -17,15 +17,15 @@
package org.mc4j.ems.connection.settings;
-import org.mc4j.ems.connection.support.metadata.ConnectionTypeDescriptor;
-
import java.io.File;
import java.io.ObjectStreamField;
import java.io.Serializable;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
-import java.util.Map;
+import org.mc4j.ems.connection.support.metadata.ConnectionTypeDescriptor;
+
/**
* Options for connections
*
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/persistence/ConnectionSettingPersistence.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/persistence/ConnectionSettingPersistence.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/persistence/ConnectionSettingPersistence.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,20 +16,20 @@
package org.mc4j.ems.connection.settings.persistence;
-import org.mc4j.ems.connection.settings.ConnectionSettings;
-import org.mc4j.ems.connection.EmsException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.ByteArrayInputStream;
-import java.beans.XMLEncoder;
+import java.beans.Encoder;
import java.beans.ExceptionListener;
+import java.beans.Expression;
import java.beans.PersistenceDelegate;
-import java.beans.Expression;
-import java.beans.Encoder;
import java.beans.XMLDecoder;
+import java.beans.XMLEncoder;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import org.mc4j.ems.connection.EmsException;
+import org.mc4j.ems.connection.settings.ConnectionSettings;
+
/**
* @author Greg Hinkle (gh...@us...), May 9, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/persistence/ConnectionSettingsStore.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/persistence/ConnectionSettingsStore.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/persistence/ConnectionSettingsStore.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,11 +16,11 @@
package org.mc4j.ems.connection.settings.persistence;
+import java.util.prefs.Preferences;
+
import org.mc4j.ems.connection.settings.ConnectionSettings;
-import java.util.prefs.Preferences;
-
/**
* @author Greg Hinkle (gh...@us...), May 5, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,27 +16,33 @@
package org.mc4j.ems.connection.support.classloader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.mc4j.ems.connection.ConnectionFactory;
-import org.mc4j.ems.connection.EmsConnectException;
-import org.mc4j.ems.connection.EmsException;
-import org.mc4j.ems.connection.settings.ConnectionSettings;
-import org.mc4j.ems.connection.support.metadata.JSR160ConnectionTypeDescriptor;
-import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.ref.WeakReference;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.*;
-import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.mc4j.ems.connection.ConnectionFactory;
+import org.mc4j.ems.connection.EmsConnectException;
+import org.mc4j.ems.connection.EmsException;
+import org.mc4j.ems.connection.settings.ConnectionSettings;
+import org.mc4j.ems.connection.support.metadata.JSR160ConnectionTypeDescriptor;
+import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor;
+
/**
* @author Greg Hinkle (gh...@us...), Apr 5, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/DeepClassLoader.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/DeepClassLoader.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/DeepClassLoader.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,8 +16,6 @@
package org.mc4j.ems.connection.support.classloader;
-import org.mc4j.ems.connection.support.classloader.deepjar.Handler;
-
import java.net.MalformedURLException;
import java.net.URL;
import java.security.CodeSigner;
@@ -25,6 +23,8 @@
import java.security.ProtectionDomain;
import java.util.Map;
+import org.mc4j.ems.connection.support.classloader.deepjar.Handler;
+
/**
* @author Greg Hinkle (gh...@us...), May 17, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/DeepClassLoaderOrig.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/DeepClassLoaderOrig.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/DeepClassLoaderOrig.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,8 +16,6 @@
package org.mc4j.ems.connection.support.classloader;
-import org.mc4j.ems.connection.support.classloader.deepjar.Handler;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -41,6 +39,8 @@
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
+import org.mc4j.ems.connection.support.classloader.deepjar.Handler;
+
/**
* @author Greg Hinkle (gh...@us...), May 9, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/NestedJarClassLoader.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/NestedJarClassLoader.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/NestedJarClassLoader.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,16 +16,16 @@
package org.mc4j.ems.connection.support.classloader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* <p>This classloader is able to load classes from the contents of jar files available
* in the parent classloader. This mechanism creates support for nested jar file
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/deepjar/Handler.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/deepjar/Handler.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/deepjar/Handler.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,15 +16,16 @@
package org.mc4j.ems.connection.support.classloader.deepjar;
-import org.mc4j.ems.connection.support.classloader.NestedJarClassLoader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.net.URLStreamHandler;
-import java.net.URLConnection;
-import java.net.URL;
-import java.io.IOException;
-import java.io.InputStream;
+import org.mc4j.ems.connection.support.classloader.NestedJarClassLoader;
/**
* @author Greg Hinkle (gh...@us...), May 9, 2005
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/AbstractConnectionTypeDescriptor.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/AbstractConnectionTypeDescriptor.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/AbstractConnectionTypeDescriptor.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,18 +16,18 @@
package org.mc4j.ems.connection.support.metadata;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.File;
import java.io.IOException;
-import java.util.jar.JarFile;
-import java.util.jar.Attributes;
+import java.net.MalformedURLException;
+import java.util.Iterator;
import java.util.Map;
-import java.util.Iterator;
import java.util.Properties;
-import java.net.MalformedURLException;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* @author Greg Hinkle (gh...@us...), Sep 30, 2004
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/JBossConnectionTypeDescriptor.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/JBossConnectionTypeDescriptor.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/JBossConnectionTypeDescriptor.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,10 +16,11 @@
package org.mc4j.ems.connection.support.metadata;
-import javax.naming.Context;
import java.util.Properties;
+import javax.naming.Context;
+
/**
* @author Greg Hinkle (gh...@us...), Sep 30, 2004
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/store/CompleteValueHistory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/store/CompleteValueHistory.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/store/CompleteValueHistory.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,9 +16,9 @@
package org.mc4j.ems.store;
+import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
-import java.util.LinkedList;
-import java.util.Collections;
/**
* @author Greg Hinkle (gh...@us...), Apr 6, 2005
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Greg Hinkle
+ * Copyright 2002-2011 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,11 +13,31 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.mc4j.ems.impl.jmx.connection;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
+import javax.management.OperationsException;
+import javax.management.QueryExp;
+import javax.management.ReflectionException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.mc4j.ems.connection.ConnectionTracker;
import org.mc4j.ems.connection.EmsConnection;
import org.mc4j.ems.connection.EmsException;
@@ -31,24 +51,6 @@
import org.mc4j.ems.impl.jmx.connection.bean.DMBean;
import org.mc4j.ems.impl.jmx.connection.support.providers.AbstractConnectionProvider;
-import javax.management.MBeanException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectInstance;
-import javax.management.ObjectName;
-import javax.management.OperationsException;
-import javax.management.QueryExp;
-import javax.management.ReflectionException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.Comparator;
-
/**
* TODO GH: Decide exception handling strategy (runtime?)
*
@@ -62,7 +64,6 @@
protected String connectionName;
protected AbstractConnectionProvider connectionProvider;
-
protected SortedMap<DObjectName, EmsBean> beanMap;
protected boolean loaded;
@@ -89,7 +90,6 @@
return null;
}
-
public void refresh() {
try {
loadSynchronous(false);
@@ -119,29 +119,25 @@
objectNames = server.queryNames(null,null);
}*/
-
- /**
- * Does a *:* load of all MBean names. Puts them in a list
- *
- * @param deep
- */
@SuppressWarnings({"unchecked"})
public synchronized void loadSynchronous(boolean deep) {
if (!connectionProvider.isConnected())
connectionProvider.connect();
- log.info("Querying MBeanServer for all MBeans");
+ log.info("Querying MBeanServer for all MBeans...");
+ MBeanServer mBeanServer = connectionProvider.getMBeanServer();
Set<ObjectName> objectNames = null;
try {
- objectNames = (Set<ObjectName>) connectionProvider.getMBeanServer().queryNames(new ObjectName("*:*"), null);
+ objectNames = (Set<ObjectName>) mBeanServer.queryNames(new ObjectName("*:*"), null);
} catch (MalformedObjectNameException e) { /* Should never happen */ }
SortedMap<ObjectName, DMBean> retrievedBeansMap = new TreeMap<ObjectName, DMBean>(new ObjectNameComparator());
- if (!loaded)
- log.info("Found " + objectNames.size() + " MBeans, starting load");
+ if (!loaded) {
+ log.info("Found " + objectNames.size() + " MBeans - starting load...");
+ }
Set<DObjectName> currentKeys = new HashSet<DObjectName>(this.beanMap.keySet());
@@ -149,7 +145,7 @@
// TODO: We're loading the beans on every run here i think... only load it if its not in the beanMap
- DMBean bean = mapBean(connectionProvider, objectName, deep);
+ DMBean bean = mapBean(objectName, deep);
retrievedBeansMap.put(objectName, bean);
}
@@ -168,11 +164,18 @@
}
}
-// if (false)
-// log.debug("Added " + newBeans.size() + " and removed " + removedBeans.size());
+ if (loaded && log.isDebugEnabled()) {
+ log.debug("Added " + newBeans.size() + " and removed " + removedBeans.size() + " since previous load.");
+ }
+
loaded = true;
fireRegistrationEvent(newBeans, removedBeans);
+ }
+ public void unload() {
+ for (EmsBean bean : beanMap.values()) {
+ bean.unload();
+ }
}
static boolean isJMX12 = false;
@@ -185,11 +188,11 @@
}
}
- private DMBean mapBean(ConnectionProvider provider, ObjectName objectName, boolean loadSynchronous) {
+ private DMBean mapBean(ObjectName objectName, boolean loadSynchronous) {
DMBean bean = null;
DObjectName dObjectName = new DObjectName(objectName);
- // If the bean is unkown to the internal map, create our local representation and add it
+ // If the bean is unknown to the internal map, create our local representation and add it
synchronized (this) {
if (!this.beanMap.keySet().contains(dObjectName)) {
if (isJMX12) {
@@ -201,8 +204,8 @@
}
}
- // If the bean was just created then optional load its metadata syncrhonously
- // Do this outside the syncrhonized block
+ // If the bean was just created then optional load its metadata synchronously
+ // Do this outside the synchronized block
if (bean != null && loadSynchronous) {
try {
bean.loadSynchronous();
@@ -306,7 +309,7 @@
List<EmsBean> results = new ArrayList<EmsBean>();
for (ObjectName name : objectNames) {
- results.add(mapBean(connectionProvider, name, false));
+ results.add(mapBean(name, false));
}
return results;
}
@@ -338,7 +341,7 @@
try {
ObjectName objName = new ObjectName(objectName);
ObjectInstance instance = connectionProvider.getMBeanServer().createMBean(className, objName);
- return mapBean(connectionProvider, instance.getObjectName(), false);
+ return mapBean(instance.getObjectName(), false);
} catch (MBeanException e) {
e.printStackTrace();
throw new EmsException("Couldn't create MBean", e);
@@ -354,7 +357,7 @@
try {
ObjectName objName = new ObjectName(objectName);
ObjectInstance instance = connectionProvider.getMBeanServer().createMBean(className, objName, params, signature);
- return mapBean(connectionProvider, instance.getObjectName(), false);
+ return mapBean(instance.getObjectName(), false);
} catch (MBeanException e) {
e.printStackTrace();
throw new EmsException("Couldn't create MBean", e);
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/PooledConnectionTracker.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/PooledConnectionTracker.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/PooledConnectionTracker.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,13 +16,6 @@
package org.mc4j.ems.impl.jmx.connection;
-import org.mc4j.ems.connection.ConnectionTracker;
-import org.mc4j.ems.connection.bean.EmsBean;
-import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
-import org.mc4j.ems.impl.jmx.connection.bean.DMBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -31,6 +24,14 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.mc4j.ems.connection.ConnectionTracker;
+import org.mc4j.ems.connection.bean.EmsBean;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+import org.mc4j.ems.impl.jmx.connection.bean.DMBean;
+
/**
* @author Greg Hinkle (gh...@us...), Apr 12, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DAdvancedBean.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DAdvancedBean.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DAdvancedBean.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -15,13 +15,14 @@
*/
package org.mc4j.ems.impl.jmx.connection.bean;
-import org.mc4j.ems.impl.jmx.connection.support.providers.AbstractConnectionProvider;
+import java.lang.reflect.Method;
-import javax.management.ObjectName;
import javax.management.MBeanServer;
import javax.management.MBeanServerInvocationHandler;
-import java.lang.reflect.Method;
+import javax.management.ObjectName;
+import org.mc4j.ems.impl.jmx.connection.support.providers.AbstractConnectionProvider;
+
/**
* @author Greg Hinkle (gh...@us...), Nov 16, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -1,12 +1,13 @@
package org.mc4j.ems.impl.jmx.connection.bean;
-import org.mc4j.ems.connection.bean.EmsBeanName;
-import org.mc4j.ems.connection.EmsMalformedObjectNameException;
+import java.util.Map;
+import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-import java.util.Map;
+import org.mc4j.ems.connection.EmsMalformedObjectNameException;
+import org.mc4j.ems.connection.bean.EmsBeanName;
+
/**
* Created by IntelliJ IDEA.
* User: ghinkle
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 Greg Hinkle
+ * Copyright 2002-2011 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,34 +15,46 @@
*/
package org.mc4j.ems.impl.jmx.connection.bean;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanInfo;
+import javax.management.MBeanNotificationInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.mc4j.ems.connection.EmsBeanNotFoundException;
import org.mc4j.ems.connection.EmsUnsupportedTypeException;
import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.connection.bean.EmsBeanName;
-import org.mc4j.ems.connection.bean.parameter.EmsParameter;
import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.mc4j.ems.connection.bean.notification.EmsNotification;
import org.mc4j.ems.connection.bean.operation.EmsOperation;
+import org.mc4j.ems.connection.bean.parameter.EmsParameter;
import org.mc4j.ems.impl.jmx.connection.bean.attribute.DAttribute;
import org.mc4j.ems.impl.jmx.connection.bean.attribute.DUnkownAttribute;
import org.mc4j.ems.impl.jmx.connection.bean.notification.DNotification;
import org.mc4j.ems.impl.jmx.connection.bean.operation.DOperation;
import org.mc4j.ems.impl.jmx.connection.support.providers.AbstractConnectionProvider;
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanInfo;
-import javax.management.MBeanNotificationInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import java.util.*;
-
/**
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
@@ -62,7 +74,6 @@
private boolean unsupportedType = false;
protected boolean deleted = false;
-
private Map<String, EmsAttribute> attributes = new TreeMap<String, EmsAttribute>(String.CASE_INSENSITIVE_ORDER);
private Map<String, EmsOperation> operations = new TreeMap<String, EmsOperation>(String.CASE_INSENSITIVE_ORDER);
private Set<EmsOperation> allOperations = new TreeSet<EmsOperation>();
@@ -120,15 +131,8 @@
throw new UnsupportedOperationException("Proxies not supported pre-jmx 1.2");
}
- /**
- * Loads local representations of attributes, operations and notifications.
- * Current attribute values are not retrived.
- */
public synchronized void loadSynchronous() {
-
-
if (!loaded) {
- // TODO GH: Support loading twice to handle dynamic mbeans with changing descriptors?
try {
info = connectionProvider.getMBeanServer().getMBeanInfo(this.objectName);
@@ -162,7 +166,17 @@
loaded = true;
}
}
+ }
+ public void unload() {
+ if (loaded) {
+ loaded = false;
+ info = null;
+ attributes.clear();
+ operations.clear();
+ allOperations.clear();
+ notifications.clear();
+ }
}
public boolean isRegistered() {
@@ -198,7 +212,12 @@
if (info == null)
loadSynchronous();
- MBeanAttributeInfo[] infos = this.info.getAttributes();
+ MBeanAttributeInfo[] infos = new MBeanAttributeInfo[0];
+ try {
+ infos = this.info.getAttributes();
+ } catch (RuntimeException e) {
+ // If this throws an exception, there's a good chance our cached
+ }
// MUST be careful to only ask for types that we know we have
// otherwise the RMI call will fail and we will get no data.
@@ -402,7 +421,6 @@
otherBean.getObjectName().getCanonicalName());
}
-
public String toString() {
return this.getBeanName().toString();
}
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,38 +16,38 @@
package org.mc4j.ems.impl.jmx.connection.bean.attribute;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.mc4j.ems.connection.EmsException;
-import org.mc4j.ems.connection.bean.attribute.AttributeChangeEvent;
-import org.mc4j.ems.connection.bean.attribute.AttributeChangeListener;
-import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
-import org.mc4j.ems.impl.jmx.connection.bean.DMBean;
-import org.mc4j.ems.store.Value;
-import org.mc4j.ems.store.ValueHistory;
-import org.mc4j.ems.store.CompleteValueHistory;
-
-import javax.management.Attribute;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.ReflectionException;
-import javax.management.modelmbean.ModelMBeanAttributeInfo;
import java.io.NotSerializableException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.UndeclaredThrowableException;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Collections;
+import javax.management.Attribute;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
+import javax.management.ReflectionException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.mc4j.ems.connection.EmsException;
+import org.mc4j.ems.connection.bean.attribute.AttributeChangeEvent;
+import org.mc4j.ems.connection.bean.attribute.AttributeChangeListener;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+import org.mc4j.ems.impl.jmx.connection.bean.DMBean;
+import org.mc4j.ems.store.CompleteValueHistory;
+import org.mc4j.ems.store.ValueHistory;
+
/**
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/notification/DNotification.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/notification/DNotification.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/notification/DNotification.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,18 +16,29 @@
package org.mc4j.ems.impl.jmx.connection.bean.notification;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanNotificationInfo;
+import javax.management.Notification;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+
import org.mc4j.ems.connection.EmsBeanNotFoundException;
+import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.connection.bean.notification.EmsNotification;
import org.mc4j.ems.connection.bean.notification.EmsNotificationEvent;
import org.mc4j.ems.connection.bean.notification.EmsNotificationListener;
-import org.mc4j.ems.connection.bean.EmsBean;
import org.mc4j.ems.impl.jmx.connection.bean.DBeanName;
import org.mc4j.ems.impl.jmx.connection.bean.DMBean;
-import javax.management.*;
-import java.io.Serializable;
-import java.util.*;
-
/**
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/operation/DOperation.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/operation/DOperation.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/operation/DOperation.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,20 +16,19 @@
package org.mc4j.ems.impl.jmx.connection.bean.operation;
-import org.mc4j.ems.impl.jmx.connection.bean.DMBean;
-import org.mc4j.ems.impl.jmx.connection.bean.parameter.DParameter;
-import org.mc4j.ems.connection.bean.operation.EmsOperation;
-import org.mc4j.ems.connection.bean.parameter.EmsParameter;
-import org.mc4j.ems.connection.EmsInvocationException;
+import java.util.ArrayList;
+import java.util.List;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
import javax.management.ReflectionException;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
+import org.mc4j.ems.connection.EmsInvocationException;
+import org.mc4j.ems.connection.bean.operation.EmsOperation;
+import org.mc4j.ems.connection.bean.parameter.EmsParameter;
+import org.mc4j.ems.impl.jmx.connection.bean.DMBean;
+import org.mc4j.ems.impl.jmx.connection.bean.parameter.DParameter;
+
/**
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/parameter/DParameter.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/parameter/DParameter.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/parameter/DParameter.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,10 +16,10 @@
package org.mc4j.ems.impl.jmx.connection.bean.parameter;
+import javax.management.MBeanParameterInfo;
+
import org.mc4j.ems.connection.bean.parameter.EmsParameter;
-import javax.management.MBeanParameterInfo;
-
/**
* Created: Jul 20, 2005 1:12:14 AM
*
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 Greg Hinkle
+ * Copyright 2002-2011 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,19 +15,20 @@
*/
package org.mc4j.ems.impl.jmx.connection.support.providers;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Timer;
+
+import javax.management.MBeanServer;
+
+import org.mc4j.ems.connection.EmsConnectException;
import org.mc4j.ems.connection.EmsConnection;
-import org.mc4j.ems.connection.EmsConnectException;
import org.mc4j.ems.connection.settings.ConnectionSettings;
+import org.mc4j.ems.connection.support.ConnectionListener;
import org.mc4j.ems.connection.support.ConnectionProvider;
-import org.mc4j.ems.connection.support.ConnectionListener;
import org.mc4j.ems.impl.jmx.connection.DConnection;
import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.StatsProxy;
-import javax.management.MBeanServer;
-import java.util.Timer;
-import java.util.List;
-import java.util.ArrayList;
-
/**
* This Node is the abstract node representing a connection to a JMX Server.
*
@@ -81,18 +82,21 @@
return this.connected;
}
+ @Deprecated
public void setConnected(boolean connected) throws Exception {
-
- if (this.connected) {
+ if (connected) {
+ connect();
+ } else {
disconnect();
- } else {
- connect();
}
-
}
public final EmsConnection connect() {
+ if (existingConnection != null) {
+ // We were previously connected. Clear any cached data, since it could contain references to stale RMI stubs.
+ existingConnection.unload();
+ }
try {
doConnect();
@@ -103,7 +107,7 @@
}
if (existingConnection == null) {
- DConnection connection = new DConnection("unknown",this);
+ DConnection connection = new DConnection("unknown", this);
this.existingConnection = connection;
} else {
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -15,15 +15,16 @@
*/
package org.mc4j.ems.impl.jmx.connection.support.providers;
-import org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
import java.lang.management.ManagementFactory;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+import org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor;
+
/**
* Connect to the platform mbean server in the VM that EMS is running in.
*
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -15,23 +15,25 @@
*/
package org.mc4j.ems.impl.jmx.connection.support.providers;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.mc4j.ems.connection.ConnectionException;
-import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.GenericMBeanServerProxy;
-import org.mc4j.ems.impl.jmx.connection.support.providers.jaas.JBossCallbackHandler;
-import org.mc4j.ems.impl.jmx.connection.support.providers.jaas.JBossConfiguration;
+import java.util.Properties;
import javax.management.MBeanServer;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.NoInitialContextException;
+import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import javax.security.auth.login.Configuration;
-import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.mc4j.ems.connection.ConnectionException;
+import org.mc4j.ems.impl.jmx.connection.support.providers.jaas.JBossCallbackHandler;
+import org.mc4j.ems.impl.jmx.connection.support.providers.jaas.JBossConfiguration;
+import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.GenericMBeanServerProxy;
+
/**
* Represents a Connection to a JBoss JMX Server. This connection
* works against the JBoss RMI connector. If a principal and
@@ -84,6 +86,7 @@
if (this.proxy != null) {
// This is a reconnect
+ log.debug("Reconnecting to remote JBoss MBeanServer...");
this.proxy.setRemoteServer(rmiAdaptor);
} else {
this.proxy = new GenericMBeanServerProxy(rmiAdaptor);
@@ -115,7 +118,8 @@
// Try to be more helpful, indicating the reason we couldn't make the connection in this
// common case of missing libraries.
if (e.getCause() instanceof ClassNotFoundException) {
- throw new ConnectionException("Necessary classes not found for remote connection, check installation path configuration.",e.getCause());
+ throw new ConnectionException("Necessary classes not found for remote connection, check installation path configuration.",
+ e.getCause());
}
throw e;
}
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java 2011-09-13 16:50:12 UTC (rev 628)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java 2011-10-28 21:44:26 UTC (rev 629)
@@ -16,11 +16,16 @@
package org.mc4j.ems.impl.jmx.connection.support.providers;
-import org.mc4j.ems.connection.EmsConnectException;
-import org.mc4j.ems.connection.EmsException;
-import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.JMXRemotingMBeanServerProxy;
-import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.JSR77ManagementMBeanServerProxy;
-import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.StatsProxy;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
import javax.management.MBeanServer;
import javax.management.MBeanServerConnection;
@@ -35,17 +40,13 @@
import javax.naming.NamingException;
import javax.rmi.PortableRemoteObject;
import javax.rmi.ssl.SslRMIClientSocketFactory;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
+import org.mc4j.ems.connection.EmsConnectException;
+import org.mc4j.ems.connection.EmsException;
+import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.JMXRemotingMBeanServerProxy;
+import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.JSR77ManagementMBeanServerProxy;
+import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.StatsProxy;
+
/**
* Represents a Connection to a JSR 160 compliant RMI server
*
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/LocalVMProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems...
[truncated message content] |
|
From: <ian...@us...> - 2011-09-13 16:50:18
|
Revision: 628
http://mc4j.svn.sourceforge.net/mc4j/?rev=628&view=rev
Author: ianpspringer
Date: 2011-09-13 16:50:12 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
create tag for EMS 1.2.16
Added Paths:
-----------
tags/ems_1_2_16/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2011-09-13 16:47:10
|
Revision: 627
http://mc4j.svn.sourceforge.net/mc4j/?rev=627&view=rev
Author: ianpspringer
Date: 2011-09-13 16:47:02 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
do our best to make sure methods being invoked reflectively on the MBeanServer are accessible; this solves an IllegalAccessException that was occurring when trying to invoke the 'queryNames' method on a JBoss AS 6.0 MBeanServer; see https://bugzilla.redhat.com/show_bug.cgi?id=738031 for more details
Modified Paths:
--------------
trunk/mc4j/MC4JProject.ipr
trunk/mc4j/MC4JProject.iws
trunk/mc4j/modules/ems/build.xml
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVMFinder.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java
Modified: trunk/mc4j/MC4JProject.ipr
===================================================================
--- trunk/mc4j/MC4JProject.ipr 2010-09-27 19:20:47 UTC (rev 626)
+++ trunk/mc4j/MC4JProject.ipr 2011-09-13 16:47:02 UTC (rev 627)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="true" version="4">
+<project version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
<buildFile url="file://$PROJECT_DIR$/build.xml">
@@ -42,6 +42,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</value>
</option>
<ADDITIONAL_INDENT_OPTIONS fileType="groovy">
@@ -52,6 +53,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="gsp">
<option name="INDENT_SIZE" value="2" />
@@ -61,6 +63,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="java">
<option name="INDENT_SIZE" value="4" />
@@ -70,6 +73,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="js">
<option name="INDENT_SIZE" value="4" />
@@ -79,6 +83,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="jsp">
<option name="INDENT_SIZE" value="4" />
@@ -88,7 +93,18 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="php">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="sql">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
@@ -97,6 +113,7 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="xml">
<option name="INDENT_SIZE" value="4" />
@@ -106,7 +123,18 @@
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="yml">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
@@ -120,7 +148,6 @@
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
- <option name="DEPLOY_AFTER_MAKE" value="0" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html)" />
<entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -134,6 +161,7 @@
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
</wildcardResourcePatterns>
+ <annotationProcessing enabled="false" useClasspath="true" />
</component>
<component name="CopyrightManager" default="">
<module2copyright />
@@ -145,11 +173,8 @@
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
<component name="EclipseCompilerSettings">
- <option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
<option name="DEPRECATION" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="EclipseEmbeddedCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
@@ -175,9 +200,6 @@
</component>
<component name="IdProvider" IDEtalkID="C140C6D456661C4C2FD16D8C7971265F" />
<component name="InspectionProjectProfileManager">
- <option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_PROFILE" value="true" />
- <version value="1.0" />
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
@@ -210,6 +232,8 @@
</option>
<option name="IGNORE_DEPRECATED" value="false" />
<option name="IGNORE_JAVADOC_PERIOD" value="true" />
+ <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+ <option name="IGNORE_POINT_TO_ITSELF" value="false" />
<option name="myAdditionalJavadocTags" value="hq-equiv" />
</inspection_tool>
<inspection_tool class="JavadocReference" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -221,22 +245,23 @@
<inspection_tool class="UnnecessaryReturn" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
</profiles>
- <list size="4">
- <item index="0" class="java.lang.String" itemvalue="INFO" />
- <item index="1" class="java.lang.String" itemvalue="WARNING" />
- <item index="2" class="java.lang.String" itemvalue="ERROR" />
- <item index="3" class="java.lang.String" itemvalue="SERVER PROBLEM" />
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
+ <list size="6">
+ <item index="0" class="java.lang.String" itemvalue="WEAK WARNING" />
+ <item index="1" class="java.lang.String" itemvalue="INFO" />
+ <item index="2" class="java.lang.String" itemvalue="TYPO" />
+ <item index="3" class="java.lang.String" itemvalue="WARNING" />
+ <item index="4" class="java.lang.String" itemvalue="ERROR" />
+ <item index="5" class="java.lang.String" itemvalue="SERVER PROBLEM" />
</list>
</component>
<component name="JUnitProjectSettings">
<option name="TEST_RUNNER" value="UI" />
</component>
<component name="JavacSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="DEPRECATION" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="-O" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" />
@@ -255,14 +280,6 @@
<option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
- <component name="JikesSettings">
- <option name="JIKES_PATH" value="" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="DEPRECATION" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="IS_EMACS_ERRORS_MODE" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
<component name="LogConsolePreferences">
<option name="FILTER_ERRORS" value="false" />
<option name="FILTER_WARNINGS" value="false" />
@@ -393,7 +410,18 @@
<component name="ProjectDetails">
<option name="projectName" value="MC4JProject" />
</component>
- <component name="ProjectFileVersion" converted="true" />
+ <component name="ProjectDictionaryState">
+ <dictionary name="ips">
+ <words>
+ <w>attribute's</w>
+ <w>classloader's</w>
+ <w>deserialize</w>
+ <w>hinkle</w>
+ <w>unregister</w>
+ <w>unregisters</w>
+ </words>
+ </dictionary>
+ </component>
<component name="ProjectKey">
<option name="state" value="https://mc4j.svn.sourceforge.net/svnroot/mc4j/trunk/mc4j/MC4JProject.ipr" />
</component>
@@ -403,7 +431,10 @@
<module fileurl="file://$PROJECT_DIR$/modules/ems/ems.iml" filepath="$PROJECT_DIR$/modules/ems/ems.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK" />
+ <component name="ProjectResources">
+ <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK" />
<component name="ResourceManagerContainer">
<option name="myResourceBundles">
<value>
@@ -411,13 +442,6 @@
</value>
</option>
</component>
- <component name="RmicSettings">
- <option name="IS_EANABLED" value="false" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="GENERATE_IIOP_STUBS" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
<component name="SvnBranchConfigurationManager">
<option name="myConfigurationMap">
<map>
@@ -603,21 +627,13 @@
</Base>
</component>
<component name="libraryTable">
- <library name="UtilConcurrent">
+ <library name="Carbon">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/common/utilConcurrent1.3.2.jar!/" />
+ <root url="jar://$USER_HOME$/carbon/carbon/jars/carbon-core.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
- <library name="JDMK">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/jmxri.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/sun_jmx_remoting.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
<library name="JBoss">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/jboss/jboss-client.jar!/" />
@@ -634,14 +650,32 @@
<JAVADOC />
<SOURCES />
</library>
- <library name="MX4J">
+ <library name="JDMK">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/mx4j/mx4j-jmx-1.1.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/mx4j/mx4j-tools-1.1.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jmxri.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/sun_jmx_remoting.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
+ <library name="JFreeChart">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/common/jfreechart-0.9.18.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/common/jcommon-0.9.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="file://$USER_HOME$/temp/jfreechart-0.9.18/src" />
+ </SOURCES>
+ </library>
+ <library name="JGraph">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/common/jgraph.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/common/jgraphaddons.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
<library name="JMX Remoting RI">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/jsr160/jmxremote.jar!/" />
@@ -651,15 +685,13 @@
<JAVADOC />
<SOURCES />
</library>
- <library name="JFreeChart">
+ <library name="MX4J">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/common/jfreechart-0.9.18.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/common/jcommon-0.9.3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/mx4j/mx4j-jmx-1.1.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/mx4j/mx4j-tools-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="file://$PROJECT_DIR$/../../temp/jfreechart-0.9.18/src" />
- </SOURCES>
+ <SOURCES />
</library>
<library name="NetBeans">
<CLASSES>
@@ -699,21 +731,6 @@
<JAVADOC />
<SOURCES />
</library>
- <library name="Carbon">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../carbon/carbon/jars/carbon-core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- <library name="JGraph">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/common/jgraph.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/common/jgraphaddons.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
<library name="Netbeans4">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../application/mc4j/modules/mc4j_core.jar!/" />
@@ -751,6 +768,13 @@
<root url="file://E:/src/netbeans-src/core/ui/src" />
</SOURCES>
</library>
+ <library name="UtilConcurrent">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/common/utilConcurrent1.3.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
</component>
<component name="simpleUML.UMLToolWindowPlugin">
<General>
Modified: trunk/mc4j/MC4JProject.iws
===================================================================
--- trunk/mc4j/MC4JProject.iws 2010-09-27 19:20:47 UTC (rev 626)
+++ trunk/mc4j/MC4JProject.iws 2011-09-13 16:47:02 UTC (rev 627)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="true" version="4">
+<project version="4">
+ <component name="BookmarkManager">
+ <bookmark url="file://$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBeanName.java" />
+ </component>
<component name="BuildServerSettings">
<option name="USER_ID" value="-1" />
<option name="SERVER_URL" value="http://buildserver" />
@@ -37,15 +40,16 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="d2c3a4f5-2ade-4c0b-9c66-cd2e25e3b030" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java" afterPath="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/MC4JProject.ipr" afterPath="$PROJECT_DIR$/MC4JProject.ipr" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java" afterPath="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ems/build.xml" afterPath="$PROJECT_DIR$/modules/ems/build.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/MC4JProject.iws" afterPath="$PROJECT_DIR$/MC4JProject.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ems/ems.iml" afterPath="$PROJECT_DIR$/modules/ems/ems.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/LocalVMProvider.java" afterPath="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/LocalVMProvider.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MC4J.iml" afterPath="$PROJECT_DIR$/MC4J.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java" afterPath="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVMFinder.java" afterPath="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVMFinder.java" />
</list>
+ <option name="TRACKING_ENABLED" value="true" />
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="Commander">
@@ -66,51 +70,16 @@
<option name="REVERSE_PATCH" value="false" />
</component>
<component name="Cvs2Configuration">
- <option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
- <option name="MERGING_MODE" value="0" />
<option name="MERGE_WITH_BRANCH1_NAME" value="ems_module_separation" />
- <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" />
- <option name="RESET_STICKY" value="false" />
- <option name="CREATE_NEW_DIRECTORIES" value="true" />
- <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" />
- <option name="PROCESS_UNKNOWN_FILES" value="false" />
- <option name="PROCESS_DELETED_FILES" value="false" />
- <option name="PROCESS_IGNORED_FILES" value="false" />
<option name="RESERVED_EDIT" value="true" />
- <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS">
- <value>
- <option name="BRANCH" value="" />
- <option name="DATE" value="" />
- <option name="USE_BRANCH" value="false" />
- <option name="USE_DATE" value="false" />
- </value>
- </option>
- <option name="UPDATE_DATE_OR_REVISION_SETTINGS">
- <value>
- <option name="BRANCH" value="" />
- <option name="DATE" value="" />
- <option name="USE_BRANCH" value="false" />
- <option name="USE_DATE" value="false" />
- </value>
- </option>
<option name="SHOW_CHANGES_REVISION_SETTINGS">
- <value>
+ <DateOrRevisionSettings>
<option name="BRANCH" value="mc4j1_2_b3" />
- <option name="DATE" value="" />
<option name="USE_BRANCH" value="true" />
- <option name="USE_DATE" value="false" />
- </value>
+ </DateOrRevisionSettings>
</option>
<option name="SHOW_OUTPUT" value="true" />
- <option name="ADD_WATCH_INDEX" value="0" />
- <option name="REMOVE_WATCH_INDEX" value="0" />
<option name="UPDATE_KEYWORD_SUBSTITUTION" value="NONE" />
- <option name="MAKE_NEW_FILES_READONLY" value="false" />
- <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" />
- <option name="TAG_AFTER_PROJECT_COMMIT" value="false" />
- <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" />
- <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" />
- <option name="CLEAN_COPY" value="false" />
</component>
<component name="CvsConfiguration">
<cvs_root>
@@ -182,7 +151,7 @@
<option name="NON_RECURSIVE" value="false" />
<option name="FORCE_RECURSIVE" value="false" />
</Editors>
- <option name="CLIENT_PATH" value="$PROJECT_DIR$/../../Program Files/GNU/WinCvs 1.3/CVSNT/cvs.exe" />
+ <option name="CLIENT_PATH" value="$USER_HOME$/Program Files/GNU/WinCvs 1.3/CVSNT/cvs.exe" />
<option name="EXTERNAL_DIFF_PATH" value="" />
<option name="USE_EXTERNAL_DIFF" value="false" />
<option name="WORKING_FILES_READONLY" value="false" />
@@ -261,7 +230,7 @@
<option name="INVERSE_CLASS_FILLTERS" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/../../src/netbeans-src/openide/src/org/openide/windows/TopComponent.java" line="422">
+ <breakpoint url="file://$USER_HOME$/src/netbeans-src/openide/src/org/openide/windows/TopComponent.java" line="422">
<option name="ENABLED" value="false" />
<option name="SUSPEND_VM" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
@@ -275,7 +244,7 @@
<option name="INVERSE_CLASS_FILLTERS" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/../../src/netbeans-src/openide/src/org/openide/windows/TopComponent.java" line="282">
+ <breakpoint url="file://$USER_HOME$/src/netbeans-src/openide/src/org/openide/windows/TopComponent.java" line="282">
<option name="ENABLED" value="false" />
<option name="SUSPEND_VM" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
@@ -605,6 +574,19 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java" line="116" class="org.mc4j.ems.impl.jmx.connection.support.providers.JBossConnectionProvider" package="org.mc4j.ems.impl.jmx.connection.support.providers">
+ <option name="ENABLED" value="true" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
</line_breakpoints>
<breakpoint_any>
<breakpoint>
@@ -717,10 +699,6 @@
<component name="EjbViewSettings">
<EjbView showMembers="false" autoscrollToSource="false" />
</component>
- <component name="ErrorTreeViewConfiguration">
- <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="HIDE_WARNINGS" value="false" />
- </component>
<component name="FavoritesManager">
<favorites_list name="MC4JProject" />
</component>
@@ -747,139 +725,122 @@
</favorites_list>
<option name="myCurrentFavoritesList" value="MC4JProject" />
</component>
- <component name="FileColors" enabled="false" enabledForTabs="false" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="LocalVMProvider.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/LocalVMProvider.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="17" column="0" selection-start="663" selection-end="663" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="JBossConnectionProvider.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="107" column="20" selection-start="4786" selection-end="4786" vertical-scroll-proportion="0.0">
+ <state line="176" column="16" selection-start="7197" selection-end="7197" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WeblogicConnectionProvider.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WeblogicConnectionProvider.java">
+ <file leaf-file-name="GenericMBeanServerProxy.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1181" selection-end="1181" vertical-scroll-proportion="0.0">
- <folding />
+ <state line="212" column="22" selection-start="8859" selection-end="8859" vertical-scroll-proportion="4.6971936">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Context.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://$PROJECT_DIR$/../../opt/jdk-1.5.0_19/src.zip!/javax/naming/Context.java">
+ <file leaf-file-name="JMXRemotingMBeanServerProxy.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/JMXRemotingMBeanServerProxy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="829" column="11" selection-start="34798" selection-end="34798" vertical-scroll-proportion="0.0">
+ <state line="32" column="13" selection-start="1115" selection-end="1115" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Configuration.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://$PROJECT_DIR$/../../opt/jdk-1.6.0_14/src.zip!/javax/security/auth/login/Configuration.java">
+ <file leaf-file-name="JSR77ManagementMBeanServerProxy.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/JSR77ManagementMBeanServerProxy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="283" column="23" selection-start="10909" selection-end="10909" vertical-scroll-proportion="0.0">
+ <state line="30" column="13" selection-start="1056" selection-end="1056" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="JBossCallbackHandler.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/jaas/JBossCallbackHandler.java">
+ <file leaf-file-name="StatsProxy.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/StatsProxy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="13" selection-start="781" selection-end="781" vertical-scroll-proportion="0.0">
+ <state line="26" column="17" selection-start="1023" selection-end="1023" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="JBossConfiguration.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/jaas/JBossConfiguration.java">
+ <file leaf-file-name="NoSuchMethodException.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar:///usr/java/jdk1.6.0_25/src.zip!/java/lang/NoSuchMethodException.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="15" selection-start="2015" selection-end="2015" vertical-scroll-proportion="1.271261">
+ <state line="17" column="6" selection-start="333" selection-end="333" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Configuration.java" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://$PROJECT_DIR$/../../opt/jdk-1.5.0_19/src.zip!/javax/security/auth/login/Configuration.java">
+ <file leaf-file-name="Class.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar:///usr/java/jdk1.6.0_25/src.zip!/java/lang/Class.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="151" column="22" selection-start="6675" selection-end="6675" vertical-scroll-proportion="0.0">
+ <state line="1597" column="46" selection-start="66147" selection-end="66147" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ConnectionSettings.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java">
+ <file leaf-file-name="SecurityException.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar:///usr/java/jdk1.6.0_25/src.zip!/java/lang/SecurityException.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="220" column="18" selection-start="6536" selection-end="6536" vertical-scroll-proportion="0.0">
+ <state line="16" column="13" selection-start="378" selection-end="378" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ConnectionTypeDescriptor.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/ConnectionTypeDescriptor.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="37" column="0" selection-start="1254" selection-end="1254" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="JBossConnectionTypeDescriptor.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/JBossConnectionTypeDescriptor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="18" selection-start="1434" selection-end="1434" vertical-scroll-proportion="0.0">
+ <state line="81" column="46" selection-start="2216" selection-end="2216" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="GenericMBeanServerProxy.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java">
+ <file leaf-file-name="ClassLoaderFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="3" selection-start="601" selection-end="601" vertical-scroll-proportion="0.0">
+ <state line="185" column="32" selection-start="6985" selection-end="6985" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AbstractConnectionProvider.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java">
+ <file leaf-file-name="ConnectionFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="22" selection-start="1466" selection-end="1466" vertical-scroll-proportion="0.0">
+ <state line="131" column="26" selection-start="6439" selection-end="6439" vertical-scroll-proportion="-11.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="EmsConnection.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/EmsConnection.java">
+ <file leaf-file-name="ConnectionNode.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/org/mc4j/console/connection/ConnectionNode.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="17" selection-start="1052" selection-end="1052" vertical-scroll-proportion="0.0">
+ <state line="392" column="49" selection-start="13896" selection-end="13896" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DConnection.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java">
+ <file leaf-file-name="ConnectionTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/ems/src/test/org/mc4j/ems/test/ConnectionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="262" column="69" selection-start="9377" selection-end="9377" vertical-scroll-proportion="0.0">
+ <state line="56" column="16" selection-start="1888" selection-end="1888" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -892,6 +853,10 @@
<setting name="OPEN_NEW_TAB" value="false" />
</FindUsagesManager>
</component>
+ <component name="Git.Settings">
+ <option name="GIT_EXECUTABLE" value="/usr/bin/git" />
+ <option name="CHECKOUT_INCLUDE_TAGS" value="false" />
+ </component>
<component name="HierarchyBrowserManager">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="SORT_ALPHABETICALLY" value="false" />
@@ -903,13 +868,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/helper/NamePasswordCallbackHandler.java" />
- <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/jaas/jboss-auth.conf" />
- <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/jaas/JBossCallbackHandler.java" />
- <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/LocalVMProvider.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/bean/parameter/EmsParameter.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotification.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBeanName.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DAdvancedBean.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/bean/attribute/EmsAttribute.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WeblogicConnectionProvider.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java" />
+ <option value="$PROJECT_DIR$/modules/ems/src/ems/org/mc4j/ems/connection/local/LocalVMFinder.java" />
<option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/proxy/GenericMBeanServerProxy.java" />
- <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java" />
- <option value="$PROJECT_DIR$/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/jaas/JBossConfiguration.java" />
</list>
</option>
</component>
@@ -930,6 +904,9 @@
<option name="ADD_LABEL_ON_UNIT_TEST" value="true" />
<option name="MARK_EXTERNAL_CHANGES_AS_UP_TO_DATE" value="true" />
</component>
+ <component name="MavenProjectNavigator">
+ <treeState />
+ </component>
<component name="ModuleEditorState">
<option name="LAST_EDITED_MODULE_NAME" value="MC4J" />
<option name="LAST_EDITED_TAB_NAME" value="Paths" />
@@ -974,7 +951,7 @@
<profile-state />
</entry>
</component>
- <component name="ProjectLevelVcsManager">
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkin" />
@@ -1495,7 +1472,7 @@
</subPane>
</component>
<component name="ProjectReloadState">
- <option name="STATE" value="2" />
+ <option name="STATE" value="0" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
@@ -1509,6 +1486,987 @@
<autoscrollFromSource PackagesPane="true" ProjectPane="true" />
<sortByType />
</navigator>
+ <panes>
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
+ <pane id="ProjectPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="< 1.6 >" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="< 1.6 >" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="rt.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="< 1.6 >" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="rt.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="javax" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="< 1.6 >" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="rt.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="javax" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="management" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="< 1.6 >" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="rt.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="< 1.6 >" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="rt.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="lang" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="< 1.6 >" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="rt.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="lang" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="reflect" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="connection" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ems" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ems" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ems" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ems-impl" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="connection" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MC4JProject" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mc4j" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ems" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" ...
[truncated message content] |
|
From: <ian...@us...> - 2010-09-27 19:20:53
|
Revision: 626
http://mc4j.svn.sourceforge.net/mc4j/?rev=626&view=rev
Author: ianpspringer
Date: 2010-09-27 19:20:47 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
branch for EMS used by EAP 5.1.x admin console
Added Paths:
-----------
branches/AdminConsole_EAP_5_1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2010-08-19 17:43:16
|
Revision: 625
http://mc4j.svn.sourceforge.net/mc4j/?rev=625&view=rev
Author: ianpspringer
Date: 2010-08-19 17:43:10 +0000 (Thu, 19 Aug 2010)
Log Message:
-----------
tag EMS 1.2.15.1
Added Paths:
-----------
tags/ems_1_2_15_1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2010-08-19 17:41:59
|
Revision: 624
http://mc4j.svn.sourceforge.net/mc4j/?rev=624&view=rev
Author: ianpspringer
Date: 2010-08-19 17:41:52 +0000 (Thu, 19 Aug 2010)
Log Message:
-----------
bump version to 1.2.15.1 (note: this version has no actual changes from 1.2.15 - I'm only bumping it so I can republish Hudson-generated artifacts to the JBoss Maven repo)
Modified Paths:
--------------
trunk/mc4j/modules/ems/build.xml
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2010-08-17 22:42:26 UTC (rev 623)
+++ trunk/mc4j/modules/ems/build.xml 2010-08-19 17:41:52 UTC (rev 624)
@@ -29,7 +29,7 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.15"/>
+ <property name="release.version" value="1.2.15.1"/>
<target name="init" description="Initializes the MC4J-EMS build system.">
@@ -260,7 +260,7 @@
<env key="JAVA_HOME" value="c:\jdk1.6.0"/>
- <!-- Under 1.5 JRE's this will start up the built-in jmxremoting support -->
+ <!-- Under 1.5 JRE's, this will start up the built-in jmxremoting support -->
<sysproperty key="com.sun.management.jmxremote.port" value="9777"/>
<sysproperty key="com.sun.management.jmxremote.ssl" value="false"/>
<sysproperty key="com.sun.management.jmxremote.authenticate" value="false"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2010-08-17 22:42:32
|
Revision: 623
http://mc4j.svn.sourceforge.net/mc4j/?rev=623&view=rev
Author: ianpspringer
Date: 2010-08-17 22:42:26 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
tag EMS 1.2.15
Added Paths:
-----------
tags/ems_1_2_15/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2010-08-17 22:41:11
|
Revision: 622
http://mc4j.svn.sourceforge.net/mc4j/?rev=622&view=rev
Author: ianpspringer
Date: 2010-08-17 22:41:04 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
wrap a couple calls in doPrivileged blocks so EMS will work when Java security is enabled, as long as the callers have the appropriate permissions; bump up EMS version to 1.2.15
Modified Paths:
--------------
trunk/mc4j/modules/ems/build.xml
trunk/mc4j/modules/ems/ems.iml
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WeblogicConnectionProvider.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2010-08-02 19:04:59 UTC (rev 621)
+++ trunk/mc4j/modules/ems/build.xml 2010-08-17 22:41:04 UTC (rev 622)
@@ -29,12 +29,10 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.14"/>
+ <property name="release.version" value="1.2.15"/>
- <target
- name="init"
- description="Initializes the mc4j-ems build system.">
+ <target name="init" description="Initializes the MC4J-EMS build system.">
<echo message="MC4J-EMS Build Environment - Try [ant -projecthelp] for more info."/>
@@ -236,18 +234,20 @@
</java>
</target>
+
<target name="test-OTHER">
<java classname="org.mc4j.ems.test.ConnectionTest" fork="yes">
<classpath>
<pathelement location="dist/org-mc4j-ems.jar"/>
<pathelement location="lib/commons-logging.jar"/>
<pathelement location="classes/test"/>
- <pathelement location="C:\projects\jboss\JON_DEV_1_4\hyperic_hq\thirdparty\lib\log4j.jard"/>
+ <pathelement location="C:\projects\jboss\JON_DEV_1_4\hyperic_hq\thirdparty\lib\log4j.jar"/>
<!--<path location="/Users/ghinkle/development/tools/jboss-4.0.2/server/default/lib/jboss-jsr77.jar"/>-->
</classpath>
</java>
</target>
+
<target name="run" description="Directly starts MC4J with the settings as the installer would use.">
<echo>Starting MC4J-EMS Test</echo>
<java
@@ -282,8 +282,8 @@
</java>
</target>
- <target name="all-test" depends="compile, jars, run" description="Compile and run the tests.">
- </target>
+ <target name="all-test" depends="compile, jars, run" description="Compile and run the tests."/>
</project>
+
Modified: trunk/mc4j/modules/ems/ems.iml
===================================================================
--- trunk/mc4j/modules/ems/ems.iml 2010-08-02 19:04:59 UTC (rev 621)
+++ trunk/mc4j/modules/ems/ems.iml 2010-08-17 22:41:04 UTC (rev 622)
@@ -36,7 +36,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../opt/jdk-1.6.0_07/lib/tools.jar!/" />
+ <root url="jar://$USER_HOME$/opt/jdk-1.6.0_07/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -45,7 +45,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../opt/jdk-1.6.0_14/lib/tools.jar!/" />
+ <root url="jar://$USER_HOME$/opt/jdk-1.6.0_14/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java 2010-08-02 19:04:59 UTC (rev 621)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/ConnectionFactory.java 2010-08-17 22:41:04 UTC (rev 622)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Greg Hinkle
+ * Copyright 2002-2010 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.mc4j.ems.connection;
import java.io.File;
import java.io.FileFilter;
import java.io.FilenameFilter;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -111,34 +112,35 @@
* @param connectionSettings the connection settings for the connection
* @return a ConnectionProvider that you can get live connection from.
*/
- public ConnectionProvider getConnectionProvider(ConnectionSettings connectionSettings)
+ public ConnectionProvider getConnectionProvider(final ConnectionSettings connectionSettings)
{
String className = connectionSettings.getConnectionType().getConnectionNodeClassName();
try {
-
// TODO GH: Does this need to be configurable per connection?
- ClassLoader loader = ClassLoaderFactory.getInstance().buildClassLoader(connectionSettings);
+ ClassLoader loader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ public ClassLoader run() {
+ return ClassLoaderFactory.getInstance().buildClassLoader(connectionSettings);
+ }
+ });
- log.debug("Loading connection class from ClassLoader [" + loader + "] ConnectionProvider class [" + className + "]");
+ log.debug("Loading connection class [" + className + "] from ClassLoader [" + loader + "]...");
// TODO GH: Add intelligent classloader layer here that can either work
// directly against current classloader or build a non-delegating child
// to override with connection specific classes
Class clazz = Class.forName(className, false, loader);
+ ConnectionProvider connectionProvider = (ConnectionProvider) clazz.newInstance();
- ConnectionProvider connectionProvider =
- (ConnectionProvider) clazz.newInstance();
-
connectionProvider.initialize(connectionSettings);
return connectionProvider;
} catch (IllegalAccessException e) {
- throw new ConnectionException("Could not access ConnectionClass", e);
+ throw new ConnectionException("Could not access ConnectionClass " + className, e);
} catch (InstantiationException e) {
- throw new ConnectionException("Could not instantiate ConnectionClass", e);
+ throw new ConnectionException("Could not instantiate ConnectionClass " + className, e);
} catch (ClassNotFoundException e) {
throw new ConnectionException("Could not find ConnectionClass " + className, e);
}
@@ -152,7 +154,7 @@
*/
public EmsConnection connect(ConnectionSettings connectionSettings) {
- log.info("Connecting to " + connectionSettings.toString());
+ log.info("Connecting to " + connectionSettings + "...");
return getConnectionProvider(connectionSettings).connect();
}
@@ -167,7 +169,7 @@
* first clear the settings' classpath entries. This method appends class path entries
* to the existing list.
*
- * @param connectionSettings the ConnectionSettings to update with recommeneded class
+ * @param connectionSettings the ConnectionSettings to update with recommended class
* path entries
*/
public void discoverServerClasses(ConnectionSettings connectionSettings) {
@@ -316,7 +318,7 @@
if (children.length == 1) {
return children[0];
} else {
- //log.info("Connection library dependancy [" + childName + "] not found in directory: " + directory.getAbsolutePath());
+ //log.info("Connection library dependency [" + childName + "] not found in directory: " + directory.getAbsolutePath());
return null;
}
}
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java 2010-08-02 19:04:59 UTC (rev 621)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/AbstractConnectionProvider.java 2010-08-17 22:41:04 UTC (rev 622)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Greg Hinkle
+ * Copyright 2002-2010 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.mc4j.ems.impl.jmx.connection.support.providers;
import org.mc4j.ems.connection.EmsConnection;
@@ -92,15 +91,15 @@
}
-
public final EmsConnection connect() {
try {
- doConnect();
+ doConnect();
+
this.connected = true;
this.connectionFailure = false;
} catch (Exception e) {
- throw new EmsConnectException("Could not connect [" + connectionSettings.getServerUrl() + "] " + e.toString(), e);
+ throw new EmsConnectException("Could not connect [" + connectionSettings.getServerUrl() + "] " + e, e);
}
if (existingConnection == null) {
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java 2010-08-02 19:04:59 UTC (rev 621)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/InternalVMProvider.java 2010-08-17 22:41:04 UTC (rev 622)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Greg Hinkle
+ * Copyright 2002-2010 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.mc4j.ems.impl.jmx.connection.support.providers;
import org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor;
@@ -21,6 +20,9 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import java.lang.management.ManagementFactory;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
/**
* Connect to the platform mbean server in the VM that EMS is running in.
@@ -45,12 +47,20 @@
MBeanServer foundServer = null;
if (mbeanSearch != null)
{
- for (Object mbs : MBeanServerFactory.findMBeanServer(null))
+ ArrayList mbeanServers = AccessController.doPrivileged(new PrivilegedAction<ArrayList>()
{
- if (mbeanSearch.equals(((MBeanServer)mbs).getDefaultDomain()))
+ public ArrayList run()
{
- foundServer = (MBeanServer) mbs;
+ return MBeanServerFactory.findMBeanServer(null);
}
+ });
+ for (Object mbeanServerObj : mbeanServers)
+ {
+ MBeanServer mbeanServer = (MBeanServer) mbeanServerObj;
+ if (mbeanSearch.equals(mbeanServer.getDefaultDomain()))
+ {
+ foundServer = mbeanServer;
+ }
}
}
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java 2010-08-02 19:04:59 UTC (rev 621)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java 2010-08-17 22:41:04 UTC (rev 622)
@@ -16,7 +16,6 @@
package org.mc4j.ems.impl.jmx.connection.support.providers;
-
import org.mc4j.ems.connection.EmsConnectException;
import org.mc4j.ems.connection.EmsException;
import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.JMXRemotingMBeanServerProxy;
@@ -47,7 +46,6 @@
import java.util.Map;
import java.util.Set;
-
/**
* Represents a Connection to a JSR 160 compliant RMI server
*
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WeblogicConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WeblogicConnectionProvider.java 2010-08-02 19:04:59 UTC (rev 621)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WeblogicConnectionProvider.java 2010-08-17 22:41:04 UTC (rev 622)
@@ -16,7 +16,6 @@
package org.mc4j.ems.impl.jmx.connection.support.providers;
-
import org.mc4j.ems.impl.jmx.connection.support.providers.proxy.GenericMBeanServerProxy;
import javax.management.MBeanServer;
@@ -25,7 +24,6 @@
import java.lang.reflect.Method;
import java.util.Hashtable;
-
/**
* This Node acts as a connection to a WebLogic(tm) MBean Server.
*
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java 2010-08-02 19:04:59 UTC (rev 621)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java 2010-08-17 22:41:04 UTC (rev 622)
@@ -27,7 +27,6 @@
import java.net.URI;
import java.util.Properties;
-
/**
* This Node acts as a connection to a WebSphere(tm) MBean Server (TMX4J based).
*
@@ -209,5 +208,4 @@
return statsProxy.getFailures();
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2010-08-02 19:05:05
|
Revision: 621
http://mc4j.svn.sourceforge.net/mc4j/?rev=621&view=rev
Author: ianpspringer
Date: 2010-08-02 19:04:59 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
tag for EMS 1.2.14
Added Paths:
-----------
tags/ems_1_2_14/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2010-08-02 19:03:12
|
Revision: 620
http://mc4j.svn.sourceforge.net/mc4j/?rev=620&view=rev
Author: ianpspringer
Date: 2010-08-02 19:03:05 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
always compile w/ source and target of 1.5, so generics will be understood when EMS classes are used by a project compiled using JDK 1.7; improve some javadocs; upgrade version to 1.2.14
Modified Paths:
--------------
trunk/mc4j/modules/ems/build.xml
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBeanName.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/attribute/EmsAttribute.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotification.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/operation/EmsOperation.java
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/parameter/EmsParameter.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/build.xml 2010-08-02 19:03:05 UTC (rev 620)
@@ -2,11 +2,10 @@
<!--
-
Author: Greg Hinkle
- Copyright 2002-2009 Greg Hinkle
+ Copyright 2002-2010 Greg Hinkle
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -30,7 +29,7 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.13"/>
+ <property name="release.version" value="1.2.14"/>
<target
@@ -67,11 +66,11 @@
property="installed.netbeans"/>
-<!--
+ <fail unless="jre15Available" message="JDK 1.5 or later is required to compile EMS."/>
<property name="compile.target" value="1.5"/>
<property name="compile.source" value="1.5"/>
--->
+<!--
<condition property="compile.target" value="jsr14">
<isset property="jre15Available"/>
</condition>
@@ -89,7 +88,7 @@
<condition property="compile.source" value="1.5">
<isset property="jre15Available"/>
</condition>
-
+-->
<echo message="Will compile with target [${compile.target}] and source [${compile.source}]"/>
</target>
@@ -204,6 +203,31 @@
<target name="dist" depends="jars" description="Build the EMS distribution"/>
+ <target name="install" depends="jars" description="Deploys the EMS JAR Files to the Local Maven Repo">
+ <property name="maven.repo.local" location="${user.home}/.m2/repository"/>
+ <property name="ems.artifact.dir" location="${maven.repo.local}/mc4j/org-mc4j-ems/${release.version}"/>
+ <mkdir dir="${ems.artifact.dir}"/>
+ <property name="ems-impl.artifact.dir" location="${maven.repo.local}/mc4j/org-mc4j-ems-impl/${release.version}"/>
+ <mkdir dir="${ems-impl.artifact.dir}"/>
+
+ <copy todir="${ems.artifact.dir}">
+ <fileset dir="dist">
+ <include name="org-mc4j-ems-${release.version}.jar"/>
+ <include name="org-mc4j-ems-${release.version}-sources.jar"/>
+ <include name="org-mc4j-ems-${release.version}-javadoc.jar"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${ems-impl.artifact.dir}">
+ <fileset dir="dist">
+ <include name="org-mc4j-ems-impl-${release.version}.jar"/>
+ <include name="org-mc4j-ems-impl-${release.version}-sources.jar"/>
+ <include name="org-mc4j-ems-impl-${release.version}-javadoc.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+
<target name="test-classloader" depends="dist">
<java classname="org.mc4j.ems.connection.support.classloader.NestedJarClassLoader" fork="yes">
<classpath>
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBean.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Greg Hinkle
+ * Copyright 2002-2010 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.mc4j.ems.connection.bean;
import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
@@ -25,27 +24,54 @@
import java.util.SortedSet;
/**
+ * An MBean.
+ *
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
*/
public interface EmsBean extends Comparable {
+ /**
+ * Returns the name of this MBean as an EmsBeanName (analogous to <tt>javax.management.ObjectName</tt>; never null.
+ *
+ * @return the name of this MBean as an EmsBeanName (analogous to <tt>javax.management.ObjectName</tt>; never null
+ */
EmsBeanName getBeanName();
+ /**
+ * Returns the connection provider that was used to load this MBean; never null.
+ *
+ * @return the connection provider that was used to load this MBean; never null
+ */
ConnectionProvider getConnectionProvider();
+ /**
+ * Returns a proxy for this MBean, typed to the specified interface (typically its MBean interface); never null.
+ * Example Usage:
+ * <code>
+ * FooMBean fooMBean = getProxy(FooMBean.class);
+ * </code>
+ *
+ * @param beanInterface the interface class that the proxy should implement
+ * @param <T> the interface that the proxy should implement
+ *
+ * @return a proxy for this MBean, typed to the specified interface (typically its MBean interface); never null
+ */
<T> T getProxy(Class<T> beanInterface);
void loadSynchronous() ;
- EmsAttribute getAttribute(String name);
-
+ /**
+ * Returns the set of all attributes for this MBean; never null.
+ *
+ * @return the set of all attributes for this MBean; never null
+ */
SortedSet<EmsAttribute> getAttributes();
-
/**
- * Refresh, from the server, all attribute values for an MBean
- * @return the List<EmsAttribute> attribute list
+ * Refresh, from the server, all attribute values for this MBean and return the set of attributes; never null.
+ *
+ * @return the list of all attributes, with updated values from the server; never null
*/
List<EmsAttribute> refreshAttributes();
@@ -54,36 +80,113 @@
* the requested list of attributes by name.
* This method can be used to load a group of attributes with a single
* server call. Attributes updated in this fashion do update their
- * internal representation and do fire events on the changes.
- * @param attributeNames the names of attributes to load.
- * @return the list of requested attribute objects updated
+ * internal representation and do fire events on the changes. Never null.
+ *
+ * @param names the names of attributes to load
+ *
+ * @return the list of requested attributes, with updated values from the server; never null
*/
- List<EmsAttribute> refreshAttributes(List<String> attributeNames);
+ List<EmsAttribute> refreshAttributes(List<String> names);
+ /**
+ * Returns the attribute with the specified name, or null if this MBean has no such attribute.
+ *
+ * @param name the attribute name
+ *
+ * @return the attribute with the specified name, or null if this MBean has no such attribute
+ */
+ EmsAttribute getAttribute(String name);
+
+ /**
+ * The fully qualified class name of this MBean's interface (e.g. "com.example.FooMBean"), as defined in its
+ * MBeanInfo.
+ *
+ * @return the name of this MBean's Java interface (e.g. "com.example.FooMBean"), as defined in its MBeanInfo
+ */
String getClassTypeName();
+ /**
+ * This MBean's interface class (e.g. com.example.FooMBean), as defined in its MBeanInfo.
+ *
+ * @return this MBean's interface class (e.g. com.example.FooMBean), as defined in its MBeanInfo
+ *
+ * @throws ClassNotFoundException if the MBean's interface class could not be found in our class loader
+ */
Class getClassType() throws ClassNotFoundException;
+ /**
+ * Returns the set of all operations for this MBean; never null.
+ *
+ * @return the set of all operations for this MBean; never null
+ */
+ SortedSet<EmsOperation> getOperations();
+
+ /**
+ * Returns an operation with the specified name, or null if this MBean has no such operations.
+ * <b>NOTE: </b> If the MBean has more than one operation defined with the specified name, the operation that is
+ * returned is indeterminate, which is why this method has been deprecated in favor of
+ * {@link #getOperation(String, Class[])}.
+ *
+ * @param name the operation name
+ *
+ * @return an operation with the specified name, or null if this MBean has no such operations
+ *
+ * @deprecated {@link #getOperation(String, Class[])} should be used instead
+ */
EmsOperation getOperation(String name);
- SortedSet<EmsOperation> getOperations();
+ /**
+ * Returns the operation with the specified name and parameter types, or null if this MBean has no such operation.
+ *
+ * @param name the operation name
+ * @param parameterTypes the operation parameter types
+ *
+ * @return the operation with the specified name and parameter types, or null if this MBean has no such operation
+ */
+ EmsOperation getOperation(String name, Class... parameterTypes);
+ /**
+ * Returns the set of all notifications for this MBean; never null.
+ *
+ * @return the set of all notifications for this MBean; never null
+ */
+ SortedSet<EmsNotification> getNotifications();
+
+ /**
+ * Returns the notification with the specified name, or null if this MBean has no such notification.
+ *
+ * @param name the notification name
+ *
+ * @return the notification with the specified name, or null if this MBean has no such notification
+ */
EmsNotification getNotification(String name);
- SortedSet<EmsNotification> getNotifications();
-
+ /**
+ * Unregisters this MBean from the server.
+ */
void unregister();
/**
- * This runs an live mbean server request to check that the
- * MBean represented by this bean is still registered.
+ * This sends a request to the server to check that this
+ * MBean is still registered on the server.
+ *
* @return true if the MBean is still registered in the MBeanServer
*/
boolean isRegistered();
+ /**
+ * Returns true if this MBean defines one or more notifications, otherwise returns false.
+ *
+ * @return true if this MBean defines one or more notifications, otherwise returns false
+ */
boolean isNotificationEmiter();
+ /**
+ * Returns true if this MBean has one or more attributes or operations with unsupported types, otherwise returns
+ * false.
+ *
+ * @return true if this MBean has one or more attributes or operations with unsupported types, otherwise returns
+ * false
+ */
boolean isHasUnsupportedType();
-
- EmsOperation getOperation(String operationName, Class... parameterTypes);
}
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBeanName.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBeanName.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/EmsBeanName.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -3,22 +3,57 @@
import java.util.Map;
/**
- * Created by IntelliJ IDEA.
- * User: ghinkle
- * Date: Oct 25, 2005
- * Time: 1:13:12 AM
- * To change this template use File | Settings | File Templates.
+ * An MBean name.
*/
public interface EmsBeanName extends Comparable {
-
-
+ /**
+ * Returns the domain of this name.
+ *
+ * @return the domain of this name
+ */
String getDomain();
+ /**
+ * Returns the canonical form of the name as defined by {@link ObjectName#getCanonicalName()}.
+ *
+ * @return the canonical form of the name as defined by {@link ObjectName#getCanonicalName()}
+ */
String getCanonicalName();
- Map<String,String> getKeyProperties();
+ /**
+ * Returns a Map of this name's key properties. The keys of the Map are the key property names, and the values are
+ * the values of the corresponding key properties.
+ *
+ * @return a Map of this name's key properties
+ */
+ Map<String, String> getKeyProperties();
+ /**
+ * Returns the value for the key property with the specified name.
+ *
+ * @param name the key property name
+ *
+ * @return the value of the key property, or null if there is no such
+ * key property in this DBeanName.
+ *
+ * @throws NullPointerException If <code>name</code> is null
+ */
String getKeyProperty(String key);
- boolean apply(String objectName);
+ /**
+ * Tests whether this name, which may be a pattern,
+ * matches another MBean name. If <code>name</code> is a pattern,
+ * the result is false. If this EmsBeanName is a pattern, the
+ * result is true if and only if <code>name</code> matches the
+ * pattern. If neither this EmsBeanName nor <code>name</code> is
+ * a pattern, the result is true if and only if the two
+ * EmsBeanNames have canonical String forms that are equal.
+ *
+ * @param name the MBean name to compare to
+ *
+ * @return true if <code>name</code> matches this EmsBeanName
+ *
+ * @throws NullPointerException if <code>name</code> is null
+ */
+ boolean apply(String name);
}
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/attribute/EmsAttribute.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/attribute/EmsAttribute.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/attribute/EmsAttribute.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.mc4j.ems.connection.bean.attribute;
import org.mc4j.ems.store.ValueHistory;
/**
+ * An MBean attribute.
+ *
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
*/
@@ -32,47 +33,97 @@
void registerAttributeChangeListener(AttributeChangeListener listener);
+
+ /**
+ * Returns the locally stored value of this attribute. Does not ask the server for the current value.
+ *
+ * @return the locally stored value of this attribute
+ */
Object getValue();
/**
- * Set the attribute on the server
- * @param newValue The value to be set
- * @throws Exception
+ * Set the attribute's value on the server.
+ *
+ * @param newValue the value to be set
+ *
+ * @throws Exception if there was a failure to set the attribute
*/
void setValue(Object newValue) throws Exception;
+
/**
* Alters the internally stored value of this attribute. Does not update the
- * server value. Is intended for mass load of attribute data via the MBean.
- * @param newValue
+ * server value. Is intended for mass updates of attribute data via the MBean.
+ *
+ * @param newValue the value to be set
*/
void alterValue(Object newValue);
-
/**
- * Updates the local value of this mbean from the server
+ * Updates the local value of this attribute from the server.
*/
Object refresh();
+ /**
+ *
+ * @return
+ */
ValueHistory getValueHistory();
+ /**
+ *
+ * @return
+ */
String getName();
+
+ /**
+ *
+ * @return
+ */
String getType();
+ /**
+ *
+ * @return
+ */
Class getTypeClass();
+ /**
+ *
+ * @return
+ */
boolean isNumericType();
String getDescription() ;
+ /**
+ * Returns true if this attribute is readable, or false if it is not.
+ *
+ * @return true if this attribute is readable, or false if it is not
+ */
+ boolean isReadable();
- boolean isReadable();
+ /**
+ * Returns true if this attribute is writable, or false if it is not.
+ *
+ * @return true if this attribute is writable, or false if it is not
+ */
boolean isWritable();
-
+ /**
+ *
+ * @return
+ */
boolean isSupportedType();
+ /**
+ *
+ * @param supportedType
+ */
void setSupportedType(boolean supportedType);
-
+ /**
+ *
+ * @return
+ */
int getValueSize();
}
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotification.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotification.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification/EmsNotification.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -19,19 +19,19 @@
import java.util.List;
/**
+ * An MBean notification.
+ *
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
*/
public interface EmsNotification extends Comparable {
-
String getName();
String getDescription();
String[] getTypes();
-
void addNotificationListener(EmsNotificationListener listener);
boolean removeNotificationListener(EmsNotificationListener listener);
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/operation/EmsOperation.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/operation/EmsOperation.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/operation/EmsOperation.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -26,6 +26,8 @@
import java.io.ObjectStreamException;
/**
+ * An MBean operation.
+ *
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
*/
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/parameter/EmsParameter.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/parameter/EmsParameter.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/parameter/EmsParameter.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -1,15 +1,30 @@
package org.mc4j.ems.connection.bean.parameter;
/**
- * Created: Jul 20, 2005 1:16:45 AM
+ * An MBean operation parameter.
*
* @author Greg Hinkle (gh...@us...)
* @version $Revision$($Author$ / $Date$)
*/
public interface EmsParameter extends Comparable {
+ /**
+ * Returns the name of this parameter.
+ *
+ * @return the name of this parameter
+ */
String getName();
+ /**
+ * Returns a human readable description of this parameter; may be null.
+ *
+ * @return a human readable description of this parameter; may be null
+ */
String getDescription();
+ /**
+ * Returns the type (i.e. fully qualified class name as defined by {@link Class#getName()}) of this parameter.
+ *
+ * @return the type (i.e. fully qualified class name as defined by {@link Class#getName()}) of this parameter
+ */
String getType();
}
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -254,6 +254,7 @@
} catch (Exception e) {
throw new EmsException("Could not create MBean", e);
}
+ // TODO: Shouldn't we add the MBean to our map too?
}
public void removeMBean(String objectName) throws EmsException {
@@ -265,6 +266,7 @@
} catch (Exception e) {
throw new EmsException("Could not remove MBean", e);
}
+ // TODO: Shouldn't we remove the MBean from our map too?
}
public synchronized SortedSet<EmsBean> getBeans() {
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DBeanName.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -26,7 +26,6 @@
return objectName;
}
-
public String getDomain() {
return objectName.getDomain();
}
@@ -41,10 +40,11 @@
return (Map<String, String>) objectName.getKeyPropertyList();
}
- public String getKeyProperty(String key) {
- return objectName.getKeyProperty(key);
+ public String getKeyProperty(String name) {
+ return objectName.getKeyProperty(name);
}
+
public boolean apply(String objectNameFilterString) {
try {
return this.objectName.apply(new ObjectName(objectNameFilterString));
@@ -54,8 +54,9 @@
}
/**
- * Output the generalized objectname string in input format
- * @return
+ * <p>Returns a string representation of this name.</p>
+ *
+ * @return a string representation of this name
*/
public String toString() {
return this.objectName.toString();
@@ -67,7 +68,6 @@
return toString().compareTo(((EmsBeanName) o).toString());
}
-
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Greg Hinkle
+ * Copyright 2002-2010 Greg Hinkle
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.mc4j.ems.impl.jmx.connection.bean;
import org.apache.commons.logging.Log;
@@ -44,7 +43,6 @@
import javax.management.ObjectName;
import java.util.*;
-
/**
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
@@ -388,6 +386,8 @@
} catch (InstanceNotFoundException e) {
throw new EmsBeanNotFoundException("Could not unregister bean, instance not found [" + getObjectName().getCanonicalName() + "]", e);
}
+ // TODO: Shouldn't we remove the MBean from our map too?
+ //connectionProvider.getExistingConnection().removeMBean(getObjectName().toString());
}
protected MBeanInfo getMBeanInfo() {
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java 2010-07-31 15:21:22 UTC (rev 619)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute/DAttribute.java 2010-08-02 19:03:05 UTC (rev 620)
@@ -51,6 +51,8 @@
/**
* @author Greg Hinkle (gh...@us...), Apr 4, 2005
* @version $Revision$($Author$ / $Date$)
+ *
+ * TODO: Implement Comparable.
*/
public class DAttribute implements EmsAttribute {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jma...@us...> - 2010-07-31 15:21:29
|
Revision: 619
http://mc4j.svn.sourceforge.net/mc4j/?rev=619&view=rev
Author: jmazzitelli
Date: 2010-07-31 15:21:22 +0000 (Sat, 31 Jul 2010)
Log Message:
-----------
this provides a public API that allows consumers of EMS to ask the ClassLoaderFactory
to clear all its caches of jar files, temp files and classloaders. When consumers know
they are finished with EMS, they can call this public API to help free up things within
perm gen. this fix also nulls out login context within the JBoss connection provider
to help the GC.
Modified Paths:
--------------
trunk/mc4j/modules/ems/build.xml
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2010-07-30 21:53:43 UTC (rev 618)
+++ trunk/mc4j/modules/ems/build.xml 2010-07-31 15:21:22 UTC (rev 619)
@@ -30,7 +30,7 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.12"/>
+ <property name="release.version" value="1.2.13"/>
<target
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java 2010-07-30 21:53:43 UTC (rev 618)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java 2010-07-31 15:21:22 UTC (rev 619)
@@ -79,6 +79,16 @@
}
/**
+ * Clears this factory's caches. You usually only call this when you need
+ * help cleaning out the classloaders created by this factory.
+ */
+ public static void clearCaches() {
+ jarCache.clear();
+ tempJarCache.clear();
+ classLoaderCache.clear();
+ }
+
+ /**
* TODO GH: Implement a special classloader that can load classes from
* within a jar inside another jar or perhaps just ship the impl jar separately...
*/
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java 2010-07-30 21:53:43 UTC (rev 618)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JBossConnectionProvider.java 2010-07-31 15:21:22 UTC (rev 619)
@@ -141,7 +141,7 @@
public void doDisconnect() {
-
+ this.loginContext = null;
}
/* public Object getMEJB() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jma...@us...> - 2010-07-30 21:53:49
|
Revision: 618
http://mc4j.svn.sourceforge.net/mc4j/?rev=618&view=rev
Author: jmazzitelli
Date: 2010-07-30 21:53:43 +0000 (Fri, 30 Jul 2010)
Log Message:
-----------
tagging new version that helps free perm gen memory
Added Paths:
-----------
tags/ems_1_2_12/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jma...@us...> - 2010-07-30 21:39:44
|
Revision: 617
http://mc4j.svn.sourceforge.net/mc4j/?rev=617&view=rev
Author: jmazzitelli
Date: 2010-07-30 21:39:38 +0000 (Fri, 30 Jul 2010)
Log Message:
-----------
perm gen memory seems to be left un-gc'ed. but cleaning up
apache commons LogFactory seems to help alot with reclaiming
perm gen memory
Modified Paths:
--------------
trunk/mc4j/modules/ems/build.xml
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2010-02-05 13:30:54 UTC (rev 616)
+++ trunk/mc4j/modules/ems/build.xml 2010-07-30 21:39:38 UTC (rev 617)
@@ -30,7 +30,7 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.11"/>
+ <property name="release.version" value="1.2.12"/>
<target
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java 2010-02-05 13:30:54 UTC (rev 616)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/DConnection.java 2010-07-30 21:39:38 UTC (rev 617)
@@ -102,6 +102,7 @@
// tracker.stopTracker();
connectionProvider.disconnect();
+ LogFactory.release(connectionProvider.getClass().getClassLoader());
}
/* TODO: Check WebLogic <= 8.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2010-02-05 14:08:34
|
Revision: 615
http://mc4j.svn.sourceforge.net/mc4j/?rev=615&view=rev
Author: ianpspringer
Date: 2010-02-05 13:28:39 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
test commit
Modified Paths:
--------------
trunk/mc4j/build.xml
Modified: trunk/mc4j/build.xml
===================================================================
--- trunk/mc4j/build.xml 2009-08-13 23:23:46 UTC (rev 614)
+++ trunk/mc4j/build.xml 2010-02-05 13:28:39 UTC (rev 615)
@@ -2,7 +2,6 @@
<!--
-
Author: Greg Hinkle
@@ -27,7 +26,6 @@
<project name="MC4J" basedir="." default="all">
-
<!--
# Property: build.properties.file
# Specifies the properties file in use for the project. The
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2010-02-05 13:31:03
|
Revision: 616
http://mc4j.svn.sourceforge.net/mc4j/?rev=616&view=rev
Author: ianpspringer
Date: 2010-02-05 13:30:54 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
test commit
Modified Paths:
--------------
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java 2010-02-05 13:28:39 UTC (rev 615)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/settings/ConnectionSettings.java 2010-02-05 13:30:54 UTC (rev 616)
@@ -34,7 +34,6 @@
*/
public class ConnectionSettings implements Serializable, Comparable {
-
private ConnectionTypeDescriptor connectionType;
private String connectionName;
@@ -95,6 +94,11 @@
return result;
}
+ public int hashCode() {
+ int result = this.connectionName.hashCode();
+ result = 31 * result + this.serverUrl.hashCode();
+ return result;
+ }
/**
* Getter for property connectionType.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jma...@us...> - 2009-08-13 23:23:56
|
Revision: 614
http://mc4j.svn.sourceforge.net/mc4j/?rev=614&view=rev
Author: jmazzitelli
Date: 2009-08-13 23:23:46 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
do not set the javax.net.debug system property
Modified Paths:
--------------
trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java
Modified: trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java 2009-07-17 06:05:23 UTC (rev 613)
+++ trunk/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/WebsphereConnectionProvider.java 2009-08-13 23:23:46 UTC (rev 614)
@@ -117,7 +117,7 @@
URI serverUrl = new URI(connectionSettings.getServerUrl());
if (serverUrl.getScheme().equalsIgnoreCase("http") || serverUrl.getScheme().equalsIgnoreCase("https")) {
- System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");
+ //System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");
//Security.addProvider(new sun.security.provider.Sun());
System.setProperty("java.protocol.handler.pkgs","com.sun.net.ssl.internal.www.protocol");
//System.setProperty("ssl.SocketFactory.provider", "javax.net.ssl.SSLSocketFactory");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jma...@us...> - 2009-07-17 06:05:24
|
Revision: 613
http://mc4j.svn.sourceforge.net/mc4j/?rev=613&view=rev
Author: jmazzitelli
Date: 2009-07-17 06:05:23 +0000 (Fri, 17 Jul 2009)
Log Message:
-----------
EMS 1.2.11 tag
Added Paths:
-----------
tags/ems_1_2_11/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2009-07-16 23:59:02
|
Revision: 612
http://mc4j.svn.sourceforge.net/mc4j/?rev=612&view=rev
Author: ianpspringer
Date: 2009-07-16 23:59:00 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
we need the ems impl jar added to the classloader even when the useContextClassLoader option is specified
Modified Paths:
--------------
trunk/mc4j/modules/ems/build.xml
trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2009-07-16 22:29:29 UTC (rev 611)
+++ trunk/mc4j/modules/ems/build.xml 2009-07-16 23:59:00 UTC (rev 612)
@@ -30,7 +30,7 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.10"/>
+ <property name="release.version" value="1.2.11"/>
<target
Modified: trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java
===================================================================
--- trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java 2009-07-16 22:29:29 UTC (rev 611)
+++ trunk/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader/ClassLoaderFactory.java 2009-07-16 23:59:00 UTC (rev 612)
@@ -175,17 +175,20 @@
public ClassLoader buildClassLoader(ConnectionSettings settings) {
- Boolean useContextClassLoader = Boolean.valueOf(settings.getAdvancedProperties().getProperty(ConnectionFactory.USE_CONTEXT_CLASSLOADER, "false"));
- if (useContextClassLoader.booleanValue()) {
- return Thread.currentThread().getContextClassLoader();
- }
-
String tempDirString = (String) settings.getControlProperties().get(ConnectionFactory.JAR_TEMP_DIR);
File tempDir = null;
if (tempDirString != null) {
tempDir = new File(tempDirString);
}
+ Boolean useContextClassLoader = Boolean.valueOf(settings.getAdvancedProperties().getProperty(ConnectionFactory.USE_CONTEXT_CLASSLOADER, "false"));
+ if (useContextClassLoader.booleanValue()) {
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ URL implURL = storeImplToTemp("org-mc4j-ems-impl.jar", tempDir);
+ ClassLoader loader = new URLClassLoader(new URL[] {implURL}, contextClassLoader);
+ return loader;
+ }
+
List<URL> entries = new ArrayList<URL>();
if (settings.getClassPathEntries() != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2009-07-16 22:29:30
|
Revision: 611
http://mc4j.svn.sourceforge.net/mc4j/?rev=611&view=rev
Author: ianpspringer
Date: 2009-07-16 22:29:29 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
re-tag
Added Paths:
-----------
tags/ems_1_2_10/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2009-07-16 22:28:54
|
Revision: 610
http://mc4j.svn.sourceforge.net/mc4j/?rev=610&view=rev
Author: ianpspringer
Date: 2009-07-16 22:28:53 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
need to re-tag again
Removed Paths:
-------------
tags/ems_1_2_10/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2009-07-16 21:47:54
|
Revision: 609
http://mc4j.svn.sourceforge.net/mc4j/?rev=609&view=rev
Author: ianpspringer
Date: 2009-07-16 21:47:51 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
oops, i screwed up the name of the impl jar that lives inside the main jar
Modified Paths:
--------------
trunk/mc4j/modules/ems/build.xml
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2009-07-16 17:25:48 UTC (rev 608)
+++ trunk/mc4j/modules/ems/build.xml 2009-07-16 21:47:51 UTC (rev 609)
@@ -162,7 +162,7 @@
</fileset>
</delete>
- <jar jarfile="classes/main/org-mc4j-ems-impl-${release.version}.jar" update="true" compress="false">
+ <jar jarfile="classes/main/org-mc4j-ems-impl.jar" update="true" compress="false">
<fileset dir="classes/impl" includes="org/mc4j/ems/impl/**"/>
<manifest>
<attribute name="Implementation-Title" value="MC4J-EMS"/>
@@ -171,7 +171,8 @@
<attribute name="Implementation-URL" value="http://mc4j.org/"/>
</manifest>
</jar>
- <copy file="classes/main/org-mc4j-ems-impl-${release.version}.jar" todir="dist"/>
+ <copy file="classes/main/org-mc4j-ems-impl.jar"
+ tofile="dist/org-mc4j-ems-impl-${release.version}.jar"/>
<jar jarfile="dist/org-mc4j-ems-${release.version}.jar" update="true" compress="false">
<fileset dir="classes/main"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2009-07-16 17:25:51
|
Revision: 608
http://mc4j.svn.sourceforge.net/mc4j/?rev=608&view=rev
Author: ianpspringer
Date: 2009-07-16 17:25:48 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
EMS 1.2.10 - take two
Added Paths:
-----------
tags/ems_1_2_10/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2009-07-16 17:24:50
|
Revision: 607
http://mc4j.svn.sourceforge.net/mc4j/?rev=607&view=rev
Author: ianpspringer
Date: 2009-07-16 17:24:45 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
need to re-tag
Removed Paths:
-------------
tags/ems_1_2_10/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ian...@us...> - 2009-07-16 17:23:59
|
Revision: 606
http://mc4j.svn.sourceforge.net/mc4j/?rev=606&view=rev
Author: ianpspringer
Date: 2009-07-16 17:23:56 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
prep for re-tag of EMS 1.2.10 (forgot to update ems.version prop in original tag)
Modified Paths:
--------------
trunk/mc4j/build.xml
trunk/mc4j/modules/ems/build.xml
Property Changed:
----------------
trunk/mc4j/
Property changes on: trunk/mc4j
___________________________________________________________________
Modified: svn:ignore
- .nbintdb
Thumbs.db
.nbattrs
.DS_Store
+ .nbintdb
Thumbs.db
.nbattrs
.DS_Store
build
Modified: trunk/mc4j/build.xml
===================================================================
--- trunk/mc4j/build.xml 2009-07-15 21:13:20 UTC (rev 605)
+++ trunk/mc4j/build.xml 2009-07-16 17:23:56 UTC (rev 606)
@@ -28,7 +28,6 @@
<project name="MC4J" basedir="." default="all">
-
<!--
# Property: build.properties.file
# Specifies the properties file in use for the project. The
@@ -45,8 +44,8 @@
<property name="platform.dir" value="platform6"/>
<property name="application.install" value="build/mc4j"/>
+
-
<target
name="init"
description="Initializes the MC4J build system.">
@@ -60,10 +59,16 @@
<path id="classpath.compile">
<!-- When reasonable, replace these with specific paths -->
- <!-- to openide*.jar and whatever else you need. -->
-
- <pathelement path="modules/ems/dist/org-mc4j-ems.jar"/>
-
+ <!-- to openide*.jar and whatever else you need. -->
+
+ <fileset dir="modules/ems/dist">
+ <include name="org-mc4j-ems-*.jar"/>
+ <exclude name="*-sources.jar"/>
+ <exclude name="*-javadoc.jar"/>
+ <exclude name="*-impl*.jar"/>
+ </fileset>
+
+
<fileset dir="${application.install}/${platform.dir}/core">
<include name="**/*.jar"/>
</fileset>
@@ -197,29 +202,30 @@
</target>
+
+ <property name="platform-file" value="netbeans-5_0-platform.bz2"/>
- <!--<property name="platform-file" value="netbeans-4_1-platform.zip"/>-->
- <property name="platform-file" value="netbeans-5_0-platform.zip"/>
-
<target name="get-nb-platform">
- <mkdir dir="build"/>
<mkdir dir="build/download"/>
- <echo message="Downloading NetBeans Platform (~4.4 MB)"/>
- <!--<get dest="build/download/${platform-file}"
- src="http://www.netbeans.org/download/4_1/fcs/200505031930/66083d474e5fdfc80a1443fb851bd9d5/${platform-file}"
- verbose="true"/>-->
- <get dest="build/download/${platform-file}"
- src="http://us1.mirror.netbeans.org/download/5_0/fcs/200601251500/netbeans-5_0-platform.zip"
- verbose="true"/>
+ <echo message="Downloading NetBeans Platform (~3.6 MB)"/>
+
+ <get dest="build/download/${platform-file}"
+ src="http://download.netbeans.org/netbeans/download/5_0/fcs/200601251500/netbeans-5_0-platform.tar.bz2"
+ verbose="true"/>
</target>
+
<target name="prepare-platform">
-
- <unzip src="build/download/${platform-file}" dest="build"/>
- <rename src="build/netbeans" dest="build/mc4j"/>
+ <bunzip2 src="build/download/${platform-file}" dest="build/download"/>
+ <!-- The tarfile doesn't have a .tar extension for some stupid reason - fix it... -->
+ <move file="build/download/netbeans-5_0-platform" tofile="build/download/netbeans-5_0-platform.tar"/>
+ <untar src="build/download/netbeans-5_0-platform.tar" dest="build"/>
+ <delete dir="build/mc4j" quiet="true"/>
+ <move file="build/netbeans" tofile="build/mc4j"/>
</target>
+
<target name="clean-dist">
<delete dir="build/mc4j"/>
</target>
@@ -228,12 +234,11 @@
<target name="all" depends="get-nb-platform, prepare-platform, build-debug" description="Setup the project and run it"/>
-
-
<target name="build" depends="compile, jars, brand, install, run" description="Build the project including preparation of the nb platform.">
</target>
-
+
+
<target name="build-debug" depends="compile, jars, brand, install, run-debug" description="Build the module.">
</target>
@@ -243,6 +248,7 @@
<ant antfile="build.xml" target="dist" dir="modules/ems"/>
</target>
+
<target name="install" depends="brand, update-dashboards" description="Create the installation of MC4J over top a platform install.">
<!-- install the modules -->
@@ -351,7 +357,7 @@
<target name="clean" description="Clean all build products.">
- <delete>
+ <delete quiet="true">
<fileset dir="classes">
<include name="**/*.class"/>
</fileset>
@@ -368,7 +374,6 @@
</target>
-
<target name="run" description="Directly starts MC4J with the settings as the installer would use.">
<echo message="Starting MC4J with home of ${basedir}/${application.install}"/>
<java
@@ -424,6 +429,7 @@
</java>
</target>
+
<target name="run-debug" description="Directly starts MC4J with the settings as the installer would use.">
<echo>Starting MC4J with debugger</echo>
@@ -489,6 +495,7 @@
</java>
</target>
+
<target name="clear-userdir" description="Cleans out the entire MC4J User Dir">
<deltree dir="${user.home}/.mc4j/${application.version}"/>
<delete file="build/mc4j/ConnectionNodes.db"/>
Modified: trunk/mc4j/modules/ems/build.xml
===================================================================
--- trunk/mc4j/modules/ems/build.xml 2009-07-15 21:13:20 UTC (rev 605)
+++ trunk/mc4j/modules/ems/build.xml 2009-07-16 17:23:56 UTC (rev 606)
@@ -30,7 +30,7 @@
<property name="module.jar" value="org-mc4j-ems.jar"/>
- <property name="release.version" value="1.2.9"/>
+ <property name="release.version" value="1.2.10"/>
<target
@@ -94,11 +94,13 @@
</target>
+
<target name="clean" description="Clean">
<delete dir="classes"/>
<delete dir="javadocs"/>
</target>
+
<target name="compile" depends="init" description="Compiles the MC4J-EMS codebase.">
<mkdir dir="classes"/>
<mkdir dir="classes/main"/>
@@ -160,7 +162,7 @@
</fileset>
</delete>
- <jar jarfile="classes/main/org-mc4j-ems-impl.jar" update="true" compress="false">
+ <jar jarfile="classes/main/org-mc4j-ems-impl-${release.version}.jar" update="true" compress="false">
<fileset dir="classes/impl" includes="org/mc4j/ems/impl/**"/>
<manifest>
<attribute name="Implementation-Title" value="MC4J-EMS"/>
@@ -169,9 +171,9 @@
<attribute name="Implementation-URL" value="http://mc4j.org/"/>
</manifest>
</jar>
- <copy file="classes/main/org-mc4j-ems-impl.jar" todir="dist"/>
+ <copy file="classes/main/org-mc4j-ems-impl-${release.version}.jar" todir="dist"/>
- <jar jarfile="dist/org-mc4j-ems.jar" update="true" compress="false">
+ <jar jarfile="dist/org-mc4j-ems-${release.version}.jar" update="true" compress="false">
<fileset dir="classes/main"/>
<fileset dir="${basedir}" includes="lib/*.jar"/>
<fileset dir="${basedir}" includes="lib/jsr160-includes/*.jar"/>
@@ -188,12 +190,12 @@
</copy>
<!-- sources jars -->
- <jar jarfile="dist/org-mc4j-ems-sources.jar" basedir="src/ems"/>
- <jar jarfile="dist/org-mc4j-ems-impl-sources.jar" basedir="src/ems-impl"/>
+ <jar jarfile="dist/org-mc4j-ems-${release.version}-sources.jar" basedir="src/ems"/>
+ <jar jarfile="dist/org-mc4j-ems-impl-${release.version}-sources.jar" basedir="src/ems-impl"/>
<!-- javadoc jars -->
- <jar jarfile="dist/org-mc4j-ems-javadoc.jar" basedir="javadocs/api"/>
- <jar jarfile="dist/org-mc4j-ems-impl-javadoc.jar" basedir="javadocs/impl"/>
+ <jar jarfile="dist/org-mc4j-ems-${release.version}-javadoc.jar" basedir="javadocs/api"/>
+ <jar jarfile="dist/org-mc4j-ems-impl-${release.version}-javadoc.jar" basedir="javadocs/impl"/>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jma...@us...> - 2009-07-15 21:13:21
|
Revision: 605
http://mc4j.svn.sourceforge.net/mc4j/?rev=605&view=rev
Author: jmazzitelli
Date: 2009-07-15 21:13:20 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
tag v1.2.10 (connects to WS securely with credentials)
Added Paths:
-----------
tags/ems_1_2_10/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|