[Mc4j-cvs] mc4j/src/org/mc4j/console/connection ConnectionNode.java,1.27,1.28 JSR160ConnectionNode.java,1.8,1.9 Mx4jConnectionNode.java,1.10,1.11 Oc4jConnectionNode.java,1.3,1.4 WeblogicConnectionNode.java,1.12,1.13 WebsphereConnectionNode.java,1.6,1.7

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

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

Modified Files:
	ConnectionNode.java JSR160ConnectionNode.java 
	Mx4jConnectionNode.java Oc4jConnectionNode.java 
	WeblogicConnectionNode.java WebsphereConnectionNode.java 
Log Message:
Completed principle -> principal fix
Added a customizable message to the connection form

Index: WebsphereConnectionNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/WebsphereConnectionNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WebsphereConnectionNode.java	16 Apr 2004 18:54:36 -0000	1.6
--- WebsphereConnectionNode.java	21 Apr 2004 20:38:47 -0000	1.7
***************
*** 158,162 ****
      }
  
!     public String getDefaultPrinciple() {
          return "admin";
      }
--- 158,162 ----
      }
  
!     public String getDefaultPrincipal() {
          return "admin";
      }

Index: Oc4jConnectionNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/Oc4jConnectionNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Oc4jConnectionNode.java	16 Apr 2004 18:54:35 -0000	1.3
--- Oc4jConnectionNode.java	21 Apr 2004 20:38:47 -0000	1.4
***************
*** 22,27 ****
--- 22,29 ----
  import org.openide.DialogDisplayer;
  import org.openide.NotifyDescriptor;
+ import org.openide.windows.IOProvider;
  
  import org.mc4j.console.connection.proxy.GenericMBeanServerProxy;
+ import org.mc4j.console.util.ExceptionUtility;
  
  import java.lang.reflect.Field;
***************
*** 87,93 ****
                  new NotifyDescriptor.Message("Unable to connect to OC4J server at [" +
                  this.connectionSettings.getServerUrl() +
!                 "]. \nCheck to make sure the OC4J server is running on the specified host and port.",
                      NotifyDescriptor.ERROR_MESSAGE);
              DialogDisplayer.getDefault().notify(d);
          } finally {
              Thread.currentThread().setContextClassLoader(contextClassLoader);
--- 89,98 ----
                  new NotifyDescriptor.Message("Unable to connect to OC4J server at [" +
                  this.connectionSettings.getServerUrl() +
!                 "]. \nCheck to make sure the OC4J server is running on the specified host and port and " +
!                 "that the user and password you supplied were correct.",
                      NotifyDescriptor.ERROR_MESSAGE);
              DialogDisplayer.getDefault().notify(d);
+             IOProvider.getDefault().getStdOut().println(
+                 "Error connecting to OC4J: " + ExceptionUtility.printStackTracesToString(e));
          } finally {
              Thread.currentThread().setContextClassLoader(contextClassLoader);
***************
*** 136,140 ****
      }
  
!     public String getDefaultPrinciple() {
          return "admin";
      }
--- 141,145 ----
      }
  
!     public String getDefaultPrincipal() {
          return "admin";
      }

Index: WeblogicConnectionNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/WeblogicConnectionNode.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** WeblogicConnectionNode.java	16 Apr 2004 18:54:36 -0000	1.12
--- WeblogicConnectionNode.java	21 Apr 2004 20:38:47 -0000	1.13
***************
*** 122,126 ****
      }
  
!     public String getDefaultPrinciple() {
          return "admin";
      }
--- 122,126 ----
      }
  
!     public String getDefaultPrincipal() {
          return "admin";
      }

Index: ConnectionNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/ConnectionNode.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ConnectionNode.java	8 Apr 2004 21:37:08 -0000	1.27
--- ConnectionNode.java	21 Apr 2004 20:38:38 -0000	1.28
***************
*** 524,528 ****
      }
  
!     public String getDefaultPrinciple() {
          return null;
      }
--- 524,528 ----
      }
  
!     public String getDefaultPrincipal() {
          return null;
      }
***************
*** 536,539 ****
--- 536,543 ----
      }
  
+     public String getConnectionMessage() {
+         return null;  //To change body of implemented methods use File | Settings | File Templates.
+     }
+ 
      public void registerDashboard(TopComponent dashboard) {
          this.openDashboards.add(dashboard);

Index: Mx4jConnectionNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/Mx4jConnectionNode.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Mx4jConnectionNode.java	2 Apr 2004 03:25:26 -0000	1.10
--- Mx4jConnectionNode.java	21 Apr 2004 20:38:46 -0000	1.11
***************
*** 115,117 ****
--- 115,121 ----
      }
  
+     public String getConnectionMessage() {
+         return "This connection type is for connections to MX4J 1.x. For versions 2.x of MX4J " +
+             "use the JSR 160 connection type above.";
+     }
  }

Index: JSR160ConnectionNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/JSR160ConnectionNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JSR160ConnectionNode.java	21 Apr 2004 12:56:36 -0000	1.8
--- JSR160ConnectionNode.java	21 Apr 2004 20:38:46 -0000	1.9
***************
*** 116,120 ****
      }
  
!     public String getDefaultPrinciple() {
          return "";
      }
--- 116,120 ----
      }
  
!     public String getDefaultPrincipal() {
          return "";
      }