[Mc4j-cvs] mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata AbstractConnectionTypeD

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11431/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata

Modified Files:
      Tag: ems_module_separation
	AbstractConnectionTypeDescriptor.java 
	JBossConnectionTypeDescriptor.java 
	Tomcat55ConnectionTypeDescriptor.java 
	Weblogic9ConnectionTypeDescriptor.java 
	Weblogic9Jsr77ConnectionTypeDescriptor.java 
Log Message:
Long overdue checkin. JMX dependencies are now complete restricted to the impl classes. Still haven't got the nested jar classloading working in all circumstances. Logging added.


Index: JBossConnectionTypeDescriptor.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/Attic/JBossConnectionTypeDescriptor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** JBossConnectionTypeDescriptor.java	26 May 2005 17:27:23 -0000	1.1.2.1
--- JBossConnectionTypeDescriptor.java	27 Oct 2005 07:03:06 -0000	1.1.2.2
***************
*** 34,38 ****
  
      public String getRecongnitionPath() {
!         return "server/all/lib/jboss.jar";
      }
  
--- 34,38 ----
  
      public String getRecongnitionPath() {
!         return "server/*/lib/jboss.jar";
      }
  
***************
*** 83,92 ****
              "jnp-client.jar",
              "jmx-rmi-connector-client.jar",
!             "jboss-j2ee.jar"
          };
      }
  
      public String getConnectionNodeClassName() {
!         return "org.mc4j.console.connection.JBossConnectionProvider";
      }
  }
--- 83,94 ----
              "jnp-client.jar",
              "jmx-rmi-connector-client.jar",
!             "jboss-j2ee.jar",
!             "jboss-management.jar",
!             "jbosssx.jar"
          };
      }
  
      public String getConnectionNodeClassName() {
!         return "org.mc4j.ems.impl.jmx.connection.support.providers.JBossConnectionProvider";
      }
  }

Index: Weblogic9Jsr77ConnectionTypeDescriptor.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/Attic/Weblogic9Jsr77ConnectionTypeDescriptor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Weblogic9Jsr77ConnectionTypeDescriptor.java	26 May 2005 17:27:23 -0000	1.1.2.1
--- Weblogic9Jsr77ConnectionTypeDescriptor.java	27 Oct 2005 07:03:06 -0000	1.1.2.2
***************
*** 17,22 ****
  package org.mc4j.ems.connection.support.metadata;
  
- import javax.management.remote.JMXConnectorFactory;
- import javax.management.remote.JMXServiceURL;
  import java.net.MalformedURLException;
  import java.util.HashMap;
--- 17,20 ----
***************
*** 30,39 ****
  
      public static void main(String[] args) throws MalformedURLException {
!         String protocol = "t3";
!         String jndiroot = "/jndi/";
!         String mserver = "weblogic.management.mbeanservers.domainruntime";
!         JMXServiceURL serviceURL = new JMXServiceURL(protocol, "localhost", 7001,
!             jndiroot + mserver);
!         System.out.println("URL: " + serviceURL);
      }
  
--- 28,37 ----
  
      public static void main(String[] args) throws MalformedURLException {
! //        String protocol = "t3";
! //        String jndiroot = "/jndi/";
! //        String mserver = "weblogic.management.mbeanservers.domainruntime";
! //        JMXServiceURL serviceURL = new JMXServiceURL(protocol, "localhost", 7001,
! //            jndiroot + mserver);
! //        System.out.println("URL: " + serviceURL);
      }
  
***************
*** 65,69 ****
          Map props = new HashMap();
  
!         props.put(JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES,
              "weblogic.management.remote");
          return props;
--- 63,68 ----
          Map props = new HashMap();
  
!         // Don't want runtime dependency on JMX classes at this level
!         props.put("jmx.remote.protocol.provider.pkgs" /*JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES*/,
              "weblogic.management.remote");
          return props;

Index: AbstractConnectionTypeDescriptor.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/Attic/AbstractConnectionTypeDescriptor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** AbstractConnectionTypeDescriptor.java	26 May 2005 17:27:23 -0000	1.1.2.1
--- AbstractConnectionTypeDescriptor.java	27 Oct 2005 07:03:06 -0000	1.1.2.2
***************
*** 17,20 ****
--- 17,23 ----
  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;
***************
*** 31,34 ****
--- 34,38 ----
  public abstract class AbstractConnectionTypeDescriptor implements ConnectionTypeDescriptor {
  
+     private static Log log = LogFactory.getLog(AbstractConnectionTypeDescriptor.class);
      public String toString() {
          return getDisplayName();
***************
*** 57,63 ****
              return version;
          } catch (MalformedURLException e) {
!             e.printStackTrace();
          } catch (IOException e) {
!             e.printStackTrace();
          }
          return null;
--- 61,67 ----
              return version;
          } catch (MalformedURLException e) {
!             log.warn("Could not determine server version from matched file " + recognitionFile.getAbsolutePath(),e);
          } catch (IOException e) {
!             log.warn("Could not determine server version from matched file " + recognitionFile.getAbsolutePath(),e);
          }
          return null;

Index: Weblogic9ConnectionTypeDescriptor.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata/Attic/Weblogic9ConnectionTypeDescriptor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Weblogic9ConnectionTypeDescriptor.java	26 May 2005 17:27:23 -0000	1.1.2.1
--- Weblogic9ConnectionTypeDescriptor.java	27 Oct 2005 07:03:06 -0000	1.1.2.2
***************
*** 17,22 ****
  package org.mc4j.ems.connection.support.metadata;
  
- import javax.management.remote.JMXConnectorFactory;
- import javax.management.remote.JMXServiceURL;
  import java.net.MalformedURLException;
  import java.util.HashMap;
--- 17,20 ----
***************
*** 30,39 ****
  
      public static void main(String[] args) throws MalformedURLException {
!         String protocol = "t3";
!         String jndiroot = "/jndi/";
!         String mserver = "weblogic.management.mbeanservers.domainruntime";
!         JMXServiceURL serviceURL = new JMXServiceURL(protocol, "localhost", 7001,
!             jndiroot + mserver);
!         System.out.println("URL: " + serviceURL);
      }
  
--- 28,37 ----
  
      public static void main(String[] args) throws MalformedURLException {
! //        String protocol = "t3";
! //        String jndiroot = "/jndi/";
! //        String mserver = "weblogic.management.mbeanservers.domainruntime";
! //        JMXServiceURL serviceURL = new JMXServiceURL(protocol, "localhost", 7001,
! //            jndiroot + mserver);
! //        System.out.println("URL: " + serviceURL);
      }
  
***************
*** 66,70 ****
          Map props = new HashMap();
  
!         props.put(JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES,
              "weblogic.management.remote");
          return props;
--- 64,68 ----
          Map props = new HashMap();
  
!         props.put("jmx.remote.protocol.provider.pkgs",
              "weblogic.management.remote");
          return props;