mc4j-cvs Mailing List for MC4J JMX Console (Page 32)
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: Greg H. <gh...@us...> - 2004-04-21 20:41:47
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10460/src/org/mc4j/console/bean/attribute Modified Files: AttributeNode.java AttributeSetChildren.java Log Message: sort attribute nodes Index: AttributeSetChildren.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute/AttributeSetChildren.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AttributeSetChildren.java 7 Feb 2004 16:10:40 -0000 1.5 --- AttributeSetChildren.java 21 Apr 2004 20:41:18 -0000 1.6 *************** *** 30,34 **** * @version $Revision$($Author$ / $Date$) */ ! public class AttributeSetChildren extends Children.Array { protected MBeanNode mbeanNode; --- 30,34 ---- * @version $Revision$($Author$ / $Date$) */ ! public class AttributeSetChildren extends Children.SortedArray { protected MBeanNode mbeanNode; Index: AttributeNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute/AttributeNode.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AttributeNode.java 7 Apr 2004 03:07:14 -0000 1.10 --- AttributeNode.java 21 Apr 2004 20:41:17 -0000 1.11 *************** *** 20,32 **** package org.mc4j.console.bean.attribute; - import java.lang.reflect.Array; - import java.lang.reflect.InvocationTargetException; - - import javax.management.Attribute; - import javax.management.MBeanAttributeInfo; - import javax.management.MBeanServer; - import javax.management.ObjectInstance; - import javax.management.ObjectName; - import org.openide.actions.PropertiesAction; import org.openide.actions.ToolsAction; --- 20,23 ---- *************** *** 41,44 **** --- 32,44 ---- import org.mc4j.console.Refreshable; + import java.lang.reflect.Array; + import java.lang.reflect.InvocationTargetException; + + import javax.management.Attribute; + import javax.management.MBeanAttributeInfo; + import javax.management.MBeanServer; + import javax.management.ObjectInstance; + import javax.management.ObjectName; + /** * Represents an attribute on an MBean. *************** *** 47,51 **** * @version $Revision$($Author$ / $Date$) */ ! public class AttributeNode extends AbstractNode implements Refreshable { protected MBeanServer server; --- 47,51 ---- * @version $Revision$($Author$ / $Date$) */ ! public class AttributeNode extends AbstractNode implements Refreshable, Comparable { protected MBeanServer server; *************** *** 169,172 **** --- 169,177 ---- } + public int compareTo(Object o) { + Node otherNode = (Node) o; + return this.getDisplayName().compareTo(otherNode.getDisplayName()); + } + // RECOMMENDED - handle cloning specially (so as not to invoke the overhead of FilterNode): |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:40:29
|
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 ""; } |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:39:53
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/persistence In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9756/src/org/mc4j/console/connection/persistence Modified Files: ConnectionSettings.java ConnectionSettingsBeanInfo.java Log Message: Completed principle -> principal fix Added a customizable message to the connection form Index: ConnectionSettingsBeanInfo.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/persistence/ConnectionSettingsBeanInfo.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ConnectionSettingsBeanInfo.java 16 Apr 2004 18:54:34 -0000 1.7 --- ConnectionSettingsBeanInfo.java 21 Apr 2004 20:38:19 -0000 1.8 *************** *** 28,32 **** */ public class ConnectionSettingsBeanInfo extends SimpleBeanInfo { ! // Bean descriptor //GEN-FIRST:BeanDescriptor /*lazy BeanDescriptor*/ --- 28,32 ---- */ public class ConnectionSettingsBeanInfo extends SimpleBeanInfo { ! // Bean descriptor //GEN-FIRST:BeanDescriptor /*lazy BeanDescriptor*/ *************** *** 50,54 **** private static final int PROPERTY_libraryURI = 7; private static final int PROPERTY_liveTree = 8; ! private static final int PROPERTY_principle = 9; private static final int PROPERTY_serverUrl = 10; --- 50,54 ---- private static final int PROPERTY_libraryURI = 7; private static final int PROPERTY_liveTree = 8; ! private static final int PROPERTY_principal = 9; private static final int PROPERTY_serverUrl = 10; *************** *** 83,89 **** properties[PROPERTY_liveTree].setDisplayName ( "Live Tree" ); properties[PROPERTY_liveTree].setPropertyEditorClass ( null ); ! properties[PROPERTY_principle] = new PropertyDescriptor ( "principle", ConnectionSettings.class, "getPrincipal", "setPrincipal" ); ! properties[PROPERTY_principle].setDisplayName ( "Principle" ); ! properties[PROPERTY_principle].setShortDescription ( "The principle or username used to connect." ); properties[PROPERTY_serverUrl] = new PropertyDescriptor ( "serverUrl", ConnectionSettings.class, "getServerUrl", "setServerUrl" ); properties[PROPERTY_serverUrl].setDisplayName ( "Server URL" ); --- 83,89 ---- properties[PROPERTY_liveTree].setDisplayName ( "Live Tree" ); properties[PROPERTY_liveTree].setPropertyEditorClass ( null ); ! properties[PROPERTY_principal] = new PropertyDescriptor ( "principal", ConnectionSettings.class, "getPrincipal", "setPrincipal" ); ! properties[PROPERTY_principal].setDisplayName ( "Principal" ); ! properties[PROPERTY_principal].setShortDescription ( "The principal or username used to connect." ); properties[PROPERTY_serverUrl] = new PropertyDescriptor ( "serverUrl", ConnectionSettings.class, "getServerUrl", "setServerUrl" ); properties[PROPERTY_serverUrl].setDisplayName ( "Server URL" ); |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:39:32
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/wizard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9756/src/org/mc4j/console/connection/wizard Modified Files: ConnectionVisualPanel.form ConnectionVisualPanel.java Log Message: Completed principle -> principal fix Added a customizable message to the connection form Index: ConnectionVisualPanel.form =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/wizard/ConnectionVisualPanel.form,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ConnectionVisualPanel.form 12 Sep 2002 23:22:41 -0000 1.4 --- ConnectionVisualPanel.form 21 Apr 2004 20:38:21 -0000 1.5 *************** *** 7,11 **** </NonVisualComponents> <AuxValues> ! <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,13,0,0,1,-13"/> </AuxValues> --- 7,11 ---- </NonVisualComponents> <AuxValues> ! <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,79,0,0,2,12"/> </AuxValues> *************** *** 18,22 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="8" insetsBottom="9" insetsRight="9" anchor="13" weightX="0.0" weightY="1.0"/> </Constraint> </Constraints> --- 18,22 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="13" weightX="0.0" weightY="1.0"/> </Constraint> </Constraints> *************** *** 28,31 **** --- 28,32 ---- <Font name="Dialog" size="12" style="0"/> </Property> + <Property name="toolTipText" type="java.lang.String" value="Select the initial context factory that will allow you to connect to the server's JNDI software."/> <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> <StringArray count="4"> *************** *** 36,44 **** </StringArray> </Property> ! <Property name="toolTipText" type="java.lang.String" value="Select the initial context factory that will allow you to connect to the server's JNDI software."/> ! <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[300, 20]"/> </Property> ! <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[300, 20]"/> </Property> --- 37,44 ---- </StringArray> </Property> ! <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[300, 20]"/> </Property> ! <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[300, 20]"/> </Property> *************** *** 46,50 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="10" anchor="17" weightX="0.0" weightY="1.0"/> </Constraint> </Constraints> --- 46,50 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="17" weightX="1.0" weightY="1.0"/> </Constraint> </Constraints> *************** *** 56,60 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="9" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 56,60 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 74,81 **** </StringArray> </Property> ! <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[120, 20]"/> </Property> ! <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[120, 20]"/> </Property> --- 74,81 ---- </StringArray> </Property> ! <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[120, 20]"/> </Property> ! <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Dimension value="[120, 20]"/> </Property> *************** *** 83,87 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="10" anchor="17" weightX="0.0" weightY="1.0"/> </Constraint> </Constraints> --- 83,87 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="17" weightX="1.0" weightY="1.0"/> </Constraint> </Constraints> *************** *** 93,97 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="9" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 93,97 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 103,107 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="9" anchor="12" weightX="0.0" weightY="0.2"/> </Constraint> </Constraints> --- 103,107 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="6" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="13" weightX="0.0" weightY="0.2"/> </Constraint> </Constraints> *************** *** 110,114 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="9" anchor="17" weightX="0.0" weightY="1.0"/> </Constraint> </Constraints> --- 110,114 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="17" weightX="1.0" weightY="1.0"/> </Constraint> </Constraints> *************** *** 120,124 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="9" anchor="11" weightX="0.0" weightY="1.0"/> </Constraint> </Constraints> --- 120,124 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="17" weightX="1.0" weightY="1.0"/> </Constraint> </Constraints> *************** *** 130,134 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="10" anchor="17" weightX="0.0" weightY="1.0"/> </Constraint> </Constraints> --- 130,134 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="17" weightX="1.0" weightY="1.0"/> </Constraint> </Constraints> *************** *** 140,144 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="8" insetsBottom="9" insetsRight="9" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 140,144 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 150,154 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="8" insetsBottom="9" insetsRight="9" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> --- 150,154 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="13" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> *************** *** 160,164 **** <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="9" insetsLeft="0" insetsBottom="9" insetsRight="10" anchor="17" weightX="0.0" weightY="1.0"/> </Constraint> </Constraints> --- 160,182 ---- <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="17" weightX="1.0" weightY="1.0"/> ! </Constraint> ! </Constraints> ! </Component> ! <Component class="javax.swing.JTextArea" name="messageLabel"> ! <Properties> ! <Property name="editable" type="boolean" value="false"/> ! <Property name="rows" type="int" value="3"/> ! <Property name="text" type="java.lang.String" value="message text"/> ! <Property name="lineWrap" type="boolean" value="true"/> ! <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor"> ! <Color blue="0" green="0" red="ff" type="rgb"/> ! </Property> ! <Property name="wrapStyleWord" type="boolean" value="true"/> ! <Property name="opaque" type="boolean" value="false"/> ! </Properties> ! <Constraints> ! <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> ! <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="5" insetsBottom="5" insetsRight="5" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> Index: ConnectionVisualPanel.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/wizard/ConnectionVisualPanel.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ConnectionVisualPanel.java 16 Apr 2004 18:54:35 -0000 1.14 --- ConnectionVisualPanel.java 21 Apr 2004 20:38:28 -0000 1.15 *************** *** 102,106 **** dServerUrl = null, dPrinciple = null, ! dCredentials = null; dName = ""; // Everyone needs a name --- 102,107 ---- dServerUrl = null, dPrinciple = null, ! dCredentials = null, ! dMessage = null; dName = ""; // Everyone needs a name *************** *** 113,160 **** dInitialContext = connectionNode.getDefaultInitialContext(); dServerUrl = connectionNode.getDefaultServerUrl(); ! dPrinciple = connectionNode.getDefaultPrinciple(); dCredentials = connectionNode.getDefaultCredentials(); } ! /* ! if ("JBoss".equals(type)) { ! dJndiName = "jmx/rmi/RMIAdaptor"; ! dInitialContext = "org.jnp.interfaces.NamingContextFactory"; ! dServerUrl = "jnp://localhost:1099"; ! } else if ("MX4J".equals(type)) { ! dJndiName = "jrmp"; ! dInitialContext = "com.sun.jndi.rmi.registry.RegistryContextFactory"; ! dServerUrl = "rmi://localhost:1099"; ! } else if ("Weblogic".equals(type)) { ! dJndiName = "weblogic.management.adminhome"; ! dInitialContext = "weblogic.jndi.WLInitialContextFactory"; ! dServerUrl = "t3://localhost:7001"; ! dPrinciple = ""; ! dCredentials = ""; ! } else if (ManagementNode.JSR160_CONNECTION.equals(type)) { ! dServerUrl = "service:jmx:rmi:///jndi/rmi://localhost:9999/server"; ! dPrinciple = ""; ! dCredentials = ""; ! } else if ("JDMK".equals(type)) { ! dInitialContext = null; ! dServerUrl = "localhost:8086"; ! dJndiName = "name=RmiConnectorServer"; ! } else if ("Websphere".equals(type)) { ! dServerUrl = "http://localhost:8880"; ! dJndiName = null; ! } else if("OC4J".equals(type)) { ! dServerUrl="ormi://localhost:23791/default"; ! dJndiName = "java:comp/env/ejb/mgmt/MEJB"; ! dInitialContext="com.evermind.server.ApplicationClientInitialContextFactory"; ! dPrinciple="admin"; ! dCredentials=""; ! } else { ! ! dName = ""; ! dJndiName =""; ! dInitialContext = ""; ! dServerUrl = ""; ! dPrinciple = ""; ! dCredentials = ""; ! }*/ this.jndiNameField.setEnabled(dJndiName != null); --- 114,123 ---- dInitialContext = connectionNode.getDefaultInitialContext(); dServerUrl = connectionNode.getDefaultServerUrl(); ! dPrinciple = connectionNode.getDefaultPrincipal(); dCredentials = connectionNode.getDefaultCredentials(); + dMessage = connectionNode.getConnectionMessage(); } ! ! this.messageLabel.setText(dMessage); this.jndiNameField.setEnabled(dJndiName != null); *************** *** 262,265 **** --- 225,229 ---- jndiNameLabel = new javax.swing.JLabel(); jndiNameField = new javax.swing.JTextField(); + messageLabel = new javax.swing.JTextArea(); setLayout(new java.awt.GridBagLayout()); *************** *** 269,290 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 3; gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(9, 8, 9, 9); add(initialContextFactoryLabel, gridBagConstraints); initialContextFactoryComboBox.setEditable(true); initialContextFactoryComboBox.setFont(new java.awt.Font("Dialog", 0, 12)); - initialContextFactoryComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "com.sun.jndi.rmi.registry.RegistryContextFactory", "weblogic.jndi.WLInitialContextFactory", "com.sun.jndi.cosnaming.CNCtxFactory", "org.jnp.interfaces.NamingContextFactory" })); initialContextFactoryComboBox.setToolTipText("Select the initial context factory that will allow you to connect to the server's JNDI software."); ! initialContextFactoryComboBox.setMinimumSize(new java.awt.Dimension(300, 20)); initialContextFactoryComboBox.setPreferredSize(new java.awt.Dimension(300, 20)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 3; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 10); add(initialContextFactoryComboBox, gridBagConstraints); --- 233,255 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 3; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.weighty = 1.0; add(initialContextFactoryLabel, gridBagConstraints); initialContextFactoryComboBox.setEditable(true); initialContextFactoryComboBox.setFont(new java.awt.Font("Dialog", 0, 12)); initialContextFactoryComboBox.setToolTipText("Select the initial context factory that will allow you to connect to the server's JNDI software."); ! initialContextFactoryComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "com.sun.jndi.rmi.registry.RegistryContextFactory", "weblogic.jndi.WLInitialContextFactory", "com.sun.jndi.cosnaming.CNCtxFactory", "org.jnp.interfaces.NamingContextFactory" })); initialContextFactoryComboBox.setPreferredSize(new java.awt.Dimension(300, 20)); + initialContextFactoryComboBox.setMinimumSize(new java.awt.Dimension(300, 20)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 3; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; add(initialContextFactoryComboBox, gridBagConstraints); *************** *** 293,312 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 4; gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 9); add(serverUrlLabel, gridBagConstraints); serverURLComboBox.setEditable(true); serverURLComboBox.setFont(new java.awt.Font("Dialog", 0, 12)); ! serverURLComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "rmi://localhost:1099", "t3://localhost:7001", "iiop://localhost:900", "jnp://localhost:1099", "http://localhost:8880" })); ! serverURLComboBox.setMinimumSize(new java.awt.Dimension(120, 20)); serverURLComboBox.setPreferredSize(new java.awt.Dimension(120, 20)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 4; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 10); add(serverURLComboBox, gridBagConstraints); --- 258,278 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 4; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; add(serverUrlLabel, gridBagConstraints); serverURLComboBox.setEditable(true); serverURLComboBox.setFont(new java.awt.Font("Dialog", 0, 12)); ! serverURLComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "rmi://localhost:1099", "t3://localhost:7001", "iiop://localhost:900", "jnp://localhost:1099" })); serverURLComboBox.setPreferredSize(new java.awt.Dimension(120, 20)); + serverURLComboBox.setMinimumSize(new java.awt.Dimension(120, 20)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 4; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; add(serverURLComboBox, gridBagConstraints); *************** *** 315,320 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 5; gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 9); add(principleLabel, gridBagConstraints); --- 281,286 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 5; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; add(principleLabel, gridBagConstraints); *************** *** 323,329 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 6; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST; gridBagConstraints.weighty = 0.2; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 9); add(credentialsLabel, gridBagConstraints); --- 289,295 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 6; ! gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); ! gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.weighty = 0.2; add(credentialsLabel, gridBagConstraints); *************** *** 332,338 **** gridBagConstraints.gridy = 5; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 9); add(principleField, gridBagConstraints); --- 298,305 ---- gridBagConstraints.gridy = 5; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; add(principleField, gridBagConstraints); *************** *** 341,347 **** gridBagConstraints.gridy = 6; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; ! gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 9); add(credentialsField, gridBagConstraints); --- 308,315 ---- gridBagConstraints.gridy = 6; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; ! gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); ! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; ! gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; add(credentialsField, gridBagConstraints); *************** *** 356,362 **** gridBagConstraints.gridy = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 10); add(nameField, gridBagConstraints); --- 324,331 ---- gridBagConstraints.gridy = 1; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; add(nameField, gridBagConstraints); *************** *** 365,370 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; - gridBagConstraints.insets = new java.awt.Insets(9, 8, 9, 9); add(nameLabel, gridBagConstraints); --- 334,339 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; add(nameLabel, gridBagConstraints); *************** *** 373,378 **** gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; - gridBagConstraints.insets = new java.awt.Insets(9, 8, 9, 9); add(jndiNameLabel, gridBagConstraints); --- 342,347 ---- gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; add(jndiNameLabel, gridBagConstraints); *************** *** 382,390 **** gridBagConstraints.gridy = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(9, 0, 9, 10); add(jndiNameField, gridBagConstraints); }//GEN-END:initComponents --- 351,373 ---- gridBagConstraints.gridy = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; add(jndiNameField, gridBagConstraints); + messageLabel.setEditable(false); + messageLabel.setRows(3); + messageLabel.setText("message text"); + messageLabel.setLineWrap(true); + messageLabel.setForeground(new java.awt.Color(255, 0, 0)); + messageLabel.setWrapStyleWord(true); + messageLabel.setOpaque(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5); + add(messageLabel, gridBagConstraints); + }//GEN-END:initComponents *************** *** 399,415 **** // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JComboBox initialContextFactoryComboBox; private javax.swing.JLabel initialContextFactoryLabel; - private javax.swing.JTextField nameField; - private javax.swing.JLabel nameLabel; - private javax.swing.JComboBox serverURLComboBox; - private javax.swing.JLabel serverUrlLabel; private javax.swing.JTextField jndiNameField; private javax.swing.JLabel jndiNameLabel; ! private javax.swing.JTextField credentialsField; private javax.swing.JTextField principleField; - private javax.swing.JLabel credentialsLabel; private javax.swing.JLabel principleLabel; private javax.swing.ButtonGroup serverTypeButtonGroup; // End of variables declaration//GEN-END:variables --- 382,399 ---- // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JTextField credentialsField; + private javax.swing.JLabel credentialsLabel; private javax.swing.JComboBox initialContextFactoryComboBox; private javax.swing.JLabel initialContextFactoryLabel; private javax.swing.JTextField jndiNameField; private javax.swing.JLabel jndiNameLabel; ! private javax.swing.JTextArea messageLabel; ! private javax.swing.JTextField nameField; ! private javax.swing.JLabel nameLabel; private javax.swing.JTextField principleField; private javax.swing.JLabel principleLabel; private javax.swing.ButtonGroup serverTypeButtonGroup; + private javax.swing.JComboBox serverURLComboBox; + private javax.swing.JLabel serverUrlLabel; // End of variables declaration//GEN-END:variables |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:35:40
|
Update of /cvsroot/mc4j/mc4j/doc-build/guide In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8683/doc-build/guide Modified Files: Attributes.xml Connections.xml Dashboards.xml Graphs.xml MBean.xml Notifications.xml Operations.xml Overview.xml Queries.xml connect_wizard.gif connection_tree.gif index.xml Log Message: Some updates to guides, a few new pages, new screen shots. Index: index.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/index.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.xml 6 Jun 2003 22:52:43 -0000 1.2 --- index.xml 21 Apr 2004 20:31:51 -0000 1.3 *************** *** 3,7 **** <!ENTITY CarbonModule SYSTEM "module.xml"> ]> ! <document url="index.html"> &CarbonModule; --- 3,7 ---- <!ENTITY CarbonModule SYSTEM "module.xml"> ]> ! <document url="guide/index.html"> &CarbonModule; Index: Notifications.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Notifications.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Notifications.xml 6 Jun 2003 22:52:43 -0000 1.1 --- Notifications.xml 21 Apr 2004 20:31:51 -0000 1.2 *************** *** 6,10 **** ]> ! <document url="MBean.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/MBean.html"> &CarbonModule; Index: connection_tree.gif =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/connection_tree.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvstB4lLL and /tmp/cvsztK4eb differ Index: Connections.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Connections.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Connections.xml 13 Nov 2003 02:00:24 -0000 1.2 --- Connections.xml 21 Apr 2004 20:31:50 -0000 1.3 *************** *** 6,10 **** ]> ! <document url="Connections.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/Connections.html"> &CarbonModule; Index: Queries.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Queries.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Queries.xml 6 Jun 2003 22:52:43 -0000 1.1 --- Queries.xml 21 Apr 2004 20:31:51 -0000 1.2 *************** *** 6,10 **** ]> ! <document url="MBean.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/MBean.html"> &CarbonModule; Index: Dashboards.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Dashboards.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Dashboards.xml 8 Apr 2004 22:12:22 -0000 1.2 --- Dashboards.xml 21 Apr 2004 20:31:50 -0000 1.3 *************** *** 6,10 **** ]> ! <document url="Dashboards.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/Dashboards.html"> &CarbonModule; Index: MBean.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/MBean.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MBean.xml 6 Jun 2003 22:52:43 -0000 1.1 --- MBean.xml 21 Apr 2004 20:31:51 -0000 1.2 *************** *** 6,10 **** ]> ! <document url="MBean.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/MBean.html"> &CarbonModule; Index: Attributes.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Attributes.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Attributes.xml 6 Jun 2003 22:52:43 -0000 1.1 --- Attributes.xml 21 Apr 2004 20:31:47 -0000 1.2 *************** *** 6,10 **** ]> ! <document url="Attributes.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/Attributes.html"> &CarbonModule; Index: Overview.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Overview.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Overview.xml 6 Jun 2003 22:52:43 -0000 1.2 --- Overview.xml 21 Apr 2004 20:31:51 -0000 1.3 *************** *** 6,10 **** ]> ! <document url="Overview.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/Overview.html"> &CarbonModule; *************** *** 23,27 **** <p> MC4J, by default, has a four section layout that provides standard locations for information and functionality. ! Many of these panels, however, can be rearranged to suit a desired style. </p> --- 23,28 ---- <p> MC4J, by default, has a four section layout that provides standard locations for information and functionality. ! These panels can be rearranged by dragging the title tabs to any location within the application. This allows ! you to let as many panels be visible as you like and in almost any layout. </p> *************** *** 30,37 **** <p> The first and most important section is the Explorer section. This top-left area of the console provides the ! primary interface for the information and servers that MC4J exposes. This area includes four main tabs, one ! for each of the supported server types. Each tab holds a tree structure of the servers of that type that are ! configured. This section is where new connections to servers are configured and where those connections are ! managed. Many of the nodes within these explorer trees support right-click operations for further operation. </p> --- 31,38 ---- <p> The first and most important section is the Explorer section. This top-left area of the console provides the ! primary interface for the server connections that MC4J exposes. The area holds a tree structure of the ! server connections configured. When a connection is active, the beans and views of the server are shown ! in a tree structure below the connection. Many of the nodes within these explorer trees support ! right-click operations for typical actions. </p> Index: Graphs.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Graphs.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Graphs.xml 6 Jun 2003 22:52:43 -0000 1.1 --- Graphs.xml 21 Apr 2004 20:31:50 -0000 1.2 *************** *** 6,10 **** ]> ! <document url="MBean.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/MBean.html"> &CarbonModule; Index: connect_wizard.gif =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/connect_wizard.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs5myJRS and /tmp/cvs804vMr differ Index: Operations.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/guide/Operations.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Operations.xml 6 Jun 2003 22:52:43 -0000 1.1 --- Operations.xml 21 Apr 2004 20:31:51 -0000 1.2 *************** *** 6,10 **** ]> ! <document url="MBean.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="guide/MBean.html"> &CarbonModule; |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:33:51
|
Update of /cvsroot/mc4j/mc4j/doc-build/dashboard-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8683/doc-build/dashboard-dev Modified Files: DashboardComponents.xml DashboardXML.xml index.xml Log Message: Some updates to guides, a few new pages, new screen shots. Index: index.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/dashboard-dev/index.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.xml 8 Apr 2004 22:12:21 -0000 1.1 --- index.xml 21 Apr 2004 20:31:46 -0000 1.2 *************** *** 3,7 **** <!ENTITY CarbonModule SYSTEM "module.xml"> ]> ! <document url="index.html"> &CarbonModule; --- 3,7 ---- <!ENTITY CarbonModule SYSTEM "module.xml"> ]> ! <document url="dashboard-dev/index.html"> &CarbonModule; Index: DashboardComponents.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/dashboard-dev/DashboardComponents.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DashboardComponents.xml 8 Apr 2004 22:12:21 -0000 1.1 --- DashboardComponents.xml 21 Apr 2004 20:31:36 -0000 1.2 *************** *** 6,10 **** ]> ! <document url="DashboardComponents.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="dashboard-dev/DashboardComponents.html"> &CarbonModule; *************** *** 53,61 **** </section> ! <Section name="Standard Components"> <p> The following are the standard set of Dashboard Components that can be used to construct Dashboard views. </p> <subsection name="AttributeListComponent"> --- 53,62 ---- </section> ! <section name="Standard Components"> <p> The following are the standard set of Dashboard Components that can be used to construct Dashboard views. </p> + <subsection name="AttributeListComponent"> *************** *** 85,89 **** <subsection name="RefreshControlComponent"></subsection> <subsection name="RelationsGraphComponent"></subsection> ! </Section> </body> --- 86,90 ---- <subsection name="RefreshControlComponent"></subsection> <subsection name="RelationsGraphComponent"></subsection> ! </section> </body> Index: DashboardXML.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/dashboard-dev/DashboardXML.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DashboardXML.xml 8 Apr 2004 22:12:21 -0000 1.1 --- DashboardXML.xml 21 Apr 2004 20:31:36 -0000 1.2 *************** *** 6,10 **** ]> ! <document url="DashboardXML.html"> &CarbonModule; --- 6,10 ---- ]> ! <document url="dashboard-dev/DashboardXML.html"> &CarbonModule; *************** *** 143,146 **** --- 143,147 ---- </p> + <span class="pretitle">A complete dashboard example</span> <pre> <?xml version="1.0" encoding="UTF-8"?> |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:33:47
|
Update of /cvsroot/mc4j/mc4j/doc-build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8683/doc-build Modified Files: ScreenShots.xml index.xml module.xml Added Files: Download.xml j2se15_connection.gif usageJRE15.xml Log Message: Some updates to guides, a few new pages, new screen shots. Index: index.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/index.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.xml 8 Apr 2004 22:12:22 -0000 1.8 --- index.xml 21 Apr 2004 20:32:52 -0000 1.9 *************** *** 120,127 **** <td style="background-color: #6998BE">Supported/Tested Versions</td> </tr> <tr> <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB"> <a href="http://www.jboss.org">JBoss</a></td> ! <td style="border-bottom: .75pt solid silver">3.0.x<br/>3.2.x<br/>4.0 DRx</td> </tr> --- 120,134 ---- <td style="background-color: #6998BE">Supported/Tested Versions</td> </tr> + + <tr> + <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB"> + <a href="http://java.sun.com/j2se/1.5.0/download.jsp">J2SE 1.5</a></td> + <td style="border-bottom: .75pt solid silver">1.5 beta 1</td> + </tr> + <tr> <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB"> <a href="http://www.jboss.org">JBoss</a></td> ! <td style="border-bottom: .75pt solid silver">3.0.x<br/>3.2.x<br/>4.0 DR2</td> </tr> Index: ScreenShots.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/ScreenShots.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ScreenShots.xml 20 Feb 2004 00:01:09 -0000 1.4 --- ScreenShots.xml 21 Apr 2004 20:32:52 -0000 1.5 *************** *** 25,34 **** </section> ! <section name="Full Example"> ! <div><a href="ss5_large.gif"><img src="ss5_small.gif"/></a></div> </section> ! <section name="Dashboard Example"> ! <div><a href="ss1_large.gif"><img src="ss1_small.gif"/></a></div> </section> --- 25,42 ---- </section> ! <section name="Full Examples"> ! <div> ! <a href="ss/ss6_large.gif"><img src="ss/ss6_small.gif"/></a> ! <a href="ss/ss7_large.gif"><img src="ss/ss7_small.gif"/></a> ! <a href="ss/ss8_large.gif"><img src="ss/ss8_small.gif"/></a> ! </div> </section> ! <section name="On OS X"> ! <div> ! <a href="ss/ss9_large.gif"><img src="ss/ss9_small.gif"/></a> ! <a href="ss/ss10_large.gif"><img src="ss/ss10_small.gif"/></a> ! <a href="ss/ss11_large.gif"><img src="ss/ss11_small.gif"/></a> ! </div> </section> --- NEW FILE: Download.xml --- <?xml version="1.0"?> <!DOCTYPE document [ <!ENTITY CarbonModule SYSTEM "module.xml"> <!ENTITY nbsp " "> ]> <document url="Download.html"> &CarbonModule; <properties> <author email="gh...@sa...">Greg Hinkle</author> <created>April 2004</created> <title>Download MC4J</title> <version>$Revision: 1.1 $($Author: ghinkl $ / $Date: 2004/04/21 20:32:38 $)</version> </properties> <body> <section name="Download"> <p> You can download the latest version of MC4J from this page. </p> <subsection name="Download MC4J 1.2 beta 5 (April 8th, 2004)"> <p> <table style="border: 1pt solid silver; background-color: #DDE6E6"> <tr> <td colspan="2" style="font-size: 18;background-color: #6998BE">Installers</td> </tr> <tr> <td style="font-weight: bold; border-bottom: .75pt solid silver" width="200"> <img src="images/linux.gif"/>Linux </td> <td style="border-bottom: .75pt solid silver"> <a href="http://prdownloads.sourceforge.net/mc4j/MC4J12b5_Linux.bin?download">Download</a> </td> </tr> <tr> <td style="font-weight: bold; border-bottom: .75pt solid silver"> <img src="images/mac.gif"/>Mac OS X 10.3+ </td> <td style="border-bottom: .75pt solid silver"> <a href="http://prdownloads.sourceforge.net/mc4j/MC4J-12b5-MacOSX.zip?download">Download</a> </td> </tr> <tr> <td style="font-weight: bold; border-bottom: .75pt solid silver"> <img src="images/win.gif"/>Windows </td> <td style="border-bottom: .75pt solid silver"> <a href="http://prdownloads.sourceforge.net/mc4j/MC4J-12b5-Windows.exe?download">Download</a> </td> </tr> <tr> <td style="font-weight: bold; border-bottom: .75pt solid silver"> <img src="images/solaris.gif"/>Other (Solaris, etc.) </td> <td style="border-bottom: .75pt solid silver"> <a href="http://prdownloads.sourceforge.net/mc4j/MC4J12b5-Java.jar?download">Download</a> </td> </tr> </table> </p> </subsection> <p> Older versions can be downloaded <a href="http://sourceforge.net/project/showfiles.php?group_id=60228&release_id=107843">here</a>. </p> </section> </body> </document> --- NEW FILE: usageJRE15.xml --- <?xml version="1.0"?> <!DOCTYPE document [ <!ENTITY CarbonModule SYSTEM "module.xml"> <!ENTITY nbsp " "> ]> <document url="usageJRE15.html"> &CarbonModule; <properties> <author email="gh...@sa...">Greg Hinkle</author> <created>April 2004</created> <title>Using MC4J with J2SE 1.5</title> <version>$Revision: 1.1 $($Author: ghinkl $ / $Date: 2004/04/21 20:32:52 $)</version> </properties> <body> <section name="JMX Remoting"> <p> The MC4J application now has support for connecting to any server support the JMX Remoting Protocol 1.0+ as defined by JSR-160. This specification aims to provide a common remote connection specification and will hopefully, finally make JMX implementations compatible. At the moment, no major application servers are supporting jmx remoting, but MC4J can connect over JSR-160 style connections to both MX4J 2.x services as well as J2SE 1.5 jvms. </p> <p> <b>Note: </b>In order to use the specialized 1.5 monitoring and graphing features of MC4J you must run MC4J with the 1.5 JVM. To do this, you must select a 1.5 JVM while installing MC4J... if you need to reset which JVM for MC4J to use, it is probably easiest to just reinstall MC4J and select the 1.5 JVM. </p> <subsection name="J2SE 1.5 Management and Monitoring"> <p> The J2SE 1.5 beta, released by Sun, has support for JMX Remoting and can be connected to through MC4J's JSR-160 style connector. The Management and Monitoring specification added to the JVM in this release is documented in the <a href="http://java.sun.com/j2se/1.5.0/docs/guide/management/index.html">Management and Monitoring</a> section of the 1.5 documentation. </p> </subsection> </section> <section name="Connecting MC4J to J2SE 1.5 beta"> <p> In order to connection MC4J to a J2SE 1.5 JVM you must first have the JVM start the JMX MBean Server and the Remoting adaptor. This can be done simply by adding a command line argument to the java command such as: [java -Dcom.sun.management.jmxremote.port=8999]. You will also want to customize jvm management properties to add a username and password. You can edit the <jdk-home>/jre/lib/management/jmxremote.password file to add a username and password combination. </p> <p> Passing the port number to connect to will have the JVM start the facilities in the JVM to allow MC4J to connect to it. To connect MC4J to this JVM, follow these steps: </p> <ol> <li>Choose the <i>Management -> Create Server Connection</i> menu item</li> <li>Select the <i>JSR 160</i> connection type from the first drop-down</li> <li>Enter a name for the connection</li> <li>Customize the hostname, port and path in the Server URL. Make sure the port is the same as specified on the command line above. Set the path to be <i>jmxrmi</i>. The final Server URL in the case of a local jvm would be: <b>service:jmx:rmi:///jndi/rmi://localhost:8999/jmxrmi</b>.</li> <li>Enter the username and password you specified above</li> <li>Complete the wizard with no other customizations</li> </ol> <img src="j2se15_connection.gif"/> <p> This should connect you to your J2SE JVM and show you about 17 built in MBeans. The global dashboards section will have the dashboards to show you the cool thread info and memory pool graphs and charts. </p> </section> <section name="Requirements"> <p> This will only work with J2SE 1.5 beta release available at <a href="http://java.sun.com/j2se/1.5.0/download.jsp">Sun's download section</a>. </p> </section> </body> </document> --- NEW FILE: j2se15_connection.gif --- (This appears to be a binary file; contents omitted.) Index: module.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/module.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** module.xml 8 Apr 2004 22:12:22 -0000 1.8 --- module.xml 21 Apr 2004 20:32:52 -0000 1.9 *************** *** 10,14 **** <menu name="Getting Started"> ! <item name="Download" href="http://sourceforge.net/project/showfiles.php?group_id=60228&release_id=107843"/> <item name="Screen Shots" href="ScreenShots.html"/> </menu> --- 10,14 ---- <menu name="Getting Started"> ! <item name="Download" href="Download.html"/> <item name="Screen Shots" href="ScreenShots.html"/> </menu> *************** *** 20,23 **** --- 20,24 ---- <menu name="Server Support"> + <item name="J2SE 1.5" href="usageJRE15.html"/> <item name="JBoss" href="usageJBoss.html"/> <item name="MX4J" href="usageMX4J.html"/> |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:33:19
|
Update of /cvsroot/mc4j/mc4j/doc-build/ss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8683/doc-build/ss Added Files: ss10_large.gif ss10_small.gif ss11_large.gif ss11_small.gif ss6_large.gif ss6_small.gif ss7_large.gif ss7_small.gif ss8_large.gif ss8_small.gif ss9_large.gif ss9_small.gif Log Message: Some updates to guides, a few new pages, new screen shots. --- NEW FILE: ss7_small.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss10_small.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss11_small.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss8_large.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss11_large.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss6_large.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss9_small.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss6_small.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss9_large.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss8_small.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss7_large.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ss10_large.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:32:23
|
Update of /cvsroot/mc4j/mc4j/doc-build/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8683/doc-build/images Added Files: linux.gif linux.jpg mac.gif solaris.gif win.gif Log Message: Some updates to guides, a few new pages, new screen shots. --- NEW FILE: solaris.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mac.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: linux.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: linux.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: win.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:24:36
|
Update of /cvsroot/mc4j/mc4j/doc-build/guide In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7459/doc-build/guide Added Files: jre15_features_large.gif jre15_features_small.gif Log Message: Some updates to guides, a few new pages, new screen shots. --- NEW FILE: jre15_features_large.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jre15_features_small.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Greg H. <gh...@us...> - 2004-04-21 20:20:30
|
Update of /cvsroot/mc4j/mc4j/doc-build/ss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6726/doc-build/ss Log Message: Directory /cvsroot/mc4j/mc4j/doc-build/ss added to the repository |
|
From: Greg H. <gh...@us...> - 2004-04-21 13:49:20
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28707/src/org/mc4j/console/dashboard Modified Files: DashboardLoader.java Log Message: Code cleanup Index: DashboardLoader.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardLoader.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DashboardLoader.java 21 Apr 2004 13:47:29 -0000 1.5 --- DashboardLoader.java 21 Apr 2004 13:48:46 -0000 1.6 *************** *** 76,81 **** Dashboard dashboard = null; try { - //IOProvider.getDefault().getIO("Dashboard debugging",false).getOut(). - // println("Parsing dashboard: " + dashboardFile.getName()); Document document = buildDocument(new FileInputStream(dashboardFile)); --- 76,79 ---- *************** *** 88,99 **** document); - //dashboard.setNameFilter(rootElement.getAttribute("nameFilter")); - dashboard.setDescription(rootElement.getElementsByTagName("Description").item(0).getNodeValue()); - //dashboard.setIsMultiBean(Boolean.valueOf(rootElement.getAttribute("isMultiBean")).booleanValue()); - - //dashboard.setGlobal(Boolean.valueOf(rootElement.getAttribute("isGlobal")).booleanValue()); - assignDashboardMatch(dashboard, rootElement); --- 86,91 ---- |
|
From: Greg H. <gh...@us...> - 2004-04-21 13:48:13
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28498/src/org/mc4j/console/dashboard Modified Files: DashboardLoader.java Log Message: more error handling to deal with old dashboards. Index: DashboardLoader.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardLoader.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DashboardLoader.java 21 Apr 2004 13:27:46 -0000 1.4 --- DashboardLoader.java 21 Apr 2004 13:47:29 -0000 1.5 *************** *** 102,111 **** --- 102,118 ---- println("Dashboard parsing failed on: " + dashboardFile.getName() + " " + se); ErrorManager.getDefault().notify(se); + dashboard = null; } catch(FileNotFoundException fnfe) { IOProvider.getDefault().getIO("Dashboard debugging",false).getOut(). println("Dashboard parsing failed on: " + dashboardFile.getName() + " " + fnfe); ErrorManager.getDefault().notify(fnfe); + dashboard = null; } catch(IOException ioe) { ErrorManager.getDefault().notify(ioe); + dashboard = null; + } catch(Exception e) { + IOProvider.getDefault().getIO("Dashboard debugging",false).getOut(). + println("Dashboard parsing failed for unknown reason on: " + dashboardFile.getName() + " " + e); + dashboard = null; } return dashboard; |
|
From: Greg H. <gh...@us...> - 2004-04-21 13:28:47
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24157/src/org/mc4j/console/dashboard Modified Files: DashboardLoader.java DashboardManager.java Log Message: A little better error handling to deal with old dashboards. Index: DashboardManager.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DashboardManager.java 8 Apr 2004 15:08:49 -0000 1.2 --- DashboardManager.java 21 Apr 2004 13:27:50 -0000 1.3 *************** *** 20,23 **** --- 20,29 ---- package org.mc4j.console.dashboard; + import org.openide.awt.StatusDisplayer; + import org.openide.modules.InstalledFileLocator; + import org.openide.windows.IOProvider; + + import org.mc4j.console.bean.MBeanNode; + import java.io.File; import java.io.FileFilter; *************** *** 30,39 **** import java.util.TreeSet; - import org.openide.awt.StatusDisplayer; - import org.openide.modules.InstalledFileLocator; - import org.openide.windows.IOProvider; - - import org.mc4j.console.bean.MBeanNode; - /** * This static-singleton manages the set of dashboards for found by the MC4J --- 36,39 ---- *************** *** 96,100 **** for (int i = 0; i < dashboardFiles.length; i++) { ! Dashboard dashboard = DashboardLoader.getInstance().buildDashboard(dashboardFiles[i]); if (dashboard != null) --- 96,100 ---- for (int i = 0; i < dashboardFiles.length; i++) { ! Dashboard dashboard = DashboardLoader.getInstance().buildDashboard(dashboardFiles[i]); if (dashboard != null) Index: DashboardLoader.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardLoader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DashboardLoader.java 8 Apr 2004 20:30:43 -0000 1.3 --- DashboardLoader.java 21 Apr 2004 13:27:46 -0000 1.4 *************** *** 19,22 **** --- 19,36 ---- package org.mc4j.console.dashboard; + import org.w3c.dom.Document; + import org.w3c.dom.Element; + import org.w3c.dom.NodeList; + import org.xml.sax.InputSource; + import org.xml.sax.SAXException; + import org.xml.sax.helpers.DefaultHandler; + + import org.openide.ErrorManager; + import org.openide.windows.IOProvider; + + import org.mc4j.console.dashboard.match.BeanCondition; + import org.mc4j.console.dashboard.match.BeanMatch; + import org.mc4j.console.dashboard.match.DashboardMatch; + import java.io.File; import java.io.FileInputStream; *************** *** 29,46 **** import javax.xml.parsers.ParserConfigurationException; - import org.openide.ErrorManager; - import org.openide.windows.IOProvider; - - import org.mc4j.console.dashboard.match.BeanCondition; - import org.mc4j.console.dashboard.match.BeanMatch; - import org.mc4j.console.dashboard.match.DashboardMatch; - - import org.w3c.dom.Document; - import org.w3c.dom.Element; - import org.w3c.dom.NodeList; - import org.xml.sax.InputSource; - import org.xml.sax.SAXException; - import org.xml.sax.helpers.DefaultHandler; - /** * This static singleton is primarily here to load dashboard xml files into their --- 43,46 ---- *************** *** 121,134 **** * @param rootElement */ ! private void assignDashboardMatch(Dashboard dashboard, Element rootElement) { Element dashboardMatchElement = (Element) rootElement.getElementsByTagName("DashboardMatch").item(0); DashboardMatch dashboardMatch = new DashboardMatch(); String type = dashboardMatchElement.getAttribute("type"); ! if (type != null) dashboardMatch.setType(type); String location = dashboardMatchElement.getAttribute("location"); --- 121,143 ---- * @param rootElement */ ! private void assignDashboardMatch(Dashboard dashboard, Element rootElement) ! throws SAXException { Element dashboardMatchElement = (Element) rootElement.getElementsByTagName("DashboardMatch").item(0); + if (dashboardMatchElement == null) { + throw new SAXException( + "The required element [DashboardMatch] is missing"); + } DashboardMatch dashboardMatch = new DashboardMatch(); String type = dashboardMatchElement.getAttribute("type"); ! if (type != null) { dashboardMatch.setType(type); + } else { + throw new SAXException( + "The required attribute [type] on the element[DashboardMatch] is missing or invalid."); + } String location = dashboardMatchElement.getAttribute("location"); |
|
From: Greg H. <gh...@us...> - 2004-04-21 12:57:04
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18818/src/org/mc4j/console/connection Modified Files: JSR160ConnectionNode.java Log Message: Initial context can now be set for JSR 160 connections. Security Exceptions are now properly handled. Index: JSR160ConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/JSR160ConnectionNode.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JSR160ConnectionNode.java 16 Apr 2004 18:54:35 -0000 1.7 --- JSR160ConnectionNode.java 21 Apr 2004 12:56:36 -0000 1.8 *************** *** 34,37 **** --- 34,38 ---- import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; + import javax.naming.Context; *************** *** 59,62 **** --- 60,72 ---- JMXServiceURL url = new JMXServiceURL(this.connectionSettings.getServerUrl()); + HashMap env = new HashMap(); + + if ((connectionSettings.getInitialContextName() != null) && + (connectionSettings.getInitialContextName().trim().length() > 0)) { + env.put(Context.INITIAL_CONTEXT_FACTORY, connectionSettings.getInitialContextName()); + } else { + env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.rmi.registry.RegistryContextFactory"); + } + String[] credentials = new String[] { *************** *** 64,69 **** this.connectionSettings.getCredentials() }; ! HashMap env = new HashMap(); ! env.put("jmx.remote.credentials", credentials); this.jmxConnector = JMXConnectorFactory.connect(url, env); --- 74,78 ---- this.connectionSettings.getCredentials() }; ! env.put(JMXConnector.CREDENTIALS, credentials); this.jmxConnector = JMXConnectorFactory.connect(url, env); *************** *** 82,85 **** --- 91,101 ---- NotifyDescriptor.ERROR_MESSAGE); DialogDisplayer.getDefault().notify(d); + } catch (SecurityException se) { + NotifyDescriptor d = + new NotifyDescriptor.Message("Invalid username and password combination at [" + + this.connectionSettings.getServerUrl() + + "]. \nCheck to make sure the server is running on the specified host and port.", + NotifyDescriptor.ERROR_MESSAGE); + DialogDisplayer.getDefault().notify(d); } } *************** *** 108,111 **** --- 124,131 ---- } + public String getDefaultInitialContext() { + return "com.sun.jndi.rmi.registry.RegistryContextFactory"; + } + } |
|
From: Greg H. <gh...@us...> - 2004-04-20 15:32:30
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21639/src/org/mc4j/console/swing Modified Files: LogarithmicJSlider.java Log Message: Accidentally used an sun class. Back to basic ui tick painting. Index: LogarithmicJSlider.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/LogarithmicJSlider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LogarithmicJSlider.java 16 Apr 2004 18:49:39 -0000 1.1 --- LogarithmicJSlider.java 20 Apr 2004 15:32:20 -0000 1.2 *************** *** 19,25 **** package org.mc4j.console.swing; ! import sun.swing.DefaultLookup; ! ! import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; --- 19,25 ---- package org.mc4j.console.swing; ! import java.awt.Color; ! import java.awt.Graphics; ! import java.awt.Rectangle; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; *************** *** 27,31 **** import java.util.Hashtable; ! import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; --- 27,35 ---- import java.util.Hashtable; ! import javax.swing.BoundedRangeModel; ! import javax.swing.BoxLayout; ! import javax.swing.JFrame; ! import javax.swing.JLabel; ! import javax.swing.JSlider; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; *************** *** 163,167 **** int centerEffect, tickHeight; ! g.setColor(DefaultLookup.getColor(slider, this, "Slider.tickColor", Color.black)); maj = slider.getMajorTickSpacing(); --- 167,171 ---- int centerEffect, tickHeight; ! g.setColor(Color.black); maj = slider.getMajorTickSpacing(); |
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()); |
|
From: Greg H. <gh...@us...> - 2004-04-16 18:54:43
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/wizard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7853/src/org/mc4j/console/connection/wizard Modified Files: ConnectionVisualPanel.java Log Message: Fixed the spelling of principal in all the connection code. (You will lose principals from old connection.dbs) Index: ConnectionVisualPanel.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/wizard/ConnectionVisualPanel.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ConnectionVisualPanel.java 2 Apr 2004 03:25:25 -0000 1.13 --- ConnectionVisualPanel.java 16 Apr 2004 18:54:35 -0000 1.14 *************** *** 20,25 **** package org.mc4j.console.connection.wizard; ! import java.awt.Color; ! import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; --- 20,32 ---- package org.mc4j.console.connection.wizard; ! import org.openide.WizardDescriptor; ! import org.openide.util.HelpCtx; ! import org.openide.util.NbBundle; ! ! import org.mc4j.console.IConnectionNode; ! import org.mc4j.console.ManagementNode; ! import org.mc4j.console.swing.ComponentBorder; ! ! import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; *************** *** 30,46 **** import java.util.Set; ! import javax.swing.JComboBox; ! import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; - import org.openide.WizardDescriptor; - import org.openide.util.HelpCtx; - import org.openide.util.NbBundle; - - import org.mc4j.console.IConnectionNode; - import org.mc4j.console.ManagementNode; - import org.mc4j.console.swing.ComponentBorder; - /** * This is the visual panel for the main connector wizard. It holds a reference --- 37,44 ---- import java.util.Set; ! import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; /** * This is the visual panel for the main connector wizard. It holds a reference *************** *** 187,191 **** this.connectionDescriptor.getSettings().setInitialContextName(this.initialContextFactoryComboBox.getSelectedItem().toString()); this.connectionDescriptor.getSettings().setServerUrl(this.serverURLComboBox.getSelectedItem().toString()); ! this.connectionDescriptor.getSettings().setPrinciple(this.principleField.getText()); this.connectionDescriptor.getSettings().setCredentials(this.credentialsField.getText()); } --- 185,189 ---- this.connectionDescriptor.getSettings().setInitialContextName(this.initialContextFactoryComboBox.getSelectedItem().toString()); this.connectionDescriptor.getSettings().setServerUrl(this.serverURLComboBox.getSelectedItem().toString()); ! this.connectionDescriptor.getSettings().setPrincipal(this.principleField.getText()); this.connectionDescriptor.getSettings().setCredentials(this.credentialsField.getText()); } |
|
From: Greg H. <gh...@us...> - 2004-04-16 18:54:43
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/persistence In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7853/src/org/mc4j/console/connection/persistence Modified Files: ConnectionSettings.java ConnectionSettingsBeanInfo.java Log Message: Fixed the spelling of principal in all the connection code. (You will lose principals from old connection.dbs) Index: ConnectionSettingsBeanInfo.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/persistence/ConnectionSettingsBeanInfo.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ConnectionSettingsBeanInfo.java 7 Feb 2004 16:10:41 -0000 1.6 --- ConnectionSettingsBeanInfo.java 16 Apr 2004 18:54:34 -0000 1.7 *************** *** 20,30 **** package org.mc4j.console.connection.persistence; ! import java.beans.BeanDescriptor; ! import java.beans.EventSetDescriptor; ! import java.beans.IndexedPropertyDescriptor; ! import java.beans.IntrospectionException; ! import java.beans.MethodDescriptor; ! import java.beans.PropertyDescriptor; ! import java.beans.SimpleBeanInfo; /** --- 20,24 ---- package org.mc4j.console.connection.persistence; ! import java.beans.*; /** *************** *** 89,93 **** properties[PROPERTY_liveTree].setDisplayName ( "Live Tree" ); properties[PROPERTY_liveTree].setPropertyEditorClass ( null ); ! properties[PROPERTY_principle] = new PropertyDescriptor ( "principle", ConnectionSettings.class, "getPrinciple", "setPrinciple" ); properties[PROPERTY_principle].setDisplayName ( "Principle" ); properties[PROPERTY_principle].setShortDescription ( "The principle or username used to connect." ); --- 83,87 ---- properties[PROPERTY_liveTree].setDisplayName ( "Live Tree" ); properties[PROPERTY_liveTree].setPropertyEditorClass ( null ); ! properties[PROPERTY_principle] = new PropertyDescriptor ( "principle", ConnectionSettings.class, "getPrincipal", "setPrincipal" ); properties[PROPERTY_principle].setDisplayName ( "Principle" ); properties[PROPERTY_principle].setShortDescription ( "The principle or username used to connect." ); Index: ConnectionSettings.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/persistence/ConnectionSettings.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ConnectionSettings.java 7 Feb 2004 16:10:41 -0000 1.8 --- ConnectionSettings.java 16 Apr 2004 18:54:34 -0000 1.9 *************** *** 38,42 **** private String initialContextName; private String serverUrl; ! private String principle; private String credentials; --- 38,42 ---- private String initialContextName; private String serverUrl; ! private String principal; private String credentials; *************** *** 62,66 **** new java.io.ObjectStreamField("jndiName", java.lang.String.class), new java.io.ObjectStreamField("libraryURI", java.lang.String.class), ! new java.io.ObjectStreamField("principle", java.lang.String.class), new java.io.ObjectStreamField("serverUrl", java.lang.String.class)}; --- 62,66 ---- new java.io.ObjectStreamField("jndiName", java.lang.String.class), new java.io.ObjectStreamField("libraryURI", java.lang.String.class), ! new java.io.ObjectStreamField("principal", java.lang.String.class), new java.io.ObjectStreamField("serverUrl", java.lang.String.class)}; *************** *** 160,177 **** } ! /** Getter for property principle. ! * @return Value of property principle. * */ ! public String getPrinciple() { ! return principle; } ! /** Setter for property principle. ! * @param principle New value of property principle. * */ ! public void setPrinciple(String principle) { ! this.principle = principle; } --- 160,177 ---- } ! /** Getter for property principal. ! * @return Value of property principal. * */ ! public String getPrincipal() { ! return principal; } ! /** Setter for property principal. ! * @param principal New value of property principal. * */ ! public void setPrincipal(String principal) { ! this.principal = principal; } |
|
From: Greg H. <gh...@us...> - 2004-04-16 18:49:54
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/graph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6737/src/org/mc4j/console/swing/graph Modified Files: AbstractGraphPanel.java Log Message: A new Logarithmic version of JSlider, plus one that deals in time to make the sleep delay in the graph popup easier to use. Index: AbstractGraphPanel.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/graph/AbstractGraphPanel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AbstractGraphPanel.java 8 Apr 2004 20:32:17 -0000 1.6 --- AbstractGraphPanel.java 16 Apr 2004 18:49:38 -0000 1.7 *************** *** 20,58 **** package org.mc4j.console.swing.graph; - import java.awt.BorderLayout; - import java.awt.Color; - import java.awt.Dimension; - import java.awt.FlowLayout; - import java.awt.Font; - import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; - import java.awt.event.WindowAdapter; - import java.awt.event.WindowEvent; - import java.util.Calendar; - import java.util.Date; - import java.util.GregorianCalendar; - import java.util.HashMap; - import java.util.Map; - import java.util.Timer; - import java.util.TimerTask; - - import javax.swing.BorderFactory; - import javax.swing.BoxLayout; - import javax.swing.ButtonGroup; - import javax.swing.Icon; - import javax.swing.ImageIcon; - import javax.swing.JCheckBox; - import javax.swing.JFrame; - import javax.swing.JPanel; - import javax.swing.JPopupMenu; - import javax.swing.JRadioButton; - import javax.swing.JSlider; - import javax.swing.SwingUtilities; - import javax.swing.border.LineBorder; - - import org.openide.windows.TopComponent; - - import org.mc4j.console.dashboard.components.RefreshControlComponent; - import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; --- 20,23 ---- *************** *** 67,70 **** --- 32,51 ---- import org.jfree.data.time.TimeSeriesCollection; + import org.openide.windows.TopComponent; + + import org.mc4j.console.dashboard.components.RefreshControlComponent; + import org.mc4j.console.swing.LogarithmicTimeJSlider; + + import java.awt.*; + import java.awt.event.ActionEvent; + import java.awt.event.ActionListener; + import java.awt.event.WindowAdapter; + import java.awt.event.WindowEvent; + import java.util.*; + import java.util.Timer; + + import javax.swing.*; + import javax.swing.border.LineBorder; + /** * This is an abstract base class for dynamic, running Graphs in MC4J. This *************** *** 101,105 **** private JRadioButton jRadioTimeMinutes; private JRadioButton jRadioTimeSeconds; ! protected JSlider sleepSlider; --- 82,87 ---- private JRadioButton jRadioTimeMinutes; private JRadioButton jRadioTimeSeconds; ! protected LogarithmicTimeJSlider sleepSlider; ! protected JLabel sleepDelay; *************** *** 248,252 **** if (this.dataGeneratorTimerTask != null) { ! this.dataGeneratorTimerTask.cancel(); } --- 230,236 ---- if (this.dataGeneratorTimerTask != null) { ! try { ! this.dataGeneratorTimerTask.cancel(); ! } catch(Exception e) { e.printStackTrace();} } *************** *** 336,342 **** // ***************** * * * * * * * * * * * * * if (this.jRadioTimeMinutes.isSelected()) { - sleepSlider.setValue(5000); - } else if (this.jRadioTimeHours.isSelected()) { sleepSlider.setValue(10000); } --- 320,326 ---- // ***************** * * * * * * * * * * * * * if (this.jRadioTimeMinutes.isSelected()) { sleepSlider.setValue(10000); + } else if (this.jRadioTimeHours.isSelected()) { + sleepSlider.setValue(100000); } *************** *** 403,417 **** updateSpeedPanel.setBorder(BorderFactory.createTitledBorder("Update Speed")); ! sleepSlider = new javax.swing.JSlider(100,10000,1000); ! sleepSlider.setPaintLabels(true); sleepSlider.setPaintTicks(true); ! sleepSlider.setMinorTickSpacing(500); ! sleepSlider.setMajorTickSpacing(2000); ! sleepSlider.setToolTipText("Milleseconds between updates"); sleepSlider.setOpaque(false); sleepSlider.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { sleepSliderPropertyChange(null); } }); --- 387,412 ---- updateSpeedPanel.setBorder(BorderFactory.createTitledBorder("Update Speed")); ! //sleepSlider = new javax.swing.JSlider(100,10000,1000); ! //sleepSlider.setPaintLabels(true); ! //sleepSlider.setPaintTicks(true); ! //sleepSlider.setMinorTickSpacing(500); ! //sleepSlider.setMajorTickSpacing(2000); ! ! sleepSlider = new LogarithmicTimeJSlider(100, 100000, 1000); ! sleepSlider.setPaintTicks(true); ! sleepSlider.setPaintLabels(true); ! sleepSlider.setMajorTickSpacing(10); ! sleepSlider.setMinorTickSpacing(10); ! ! sleepSlider.setToolTipText("Time between updates"); sleepSlider.setOpaque(false); + sleepDelay = new JLabel("Delay: " + sleepSlider.getTime()); + sleepSlider.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { sleepSliderPropertyChange(null); + sleepDelay.setText("Delay: " + sleepSlider.getTime()); } }); *************** *** 419,422 **** --- 414,418 ---- updateSpeedPanel.add(sleepSlider); + updateSpeedPanel.add(sleepDelay); jRadioButtonScaleLinear.addChangeListener(new javax.swing.event.ChangeListener() { *************** *** 481,485 **** name, Millisecond.class); ! ts.setHistoryCount(17280000); // 48 hours this.timeSeriesMap.put(key, ts); dataset.addSeries(ts); --- 477,481 ---- name, Millisecond.class); ! ts.setHistoryCount(1728000); // 48 hours at 100 seconds this.timeSeriesMap.put(key, ts); dataset.addSeries(ts); |
|
From: Greg H. <gh...@us...> - 2004-04-16 18:49:54
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6737/src/org/mc4j/console/swing Added Files: LogarithmicJSlider.java LogarithmicTimeJSlider.java Log Message: A new Logarithmic version of JSlider, plus one that deals in time to make the sleep delay in the graph popup easier to use. --- NEW FILE: LogarithmicTimeJSlider.java --- /* * Author: Greg Hinkle * * The contents of this file are subject to the Sapient Public License Version 1.0 (the "License"); * you may not use this file except in compliance with the License. You may obtain a copy of the * License at http://mc4j.sf.net/License-SPL.html. * * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, * either express or implied. See the License for the specific language governing rights and limitations * under the License. * * The Original Code is The MC4J Management Console * The Initial Developer of the Original Code is Greg Hinkle (gh...@us...) * Copyright (C) 2004 Greg Hinkle. All Rights Reserved. * * Redistributions of code or binary files using or based on this code must reproduce the * above copyright and disclaimer. For more information see <http://mc4j.sourceforge.net>. */ package org.mc4j.console.swing; import java.text.DecimalFormat; import java.util.Hashtable; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; /** * This extension to the LogarithmicJSlider alters the major tick * labels to label logarithmic time scales from milleseconds to days. * * @author Greg Hinkle (gh...@us...), Apr 12, 2004 * @version $Revision: 1.1 $($Author: ghinkl $ / $Date: 2004/04/16 18:49:39 $) */ public class LogarithmicTimeJSlider extends LogarithmicJSlider { public LogarithmicTimeJSlider(int orientation) { super(orientation); } public LogarithmicTimeJSlider(int min, int max) { super(min, max); } public LogarithmicTimeJSlider(int min, int max, int value) { super(min, max, value); } public LogarithmicTimeJSlider(int orientation, int min, int max, int value) { super(orientation, min, max, value); } public LogarithmicTimeJSlider(BoundedRangeModel brm) { super(brm); } public LogarithmicTimeJSlider() { super(); } protected static DecimalFormat format = new DecimalFormat("#.#"); protected void createLabels(Hashtable table, int increment, int start) { for (int labelIndex = start; labelIndex <= getMaximum(); labelIndex *= increment) { String label = formatMilleseconds(labelIndex); table.put(new Integer(labelIndex), new LabelUIResource(label, JLabel.CENTER)); } } public String getTime() { return formatMilleseconds(getValue()); } public String formatMilleseconds(int labelIndex) { String label; if (labelIndex >= (1000 * 60 * 60 * 24)) { label = format.format(labelIndex / (double)(1000 * 60 * 60 * 24)) + " days"; } else if (labelIndex >= (1000 * 60 * 60)) { label = format.format(labelIndex / (double)(1000 * 60 * 60)) + " hours"; } else if (labelIndex >= (double)(1000 * 60)) { label = format.format(labelIndex / (double)(1000 * 60)) + " mins"; } else if (labelIndex >= 1000) { label = format.format(labelIndex / (double)1000) + " secs"; } else { label = labelIndex + " ms"; } return label; } /** * Just for testing * @param args */ public static void main(String[] args) { JFrame frame = new JFrame(); frame.setSize(408, 408); final LogarithmicTimeJSlider slider = new LogarithmicTimeJSlider(1000, 1000 * 60 * 60 * 24 * 7, 1000); final JLabel label = new JLabel(); slider.setPaintTicks(true); slider.setPaintLabels(true); slider.setMajorTickSpacing(10); slider.setMinorTickSpacing(10); slider.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { System.out.println("Value is now: " + slider.getValue()); label.setText("Current value is: " + slider.formatMilleseconds(slider.getValue())); } }); frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); frame.getContentPane().add(slider); frame.getContentPane().add(label); frame.setVisible(true); LogSliderUI ui = (LogSliderUI) slider.getUI(); for (int i = 10; i <= 100000; i *= 10) { System.out.println("I: " + i + " xPos: " + ui.xPositionForValue(i) + " valueFor: " + ui.valueForXPosition(ui.xPositionForValue(i))); } } } --- NEW FILE: LogarithmicJSlider.java --- /* * Author: Greg Hinkle * * The contents of this file are subject to the Sapient Public License Version 1.0 (the "License"); * you may not use this file except in compliance with the License. You may obtain a copy of the * License at http://mc4j.sf.net/License-SPL.html. * * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, * either express or implied. See the License for the specific language governing rights and limitations * under the License. * * The Original Code is The MC4J Management Console * The Initial Developer of the Original Code is Greg Hinkle (gh...@us...) * Copyright (C) 2004 Greg Hinkle. All Rights Reserved. * * Redistributions of code or binary files using or based on this code must reproduce the * above copyright and disclaimer. For more information see <http://mc4j.sourceforge.net>. */ package org.mc4j.console.swing; import sun.swing.DefaultLookup; import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Enumeration; import java.util.Hashtable; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.plaf.SliderUI; import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicSliderUI; /** * This JSlider subclass uses a custom UI to allow a slider to work in * logarithmic scale. Major and minor ticks are drawn for logarithmic * scale as well. * * @author Greg Hinkle (gh...@us...), Apr 10, 2004 * @version $Revision: 1.1 $($Author: ghinkl $ / $Date: 2004/04/16 18:49:39 $) */ public class LogarithmicJSlider extends JSlider { public LogarithmicJSlider(int orientation) { super(orientation); SliderUI ui = new LogSliderUI(this); this.setUI(ui); } public LogarithmicJSlider(int min, int max) { super(min, max); SliderUI ui = new LogSliderUI(this); this.setUI(ui); } public LogarithmicJSlider(int min, int max, int value) { super(min, max, value); SliderUI ui = new LogSliderUI(this); this.setUI(ui); } public LogarithmicJSlider(int orientation, int min, int max, int value) { super(orientation, min, max, value); SliderUI ui = new LogSliderUI(this); this.setUI(ui); } public LogarithmicJSlider(BoundedRangeModel brm) { super(brm); SliderUI ui = new LogSliderUI(this); this.setUI(ui); } public LogarithmicJSlider() { SliderUI ui = new LogSliderUI(this); this.setUI(ui); } public static class LogSliderUI extends BasicSliderUI { public LogSliderUI(JSlider b) { super(b); } public int xPositionForValue(int value) { int min = slider.getMinimum(); int max = slider.getMaximum(); int trackLength = trackRect.width; double valueRange = (double) Math.log(max) - (double) Math.log(min); double pixelsPerValue = (double) trackLength / valueRange; int trackLeft = trackRect.x; int trackRight = trackRect.x + (trackRect.width - 1); int xPosition; if (!drawInverted()) { xPosition = trackLeft; xPosition += Math.round(pixelsPerValue * ((double) Math.log(value) - Math.log(min))); } else { xPosition = trackRight; xPosition -= Math.round(pixelsPerValue * ((double) Math.log(value) - Math.log(min))); } xPosition = Math.max(trackLeft, xPosition); xPosition = Math.min(trackRight, xPosition); return xPosition; } public int yPositionForValue(int value) { // TODO GH: Implement to support vertical log sliders return super.yPositionForValue(value); } public int valueForYPosition(int yPos) { // TODO GH: Implement to support vertical log sliders return super.valueForYPosition(yPos); } public int valueForXPosition(int xPos) { int value; final int minValue = slider.getMinimum(); final int maxValue = slider.getMaximum(); final int trackLength = trackRect.width; final int trackLeft = trackRect.x; final int trackRight = trackRect.x + (trackRect.width - 1); if (xPos <= trackLeft) { value = drawInverted() ? maxValue : minValue; } else if (xPos >= trackRight) { value = drawInverted() ? minValue : maxValue; } else { int distanceFromTrackLeft = xPos - trackLeft; double valueRange = (double) Math.log(maxValue) - (double) Math.log(minValue); //double valuePerPixel = (double)valueRange / (double)trackLength; //int valueFromTrackLeft = // (int)Math.round( Math.pow(3.5,(double)distanceFromTrackLeft * (double)valuePerPixel)); int valueFromTrackLeft = (int) Math.round(Math.pow(Math.E, Math.log(minValue) + ((((double) distanceFromTrackLeft) * valueRange) / (double) trackLength))); value = drawInverted() ? maxValue - valueFromTrackLeft : (int) Math.log(minValue) + valueFromTrackLeft; } return value; } public void paintTicks(Graphics g) { Rectangle tickBounds = tickRect; int i; int maj, min, max; int w = tickBounds.width; int h = tickBounds.height; int centerEffect, tickHeight; g.setColor(DefaultLookup.getColor(slider, this, "Slider.tickColor", Color.black)); maj = slider.getMajorTickSpacing(); min = slider.getMinorTickSpacing(); if (slider.getOrientation() == JSlider.HORIZONTAL) { g.translate(0, tickBounds.y); int value = slider.getMinimum(); int xPos = 0; if (slider.getMinorTickSpacing() > 0) { int majorValue = slider.getMinimum(); while (value <= slider.getMaximum()) { if (value >= majorValue) { value = majorValue; majorValue *= maj; } value += (majorValue / 10.0); xPos = xPositionForValue(value); paintMinorTickForHorizSlider(g, tickBounds, xPos); } } if (slider.getMajorTickSpacing() > 0) { value = slider.getMinimum(); while (value <= slider.getMaximum()) { xPos = xPositionForValue(value); paintMajorTickForHorizSlider(g, tickBounds, xPos); value *= slider.getMajorTickSpacing(); } } g.translate(0, -tickBounds.y); } else { g.translate(tickBounds.x, 0); int value = slider.getMinimum(); int yPos = 0; if (slider.getMinorTickSpacing() > 0) { int majorValue = slider.getMinimum(); int offset = 0; if (!slider.getComponentOrientation().isLeftToRight()) { offset = tickBounds.width - tickBounds.width / 2; g.translate(offset, 0); } while (value <= slider.getMaximum()) { if (value >= majorValue) { value = majorValue; majorValue *= maj; } yPos = yPositionForValue(value); paintMinorTickForVertSlider(g, tickBounds, yPos); value += (majorValue / 10.0); } if (!slider.getComponentOrientation().isLeftToRight()) { g.translate(-offset, 0); } } if (slider.getMajorTickSpacing() > 0) { value = slider.getMinimum(); if (!slider.getComponentOrientation().isLeftToRight()) { g.translate(2, 0); } while (value <= slider.getMaximum()) { yPos = yPositionForValue(value); paintMajorTickForVertSlider(g, tickBounds, yPos); value *= slider.getMajorTickSpacing(); } if (!slider.getComponentOrientation().isLeftToRight()) { g.translate(-2, 0); } } g.translate(-tickBounds.x, 0); } } } public static void main(String[] args) { JFrame frame = new JFrame(); frame.setSize(408, 408); final JSlider slider = new LogarithmicJSlider(100, 10000000, 1000); final JLabel label = new JLabel(); slider.setPaintTicks(true); slider.setPaintLabels(true); slider.setMajorTickSpacing(10); slider.setMinorTickSpacing(10); slider.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { System.out.println("Value is now: " + slider.getValue()); label.setText("Current value is: " + slider.getValue()); } }); frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); frame.getContentPane().add(slider); frame.getContentPane().add(label); frame.setVisible(true); LogSliderUI ui = (LogSliderUI) slider.getUI(); for (int i = 10; i <= 100000; i *= 10) { System.out.println("I: " + i + " xPos: " + ui.xPositionForValue(i) + " valueFor: " + ui.valueForXPosition(ui.xPositionForValue(i))); } } /** * Creates a hashtable holding the text labels for this slider. This implementation * uses the increment as a log-base. * */ public Hashtable createStandardLabels(int increment, int start) { if (start > getMaximum() || start < getMinimum()) { throw new IllegalArgumentException("Slider label start point out of range."); } if (increment <= 0) { throw new IllegalArgumentException("Label incremement must be > 0"); } class LabelHashtable extends Hashtable implements PropertyChangeListener { int increment = 0; int start = 0; boolean startAtMin = false; public LabelHashtable(int increment, int start) { super(); this.increment = increment; this.start = start; startAtMin = start == getMinimum(); createLabels(this, increment, start); } public void propertyChange(PropertyChangeEvent e) { if (e.getPropertyName().equals("minimum") && startAtMin) { start = getMinimum(); } if (e.getPropertyName().equals("minimum") || e.getPropertyName().equals("maximum")) { Enumeration keys = getLabelTable().keys(); Object key = null; Hashtable hashtable = new Hashtable(); // Save the labels that were added by the developer while (keys.hasMoreElements()) { key = keys.nextElement(); Object value = getLabelTable().get(key); if (!(value instanceof LabelUIResource)) { hashtable.put(key, value); } } clear(); createLabels(this, increment, start); // Add the saved labels keys = hashtable.keys(); while (keys.hasMoreElements()) { key = keys.nextElement(); put(key, hashtable.get(key)); } ((JSlider) e.getSource()).setLabelTable(this); } } } LabelHashtable table = new LabelHashtable(increment, start); if (getLabelTable() != null && (getLabelTable() instanceof PropertyChangeListener)) { removePropertyChangeListener((PropertyChangeListener) getLabelTable()); } addPropertyChangeListener(table); return table; } /** * This method creates the table of labels that are used to label major ticks * on the slider. * @param table * @param increment * @param start */ protected void createLabels(Hashtable table, int increment, int start) { for (int labelIndex = start; labelIndex <= getMaximum(); labelIndex *= increment) { table.put(new Integer(labelIndex), new LabelUIResource("" + labelIndex, JLabel.CENTER)); } } protected class LabelUIResource extends JLabel implements UIResource { public LabelUIResource(String text, int alignment) { super(text, alignment); setName("Slider.label"); } } } |
|
From: Greg H. <gh...@us...> - 2004-04-16 15:57:55
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/jre15 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv942/application/dashboards/jre15 Modified Files: JRE15_MemoryUsage_LineChart.xml JRE15_MemoryUsagePools_PieChart.xml JRE15_ThreadTree.xml Log Message: The refresh delays were accidentally set to 30 seconds Some dbs shouldn't have had the refresh controller at all Index: JRE15_MemoryUsagePools_PieChart.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_MemoryUsagePools_PieChart.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JRE15_MemoryUsagePools_PieChart.xml 8 Apr 2004 21:38:26 -0000 1.3 --- JRE15_MemoryUsagePools_PieChart.xml 16 Apr 2004 15:57:46 -0000 1.4 *************** *** 2,6 **** <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd"> ! <Dashboard version="1.0" name="Memory Usage Pools"> <Description>Memory usage chart of pools for a 1.5 JVM.</Description> --- 2,6 ---- <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd"> ! <Dashboard version="1.0" name="Pool Usage Pie Chart"> <Description>Memory usage chart of pools for a 1.5 JVM.</Description> Index: JRE15_ThreadTree.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_ThreadTree.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JRE15_ThreadTree.xml 8 Apr 2004 21:38:26 -0000 1.3 --- JRE15_ThreadTree.xml 16 Apr 2004 15:57:46 -0000 1.4 *************** *** 42,46 **** <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)30000"/> </Component> </Content> --- 42,46 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)1000"/> </Component> </Content> Index: JRE15_MemoryUsage_LineChart.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_MemoryUsage_LineChart.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JRE15_MemoryUsage_LineChart.xml 8 Apr 2004 21:38:26 -0000 1.3 --- JRE15_MemoryUsage_LineChart.xml 16 Apr 2004 15:57:38 -0000 1.4 *************** *** 2,6 **** <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd"> ! <Dashboard version="1.0" name="Memory Usage Pools Line Chart"> <Description>Memory usage chart of pools for a 1.5 JVM.</Description> --- 2,6 ---- <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd"> ! <Dashboard version="1.0" name="Pool Usage Line Chart"> <Description>Memory usage chart of pools for a 1.5 JVM.</Description> |
|
From: Greg H. <gh...@us...> - 2004-04-16 15:49:59
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/jboss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31527/application/dashboards/jboss Modified Files: JBoss_MQ_QueueTable.xml JBoss_MQ_TopicTable.xml JBoss_ServerInfo_Memory.xml JBoss_ServerInfoMBean.xml JBoss_System_Server_Control.xml JBoss_Web_Jetty.xml JBoss_Web_JettyNew.xml JBoss_WebTable.xml Log Message: The refresh delays were accidentally set to 30 seconds Index: JBoss_Web_JettyNew.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_Web_JettyNew.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JBoss_Web_JettyNew.xml 8 Apr 2004 21:38:26 -0000 1.3 --- JBoss_Web_JettyNew.xml 16 Apr 2004 15:49:47 -0000 1.4 *************** *** 43,47 **** <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)30000"/> </Component> </Content> --- 43,47 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)1000"/> </Component> </Content> Index: JBoss_MQ_QueueTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_MQ_QueueTable.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JBoss_MQ_QueueTable.xml 8 Apr 2004 21:38:26 -0000 1.4 --- JBoss_MQ_QueueTable.xml 16 Apr 2004 15:49:47 -0000 1.5 *************** *** 42,46 **** <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)30000"/> </Component> </Content> --- 42,46 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)1000"/> </Component> </Content> Index: JBoss_MQ_TopicTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_MQ_TopicTable.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JBoss_MQ_TopicTable.xml 8 Apr 2004 21:38:26 -0000 1.4 --- JBoss_MQ_TopicTable.xml 16 Apr 2004 15:49:47 -0000 1.5 *************** *** 42,46 **** <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)30000"/> </Component> </Content> --- 42,46 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)1000"/> </Component> </Content> Index: JBoss_ServerInfoMBean.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_ServerInfoMBean.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JBoss_ServerInfoMBean.xml 8 Apr 2004 21:38:26 -0000 1.4 --- JBoss_ServerInfoMBean.xml 16 Apr 2004 15:49:47 -0000 1.5 *************** *** 48,52 **** <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)30000"/> </Component> </Content> --- 48,52 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)1000"/> </Component> </Content> Index: JBoss_ServerInfo_Memory.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_ServerInfo_Memory.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JBoss_ServerInfo_Memory.xml 8 Apr 2004 21:38:26 -0000 1.3 --- JBoss_ServerInfo_Memory.xml 16 Apr 2004 15:49:47 -0000 1.4 *************** *** 2,13 **** <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd"> - <!-- - Document : BasicMBean.xml - Created on : October 6, 2002, 10:01 PM - Author : ghinkl - Description: - Displays the basic information of an MBean - --> - <Dashboard version="1.0" name="JBoss Memory Meter"> <Description>This dashboard displays basic information relating to the --- 2,5 ---- *************** *** 55,78 **** </Component> ! <!-- *** Contents *** --> ! <Component type="javax.swing.JPanel"> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Content> ! <Component type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter"> ! <Attribute name="beanNode" value="JBossServerInfoBean"/> ! <Attribute name="maxAttributeName" value="(Literal)MaxMemory"/> ! <Attribute name="currentAttributeName" value="(Literal)FreeMemory"/> ! <!--<Attribute name="minimumSize" value="(Literal)50,50"/>--> ! <Attribute name="label" value="(Literal)Free Memory"/> ! <Attribute name="updateInterval" value="(Literal)1000"/> ! <Attribute name="warningPoint" value="(Literal)0.2"/> ! <Attribute name="criticalPoint" value="(Literal)0.05"/> ! <Attribute name="title" value="(Literal)Available Memory"/> ! <Attribute name="units" value="(Literal)bytes"/> ! ! </Component> ! </Content> </Component> ! </Content> </Dashboard> --- 47,66 ---- </Component> ! ! <Component type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter"> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="beanNode" value="JBossServerInfoBean"/> ! <Attribute name="maxAttributeName" value="(Literal)MaxMemory"/> ! <Attribute name="currentAttributeName" value="(Literal)FreeMemory"/> ! <!--<Attribute name="minimumSize" value="(Literal)50,50"/>--> ! <Attribute name="label" value="(Literal)Free Memory"/> ! <Attribute name="updateInterval" value="(Literal)1000"/> ! <Attribute name="warningPoint" value="(Literal)0.2"/> ! <Attribute name="criticalPoint" value="(Literal)0.05"/> ! <Attribute name="title" value="(Literal)Available Memory"/> ! <Attribute name="units" value="(Literal)bytes"/> ! </Component> ! </Content> </Dashboard> Index: JBoss_Web_Jetty.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_Web_Jetty.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JBoss_Web_Jetty.xml 8 Apr 2004 21:38:26 -0000 1.3 --- JBoss_Web_Jetty.xml 16 Apr 2004 15:49:47 -0000 1.4 *************** *** 43,47 **** <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)30000"/> </Component> </Content> --- 43,47 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)1000"/> </Component> </Content> Index: JBoss_System_Server_Control.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_System_Server_Control.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JBoss_System_Server_Control.xml 8 Apr 2004 21:38:26 -0000 1.3 --- JBoss_System_Server_Control.xml 16 Apr 2004 15:49:47 -0000 1.4 *************** *** 44,51 **** </Content> </Component> - <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> - <Constraint type="BorderConstraints" direction="EAST"/> - <Attribute name="refreshDelay" value="(Literal)30000"/> - </Component> </Content> </Component> --- 44,47 ---- Index: JBoss_WebTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_WebTable.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JBoss_WebTable.xml 8 Apr 2004 21:38:26 -0000 1.3 --- JBoss_WebTable.xml 16 Apr 2004 15:49:47 -0000 1.4 *************** *** 42,46 **** <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)30000"/> </Component> </Content> --- 42,46 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="(Literal)1000"/> </Component> </Content> |
|
From: Greg H. <gh...@us...> - 2004-04-16 15:49:18
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31408/src/org/mc4j/console/connection Modified Files: Oc4jConnectionNode.java Log Message: Turning off debug Index: Oc4jConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/Oc4jConnectionNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Oc4jConnectionNode.java 2 Apr 2004 03:25:51 -0000 1.1 --- Oc4jConnectionNode.java 16 Apr 2004 15:49:09 -0000 1.2 *************** *** 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.Field; import java.util.Hashtable; *************** *** 30,38 **** import javax.rmi.PortableRemoteObject; - import org.openide.DialogDisplayer; - import org.openide.NotifyDescriptor; - - import org.mc4j.console.connection.proxy.GenericMBeanServerProxy; - /** * This Node acts as a connection to an OC4J MBean Server via a MEJB. --- 35,38 ---- *************** *** 49,53 **** */ public class Oc4jConnectionNode extends ConnectionNode { ! private static final boolean M_DEBUG = true; protected MBeanServer mbeanServer; --- 49,53 ---- */ public class Oc4jConnectionNode extends ConnectionNode { ! private static final boolean M_DEBUG = false; protected MBeanServer mbeanServer; |
|
From: Greg H. <gh...@us...> - 2004-04-13 19:52:31
|
Update of /cvsroot/mc4j/mc4j/application/dashboards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15500/application/dashboards Modified Files: Dashboard_1_0.dtd Log Message: Capitalization mistake corrected Index: Dashboard_1_0.dtd =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/Dashboard_1_0.dtd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Dashboard_1_0.dtd 8 Apr 2004 20:29:26 -0000 1.2 --- Dashboard_1_0.dtd 13 Apr 2004 19:38:29 -0000 1.3 *************** *** 7,11 **** <!ATTLIST DashboardMatch location CDATA #IMPLIED> ! <!ELEMENT BeanMatch (#PCDATA | CONDITION)*> <!ATTLIST BeanMatch id CDATA #REQUIRED> <!ATTLIST BeanMatch type CDATA #REQUIRED> --- 7,11 ---- <!ATTLIST DashboardMatch location CDATA #IMPLIED> ! <!ELEMENT BeanMatch (#PCDATA | Condition)*> <!ATTLIST BeanMatch id CDATA #REQUIRED> <!ATTLIST BeanMatch type CDATA #REQUIRED> |
