mc4j-cvs Mailing List for MC4J JMX Console (Page 4)
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...> - 2006-04-17 03:07:41
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/src/org/mc4j/console/dashboard Modified Files: DashboardManager.java DashboardFactory.java AttributeFactory.java Dashboard.java Log Message: Dashboard and component tweaks Index: DashboardManager.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DashboardManager.java 12 Apr 2006 19:13:51 -0000 1.5 --- DashboardManager.java 17 Apr 2006 03:07:26 -0000 1.6 *************** *** 75,78 **** --- 75,80 ---- Dashboard dashboard = (Dashboard) dashboardIterator.next(); + dashboard.setConnectionNode(mBeanNode.getConnectionNode()); + if (dashboard.matches(mBeanNode.getEmsBean())) { results.add(dashboard); Index: DashboardFactory.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/DashboardFactory.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** DashboardFactory.java 12 Apr 2006 19:13:52 -0000 1.16 --- DashboardFactory.java 17 Apr 2006 03:07:26 -0000 1.17 *************** *** 297,301 **** for (int i = 0; i < beanList.size(); i++) { EmsBean emsBean = beanList.get(i); ! context.put("index", new Integer(i)); context.put(forEachPanelComponent.getIdKey(), emsBean); --- 297,301 ---- for (int i = 0; i < beanList.size(); i++) { EmsBean emsBean = beanList.get(i); ! context.put("index", new Integer(i)); context.put(forEachPanelComponent.getIdKey(), emsBean); Index: Dashboard.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/Dashboard.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Dashboard.java 12 Apr 2006 19:13:52 -0000 1.18 --- Dashboard.java 17 Apr 2006 03:07:26 -0000 1.19 *************** *** 19,22 **** --- 19,23 ---- import org.mc4j.console.dashboard.match.DashboardMatch; import org.mc4j.console.dashboard.match.MatchExecutor; + import org.mc4j.console.connection.ConnectionNode; import org.mc4j.ems.connection.bean.EmsBean; import org.w3c.dom.Document; *************** *** 56,59 **** --- 57,62 ---- private Map contextStarter = new HashMap(); + private ConnectionNode connectionNode; + private boolean standardHeader = false; *************** *** 85,88 **** --- 88,96 ---- } + public static Dashboard getDashboard(Map context) { + return (Dashboard) context.get(CONTEXT_DASHBOARD); + } + + /** * Compare on names to put in alphabetical order. *************** *** 205,207 **** --- 213,223 ---- this.refreshTime = refreshTime; } + + public ConnectionNode getConnectionNode() { + return connectionNode; + } + + public void setConnectionNode(ConnectionNode connectionNode) { + this.connectionNode = connectionNode; + } } Index: AttributeFactory.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/AttributeFactory.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AttributeFactory.java 12 Apr 2006 19:13:52 -0000 1.9 --- AttributeFactory.java 17 Apr 2006 03:07:26 -0000 1.10 *************** *** 113,117 **** IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("*** Exception while setting attribute [" + name + "] = [" + valueString + "] on object: " + component); ! ErrorManager.getDefault().notify(e); } --- 113,117 ---- IOProvider.getDefault().getIO("Dashboard debugging",false).getOut().println("*** Exception while setting attribute [" + name + "] = [" + valueString + "] on object: " + component); ! ErrorManager.getDefault().notify(new IllegalArgumentException("*** Exception while setting attribute [" + name + "] = [" + valueString + "] on object: " + component, e)); } |
Update of /cvsroot/mc4j/mc4j/application/dashboards/weblogic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/application/dashboards/weblogic Modified Files: Weblogic_EJBTransactionRuntime.xml Weblogic_Applications.xml Weblogic_ServletTable.xml Weblogic_EJBPoolRuntimeTable.xml Weblogic_ExecuteQueue_Stats.xml Log Message: Dashboard and component tweaks Index: Weblogic_Applications.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_Applications.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Weblogic_Applications.xml 12 Apr 2006 19:13:58 -0000 1.2 --- Weblogic_Applications.xml 17 Apr 2006 03:07:25 -0000 1.3 *************** *** 2,6 **** <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd"> ! <Dashboard version="2.0" name="Applications"> <Description>Shows installed applications.</Description> --- 2,6 ---- <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd"> ! <Dashboard version="2.0" name="Applications" standardHeader="true" autoRefresh="true" refreshControl="true"> <Description>Shows installed applications.</Description> *************** *** 17,25 **** <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent"> ! <Attribute name="beanList" value="ApplicationList"/> <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="preferredSize" value="100,100"/> --- 17,25 ---- <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent"> ! <Attribute name="beanList" value="#ApplicationList"/> <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="preferredSize" value="'100,100'"/> Index: Weblogic_EJBTransactionRuntime.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_EJBTransactionRuntime.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Weblogic_EJBTransactionRuntime.xml 12 Apr 2006 19:13:58 -0000 1.4 --- Weblogic_EJBTransactionRuntime.xml 17 Apr 2006 03:07:25 -0000 1.5 *************** *** 19,23 **** <Component type="org.mc4j.console.dashboard.components.AttributeTableComponent"> ! <Attribute name="beanList" value="EJBTransactionRuntimeList"/> <Constraint type="BorderConstraints" direction="CENTER"/> --- 19,23 ---- <Component type="org.mc4j.console.dashboard.components.AttributeTableComponent"> ! <Attribute name="beanList" value="#EJBTransactionRuntimeList"/> <Constraint type="BorderConstraints" direction="CENTER"/> Index: Weblogic_EJBPoolRuntimeTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_EJBPoolRuntimeTable.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Weblogic_EJBPoolRuntimeTable.xml 12 Apr 2006 19:13:58 -0000 1.4 --- Weblogic_EJBPoolRuntimeTable.xml 17 Apr 2006 03:07:25 -0000 1.5 *************** *** 18,22 **** <Component type="org.mc4j.console.dashboard.components.AttributeTableComponent"> ! <Attribute name="beanList" value="EJBPoolRuntimeList"/> <Constraint type="BorderConstraints" direction="CENTER"/> --- 18,22 ---- <Component type="org.mc4j.console.dashboard.components.AttributeTableComponent"> ! <Attribute name="beanList" value="#EJBPoolRuntimeList"/> <Constraint type="BorderConstraints" direction="CENTER"/> Index: Weblogic_ServletTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_ServletTable.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Weblogic_ServletTable.xml 12 Apr 2006 19:13:58 -0000 1.4 --- Weblogic_ServletTable.xml 17 Apr 2006 03:07:25 -0000 1.5 *************** *** 16,20 **** <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent"> ! <Attribute name="beanList" value="ServletRuntimeList"/> <Constraint type="BorderConstraints" direction="CENTER"/> --- 16,20 ---- <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent"> ! <Attribute name="beanList" value="#ServletRuntimeList"/> <Constraint type="BorderConstraints" direction="CENTER"/> Index: Weblogic_ExecuteQueue_Stats.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_ExecuteQueue_Stats.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Weblogic_ExecuteQueue_Stats.xml 12 Apr 2006 19:13:58 -0000 1.4 --- Weblogic_ExecuteQueue_Stats.xml 17 Apr 2006 03:07:25 -0000 1.5 *************** *** 36,42 **** <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> - <Attribute name="bean" value="#ExecuteQueueRuntimeBean"/> <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'PendingRequestCurrentCount'"/> </Component> </Content> --- 36,41 ---- <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attribute" value="#ExecuteQueueRuntimeBean.getAttribute('PendingRequestCurrentCount')"/> </Component> </Content> *************** *** 48,55 **** <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> - <Attribute name="bean" value="#ExecuteQueueRuntimeBean"/> <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'ServicedRequestTotalCount'"/> ! </Component> </Content> </Component> --- 47,53 ---- <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attribute" value="#ExecuteQueueRuntimeBean.getAttribute('ServicedRequestTotalCount')"/> ! </Component> </Content> </Component> *************** *** 60,71 **** <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> - <Attribute name="bean" value="#ExecuteQueueRuntimeBean"/> <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'ExecuteThreadCurrentIdleCount'"/> ! </Component> </Content> </Component> <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="'VERTICAL_GLUE_SHAPE'"/> </Component> </Content> --- 58,68 ---- <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attribute" value="#ExecuteQueueRuntimeBean.getAttribute('ExecuteThreadCurrentIdleCount')"/> ! </Component> </Content> </Component> <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="@org.mc4j.console.dashboard.components.FillerComponent@VERTICAL_GLUE_SHAPE"/> </Component> </Content> |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:41
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/src/org/mc4j/jre15/components Modified Files: MemoryUsageComponent.java Log Message: Dashboard and component tweaks Index: MemoryUsageComponent.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components/MemoryUsageComponent.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MemoryUsageComponent.java 12 Apr 2006 22:27:27 -0000 1.5 --- MemoryUsageComponent.java 17 Apr 2006 03:07:26 -0000 1.6 *************** *** 53,56 **** --- 53,57 ---- + 8 for (EmsAttribute attribute : getAttributes()) { Object value = attribute.refresh(); //this.emsBean.getAttribute(attributeName).refresh(); |
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/src/org/mc4j/console/dashboard/components Modified Files: NumericAttributeGraph.java AttributeTableComponent.java AttributeTablePopupComponent.java RefreshControlComponent.java Log Message: Dashboard and component tweaks Index: AttributeTableComponent.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components/AttributeTableComponent.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AttributeTableComponent.java 12 Apr 2006 19:13:59 -0000 1.13 --- AttributeTableComponent.java 17 Apr 2006 03:07:25 -0000 1.14 *************** *** 29,32 **** --- 29,33 ---- import javax.swing.*; import javax.swing.table.DefaultTableModel; + import javax.swing.table.AbstractTableModel; import java.awt.*; import java.util.*; *************** *** 34,43 **** /** * @author Greg Hinkle (gh...@us...), January 2004 * @version $Revision$($Author$ / $Date$) */ ! public class AttributeTableComponent extends JPanel implements BeanListComponent, Runnable { ! protected List attributeNames = new ArrayList(); protected List<EmsBean> beanList; --- 35,47 ---- /** + * This is meant to be a table where the rows are a list of beans that come from a match + * and the columns are attributes that are common to those beans. + * * @author Greg Hinkle (gh...@us...), January 2004 * @version $Revision$($Author$ / $Date$) */ ! public class AttributeTableComponent extends JPanel implements BeanListComponent { ! protected List<String> attributeNames = new ArrayList<String>(); protected List<EmsBean> beanList; *************** *** 48,52 **** protected AttributeTableModel tableModel; ! protected boolean sorted = false; public void setAttributeName(String name) { --- 52,59 ---- protected AttributeTableModel tableModel; ! protected Map context; ! protected boolean scrollPane = true; ! ! public void setAttributeName(String name) { *************** *** 66,71 **** this.removeAll(); ! this.setMinimumSize(null); ! this.setPreferredSize(null); //this.setBorder(new TitledBorder(this.label)); --- 73,78 ---- this.removeAll(); ! // this.setMinimumSize(null); ! // this.setPreferredSize(null); //this.setBorder(new TitledBorder(this.label)); *************** *** 74,81 **** ! Object[] columnNames = attributeNames.toArray(new String[attributeNames.size()]); ! ! ! this.tableModel = new AttributeTableModel(columnNames, this.attributeNames.size()); this.table = new JXTable(tableModel); --- 81,85 ---- ! this.tableModel = new AttributeTableModel(beanList, attributeNames); this.table = new JXTable(tableModel); *************** *** 88,96 **** ! add(new JScrollPane(this.table), BorderLayout.CENTER); // The first refresh sets column classes properly refresh(); this.doLayout(); --- 92,101 ---- ! add(scrollPane ? new JScrollPane(this.table) : this.table, BorderLayout.CENTER); // The first refresh sets column classes properly refresh(); + this.table.packAll(); this.doLayout(); *************** *** 118,123 **** public void refresh() { ! if (this.tableModel instanceof AttributeTableModel) ! ((AttributeTableModel) this.tableModel).resetChangeList(); // TODO GH: FIX! Here we are going to try and re-execute the original dashboard --- 123,128 ---- public void refresh() { ! // if (this.tableModel instanceof AttributeTableModel) ! // ((AttributeTableModel) this.tableModel).resetChangeList(); // TODO GH: FIX! Here we are going to try and re-execute the original dashboard *************** *** 149,152 **** --- 154,158 ---- */ + /* int row = 0; for (EmsBean bean : beanList) { *************** *** 168,179 **** EmsOperation operation = bean.getOperation(attributeName); ! try { ! value = operation.invoke(); ! } catch (Exception e) { ! e.printStackTrace(); } ! ! } else if (value == null) value = "unknown"; --- 174,187 ---- EmsOperation operation = bean.getOperation(attributeName); ! if (operation != null) { ! try { ! value = operation.invoke(); ! } catch (Exception e) { ! e.printStackTrace(); ! } } + } ! if (value == null) value = "unknown"; *************** *** 182,187 **** this.tableModel.setColumnClass(col, (value != null) ? value.getClass() : Object.class); } ! if ((value != null) && !value.equals(this.tableModel.getValueAt(row, col))) this.tableModel.setValueAt(value, row, col); col++; --- 190,200 ---- this.tableModel.setColumnClass(col, (value != null) ? value.getClass() : Object.class); } ! if ((value == null) || (this.tableModel.getRowCount() > row && value.equals(this.tableModel.getValueAt(row, col)))) { ! // no need to reset it ! } else { ! while(this.tableModel.getRowCount() <= row) ! this.tableModel.addRow((Vector) null); this.tableModel.setValueAt(value, row, col); + } col++; *************** *** 197,227 **** } } this.tableModel.fireTableDataChanged(); } ! public void run() { ! // Its a hack, but sleep until the component is likely to be showing ! try { ! Thread.sleep(2000); ! } catch (Exception e) { } ! while (this.isShowing()) { ! refresh(); ! try { ! Thread.sleep(1000); ! } catch (Exception e) { } } } ! public class AttributeTableModel extends DefaultTableModel { Class[] columnClass = new Class[20]; boolean[][] changes; ! public AttributeTableModel(Object[] columnNames, int rowCount) { super(columnNames, rowCount); reallocateIndexes(); --- 210,269 ---- } } + */ this.tableModel.fireTableDataChanged(); } ! public static class AttributeTableModel extends AbstractTableModel { ! List<EmsBean> beans; ! List<String> names; ! ! ! public AttributeTableModel(List<EmsBean> beans, List<String> names) { ! this.beans = beans; ! this.names = names; } ! public int getRowCount() { ! return beans.size(); ! } ! ! public int getColumnCount() { ! return names.size(); ! } ! ! public String getColumnName(int column) { ! return names.get(column); ! } ! ! public Object getValueAt(int rowIndex, int columnIndex) { ! EmsBean bean = beans.get(rowIndex); ! ! String name = names.get(columnIndex); ! EmsAttribute attribute = bean.getAttribute(name); ! if (attribute != null) { ! return attribute.getValue(); ! } ! ! // see if its an operation ! EmsOperation operation = bean.getOperation(name); ! if (operation != null) { ! return operation.invoke(); } + + // See if its an object name key property + String val = bean.getBeanName().getKeyProperty(name); + + return val != null ? val :"?" + name + "?"; } } ! public class OldAttributeTableModel extends DefaultTableModel { Class[] columnClass = new Class[20]; boolean[][] changes; ! public OldAttributeTableModel(Object[] columnNames, int rowCount) { super(columnNames, rowCount); reallocateIndexes(); *************** *** 317,320 **** --- 359,363 ---- public void setContext(Map context) { + this.context = context; if (this.beanList == null) { throw new IllegalStateException("AttributeTableComponent: You must specify an appropriate [beanList] attribute."); *************** *** 341,343 **** --- 384,394 ---- this.label = label; } + + public boolean isScrollPane() { + return scrollPane; + } + + public void setScrollPane(boolean scrollPane) { + this.scrollPane = scrollPane; + } } Index: AttributeTablePopupComponent.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components/AttributeTablePopupComponent.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AttributeTablePopupComponent.java 12 Apr 2006 19:13:59 -0000 1.5 --- AttributeTablePopupComponent.java 17 Apr 2006 03:07:25 -0000 1.6 *************** *** 19,22 **** --- 19,23 ---- import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.bean.OperationListAction; + import org.mc4j.console.dashboard.Dashboard; import org.openide.util.HelpCtx; import org.openide.util.actions.SystemAction; *************** *** 81,85 **** selectedRow = AttributeTablePopupComponent.this.table.convertRowIndexToModel(selectedRow); ! MBeanNode mbeanNode = (MBeanNode) AttributeTablePopupComponent.this.beanList.get(selectedRow); JPopupMenu popupMenu = new JPopupMenu(); --- 82,91 ---- selectedRow = AttributeTablePopupComponent.this.table.convertRowIndexToModel(selectedRow); ! ! String beanName = AttributeTablePopupComponent.this.beanList.get(selectedRow).getBeanName().getCanonicalName(); ! ! MBeanNode mbeanNode = ! Dashboard.getDashboard(context).getConnectionNode().getMBeanNode(beanName); ! JPopupMenu popupMenu = new JPopupMenu(); Index: RefreshControlComponent.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components/RefreshControlComponent.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RefreshControlComponent.java 12 Apr 2006 19:13:59 -0000 1.6 --- RefreshControlComponent.java 17 Apr 2006 03:07:25 -0000 1.7 *************** *** 22,25 **** --- 22,26 ---- import org.mc4j.console.dashboard.match.BeanMatch; import org.mc4j.ems.connection.bean.EmsBean; + import org.openide.ErrorManager; import javax.swing.*; *************** *** 191,195 **** // with large numbers of attributes that aren't all being displayed long start = System.currentTimeMillis(); ! bean.refreshAttributes(); //System.out.println((System.currentTimeMillis() - start) + "ms to refresh " + bean.getBeanName().toString()); } --- 192,200 ---- // with large numbers of attributes that aren't all being displayed long start = System.currentTimeMillis(); ! try { ! bean.refreshAttributes(); ! } catch(Exception e) { ! ErrorManager.getDefault().notify(e); ! } //System.out.println((System.currentTimeMillis() - start) + "ms to refresh " + bean.getBeanName().toString()); } Index: NumericAttributeGraph.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components/NumericAttributeGraph.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** NumericAttributeGraph.java 12 Apr 2006 22:27:52 -0000 1.15 --- NumericAttributeGraph.java 17 Apr 2006 03:07:25 -0000 1.16 *************** *** 50,54 **** } ! public Set<EmsAttribute> getAttributes() { return (Set<EmsAttribute>) getTimeSeriesKeys(); } --- 50,54 ---- } ! public Set<EmsAttribute> getAttributes() { return (Set<EmsAttribute>) getTimeSeriesKeys(); } *************** *** 64,67 **** --- 64,75 ---- public void setContext(Map context) { + if (getChartTitle() == null || getChartTitle().length() == 0) { + Set<EmsAttribute> attrs = getAttributes(); + if (attrs.size() == 1) { + setChartTitle(attrs.iterator().next().getName()); + } else { + setChartTitle("Multi-value chart"); + } + } //setChartTitle("??"); |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:38
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/modules/ems/src/ems/org/mc4j/ems/connection/support/metadata Modified Files: JSR160ConnectionTypeDescriptor.java Log Message: Dashboard and component tweaks |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:38
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers Modified Files: JMXRemotingConnectionProvider.java Log Message: Dashboard and component tweaks Index: JMXRemotingConnectionProvider.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JMXRemotingConnectionProvider.java 12 Apr 2006 19:11:33 -0000 1.2 --- JMXRemotingConnectionProvider.java 17 Apr 2006 03:07:26 -0000 1.3 *************** *** 136,140 **** ! testSsl(); if (ssl) { --- 136,140 ---- ! //testSsl(); if (ssl) { |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:36
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/jre15 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/application/dashboards/jre15 Modified Files: JRE15_SystemInfo.xml JRE15_MemoryUsage_AllPools.xml Log Message: Dashboard and component tweaks Index: JRE15_MemoryUsage_AllPools.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_MemoryUsage_AllPools.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JRE15_MemoryUsage_AllPools.xml 12 Apr 2006 19:14:01 -0000 1.2 --- JRE15_MemoryUsage_AllPools.xml 17 Apr 2006 03:07:26 -0000 1.3 *************** *** 19,44 **** <Component type="org.mc4j.console.dashboard.components.ForEachPanelComponent"> ! <Attribute name="beanList" value="memoryPools"/> <Attribute name="IdKey" value="'memoryPool'"/> <Attribute name="background" value="'0xFFFFFF'"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="preferredSize" value="100,100"/> <LayoutManager type="" axis="Y_AXIS"/> <Content> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Usage'"/> <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.jre15.components.MemoryUsageComponent"> - <Attribute name="bean" value="#memoryPool"/> <Attribute name="preferredSize" value="'400,250'"/> ! <Attribute name="attributeName" value="'Usage'"/> </Component> </Content> </Component> ! <Component type="org.mc4j.console.swing.SectionHolder"> <Attribute name="title" value="'Peak Usage'"/> <Attribute name="background" value="'0xFFFFFF'"/> --- 19,43 ---- <Component type="org.mc4j.console.dashboard.components.ForEachPanelComponent"> ! <Attribute name="beanList" value="#memoryPools"/> <Attribute name="IdKey" value="'memoryPool'"/> <Attribute name="background" value="'0xFFFFFF'"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="preferredSize" value="'100,100'"/> <LayoutManager type="" axis="Y_AXIS"/> <Content> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="#memoryPool.name + 'Usage'"/> <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.jre15.components.MemoryUsageComponent"> <Attribute name="preferredSize" value="'400,250'"/> ! <Attribute name="attribute" value="#memoryPool.getAttribute('Usage')"/> </Component> </Content> </Component> ! <!-- <Component type="org.mc4j.console.swing.SectionHolder"> <Attribute name="title" value="'Peak Usage'"/> <Attribute name="background" value="'0xFFFFFF'"/> *************** *** 51,55 **** </Component> </Content> ! </Component> </Content> --- 50,54 ---- </Component> </Content> ! </Component>--> </Content> Index: JRE15_SystemInfo.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_SystemInfo.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JRE15_SystemInfo.xml 12 Apr 2006 19:14:01 -0000 1.2 --- JRE15_SystemInfo.xml 17 Apr 2006 03:07:26 -0000 1.3 *************** *** 89,93 **** </table> ! <object classid="SystemProperties"> </object> --- 89,93 ---- </table> ! <br> <object classid="SystemProperties"> </object> |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:34
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/tomcat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/application/dashboards/tomcat Modified Files: Tomcat_ServletTable.xml Added Files: Tomcat_Overview.xml Log Message: Dashboard and component tweaks Index: Tomcat_ServletTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/tomcat/Tomcat_ServletTable.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Tomcat_ServletTable.xml 12 Apr 2006 19:14:01 -0000 1.6 --- Tomcat_ServletTable.xml 17 Apr 2006 03:07:26 -0000 1.7 *************** *** 2,8 **** <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd"> ! <Dashboard version="2.0" name="Tomcat Servlet Statistics"> ! <Description>This dashboard shows the statistics of a Tomcat Servlets.</Description> <DashboardMatch type="Global" location="/Tomcat/Web"> --- 2,8 ---- <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd"> ! <Dashboard version="2.0" name="Tomcat Servlet Statistics" standardHeader="true" autoRefresh="true" refreshControl="true"> ! <Description>Performance statistics for Tomcat deployed servlets</Description> <DashboardMatch type="Global" location="/Tomcat/Web"> *************** *** 23,34 **** <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="preferredSize" value="100,100"/> <Attribute name="AttributeName" value="'J2EEServer'"/> <Attribute name="AttributeName" value="'J2EEApplication'"/> - <Attribute name="AttributeName" value="'WebModule'"/> - <Attribute name="AttributeName" value="'name'"/> <Attribute name="AttributeName" value="'requestCount'"/> --- 23,34 ---- <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="preferredSize" value="'100,100'"/> + <Attribute name="AttributeName" value="'WebModule'"/> + <Attribute name="AttributeName" value="'name'"/> <Attribute name="AttributeName" value="'J2EEServer'"/> <Attribute name="AttributeName" value="'J2EEApplication'"/> <Attribute name="AttributeName" value="'requestCount'"/> --- NEW FILE: Tomcat_Overview.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd"> <Dashboard version="2.0" name="Tomcat Overview" refreshControl="true" standardHeader="true" autoRefresh="true"> <Description>This dashboard shows general Tomcat information</Description> <DashboardMatch type="Global" location="/Tomcat"> <BeanMatch id="Server" type="Single"> <Condition type="BeanObjectNameRegexCondition" filter="Catalina:type=Server"/> </BeanMatch> <BeanMatch id="Runtime" type="Single"> <Condition type="BeanObjectNameRegexCondition" filter="java.lang:type=Runtime"/> </BeanMatch> <BeanMatch id="OperatingSystem" type="Single"> <Condition type="BeanObjectNameRegexCondition" filter="java.lang:type=OperatingSystem"/> </BeanMatch> <BeanMatch id="Memory" type="Single"> <Condition type="BeanObjectNameRegexCondition" filter="java.lang:type=Memory"/> </BeanMatch> <BeanMatch id="RequestProcessors" type="Multiple"> <Condition type="BeanObjectNameRegexCondition" filter="type=GlobalRequestProcessor"/> </BeanMatch> <BeanMatch id="ThreadPools" type="Multiple"> <Condition type="BeanObjectNameRegexCondition" filter="type=ThreadPool"/> </BeanMatch> </DashboardMatch> <LayoutManager type="java.awt.BorderLayout"/> <Content> <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent"> <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="html"> <![CDATA[ <html><head> <style> H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A {color : black;}A.name {color : black;}HR {color : #525D76;} table { width: 100%; } td.page-title { text-align: center; vertical-align: top; font-family:sans-serif,Tahoma,Arial; font-weight: bold; background: white; color: black; } td.title { text-align: left; vertical-align: top; font-family:sans-serif,Tahoma,Arial; font-style:italic; font-weight: bold; background: #D2A41C; } td.header-left { text-align: left; vertical-align: top; font-family:sans-serif,Tahoma,Arial; font-weight: bold; background: #FFDC75; } td.header-center { text-align: center; vertical-align: top; font-family:sans-serif,Tahoma,Arial; font-weight: bold; background: #FFDC75; } td.row-left { text-align: left; vertical-align: middle; font-family:sans-serif,Tahoma,Arial; color: black; } td.row-center { text-align: center; vertical-align: middle; font-family:sans-serif,Tahoma,Arial; color: black; } td.row-right { text-align: right; vertical-align: middle; font-family:sans-serif,Tahoma,Arial; color: black; } TH { text-align: center; vertical-align: top; font-family:sans-serif,Tahoma,Arial; font-weight: bold; background: #FFDC75; } TD { text-align: center; vertical-align: middle; font-family:sans-serif,Tahoma,Arial; color: black; } </style><title>/manager</title></head><body bgcolor="#ffffff"> <a href="http://tomcat.apache.org/"> <img alt="The Apache Software Foundation" src="http://tomcat.apache.org/images/tomcat.gif" align="left" border="0"> </a> <hr noshade="noshade" size="1"> <table border="0" cellspacing="4" width="100%"> <tbody><tr> <td class="page-title" bordercolor="#000000" align="left" nowrap="nowrap"> <font size="+2">Server Status</font> </td> </tr> </tbody></table> <br> <table border="1" cellpadding="3" cellspacing="0"> <tbody><tr> <td colspan="6" class="title">Server Information</td> </tr> <tr> <td class="header-center"><small>Tomcat Version</small></td> <td class="header-center"><small>JVM Version</small></td> <td class="header-center"><small>JVM Vendor</small></td> <td class="header-center"><small>OS Name</small></td> <td class="header-center"><small>OS Version</small></td> <td class="header-center"><small>OS Architecture</small></td> </tr> <tr> <td class="row-center"><small>${#Server.serverInfo}</small></td> <td class="row-center"><small>${#Runtime.VmVersion}</small></td> <td class="row-center"><small>${#Runtime.VmVendor}</small></td> <td class="row-center"><small>${#OperatingSystem.Name}</small></td> <td class="row-center"><small>${#OperatingSystem.Version}</small></td> <td class="row-center"><small>${#OperatingSystem.Arch}</small></td> </tr> </tbody></table> <br> <h1>JVM</h1> <p> Free memory: ${#format.sizeBytes(Memory.HeapMemoryUsage["used"])} Total memory: ${#format.sizeBytes(Memory.HeapMemoryUsage["committed"])} Max memory: ${#format.sizeBytes(Memory.HeapMemoryUsage["max"])} </p> <h1>Request Processors</h1> <table width="100%"><tr><td> <object classid="RequestProcessorTable"></object> </td></tr></table> <br> <h1>Thread Pools</h1> <table width="100%" ><tr><td> <object classid="ThreadPoolTable" ></object> </td></tr></table> <br> <center><font color="#525d76" size="-1"><em>Tomcat and the Tomcat Logo are trademarks of Apache Software Foundation</em></font></center> </body></html> ]]> </Attribute> <Content> <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent" id="RequestProcessorTable"> <Attribute name="beanList" value="#RequestProcessors"/> <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="'600,150'"/> <Attribute name="AttributeName" value="'name'"/> <Attribute name="AttributeName" value="'requestCount'"/> <Attribute name="AttributeName" value="'bytesSent'"/> <Attribute name="AttributeName" value="'bytesReceived'"/> <Attribute name="AttributeName" value="'errorCount'"/> <Attribute name="AttributeName" value="'processingTime'"/> <Attribute name="AttributeName" value="'maxTime'"/> </Component> <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent" id="ThreadPoolTable"> <Attribute name="beanList" value="#ThreadPools"/> <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="'600,150'"/> <Attribute name="AttributeName" value="'name'"/> <Attribute name="AttributeName" value="'currentThreadsBusy'"/> <Attribute name="AttributeName" value="'currentThreadCount'"/> <Attribute name="AttributeName" value="'threadPriority'"/> <Attribute name="AttributeName" value="'minSpareThreads'"/> <Attribute name="AttributeName" value="'maxSpareThreads'"/> <Attribute name="AttributeName" value="'sequence'"/> <Attribute name="AttributeName" value="'maxThreads'"/> </Component> </Content> </Component> </Content> </Dashboard> |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:32
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/query In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/src/org/mc4j/console/query Modified Files: QueryNode.java Log Message: Dashboard and component tweaks Index: QueryNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/query/QueryNode.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** QueryNode.java 12 Apr 2006 19:14:15 -0000 1.12 --- QueryNode.java 17 Apr 2006 03:07:25 -0000 1.13 *************** *** 19,22 **** --- 19,24 ---- import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.connection.ConnectionNode; + import org.mc4j.ems.connection.bean.EmsBean; + import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.openide.ErrorManager; import org.openide.actions.OpenLocalExplorerAction; *************** *** 33,36 **** --- 35,39 ---- import java.util.List; import java.util.Set; + import java.util.SortedSet; import java.util.regex.Pattern; *************** *** 76,82 **** protected void refreshQuery() { ! ConnectionNode connectionNode = (ConnectionNode)getParentNode(); ! final List list = new ArrayList(connectionNode.getMBeanList()); this.getChildren().remove(this.getChildren().getNodes()); --- 79,86 ---- protected void refreshQuery() { ! final ConnectionNode connectionNode = (ConnectionNode)getParentNode(); ! final SortedSet<EmsBean> beans = connectionNode.getEmsConnection().getBeans(); ! //new ArrayList(connectionNode.getMBeanList()); this.getChildren().remove(this.getChildren().getNodes()); *************** *** 86,104 **** try { ! Iterator iter = list.iterator(); int i=0; ! while (iter.hasNext()) { ! Object obj = iter.next(); ! MBeanNode mBeanNode = (MBeanNode) obj; ! String canonicalName = mBeanNode.getEmsBean().getBeanName().getCanonicalName(); ! StatusDisplayer.getDefault().setStatusText("Searching MBean [" + i++ + " of " + list.size() + "]"); if ((patern == null) || patern.matcher(canonicalName).matches()) { if ((substringSearch == null) || (canonicalName.toUpperCase().indexOf(substringSearch.toUpperCase()) >= 0)) { ! if ((attributeNameSearch == null) || setContainsSubstring(mBeanNode.getAttributeNodeMap().keySet(), attributeNameSearch)) { ! ! addMBean(mBeanNode); } } --- 90,105 ---- try { ! for (EmsBean bean : beans) { int i=0; ! String canonicalName = bean.getBeanName().getCanonicalName(); ! StatusDisplayer.getDefault().setStatusText("Searching MBean [" + i++ + " of " + beans.size() + "]"); if ((patern == null) || patern.matcher(canonicalName).matches()) { if ((substringSearch == null) || (canonicalName.toUpperCase().indexOf(substringSearch.toUpperCase()) >= 0)) { ! if ((attributeNameSearch == null) || setContainsSubstring(bean.getAttributes(), attributeNameSearch)) { ! MBeanNode node = connectionNode.getMBeanNode(canonicalName); ! addMBean(node); } } *************** *** 107,123 **** } catch (Exception e) { ErrorManager.getDefault().notify(e); } } }); ! t.start(); } ! private boolean setContainsSubstring(Set set, String substring) { String upperSubstring = substring.toUpperCase(); ! for (Iterator iterator = set.iterator(); iterator.hasNext();) { ! String s = (String) iterator.next(); ! if (s.toUpperCase().indexOf(upperSubstring) >= 0) return true; } --- 108,125 ---- } catch (Exception e) { ErrorManager.getDefault().notify(e); + } finally{ + StatusDisplayer.getDefault().setStatusText("Finished search"); } } }); ! t.setName("Query runner"); t.start(); } ! private boolean setContainsSubstring(Set<EmsAttribute> set, String substring) { String upperSubstring = substring.toUpperCase(); ! for (EmsAttribute attribute : set) { ! if (attribute.getName().toUpperCase().contains(upperSubstring)) return true; } *************** *** 205,209 **** public void setValue(Object value) { regularExpressionText = (String)value; ! patern = Pattern.compile((String)value); refreshQuery(); } --- 207,215 ---- public void setValue(Object value) { regularExpressionText = (String)value; ! if (regularExpressionText == null || regularExpressionText.length() == 0) ! patern = null; ! else ! patern = Pattern.compile((String)value); ! refreshQuery(); } |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:29
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/src/org/mc4j/console Modified Files: Welcome.html Log Message: Dashboard and component tweaks |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:29
|
Update of /cvsroot/mc4j/mc4j In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745 Modified Files: build.xml Log Message: Dashboard and component tweaks Index: build.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/build.xml,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** build.xml 12 Apr 2006 22:30:27 -0000 1.42 --- build.xml 17 Apr 2006 03:07:25 -0000 1.43 *************** *** 204,208 **** <target name="get-nb-platform"> ! <mkdir dir="build"/> <mkdir dir="build/download"/> <echo message="Downloading NetBeans Platform (~4.4 MB)"/> --- 204,208 ---- <target name="get-nb-platform"> ! <mkdir dir="build"/> <mkdir dir="build/download"/> <echo message="Downloading NetBeans Platform (~4.4 MB)"/> *************** *** 438,441 **** --- 438,442 ---- <sysproperty key="swing.aatext" value="true"/> + <sysproperty key="http.nonProxyHosts" value="127.0.0.1|foobar"/> <!-- Support for running a debugger --> |
|
From: Greg H. <gh...@us...> - 2006-04-17 03:07:28
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/graph In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6745/src/org/mc4j/console/swing/graph Modified Files: AbstractGraphPanel.java Log Message: Dashboard and component tweaks Index: AbstractGraphPanel.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/graph/AbstractGraphPanel.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AbstractGraphPanel.java 12 Apr 2006 19:14:06 -0000 1.10 --- AbstractGraphPanel.java 17 Apr 2006 03:07:25 -0000 1.11 *************** *** 106,109 **** --- 106,112 ---- } + public String getChartTitle() { + return chart.getTitle().getText(); + } public void setChartTitle(final String name) { SwingUtilities.invokeLater(new Runnable() { *************** *** 148,154 **** true); ! chart.setTitle( ! new TextTitle("Graph ???", ! new Font("SansSerif",Font.BOLD, 12))); chartPanel = new ChartPanel(chart,false,true,true,false,false); --- 151,157 ---- true); ! // chart.setTitle( ! // new TextTitle("Graph ???", ! // new Font("SansSerif",Font.BOLD, 12))); chartPanel = new ChartPanel(chart,false,true,true,false,false); |
|
From: Greg H. <gh...@us...> - 2006-04-12 22:30:33
|
Update of /cvsroot/mc4j/mc4j In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9526 Modified Files: build.xml Log Message: A few tweaks for 1.6 compiling and some errors Index: build.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/build.xml,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** build.xml 12 Apr 2006 19:14:00 -0000 1.41 --- build.xml 12 Apr 2006 22:30:27 -0000 1.42 *************** *** 204,208 **** <target name="get-nb-platform"> ! <mkdir dir="build"/> <mkdir dir="build/download"/> <echo message="Downloading NetBeans Platform (~4.4 MB)"/> --- 204,208 ---- <target name="get-nb-platform"> ! <mkdir dir="build"/> <mkdir dir="build/download"/> <echo message="Downloading NetBeans Platform (~4.4 MB)"/> |
|
From: Greg H. <gh...@us...> - 2006-04-12 22:27:55
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7241/src/org/mc4j/console/dashboard/components Modified Files: NumericAttributeGraph.java Log Message: A few tweaks for 1.6 compiling and some errors Index: NumericAttributeGraph.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components/NumericAttributeGraph.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** NumericAttributeGraph.java 12 Apr 2006 19:13:59 -0000 1.14 --- NumericAttributeGraph.java 12 Apr 2006 22:27:52 -0000 1.15 *************** *** 50,54 **** } ! public Set<EmsAttribute> getAttributes() { return (Set<EmsAttribute>) getTimeSeriesKeys(); } --- 50,54 ---- } ! public Set<EmsAttribute> getAttributes() { return (Set<EmsAttribute>) getTimeSeriesKeys(); } |
|
From: Greg H. <gh...@us...> - 2006-04-12 22:27:30
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6993/src/org/mc4j/jre15/components Modified Files: MemoryUsageComponent.java Log Message: A few tweaks for 1.6 compiling and some errors Index: MemoryUsageComponent.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/jre15/components/MemoryUsageComponent.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MemoryUsageComponent.java 12 Apr 2006 19:14:04 -0000 1.4 --- MemoryUsageComponent.java 12 Apr 2006 22:27:27 -0000 1.5 *************** *** 50,54 **** } ! public void addObservation() throws Exception { --- 50,54 ---- } ! public void addObservation() throws Exception { |
|
From: Greg H. <gh...@us...> - 2006-04-12 22:24:51
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/tomcat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/application/dashboards/tomcat Modified Files: Tomcat_RequestProcessorTable.xml Log Message: A few tweaks for 1.6 compiling and some errors Index: Tomcat_RequestProcessorTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/tomcat/Tomcat_RequestProcessorTable.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Tomcat_RequestProcessorTable.xml 12 Apr 2006 19:14:01 -0000 1.5 --- Tomcat_RequestProcessorTable.xml 12 Apr 2006 22:24:48 -0000 1.6 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.org/Dashboard_1_1.dtd"> <Dashboard version="2.0" name="Request Processor Statistics" refreshControl="true" standardHeader="true" autoRefresh="true"> --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd"> <Dashboard version="2.0" name="Request Processor Statistics" refreshControl="true" standardHeader="true" autoRefresh="true"> |
|
From: Greg H. <gh...@us...> - 2006-04-12 22:24:50
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean Modified Files: DMBean.java Log Message: A few tweaks for 1.6 compiling and some errors Index: DMBean.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/DMBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DMBean.java 12 Apr 2006 19:11:35 -0000 1.2 --- DMBean.java 12 Apr 2006 22:24:48 -0000 1.3 *************** *** 50,53 **** --- 50,54 ---- import java.util.TreeMap; import java.util.TreeSet; + import java.util.Iterator; /** *************** *** 239,243 **** List<EmsAttribute> attributeResults = new ArrayList<EmsAttribute>(); ! for (Attribute attr : ((List<Attribute>) attributeList)) { EmsAttribute attribute = getAttribute(attr.getName()); --- 240,246 ---- List<EmsAttribute> attributeResults = new ArrayList<EmsAttribute>(); ! Iterator iter = attributeList.iterator(); ! while (iter.hasNext()) { ! Attribute attr = (Attribute) iter.next(); EmsAttribute attribute = getAttribute(attr.getName()); |
|
From: Greg H. <gh...@us...> - 2006-04-12 22:24:50
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/src/org/mc4j/console Modified Files: Welcome.html Log Message: A few tweaks for 1.6 compiling and some errors Index: Welcome.html =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/Welcome.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Welcome.html 12 Apr 2006 19:13:55 -0000 1.3 --- Welcome.html 12 Apr 2006 22:24:48 -0000 1.4 *************** *** 9,17 **** <tr> <td width="100%"> ! <span style="font-size: 24pt; font-family: Arial Black; color: #FFFFFF">MC4J 1.2 beta 9</span> ! </td> ! ! <td align="right"> ! <img align="right" src="classpath://images/FullLogo.gif"> </td> </tr> --- 9,14 ---- <tr> <td width="100%"> ! <img align="right" src="classpath://images/AnimatedLogoMC4J2_64.gif"> ! <span style="font-size: 24pt; font-family: Arial Black">MC4J 2.0 alpha 1</span> </td> </tr> *************** *** 22,29 **** <tr> <td> ! <h2>New features</h2> <ul> ! <li>WebLogic 8, 7 and 6 support fixed</li> ! <li>WebSphere Studio test environment support fixed</li> </ul> </td> --- 19,36 ---- <tr> <td> ! <h2>MC4J - Management Console for Java</h2> ! <p> ! MC4J is a project to create management software for J2EE application servers and other Java applications. ! It is designed to utilize the JMX specification to connect to and introspect information within supported ! servers and applications. It provides the ability to browse existing managed beans (MBeans), update ! configurations, monitor operation and execute tasks. ! </p> ! ! <h3>What's New</h3> <ul> ! <li>MC4J rearchitected from the ground up to make customization easier</li> ! <li>HTML-based dashboard layouts</li> ! <li>New dashboards for Java 1.5</li> ! <li>Faster</li> </ul> </td> *************** *** 36,39 **** --- 43,47 ---- </table> + <h2>How to connect</h2> Click on the icon <a href="newconnection"><img src="classpath://org/mc4j/console/connection/ConnectionNodeIcon.gif" border="0"></a> to |
|
From: Greg H. <gh...@us...> - 2006-04-12 22:24:50
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/jboss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/application/dashboards/jboss Modified Files: JBoss_ServerInfoMBean.xml Log Message: A few tweaks for 1.6 compiling and some errors Index: JBoss_ServerInfoMBean.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_ServerInfoMBean.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JBoss_ServerInfoMBean.xml 12 Apr 2006 19:13:52 -0000 1.6 --- JBoss_ServerInfoMBean.xml 12 Apr 2006 22:24:47 -0000 1.7 *************** *** 8,12 **** <Dashboard version="2.0" name="JBoss Server Info" autoRefresh="true" refreshControl="true" standardHeader="true"> ! <Description>JBoss Application Server product details and general statistics.></Description> <DashboardMatch type="Global" location="/JBoss"> --- 8,12 ---- <Dashboard version="2.0" name="JBoss Server Info" autoRefresh="true" refreshControl="true" standardHeader="true"> ! <Description>JBoss Application Server product details and general statistics.</Description> <DashboardMatch type="Global" location="/JBoss"> |
|
From: Greg H. <gh...@us...> - 2006-04-12 22:24:50
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/src/org/mc4j/console/dashboard/components Modified Files: TabularDataComponent.java Log Message: A few tweaks for 1.6 compiling and some errors Index: TabularDataComponent.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/components/TabularDataComponent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TabularDataComponent.java 12 Apr 2006 19:13:59 -0000 1.2 --- TabularDataComponent.java 12 Apr 2006 22:24:47 -0000 1.3 *************** *** 144,148 **** //noinspection unchecked ! this.values = new ArrayList<CompositeData>(this.data.values()); this.columnKeys = new ArrayList<Object>(this.data.getTabularType().getRowType().keySet()); --- 144,148 ---- //noinspection unchecked ! this.values = new ArrayList(this.data.values()); this.columnKeys = new ArrayList<Object>(this.data.getTabularType().getRowType().keySet()); |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:14:50
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/editor/jmx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/swing/editor/jmx Modified Files: CompositeDataEditor.java ObjectNameEditor.java Log Message: Merging EMS into head for the 2.0 release work Index: CompositeDataEditor.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/editor/jmx/CompositeDataEditor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompositeDataEditor.java 5 Oct 2004 05:16:02 -0000 1.2 --- CompositeDataEditor.java 12 Apr 2006 19:14:12 -0000 1.3 *************** *** 24,38 **** import org.openide.nodes.PropertySupport; import org.openide.nodes.Sheet; ! import java.awt.BorderLayout; ! import java.awt.Component; import java.beans.PropertyEditorSupport; import java.util.Iterator; import java.util.Set; - import javax.management.openmbean.CompositeData; - import javax.swing.JPanel; - - /** --- 24,38 ---- import org.openide.nodes.PropertySupport; import org.openide.nodes.Sheet; + import org.openide.windows.IOProvider; ! import javax.management.openmbean.CompositeData; ! import javax.management.openmbean.CompositeDataSupport; ! import javax.management.openmbean.OpenDataException; ! import javax.swing.*; ! import java.awt.*; import java.beans.PropertyEditorSupport; import java.util.Iterator; import java.util.Set; /** *************** *** 50,54 **** if (value instanceof CompositeData) { //return new CompositeDataPanel((CompositeData) value); ! return new CompositeDataNodePanel((CompositeData) value); } return null; --- 50,54 ---- if (value instanceof CompositeData) { //return new CompositeDataPanel((CompositeData) value); ! return new CompositeDataNodePanel((CompositeData) value, this); } return null; *************** *** 58,72 **** public static class CompositeDataNodePanel extends JPanel { ! public CompositeDataNodePanel(CompositeData data) { setLayout(new BorderLayout()); PropertySheet sheet = new PropertySheet(); ! CompositeDataNode node = new CompositeDataNode(data); try { ! sheet.setNodes(new Node[] { node }); ! } catch (Exception e) { ErrorManager.getDefault().notify(e); } ! add(sheet,BorderLayout.CENTER); } } --- 58,74 ---- public static class CompositeDataNodePanel extends JPanel { ! public CompositeDataNodePanel(CompositeData data, CompositeDataEditor cde) { setLayout(new BorderLayout()); PropertySheet sheet = new PropertySheet(); ! CompositeDataNode node = new CompositeDataNode(data, cde); try { ! sheet.setNodes(new Node[]{node}); ! } catch (Exception e) { ! ErrorManager.getDefault().notify(e); ! } ! add(sheet, BorderLayout.CENTER); } } *************** *** 75,81 **** public static class CompositeDataNode extends AbstractNode { CompositeData data; ! public CompositeDataNode(CompositeData data) { super(Children.LEAF); this.data = data; setDisplayName(this.data.getCompositeType().getDescription()); --- 77,86 ---- public static class CompositeDataNode extends AbstractNode { CompositeData data; ! CompositeDataEditor cde; ! ! public CompositeDataNode(CompositeData data, CompositeDataEditor cde) { super(Children.LEAF); this.data = data; + this.cde = cde; setDisplayName(this.data.getCompositeType().getDescription()); *************** *** 94,116 **** try { dataClass = Class.forName(this.data.getCompositeType().getType(keyName).getClassName()); ! } catch (ClassNotFoundException cnfe) { } String description = this.data.getCompositeType().getDescription(keyName); ! props.put( ! new PropertySupport.ReadWrite( ! keyName, ! dataClass, ! keyName, ! description) { ! public Object getValue() { ! Object value = data.get(keyName); ! return value; } ! public void setValue(Object value) { } ! }); } ! return new Node.PropertySet[] { props }; } --- 99,156 ---- try { dataClass = Class.forName(this.data.getCompositeType().getType(keyName).getClassName()); ! } catch (ClassNotFoundException cnfe) { ! } String description = this.data.getCompositeType().getDescription(keyName); ! props.put(new PropertySupport.ReadWrite(keyName, ! dataClass, ! keyName, ! description) { ! public Object getValue() { ! Object value = data.get(keyName); ! return value; ! } ! ! public void setValue(Object value) { ! CompositeDataSupport cds = null; ! try { ! cds = createCompositeData(value); ! data = cds; ! cde.setValue(data); ! } catch (OpenDataException e) { ! //ignore - we will just stay with the original data ! IOProvider.getDefault().getIO("MC4J Errors", false).getOut(). ! println("CompositeDataSupport exception: " + e.getMessage()); } + } ! /** ! * @param value ! * @return ! * @throws OpenDataException ! */ ! private CompositeDataSupport createCompositeData(Object value) throws OpenDataException { ! Set set = data.getCompositeType().keySet(); ! int i = 0; ! Object[] newData = new Object[set.size()]; ! String[] newDescriptions = new String[set.size()]; ! for (Iterator iter = set.iterator(); iter.hasNext();) { ! String key = (String) iter.next(); ! if (keyName.equals(key)) { ! newData[i] = value; ! } else { ! newData[i] = data.get(key); ! ; ! } ! newDescriptions[i] = key; ! i++; ! } ! CompositeDataSupport cds = new CompositeDataSupport(data.getCompositeType(), newDescriptions, newData); ! return cds; ! } ! }); } ! return new Node.PropertySet[]{props}; } Index: ObjectNameEditor.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/editor/jmx/ObjectNameEditor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ObjectNameEditor.java 5 Oct 2004 05:16:02 -0000 1.2 --- ObjectNameEditor.java 12 Apr 2006 19:14:12 -0000 1.3 *************** *** 17,20 **** --- 17,22 ---- package org.mc4j.console.swing.editor.jmx; + import org.mc4j.console.bean.MBeanNode; + import org.mc4j.console.connection.ConnectionNode; import org.openide.ErrorManager; import org.openide.explorer.propertysheet.ExPropertyEditor; *************** *** 24,33 **** import org.openide.nodes.Node; ! import org.mc4j.console.bean.MBeanNode; ! import org.mc4j.console.connection.ConnectionNode; ! ! import java.awt.Component; ! import java.awt.Graphics; ! import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; --- 26,32 ---- import org.openide.nodes.Node; ! import javax.management.ObjectName; ! import javax.swing.*; ! import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; *************** *** 38,49 **** import java.util.List; - import javax.management.ObjectName; - import javax.swing.DefaultListModel; - import javax.swing.DefaultListSelectionModel; - import javax.swing.JButton; - import javax.swing.JComponent; - import javax.swing.KeyStroke; - import javax.swing.ListSelectionModel; - --- 37,40 ---- *************** *** 54,58 **** public class ObjectNameEditor extends PropertyEditorSupport implements ExPropertyEditor, InplaceEditor.Factory { ! private ObjectName currentValue; private DefaultListModel listModel; --- 45,49 ---- public class ObjectNameEditor extends PropertyEditorSupport implements ExPropertyEditor, InplaceEditor.Factory { ! private String currentValue; private DefaultListModel listModel; *************** *** 71,78 **** public void setAsText(String text) throws IllegalArgumentException { for (int i = 0; i < this.listModel.getSize(); i++) { ! ObjectName objectName = (ObjectName)this.listModel.get(i); ! String name = objectName.toString(); if (name.equals(text)) { ! this.currentValue = objectName; this.selectionModel.setSelectionInterval(i,i); } --- 62,68 ---- public void setAsText(String text) throws IllegalArgumentException { for (int i = 0; i < this.listModel.getSize(); i++) { ! String name = (String) this.listModel.get(i); if (name.equals(text)) { ! this.currentValue = name; this.selectionModel.setSelectionInterval(i,i); } *************** *** 81,85 **** public String getAsText() { ! return (this.currentValue!= null)?this.currentValue.getCanonicalName():"<null>"; } --- 71,75 ---- public String getAsText() { ! return (this.currentValue!= null)?this.currentValue:"<null>"; } *************** *** 113,117 **** i++; //ObjectInstance instance = (ObjectInstance) ! ObjectName name = ((MBeanNode)instIter.next()).getObjectName(); //instance.getObjectName(); listModel.addElement(name); --- 103,108 ---- i++; //ObjectInstance instance = (ObjectInstance) ! String name = ((MBeanNode)instIter.next()).getEmsBean().getBeanName().getCanonicalName(); ! // ObjectName name = ((MBeanNode)instIter.next()).getObjectName(); //instance.getObjectName(); listModel.addElement(name); *************** *** 128,136 **** public void setValue(Object value) { if (value != null) { ! this.currentValue = (ObjectName) value; firePropertyChange(); for (int i = 0; i < this.listModel.getSize(); i++) { ! ObjectName objectName = (ObjectName)this.listModel.get(i); if (objectName.equals(value)) { --- 119,127 ---- public void setValue(Object value) { if (value != null) { ! this.currentValue = (String) value; firePropertyChange(); for (int i = 0; i < this.listModel.getSize(); i++) { ! String objectName = (String) this.listModel.get(i); if (objectName.equals(value)) { *************** *** 257,261 **** if ((value != null) && (value instanceof ObjectName)) { ! currentValue = (ObjectName) value; setText(getAsText()); } --- 248,252 ---- if ((value != null) && (value instanceof ObjectName)) { ! currentValue = (String) value; setText(getAsText()); } *************** *** 290,294 **** if ((value != null) && (value instanceof ObjectName)) { ! currentValue = (ObjectName) value; } } catch(Exception e) { --- 281,285 ---- if ((value != null) && (value instanceof ObjectName)) { ! currentValue = (String) value; } } catch(Exception e) { |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:14:49
|
Update of /cvsroot/mc4j/mc4j/doc-build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/doc-build Modified Files: Download.xml index.xml mc4j-docs.xsl module.xml Log Message: Merging EMS into head for the 2.0 release work Index: index.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/index.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** index.xml 19 Jan 2005 14:14:49 -0000 1.15 --- index.xml 12 Apr 2006 19:14:10 -0000 1.16 *************** *** 19,22 **** --- 19,23 ---- <section name="Introduction"> + <p> This software connects to J2EE application servers in order to expose *************** *** 25,31 **** --- 26,53 ---- monitor operation and execute tasks. </p> + <p> + Also, visit the <a href="/wiki">JMXWiki</a> to share tips about MC4J and JMX in general. + <a href="/wiki" style="float: right;"><img align="right" src="images/wiki.png" border="0"/></a> + </p> </section> <section name="News"> + <subsection name="MC4J 1.2 beta 9 released! (3/14/05)"> + <table> + <tr> + <td width="*"> + + <p> + This release is primarily to fix bugs with the WebLogic and WebSphere Studio + support. Sorry it took so long.<ul> + <li>WebLogic 6, 7 and 8.1 support fixed</li> + <li>WebSphere Studio test environment support added</li> + </ul> + </p> + + </td> + </tr> + </table> + </subsection> <subsection name="MC4J 1.2 beta 8 released! (1/18/05)"> *************** *** 239,244 **** <tr> <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB"> ! <a href="http://www.pramati.com/">Sun JSAS</a></td> ! <td style="border-bottom: .75pt solid silver">8<br/></td> </tr> <tr> --- 261,266 ---- <tr> <td style="font-weight: bold; border-bottom: .75pt solid silver; background-color: #87ADCB"> ! <a href="http://www.sun.com/appserver">Sun JSAS</a></td> ! <td style="border-bottom: .75pt solid silver">8<br/>8.1</td> </tr> <tr> Index: Download.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/Download.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Download.xml 19 Jan 2005 14:14:49 -0000 1.5 --- Download.xml 12 Apr 2006 19:14:10 -0000 1.6 *************** *** 26,29 **** --- 26,77 ---- + <subsection name="Download MC4J 1.2 beta 9 (March 14th, 2005)"> + <p> + + <a href="http://mc4j.sourceforge.net/wiki/index.php/MC4J">Known Issues</a> + <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/MC4J12b9-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-12b9-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-12b9-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/MC4J12b9-Java.jar?download">Download</a> + </td> + </tr> + </table> + </p> + </subsection> + + <subsection name="Download MC4J 1.2 beta 8 (January 18th, 2005)"> <p> Index: mc4j-docs.xsl =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/mc4j-docs.xsl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mc4j-docs.xsl 10 Nov 2004 15:44:59 -0000 1.8 --- mc4j-docs.xsl 12 Apr 2006 19:14:10 -0000 1.9 *************** *** 474,490 **** <xsl:choose> <xsl:when test="$module-menu != 'menu' and not(starts-with(@src,'/'))"> ! <img src="{$imgPath}/{$src}"/> </xsl:when> <xsl:when test="$module-menu = 'menu' and not(starts-with(@src, '/'))"> ! <img src="{$src}"/> </xsl:when> <xsl:when test="starts-with(@src, '/')"> ! <img src="{$rootPath}{$src}"/> </xsl:when> <xsl:otherwise> ! <img src="{$imgPath}/{$src}"/> </xsl:otherwise> </xsl:choose> --- 474,490 ---- <xsl:choose> <xsl:when test="$module-menu != 'menu' and not(starts-with(@src,'/'))"> ! <img border="0" src="{$imgPath}/{$src}"/> </xsl:when> <xsl:when test="$module-menu = 'menu' and not(starts-with(@src, '/'))"> ! <img border="0" src="{$src}"/> </xsl:when> <xsl:when test="starts-with(@src, '/')"> ! <img border="0" src="{$rootPath}{$src}"/> </xsl:when> <xsl:otherwise> ! <img border="0" src="{$imgPath}/{$src}"/> </xsl:otherwise> </xsl:choose> Index: module.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/doc-build/module.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** module.xml 10 Nov 2004 15:44:59 -0000 1.11 --- module.xml 12 Apr 2006 19:14:10 -0000 1.12 *************** *** 17,20 **** --- 17,21 ---- <item name="User Guide" href="guide/index.html"/> <item name="Dashboard Guide" href="dashboard-dev/index.html"/> + <item name="JMX Wiki" href="/wiki"/> </menu> *************** *** 25,28 **** --- 26,30 ---- <item name="MX4J" href="usageMX4J.html"/> <item name="OC4J" href="usageOC4J.html"/> + <item name="SJSAS" href="usageSJAS.html"/> <item name="Tomcat" href="usageTomcat.html"/> <item name="WebLogic" href="usageWebLogic.html"/> |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:14:49
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/dashboard/global Modified Files: OpenDashboardAction.java GlobalDashboardNode.java Log Message: Merging EMS into head for the 2.0 release work Index: OpenDashboardAction.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/OpenDashboardAction.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** OpenDashboardAction.java 5 Oct 2004 05:16:00 -0000 1.9 --- OpenDashboardAction.java 12 Apr 2006 19:14:11 -0000 1.10 *************** *** 17,37 **** package org.mc4j.console.dashboard.global; ! import java.util.Map; ! ! import javax.swing.JComponent; ! import javax.swing.SwingUtilities; ! ! import org.openide.ErrorManager; import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.actions.NodeAction; - import org.openide.windows.TopComponent; - - import org.mc4j.console.dashboard.Dashboard; - import org.mc4j.console.dashboard.DashboardFactory; - import org.mc4j.console.dashboard.DashboardTopComponent; /** ! * * * @author Greg Hinkle (gh...@us...), May 2003 --- 17,29 ---- package org.mc4j.console.dashboard.global; ! import org.mc4j.console.dashboard.Dashboard; ! import org.mc4j.console.dashboard.DashboardTopComponent; ! import org.mc4j.ems.connection.support.ConnectionListener; import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.actions.NodeAction; /** ! * Opens global dashboards * * @author Greg Hinkle (gh...@us...), May 2003 *************** *** 43,69 **** final GlobalDashboardNode node = (GlobalDashboardNode) nodes[0]; ! Map context = node.getDashboard().getContextStarter(); ! context.put(Dashboard.CONTEXT_MBEAN_SERVER, node.getConnectionNode().getMBeanServer()); ! ! DashboardFactory factory = new DashboardFactory(); ! try { ! JComponent component = factory.buildDashboard(node.getDashboard(), context); ! final TopComponent tc = new DashboardTopComponent(component, node.getDashboard().getName()); ! SwingUtilities.invokeLater(new Runnable() { ! public void run() { ! tc.setActivatedNodes(new Node[] { node }); ! tc.setDisplayName(node.getDashboard().getName()); ! tc.open(); ! tc.requestActive(); ! } ! }); ! node.getConnectionNode().registerDashboard(tc); ! } catch (Exception e) { ! ErrorManager.getDefault().notify(e); ! } } --- 35,58 ---- final GlobalDashboardNode node = (GlobalDashboardNode) nodes[0]; + Dashboard dashboard = node.getDashboard(); + final DashboardTopComponent tc = new DashboardTopComponent(dashboard, dashboard.getName()); + tc.launch(); ! // TODO: Need to figure out where we want to track open dashboards now... ! // probably against the EmsConnection ! node.getConnectionNode().getEmsConnection().getConnectionProvider().addConnectionListener(new ConnectionListener() { ! public void connect() { ! } ! public void disconnect() { ! tc.close(); ! } ! public void connectionFailure() { ! // TODO: Some sort of glasspane level info? ! } ! }); ! node.getConnectionNode().registerDashboard(tc); } *************** *** 83,88 **** - - public String getName() { return "Open..."; // NOI18N --- 72,75 ---- Index: GlobalDashboardNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/GlobalDashboardNode.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GlobalDashboardNode.java 5 Oct 2004 05:16:00 -0000 1.6 --- GlobalDashboardNode.java 12 Apr 2006 19:14:11 -0000 1.7 *************** *** 17,24 **** package org.mc4j.console.dashboard.global; ! import java.util.List; ! ! import javax.swing.Action; ! import org.openide.cookies.PrintCookie; import org.openide.nodes.AbstractNode; --- 17,23 ---- package org.mc4j.console.dashboard.global; ! import org.mc4j.console.bean.MBeanNode; ! import org.mc4j.console.connection.ConnectionNode; ! import org.mc4j.console.dashboard.Dashboard; import org.openide.cookies.PrintCookie; import org.openide.nodes.AbstractNode; *************** *** 29,35 **** import org.openide.windows.IOProvider; ! import org.mc4j.console.bean.MBeanNode; ! import org.mc4j.console.connection.ConnectionNode; ! import org.mc4j.console.dashboard.Dashboard; --- 28,33 ---- import org.openide.windows.IOProvider; ! import javax.swing.*; ! import java.util.List; *************** *** 63,68 **** setShortDescription(dashboard.getDescription()); - - } --- 61,64 ---- *************** *** 80,84 **** setDisplayName(dashboard.getName()); ! setShortDescription("Dashboard on " + mbeanNode.getObjectName().getCanonicalName()); getCookieSet().add(new PrintCookie() { --- 76,80 ---- setDisplayName(dashboard.getName()); ! setShortDescription("Dashboard on " + mbeanNode.getEmsBean().getBeanName().getCanonicalName()); getCookieSet().add(new PrintCookie() { |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:14:49
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/swing Modified Files: SectionHolder.java Log Message: Merging EMS into head for the 2.0 release work Index: SectionHolder.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/swing/SectionHolder.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SectionHolder.java 13 Oct 2004 05:03:28 -0000 1.9 --- SectionHolder.java 12 Apr 2006 19:14:11 -0000 1.10 *************** *** 1,4 **** /* ! * Copyright 2002-2004 Greg Hinkle * * Licensed under the Apache License, Version 2.0 (the "License"); --- 1,4 ---- /* ! * Copyright 2002-2005 Greg Hinkle * * Licensed under the Apache License, Version 2.0 (the "License"); *************** *** 14,195 **** * limitations under the License. */ - package org.mc4j.console.swing; ! import java.awt.BorderLayout; ! import java.awt.Color; ! import java.awt.Component; ! import java.awt.LayoutManager2; ! import java.awt.event.ItemEvent; ! import java.awt.event.ItemListener; ! import java.awt.event.WindowAdapter; ! import java.awt.event.WindowEvent; ! import java.net.URL; ! import javax.swing.BoxLayout; ! import javax.swing.ImageIcon; ! import javax.swing.JCheckBox; ! import javax.swing.JFrame; ! import javax.swing.JPanel; ! import javax.swing.JScrollPane; ! import javax.swing.JTable; ! import javax.swing.JTree; /** ! * @author Greg Hinkle (gh...@us...), September 2002 * @version $Revision$($Author$ / $Date$) */ ! public class SectionHolder ! extends ComponentBorder ! implements ItemListener { ! ! JCheckBox button; public SectionHolder() { ! this(""); ! } ! /** ! * Creates a new instance of SectionHolder ! */ ! public SectionHolder(String title) { ! super(new JCheckBox(title), Color.black, 4); ! this.button = (JCheckBox) super.getTitledComponent(); ! ! setOpaque(false); ! //this.button.setOpaque(false); ! this.button.setContentAreaFilled(false); ! this.button.setFocusPainted(false); ! ! ClassLoader ld = this.getClass().getClassLoader(); ! URL url = ld.getResource("images/ToggleOpen.gif"); ! //System.out.println("URL: " + url); ! if (url != null) { ! button.setIcon(new ImageIcon(url)); ! } ! URL url2 = ld.getResource("images/ToggleClosed.gif"); ! if (url2 != null) { ! //System.out.println("URL2: " + url2); ! button.setDisabledIcon(new ImageIcon(url2)); ! ! button.setSelectedIcon(new ImageIcon(url2)); ! } ! // button.setDisabledSelectedIcon( ! // new ImageIcon("org/mc4j/console/ToggleChanging.gif")); ! ! URL url3 = ld.getResource("images/ToggleChanging.gif"); ! if (url3 != null) { ! button.setPressedIcon(new ImageIcon(url3)); ! } ! this.button.addItemListener(this); ! } ! ! public void setTitle(String title) { ! this.button.setText(title); ! invalidate(); ! doLayout(); ! } ! ! /** ! * Invoked when an item has been selected or deselected by the user. ! * The code written for this method performs the operations ! * that need to occur when an item is selected (or deselected). ! */ ! public void itemStateChanged(ItemEvent e) { ! //System.out.println("SectionHolder had an itemevent: " + e); ! if (e.getStateChange() == ItemEvent.DESELECTED) { ! maximize(); ! } else { ! minimize(); ! } ! ! Component[] comp = getComponents(); ! for (int i = 0; i < comp.length; i++) { ! Component component = comp[i]; ! component.doLayout(); ! } ! ! try { ! LayoutManager2 parentLayout = (LayoutManager2) getParent().getLayout(); ! if (parentLayout != null) ! parentLayout.invalidateLayout(getParent()); ! ! getParent().doLayout(); ! } catch(ClassCastException cce) { ! System.out.println("No layoutmgr2"); ! } ! ! revalidate(); ! ! } ! ! public static void main(String args[]) { ! final JFrame fr = new JFrame(); ! fr.getContentPane().setBackground(Color.WHITE); ! ! JScrollPane scrollPane = new JScrollPane(); ! JPanel base = new JPanel(); ! ! scrollPane.setViewportView(base); ! fr.getContentPane().add(scrollPane); ! ! base.setOpaque(false); ! base.setLayout(new BoxLayout(base,BoxLayout.Y_AXIS)); ! ! scrollPane.getVerticalScrollBar().setUnitIncrement(10); ! ! SectionHolder a = new SectionHolder("This is section A"); ! a.setLayout(new BorderLayout()); ! a.setTitle("This is section A"); ! a.add(new JTable(new Object[][]{{"A", "B", "C"}, {"Foo", "Bar", "Baz"}, {"X", "Y", "Z"}}, new Object[]{"First", "Second", "Third"}), BorderLayout.CENTER); ! base.add(a); ! ! for (int i = 0; i < 10;i++) { ! SectionHolder b = new SectionHolder(); ! b.setTitle("This is section B - " + i); ! b.add(new JTable(new Object[][]{{"A", "B", "C"}, {"Foo", "Bar", "Baz"}, {"X", "Y", "Z"}}, new Object[]{"First", "Second", "Third"})); ! base.add(b); ! } ! ! for (int i = 11; i < 20; i++) { ! SectionHolder h = new SectionHolder("Section Holder #: " + i); ! h.add(new JTree()); ! base.add(h); ! } ! ! ! /* ! System.out.println("Plain table"); ! JTable t = new JTable(new Object[][]{{"A", "B", "C"}, {"Foo", "Bar", "Baz"}, {"X", "Y", "Z"}}, new Object[]{"First", "Second", "Third"}); ! System.out.println("min: " + t.getMinimumSize()); ! System.out.println("pref: " + t.getPreferredSize()); ! System.out.println("max: " + t.getMaximumSize()); ! ! System.out.println("Table in a JPanel"); ! JPanel temp = new JPanel(); ! temp.add(t); ! System.out.println("min: " + temp.getMinimumSize()); ! System.out.println("pref: " + temp.getPreferredSize()); ! System.out.println("max: " + temp.getComponent(0).getMaximumSize()); ! ! */ ! ! //fr.getContentPane().add(Box.createVerticalGlue()); ! ! //SpringUtilities.makeCompactGrid(fr.getContentPane(), 2, 1, 10, 10, 3, 3); ! ! fr.getContentPane().doLayout(); ! ! fr.pack(); ! fr.setVisible(true); ! fr.addWindowListener(new WindowAdapter() { ! public void windowClosing(WindowEvent e) { ! System.exit(0); ! } ! public void windowActivated(WindowEvent e) { ! fr.getContentPane().invalidate(); ! fr.getContentPane().doLayout(); ! } ! }); } } --- 14,34 ---- * limitations under the License. */ package org.mc4j.console.swing; ! import org.jdesktop.swingx.JXTaskPane; ! import java.awt.*; /** ! * @author Greg Hinkle (gh...@us...), Dec 27, 2005 * @version $Revision$($Author$ / $Date$) */ ! public class SectionHolder extends JXTaskPane { public SectionHolder() { ! // setMaximumSize(new Dimension(Short.MAX_VALUE,(int) ! // getMaximumSize().width)); ! setAlignmentX(Component.LEFT_ALIGNMENT); } } |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:14:48
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/welcome In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/welcome Modified Files: WelcomeTopComponent.java Log Message: Merging EMS into head for the 2.0 release work Index: WelcomeTopComponent.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/welcome/WelcomeTopComponent.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WelcomeTopComponent.java 14 Oct 2004 14:55:04 -0000 1.2 --- WelcomeTopComponent.java 12 Apr 2006 19:14:10 -0000 1.3 *************** *** 181,187 **** // c = Class.forName(classname); // } catch (ClassNotFoundException e) { ! ClassLoader loader = getClassLoader(); try { ! c = Class.forName(classname, true, loader); } catch (ClassNotFoundException e1) { } // } --- 181,187 ---- // c = Class.forName(classname); // } catch (ClassNotFoundException e) { ! // ClassLoader loader = getClassLoader(); try { ! c = Class.forName(classname); } catch (ClassNotFoundException e1) { } // } *************** *** 213,217 **** File extrasFile = InstalledFileLocator.getDefault().locate("mc4jlib/mc4j_common.jar","org.mc4j.console",false); ! if (!extrasFile.exists()) { ErrorManager.getDefault().notify( new RuntimeException("Unable to locate mc4j_common.jar in the mc4jlib folder") --- 213,217 ---- File extrasFile = InstalledFileLocator.getDefault().locate("mc4jlib/mc4j_common.jar","org.mc4j.console",false); ! if (extrasFile != null && !extrasFile.exists()) { ErrorManager.getDefault().notify( new RuntimeException("Unable to locate mc4j_common.jar in the mc4jlib folder") |
![http://tomcat.apache.org/images/tomcat.gif"](http://tomcat.apache.org/images/tomcat.gif"){kind=link}