[Mc4j-cvs] mc4j/src/org/mc4j/console/connection JBossConnectionNode.java,1.12,1.13 JSR160ConnectionN
Brought to you by:
ghinkl
Menu
▾
▴
[Mc4j-cvs] mc4j/src/org/mc4j/console/connection JBossConnectionNode.java,1.12,1.13 JSR160ConnectionNode.java,1.6,1.7 Oc4jConnectionNode.java,1.2,1.3 WeblogicConnectionNode.java,1.11,1.12 WebsphereConnectionNode.java,1.5,1.6
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7853/src/org/mc4j/console/connection Modified Files: JBossConnectionNode.java JSR160ConnectionNode.java Oc4jConnectionNode.java WeblogicConnectionNode.java WebsphereConnectionNode.java Log Message: Fixed the spelling of principal in all the connection code. (You will lose principals from old connection.dbs) Index: WebsphereConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/WebsphereConnectionNode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WebsphereConnectionNode.java 2 Apr 2004 03:25:26 -0000 1.5 --- WebsphereConnectionNode.java 16 Apr 2004 18:54:36 -0000 1.6 *************** *** 20,23 **** --- 20,27 ---- package org.mc4j.console.connection; + import org.openide.ErrorManager; + + import org.mc4j.console.connection.proxy.GenericMBeanServerProxy; + import java.lang.reflect.Field; import java.lang.reflect.Method; *************** *** 29,36 **** import javax.naming.Context; - import org.openide.ErrorManager; - - import org.mc4j.console.connection.proxy.GenericMBeanServerProxy; - /** --- 33,36 ---- *************** *** 81,85 **** //props.put(Context.INITIAL_CONTEXT_FACTORY, connectionSettings.getInitialContextName()); //props.put(Context.PROVIDER_URL, connectionSettings.getServerUrl()); ! //props.put(Context.SECURITY_PRINCIPAL, connectionSettings.getPrinciple()); //props.put(Context.SECURITY_CREDENTIALS, connectionSettings.getCredentials()); --- 81,85 ---- //props.put(Context.INITIAL_CONTEXT_FACTORY, connectionSettings.getInitialContextName()); //props.put(Context.PROVIDER_URL, connectionSettings.getServerUrl()); ! //props.put(Context.SECURITY_PRINCIPAL, connectionSettings.getPrincipal()); //props.put(Context.SECURITY_CREDENTIALS, connectionSettings.getCredentials()); Index: JBossConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/JBossConnectionNode.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** JBossConnectionNode.java 2 Apr 2004 03:25:25 -0000 1.12 --- JBossConnectionNode.java 16 Apr 2004 18:54:35 -0000 1.13 *************** *** 20,29 **** package org.mc4j.console.connection; ! import java.util.Hashtable; ! ! import javax.management.MBeanServer; ! import javax.naming.CommunicationException; ! import javax.naming.Context; ! import javax.naming.InitialContext; import org.openide.DialogDisplayer; --- 20,25 ---- package org.mc4j.console.connection; ! import org.jboss.jmx.adaptor.rmi.RMIAdaptor; ! import org.jboss.jmx.connector.rmi.RMIConnectorImpl; import org.openide.DialogDisplayer; *************** *** 32,39 **** import org.mc4j.console.connection.proxy.GenericMBeanServerProxy; ! import org.jboss.jmx.adaptor.rmi.RMIAdaptor; ! import org.jboss.jmx.connector.notification.RMINotificationListener; ! import org.jboss.jmx.connector.notification.RMINotificationListenerMBean; ! import org.jboss.jmx.connector.rmi.RMIConnectorImpl; /** --- 28,37 ---- import org.mc4j.console.connection.proxy.GenericMBeanServerProxy; ! import java.util.Hashtable; ! ! import javax.management.MBeanServer; ! import javax.naming.CommunicationException; ! import javax.naming.Context; ! import javax.naming.InitialContext; /** *************** *** 57,62 **** // Change the context classloader as the JBoss version of the // MBeanServerFactory uses it to find their class ! ClassLoader a = this.getClass().getClassLoader(); ! ClassLoader b = MBeanServer.class.getClassLoader(); //System.out.println("Classloader A: " + a); //System.out.println("Classloader b: " + b); --- 55,60 ---- // Change the context classloader as the JBoss version of the // MBeanServerFactory uses it to find their class ! //ClassLoader a = this.getClass().getClassLoader(); ! //ClassLoader b = MBeanServer.class.getClassLoader(); //System.out.println("Classloader A: " + a); //System.out.println("Classloader b: " + b); *************** *** 75,80 **** // GH: Works around a real strange "LinkageError: Duplicate class found" // by loading these classes in the main connection classloader ! Class foo = RMINotificationListener.class; ! foo = RMINotificationListenerMBean.class; // TODO GH!: I think this fixes notifications, but breaks compatibility with at least 3.0.8 --- 73,78 ---- // GH: Works around a real strange "LinkageError: Duplicate class found" // by loading these classes in the main connection classloader ! //Class foo = RMINotificationListener.class; ! //foo = RMINotificationListenerMBean.class; // TODO GH!: I think this fixes notifications, but breaks compatibility with at least 3.0.8 Index: JSR160ConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/JSR160ConnectionNode.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JSR160ConnectionNode.java 2 Apr 2004 03:25:26 -0000 1.6 --- JSR160ConnectionNode.java 16 Apr 2004 18:54:35 -0000 1.7 *************** *** 21,24 **** --- 21,29 ---- + import org.openide.DialogDisplayer; + import org.openide.NotifyDescriptor; + + import org.mc4j.console.connection.proxy.JMXRemotingMBeanServerProxy; + import java.net.ConnectException; import java.util.HashMap; *************** *** 30,38 **** import javax.management.remote.JMXServiceURL; - import org.openide.DialogDisplayer; - import org.openide.NotifyDescriptor; - - import org.mc4j.console.connection.proxy.JMXRemotingMBeanServerProxy; - /** --- 35,38 ---- *************** *** 61,65 **** String[] credentials = new String[] { ! this.connectionSettings.getPrinciple(), this.connectionSettings.getCredentials() }; --- 61,65 ---- String[] credentials = new String[] { ! this.connectionSettings.getPrincipal(), this.connectionSettings.getCredentials() }; Index: WeblogicConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/WeblogicConnectionNode.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** WeblogicConnectionNode.java 2 Apr 2004 03:25:26 -0000 1.11 --- WeblogicConnectionNode.java 16 Apr 2004 18:54:36 -0000 1.12 *************** *** 20,23 **** --- 20,28 ---- package org.mc4j.console.connection; + import org.openide.DialogDisplayer; + import org.openide.NotifyDescriptor; + + import org.mc4j.console.connection.proxy.GenericMBeanServerProxy; + import java.lang.reflect.Method; import java.util.Hashtable; *************** *** 28,36 **** import javax.naming.InitialContext; - import org.openide.DialogDisplayer; - import org.openide.NotifyDescriptor; - - import org.mc4j.console.connection.proxy.GenericMBeanServerProxy; - /** --- 33,36 ---- *************** *** 61,65 **** props.put(Context.INITIAL_CONTEXT_FACTORY, connectionSettings.getInitialContextName()); props.put(Context.PROVIDER_URL, connectionSettings.getServerUrl()); ! props.put(Context.SECURITY_PRINCIPAL, connectionSettings.getPrinciple()); props.put(Context.SECURITY_CREDENTIALS, connectionSettings.getCredentials()); --- 61,65 ---- props.put(Context.INITIAL_CONTEXT_FACTORY, connectionSettings.getInitialContextName()); props.put(Context.PROVIDER_URL, connectionSettings.getServerUrl()); ! props.put(Context.SECURITY_PRINCIPAL, connectionSettings.getPrincipal()); props.put(Context.SECURITY_CREDENTIALS, connectionSettings.getCredentials()); Index: Oc4jConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/Oc4jConnectionNode.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Oc4jConnectionNode.java 16 Apr 2004 15:49:09 -0000 1.2 --- Oc4jConnectionNode.java 16 Apr 2004 18:54:35 -0000 1.3 *************** *** 72,76 **** Hashtable env = new Hashtable(); env.put(Context.PROVIDER_URL, connectionSettings.getServerUrl()); ! env.put(Context.SECURITY_PRINCIPAL, connectionSettings.getPrinciple()); env.put(Context.SECURITY_CREDENTIALS, connectionSettings.getCredentials()); env.put(Context.INITIAL_CONTEXT_FACTORY, connectionSettings.getInitialContextName()); --- 72,76 ---- Hashtable env = new Hashtable(); env.put(Context.PROVIDER_URL, connectionSettings.getServerUrl()); ! env.put(Context.SECURITY_PRINCIPAL, connectionSettings.getPrincipal()); env.put(Context.SECURITY_CREDENTIALS, connectionSettings.getCredentials()); env.put(Context.INITIAL_CONTEXT_FACTORY, connectionSettings.getInitialContextName()); |
