[Mc4j-cvs] mc4j/src/org/mc4j/console/connection/proxy JSR77ManagementMBeanServerProxy.java,1.1,1.2 JMXRemotingMBeanServerProxy.java,1.7,1.8 Mx4jMBeanServerProxy.java,1.7,1.8 GenericMBeanServerProxy.java,1.9,NONE

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/proxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/connection/proxy

Modified Files:
	JSR77ManagementMBeanServerProxy.java 
	JMXRemotingMBeanServerProxy.java Mx4jMBeanServerProxy.java 
Removed Files:
	GenericMBeanServerProxy.java 
Log Message:
Merging EMS into head for the 2.0 release work

--- GenericMBeanServerProxy.java DELETED ---

Index: JSR77ManagementMBeanServerProxy.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/proxy/JSR77ManagementMBeanServerProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JSR77ManagementMBeanServerProxy.java	15 Jan 2005 03:48:06 -0000	1.1
--- JSR77ManagementMBeanServerProxy.java	12 Apr 2006 19:14:14 -0000	1.2
***************
*** 52,56 ****
          SwingUtility.eventThreadAlert();
  
!         ConnectionInfoAction.addHit();
  
          Class serverClass = Management.class; // this.remoteServer.getClass();
--- 52,56 ----
          SwingUtility.eventThreadAlert();
  
! //        ConnectionInfoAction.addHit();
  
          Class serverClass = Management.class; // this.remoteServer.getClass();

Index: JMXRemotingMBeanServerProxy.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/proxy/JMXRemotingMBeanServerProxy.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JMXRemotingMBeanServerProxy.java	5 Oct 2004 05:15:59 -0000	1.7
--- JMXRemotingMBeanServerProxy.java	12 Apr 2006 19:14:14 -0000	1.8
***************
*** 51,55 ****
          SwingUtility.eventThreadAlert();
  
!         ConnectionInfoAction.addHit();
  
          Class serverClass = MBeanServerConnection.class; // this.remoteServer.getClass();
--- 51,55 ----
          SwingUtility.eventThreadAlert();
  
! //        ConnectionInfoAction.addHit();
  
          Class serverClass = MBeanServerConnection.class; // this.remoteServer.getClass();

Index: Mx4jMBeanServerProxy.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/proxy/Mx4jMBeanServerProxy.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Mx4jMBeanServerProxy.java	5 Oct 2004 05:15:59 -0000	1.7
--- Mx4jMBeanServerProxy.java	12 Apr 2006 19:14:14 -0000	1.8
***************
*** 54,58 ****
          SwingUtility.eventThreadAlert();
  
!         ConnectionInfoAction.addHit();
  
          Class serverClass = RemoteMBeanServer.class; // this.remoteServer.getClass();
--- 54,58 ----
          SwingUtility.eventThreadAlert();
  
! //        ConnectionInfoAction.addHit();
  
          Class serverClass = RemoteMBeanServer.class; // this.remoteServer.getClass();