mc4j-cvs Mailing List for MC4J JMX Console (Page 9)
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-12 19:11:40
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/parameter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18666/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/parameter Added Files: DParameter.java Log Message: Merging EMS into head for the 2.0 release work --- NEW FILE: DParameter.java --- /* * Copyright 2002-2004 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.impl.jmx.connection.bean.parameter; import org.mc4j.ems.connection.bean.parameter.EmsParameter; import javax.management.MBeanParameterInfo; /** * Created: Jul 20, 2005 1:12:14 AM * * @author Greg Hinkle (gh...@us...) * @version $Revision: 1.2 $($Author: ghinkl $ / $Date: 2006/04/12 19:11:36 $) */ public class DParameter implements EmsParameter { private String name; private String description; private String type; public DParameter(MBeanParameterInfo parameterInfo) { this.name = parameterInfo.getName(); this.description = parameterInfo.getDescription(); this.type = parameterInfo.getType(); } public String getName() { return name; } public String getDescription() { return description; } public String getType() { return type; } } |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:11:40
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/access In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18666/modules/ems/src/ems/org/mc4j/ems/access Added Files: Lookup.java test.java Log Message: Merging EMS into head for the 2.0 release work --- NEW FILE: Lookup.java --- /* * Copyright 2002-2004 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.access; import ognl.Ognl; import ognl.OgnlException; import java.util.Map; import java.util.HashMap; /** * @author Greg Hinkle (gh...@us...), Apr 12, 2005 * @version $Revision: 1.2 $($Author: ghinkl $ / $Date: 2006/04/12 19:11:35 $) */ public class Lookup { private static Lookup INSTANCE = new Lookup(); public static Lookup getLookup() { return INSTANCE; } public Object lookup(String ognlExpression, Map contex) { try { Object expression = Ognl.parseExpression(ognlExpression); Object value = Ognl.getValue(expression, contex); return value; } catch (OgnlException e) { e.printStackTrace(); } return null; } public static void main(String[] args) { Map context = new HashMap(); context.put("a",new Integer(3)); context.put("b","hello, world!"); context.put("c",new String[] { "one", "two", "three", "four" }); System.out.println("Value is: " + Lookup.getLookup().lookup("c[3]",context)); System.out.println("Value is: " + Lookup.getLookup().lookup("c[3] = 'hi there'",context)); System.out.println("Value is: " + Lookup.getLookup().lookup("c[3]",context)); } } --- NEW FILE: test.java --- /* * Copyright 2002-2004 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.access; /** * @author Greg Hinkle (gh...@us...), Apr 20, 2005 * @version $Revision: 1.2 $($Author: ghinkl $ / $Date: 2006/04/12 19:11:35 $) */ public class test { public static void main(String[] args) { boolean a = true,b = false; System.out.println(a != b); } } |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:11:40
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18666/modules/ems/src/ems-impl/org/mc4j/ems/impl/jmx/connection/bean/attribute Added Files: DUnkownAttribute.java DAttribute.java Log Message: Merging EMS into head for the 2.0 release work --- NEW FILE: DAttribute.java --- /* * Copyright 2002-2004 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.impl.jmx.connection.bean.attribute; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.mc4j.ems.connection.EmsException; import org.mc4j.ems.connection.bean.attribute.AttributeChangeEvent; import org.mc4j.ems.connection.bean.attribute.AttributeChangeListener; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.impl.jmx.connection.bean.DMBean; import org.mc4j.ems.store.Value; import org.mc4j.ems.store.ValueHistory; import org.mc4j.ems.store.CompleteValueHistory; import javax.management.Attribute; import javax.management.AttributeNotFoundException; import javax.management.InstanceNotFoundException; import javax.management.MBeanAttributeInfo; import javax.management.MBeanException; import javax.management.MBeanServer; import javax.management.ReflectionException; import java.io.NotSerializableException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.UndeclaredThrowableException; import java.math.BigDecimal; import java.math.BigInteger; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.Collections; /** * @author Greg Hinkle (gh...@us...), Apr 4, 2005 * @version $Revision: 1.2 $($Author: ghinkl $ / $Date: 2006/04/12 19:11:34 $) */ public class DAttribute implements EmsAttribute { private static Log log = LogFactory.getLog(DAttribute.class); protected MBeanAttributeInfo info; protected DMBean bean; protected boolean loaded; protected boolean supportedType = true; protected Set<AttributeChangeListener> changeListeners; protected long lastRetrieved; protected Object currentValue; protected ValueHistory valueHistory; protected LinkedList<Throwable> failures; public DAttribute(MBeanAttributeInfo info, DMBean bean) { this.info = info; this.bean = bean; init(); } /** * Initializes internal storage settings for the value history */ protected void init() { if (Boolean.valueOf(getControlProperty(CONTROL_ATTRIBUTE_HISTORY,"true"))) { String historyClass = getControlProperty(CONTROL_ATTRIBUTE_HISTORY_CLASS, null); if (historyClass != null) { try { this.valueHistory = (ValueHistory) Class.forName(historyClass).newInstance(); } catch (InstantiationException e) { throw new EmsException("Could not instantiate value history class",e); } catch (IllegalAccessException e) { throw new EmsException("Could not access value history class",e); } catch (ClassNotFoundException e) { throw new EmsException("Configured ValueHistory class not found",e); } } else { this.valueHistory = new CompleteValueHistory(Integer.valueOf(getControlProperty(CONTROL_ATTRIBUTE_HISTORY_DEPTH,"1"))); } } } private String getControlProperty(String property,String defaultValue) { return bean.getConnectionProvider().getConnectionSettings().getControlProperties().getProperty(property,defaultValue); } // TODO GH: Should you be able to register for a certain frequency? and then be guaranteed that the // notifications won't be faster than that? Then the requests could be grouped as well public synchronized void registerAttributeChangeListener(AttributeChangeListener listener) { if (changeListeners == null) changeListeners = new HashSet<AttributeChangeListener>(); changeListeners.add(listener); } public Object getValue() { if (!loaded) refresh(); return this.currentValue; } public int getValueSize() { if (valueHistory.getHistorySize() == 0) { return 0; } else { // return com.vladium.utils.ObjectProfiler.sizeof(getValue()); return 0; } } /** * Set the attribute on the server * * @param newValue The value to be set * @throws Exception */ public void setValue(Object newValue) throws Exception { try { MBeanServer server = bean.getConnectionProvider().getMBeanServer(); server.setAttribute(bean.getObjectName(), new Attribute(getName(), newValue)); alterValue(newValue); } catch (Exception e) { throw new InvocationTargetException(e); } refresh(); } /** * Alters the internally stored value of this attribute. Does not update the * server value. Is intended for mass load of attribute data via the MBean. * * @param newValue */ public void alterValue(Object newValue) { if ((newValue != null && !newValue.equals(currentValue)) || (newValue == null && currentValue != null)) { if (changeListeners != null && changeListeners.size() > 0) { AttributeChangeEvent event = new AttributeChangeEvent(this, currentValue, newValue); for (AttributeChangeListener listener : changeListeners) { listener.attributeChange(event); } } // This old way stored attribute values if they were under a certain size // if (com.vladium.utils.ObjectProfiler.sizeof(newValue) < 200) if (newValue instanceof Number) valueHistory.addValue(new Value(newValue, System.currentTimeMillis())); currentValue = newValue; } } protected boolean storeHistory(Object value) { if (value instanceof Number) return true; // TODO GH: Store statistics, possibly certain open mbean types return false; } /** * Updates the local value of this mbean from the server * <p/> * TODO we should not update to null on failure, but retain the last known */ public synchronized Object refresh() { loaded = true; Object newValue = null; try { MBeanServer server = bean.getConnectionProvider().getMBeanServer(); newValue = server.getAttribute(bean.getObjectName(), getName()); } catch (ReflectionException e) { supportedType = false; registerFailure(e); throw new EmsException("Could not load attribute value " + e.toString(),e); } catch (InstanceNotFoundException e) { registerFailure(e); throw new EmsException("Could not load attribute value, bean instance not found " + bean.getObjectName().toString(),e); } catch (MBeanException e) { registerFailure(e); Throwable t = e.getTargetException(); if (t != null) throw new EmsException("Could not load attribute value, target bean threw exception " + t.getLocalizedMessage(),t); else throw new EmsException("Could not load attribute value " + e.getLocalizedMessage(), e); } catch (AttributeNotFoundException e) { registerFailure(e); throw new EmsException("Could not load attribute value, attribute [" + getName() + "] not found",e); } catch(UndeclaredThrowableException e) { if (e.getUndeclaredThrowable() instanceof InvocationTargetException) { Throwable t = e.getCause(); if (t.getCause() instanceof NotSerializableException) { supportedType = false; registerFailure(t.getCause()); throw new EmsException("Could not load attribute value " + t.getLocalizedMessage(),t.getCause()); } else throw new EmsException("Could not load attribute value " + t.getLocalizedMessage(),t); } throw new EmsException("Could not load attribute value " + e.getLocalizedMessage(),e); } catch (RuntimeException re) { supportedType = false; // TODO GH: Figure this one out // Getting weblogic.management.NoAccessRuntimeException on wl9 registerFailure(re); throw new EmsException("Could not load attribute value " + re.getLocalizedMessage(),re); } catch (NoClassDefFoundError ncdfe) { supportedType = false; registerFailure(ncdfe); throw new EmsException("Could not load attribute value " + ncdfe.getLocalizedMessage(),ncdfe); } catch (Throwable t) { throw new EmsException("Could not load attribute value " + t.getLocalizedMessage(),t); } alterValue(newValue); return newValue; } /** * TODO GH: Should this be a list of failure objects that has more info or * perhaps a custom exception with the info? (timestamp, bean name, attribute name) * TODO GH: Should this be all failures, retrieval failures, what about set failures? * TODO GH: Should this be genericised for the server proxy objects? * * @return failures of interaction with server related to this attribute */ public List<Throwable> getFailures() { return Collections.unmodifiableList(failures); } protected void registerFailure(Throwable t) { if (failures == null) failures = new LinkedList<Throwable>(); failures.add(t); // Bounding this list to make sure memory doesn't grow if (failures.size() > 2) failures.removeFirst(); log.warn("Attribute access failure " + t.getLocalizedMessage(),t); } public org.mc4j.ems.store.ValueHistory getValueHistory() { return valueHistory; } public String getName() { return info.getName(); } public String getType() { return info.getType(); } private static final Set<Class> NUMERIC_TYPES = new HashSet(); static { NUMERIC_TYPES.add(Short.TYPE); NUMERIC_TYPES.add(Short.class); NUMERIC_TYPES.add(Integer.TYPE); NUMERIC_TYPES.add(Integer.class); NUMERIC_TYPES.add(Long.TYPE); NUMERIC_TYPES.add(Long.class); NUMERIC_TYPES.add(Float.TYPE); NUMERIC_TYPES.add(Float.class); NUMERIC_TYPES.add(Double.TYPE); NUMERIC_TYPES.add(Double.class); NUMERIC_TYPES.add(BigInteger.class); NUMERIC_TYPES.add(BigDecimal.class); } private static final Map<String, Class> TYPES = new HashMap(); static { TYPES.put(Boolean.TYPE.getName(), Boolean.TYPE); TYPES.put(Character.TYPE.getName(), Character.TYPE); TYPES.put(Byte.TYPE.getName(), Byte.TYPE); TYPES.put(Short.TYPE.getName(), Short.TYPE); TYPES.put(Integer.TYPE.getName(), Integer.TYPE); TYPES.put(Long.TYPE.getName(), Long.TYPE); TYPES.put(Float.TYPE.getName(), Float.TYPE); TYPES.put(Double.TYPE.getName(), Double.TYPE); TYPES.put(Void.TYPE.getName(), Void.TYPE); } public Class getTypeClass() { if (TYPES.containsKey(getType())) { return (Class) TYPES.get(getType()); } else { // TODO: Switch to using ConnectionProvider.getClassloader(), oh and implement that too try { return Class.forName(getType(), true, getClass().getClassLoader()); } catch (ClassNotFoundException e) { return null; // TODO: Unkown type, how to handle? } } } public boolean isNumericType() { return NUMERIC_TYPES.contains(getTypeClass()); } public String getDescription() { return info.getDescription(); } public boolean isWritable() { return info.isWritable(); } public boolean isReadable() { return info.isReadable(); } public boolean isSupportedType() { return supportedType; } public void setSupportedType(boolean supportedType) { this.supportedType = supportedType; } public int compareTo(Object o) { DAttribute otherAttribute = (DAttribute) o; return this.getName().compareTo( otherAttribute.getName()); } } --- NEW FILE: DUnkownAttribute.java --- /* * Copyright 2002-2005 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.impl.jmx.connection.bean.attribute; import org.mc4j.ems.impl.jmx.connection.bean.DMBean; /** * @author Greg Hinkle (gh...@us...), Nov 16, 2005 * @version $Revision: 1.2 $($Author: ghinkl $ / $Date: 2006/04/12 19:11:34 $) */ public class DUnkownAttribute extends DAttribute { protected String name; public DUnkownAttribute(DMBean bean, String name) { super(null, bean); this.name = name; } public String getName() { return name; } public String getType() { return "Unknown"; } public String getDescription() { return "Unkown"; } public boolean isWritable() { return true; } public boolean isReadable() { return true; } } |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:11:40
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18666/modules/ems/src/ems/org/mc4j/ems/connection/bean/notification Added Files: EmsNotification.java EmsNotificationEvent.java EmsNotificationListener.java Log Message: Merging EMS into head for the 2.0 release work --- NEW FILE: EmsNotification.java --- /* * Copyright 2002-2004 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.connection.bean.notification; import java.util.List; /** * @author Greg Hinkle (gh...@us...), Apr 4, 2005 * @version $Revision: 1.2 $($Author: ghinkl $ / $Date: 2006/04/12 19:11:34 $) */ public interface EmsNotification extends Comparable { String getName(); String getDescription(); String[] getTypes(); void addNotificationListener(EmsNotificationListener listener); boolean removeNotificationListener(EmsNotificationListener listener); void startListening(); void stopListening(); List<EmsNotificationEvent> getEvents(); boolean isListening(); } --- NEW FILE: EmsNotificationListener.java --- /* * Copyright 2002-2005 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.connection.bean.notification; /** * @author Greg Hinkle (gh...@us...), Nov 10, 2005 * @version $Revision: 1.2 $($Author: ghinkl $ / $Date: 2006/04/12 19:11:34 $) */ public interface EmsNotificationListener { void handleNotification(EmsNotificationEvent event); } --- NEW FILE: EmsNotificationEvent.java --- /* * Copyright 2002-2005 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.connection.bean.notification; import org.mc4j.ems.connection.bean.EmsBean; import java.util.Date; /** * @author Greg Hinkle (gh...@us...), Nov 10, 2005 * @version $Revision: 1.2 $($Author: ghinkl $ / $Date: 2006/04/12 19:11:34 $) */ public class EmsNotificationEvent { private EmsBean bean; private String message; private long sequenceNumber; private String type; private long timeStamp; private Object userData; private Object source; public EmsNotificationEvent() { } public EmsNotificationEvent(EmsBean bean, String message, long sequenceNumber, String type, long timeStamp, Object userData, Object source) { this.bean = bean; this.message = message; this.sequenceNumber = sequenceNumber; this.type = type; this.timeStamp = timeStamp; this.userData = userData; this.source = source; } public EmsBean getBean() { return bean; } public String getMessage() { return message; } public long getSequenceNumber() { return sequenceNumber; } public String getType() { return type; } public long getTimeStamp() { return timeStamp; } public Object getUserData() { return userData; } public Object getSource() { return source; } public String toString() { StringBuffer buf = new StringBuffer(); buf.append("Notification Event on bean ["); buf.append(bean.getBeanName().getCanonicalName()); buf.append("]\n\tMessage: "); buf.append(message); buf.append("\n\tSequence: "); buf.append(sequenceNumber); buf.append("\n\tType: "); buf.append(type); buf.append("\n\tTimeStamp: "); buf.append(new Date(timeStamp)); buf.append("\n\tUser Data: "); buf.append(userData); buf.append("\n\tSource: "); buf.append(source); return buf.toString(); } } |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:11:39
|
Update of /cvsroot/mc4j/mc4j/modules/ems In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18666/modules/ems Added Files: build.xml ems.iml Log Message: Merging EMS into head for the 2.0 release work --- NEW FILE: ems.iml --- <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> <component name="NewModuleRootManager"> <output url="file://$MODULE_DIR$/classes/main" /> <exclude-output /> <exclude-exploded /> <output-test url="file://$MODULE_DIR$/classes/test" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/ems" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/ems-impl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="NetBeans" level="project" /> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../chires/dist/chires.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/build/jboss-j2ee.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/build/javax77.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/build/testng-4.1-jdk15.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/build/mx4j-jmx.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/build/objectprofiler.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/build/ognl-2.6.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/commons-logging.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntryProperties /> <javadoc-paths> <root url="file://E:/lib/ognl-2.6.7/javadoc" /> </javadoc-paths> </component> </module> --- NEW FILE: build.xml --- <?xml version="1.0"?> <!-- Author: Greg Hinkle Copyright 2002-2005 Greg Hinkle Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. http://sourceforge.net/projects/mc4j --> <project name="mc4j-ems" basedir="." default="compile"> <property name="module.jar" value="org-mc4j-ems.jar"/> <property name="release.version" value="1.0.5"/> <target name="init" description="Initializes the mc4j-ems build system."> <echo message="MC4J-EMS Build Environment - Try [ant -projecthelp] for more info."/> <tstamp/> <!-- Make sure we have all the directories we need to run a build. --> <mkdir dir="classes"/> <path id="classpath.compile"> <fileset dir="lib/build"> <include name="*.jar"/> </fileset> <fileset dir="lib"> <include name="*.jar"/> </fileset> </path> <available property="jre15Available" classname="java.lang.management.MemoryUsage" classpathref="classpath.compile"/> <!-- Check that the required dependencies are installed. --> <available classpathref="classpath.compile" classname="org.openide.DialogDisplayer" property="installed.netbeans"/> <condition property="compile.target" value="jsr14"> <isset property="jre15Available"/> </condition> <condition property="compile.target" value="1.4"> <not> <isset property="jre15Available"/> </not> </condition> <condition property="compile.source" value="1.4"> <not> <isset property="jre15Available"/> </not> </condition> <condition property="compile.source" value="1.5"> <isset property="jre15Available"/> </condition> <echo message="Will compile with target [${compile.target}] and source [${compile.source}]"/> </target> <target name="clean" description="Clean"> <delete dir="classes"/> </target> <target name="compile" depends="init" description="Compiles the MC4J-EMS codebase."> <mkdir dir="classes"/> <mkdir dir="classes/main"/> <mkdir dir="classes/impl"/> <mkdir dir="classes/test"/> <javac srcdir="src/ems" destdir="classes/main" debug="true" source="${compile.source}" target="${compile.target}"> <classpath> <path refid="classpath.compile"/> </classpath> <exclude name="**/DeepClassLoaderOrig*"/> </javac> <javac srcdir="src/ems-impl" destdir="classes/impl" debug="true" source="${compile.source}" target="${compile.target}"> <classpath> <path refid="classpath.compile"/> <pathelement location="classes/main"/> </classpath> </javac> <javac srcdir="src/test" destdir="classes/test" debug="true" source="${compile.source}" target="1.5"> <classpath> <path refid="classpath.compile"/> <pathelement location="classes/main"/> </classpath> </javac> </target> <target name="jars" depends="compile" description="Builds the MC4J Module JAR Files"> <mkdir dir="dist"/> <mkdir dir="build"/> <delete> <fileset dir="dist"> <include name="*.jar"/> </fileset> </delete> <jar jarfile="classes/main/org-mc4j-ems-impl.jar" update="true" compress="false"> <fileset dir="classes/impl" includes="org/mc4j/ems/impl/**"/> <manifest> <attribute name="Implementation-Title" value="MC4J-EMS"/> <attribute name="Specification-Version" value="${release.version}"/> <attribute name="Implementation-Version" value="${release.version}"/> <attribute name="Implementation-URL" value="http://mc4j.org/"/> </manifest> </jar> <jar jarfile="dist/org-mc4j-ems.jar" update="true" compress="false"> <fileset dir="classes/main"/> <fileset dir="${basedir}" includes="lib/*.jar"/> <fileset dir="${basedir}" includes="lib/jsr160-includes/*.jar"/> <manifest> <attribute name="Implementation-Title" value="MC4J-EMS"/> <attribute name="Specification-Version" value="${release.version}"/> <attribute name="Implementation-Version" value="${release.version}"/> <attribute name="Implementation-URL" value="http://mc4j.org/"/> </manifest> </jar> <copy todir="dist"> <fileset dir="lib" includes="*.jar"/> </copy> </target> <target name="dist" depends="jars" description="Build the EMS distribution"/> <target name="test-classloader" depends="dist"> <java classname="org.mc4j.ems.connection.support.classloader.NestedJarClassLoader" fork="yes"> <classpath> <pathelement location="dist/org-mc4j-ems.jar"/> </classpath> </java> </target> <target name="test-OTHER"> <java classname="org.mc4j.ems.test.MultiConnectionTest" fork="yes"> <classpath> <pathelement location="dist/org-mc4j-ems.jar"/> <pathelement location="lib/commons-logging.jar"/> <pathelement location="classes/test"/> <!--<path location="/Users/ghinkle/development/tools/jboss-4.0.2/server/default/lib/jboss-jsr77.jar"/>--> </classpath> </java> </target> <target name="run" description="Directly starts MC4J with the settings as the installer would use."> <echo>Starting MC4J-EMS Test</echo> <java classname="org.mc4j.ems.test.ConnectionTest" fork="yes"> <jvmarg value="-Xms24m"/> <jvmarg value="-Xmx128m"/> <!-- Under 1.5 JRE's this will start up the built-in jmxremoting support --> <sysproperty key="com.sun.management.jmxremote.port" value="9777"/> <sysproperty key="com.sun.management.jmxremote.ssl" value="false"/> <sysproperty key="com.sun.management.jmxremote.authenticate" value="false"/> <!--<jvmarg value="-Xdebug"/> <jvmarg value="-Xnoagent"/> <jvmarg value="-Djava.compiler=NONE"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>--> <classpath> <path refid="classpath.compile"/> <path location="dist/org-mc4j-ems.jar"/> <pathelement location="lib/commons-logging.jar"/> <!--<pathelement location="c:\\bea\\weblogic81\\server\\lib\\weblogic.jar"/>--> <!--<pathelement location="e:\\tools\\weblogic9\\weblogic90b\\server\\lib\\weblogic.jar"/>--> </classpath> </java> </target> <target name="all-test" depends="compile, jars, run" description="Compile and run the tests."> </target> </project> |
|
From: Greg H. <gh...@us...> - 2006-04-12 19:11:39
|
Update of /cvsroot/mc4j/mc4j/modules/ems/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18666/modules/ems/lib Added Files: .cvsignore commons-logging.jar Log Message: Merging EMS into head for the 2.0 release work --- NEW FILE: .cvsignore --- .DS_Store --- NEW FILE: commons-logging.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Greg H. <gh...@us...> - 2006-04-12 18:25:39
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17225/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader Added Files: Tag: ems_module_separation ClassLoaderFactory.java Log Message: no message --- NEW FILE: ClassLoaderFactory.java --- /* * Copyright 2002-2004 Greg Hinkle * * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.mc4j.ems.connection.support.classloader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.mc4j.ems.connection.EmsConnectException; import org.mc4j.ems.connection.EmsException; import org.mc4j.ems.connection.settings.ConnectionSettings; import org.mc4j.ems.connection.support.metadata.JSR160ConnectionTypeDescriptor; import org.mc4j.ems.connection.support.metadata.WeblogicConnectionTypeDescriptor; import java.io.*; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.HashMap; /** * @author Greg Hinkle (gh...@us...), Apr 5, 2005 * @version $Revision: 1.1.2.5 $($Author: ghinkl $ / $Date: 2006/04/12 18:25:32 $) */ public class ClassLoaderFactory { private static ClassLoaderFactory INSTANCE; private static Log log = LogFactory.getLog(ClassLoaderFactory.class); private static Map<String, File> jarCache = new HashMap<String, File>(); static { String className = System.getProperty("org.mc4j.ems.classloaderfactory"); if (className != null) { try { INSTANCE = ((Class<ClassLoaderFactory>) Class.forName(className)).newInstance(); } catch (Exception e) { throw new EmsException("Unable to load custom classloader factory " + className, e); } } if (INSTANCE == null) { INSTANCE = new ClassLoaderFactory(); } } /** * Retrieves the configured classloader factory for EMS. This can be customized by * setting the system property "org.mc4j.ems.classloaderfactory". * * @return the Classloader Factory used to build the connection classloader */ public static ClassLoaderFactory getInstance() { return INSTANCE; } /** * TODO GH: Implement a special classloader that can load classes from * within a jar inside another jar or perhaps just ship the impl jar separately... */ protected URL storeImplToTemp(String archiveResource) { try { if (jarCache.containsKey(archiveResource)) { return jarCache.get(archiveResource).toURI().toURL(); } InputStream is = ClassLoaderFactory.class.getClassLoader().getResourceAsStream(archiveResource); if (is == null) { throw new EmsException("Unable to find resource to store [" + archiveResource + "]"); } // String tmpPath = System.getProperty("java.io.tmpdir"); String jarName = new File(archiveResource).getName(); jarName = jarName.substring(0, jarName.length() - 4); File tmpFile = File.createTempFile(jarName, ".jar"); tmpFile.deleteOnExit(); FileOutputStream fos = new FileOutputStream(tmpFile); byte[] buffer = new byte[4096]; int size = is.read(buffer); while (size != -1) { fos.write(buffer, 0, size); size = is.read(buffer); } fos.close(); is.close(); jarCache.put(archiveResource, tmpFile); return tmpFile.toURI().toURL(); } catch (FileNotFoundException e) { throw new EmsException("Unable to make temporary file store",e); } catch (IOException e) { throw new EmsException("Unable to make temporary file store",e); } } public ClassLoader buildClassLoader(ConnectionSettings settings) { // TODO GH: Implement configurable system to point at jar instead of creating temporary version List<URL> entries = new ArrayList<URL>(); if (settings.getClassPathEntries() != null) { for (File file : settings.getClassPathEntries()) { try { entries.add(file.toURI().toURL()); } catch (MalformedURLException e) { throw new EmsConnectException("Unable to read class path library url", e); } } } // Now load in the implementation jar // URL implURL = new URL(null, "deepjar://org-mc4j-ems-impl.jar", new Handler()); URL implURL = storeImplToTemp("org-mc4j-ems-impl.jar"); entries.add(implURL); // Add internal support jars for JSR160 on < jdk5 if ((settings.getConnectionType() instanceof JSR160ConnectionTypeDescriptor) && settings.getConnectionType().getConnectionClasspathEntries() == null && Double.parseDouble(System.getProperty("java.version").substring(0, 3)) < 1.5) { entries.add(storeImplToTemp("lib/jsr160-includes/mx4j.jar")); entries.add(storeImplToTemp("lib/jsr160-includes/mx4j-remote.jar")); } // TODO: Check if file exists, log warning if not URL[] entryArray = entries.toArray(new URL[entries.size()]); // TODO - WARNING: GH - DISGUSTING HACK URLClassLoader loader = null; if ((settings.getConnectionType() instanceof WeblogicConnectionTypeDescriptor)) { loader = new ChildFirstClassloader(entryArray, ClassLoaderFactory.class.getClassLoader()); } else { // TODO was NestedJarClassLoader //loader = new ChildFirstClassloader(entryArray, ClassLoaderFactory.class.getClassLoader()); loader = new URLClassLoader(entryArray, ClassLoaderFactory.class.getClassLoader()); //loader = new NestedJarClassLoader(entryArray, ClassLoaderFactory.class.getClassLoader()); } if (log.isDebugEnabled()) { StringBuffer buf = new StringBuffer("Classloader built with: \n"); for (URL url : entries) { buf.append("\t").append(url).append("\n"); } log.debug(buf.toString()); } return loader; } } |
|
From: Greg H. <gh...@us...> - 2006-04-12 18:24:57
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16651/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader Removed Files: Tag: ems_module_separation ClassLoaderFactory.java Log Message: no message --- ClassLoaderFactory.java DELETED --- |
|
From: Greg H. <gh...@us...> - 2006-04-12 18:24:27
|
Update of /cvsroot/mc4j/mc4j/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16401/modules/ems/src/ems/org/mc4j/ems/connection/support/classloader Removed Files: Tag: ems_module_separation ClassloaderFactory.java Log Message: no message --- ClassloaderFactory.java DELETED --- |
|
From: Greg H. <gh...@us...> - 2006-04-12 18:09:13
|
Update of /cvsroot/mc4j/mc4j/modules/ems In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5968/modules/ems Modified Files: Tag: ems_module_separation build.xml Log Message: no message Index: build.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/modules/ems/Attic/build.xml,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** build.xml 12 Dec 2005 14:14:12 -0000 1.1.2.8 --- build.xml 12 Apr 2006 18:09:04 -0000 1.1.2.9 *************** *** 31,35 **** <property name="module.jar" value="org-mc4j-ems.jar"/> ! <property name="release.version" value="1.0.5"/> --- 31,35 ---- <property name="module.jar" value="org-mc4j-ems.jar"/> ! <property name="release.version" value="1.0.9"/> *************** *** 114,118 **** </classpath> </javac> ! <javac srcdir="src/test" destdir="classes/test" debug="true" source="${compile.source}" target="1.5"> <classpath> <path refid="classpath.compile"/> --- 114,118 ---- </classpath> </javac> ! <javac srcdir="src/test" destdir="classes/test" debug="true" source="${compile.source}" target="jsr14"> <classpath> <path refid="classpath.compile"/> *************** *** 179,184 **** --- 179,195 ---- <pathelement location="lib/commons-logging.jar"/> <pathelement location="classes/test"/> + <pathelement location="lib/test/log4j.jar"/> + <pathelement location="lib/test/"/> <!--<path location="/Users/ghinkle/development/tools/jboss-4.0.2/server/default/lib/jboss-jsr77.jar"/>--> + </classpath> + <sysproperty key="mc4j.ems.fileSearchBroad" value="false"/> + <sysproperty key="mc4j.ems.fileSearchDepth" value="6"/> + + <!--<jvmarg value="-Xdebug"/> + <jvmarg value="-Xnoagent"/> + <jvmarg value="-Djava.compiler=NONE"/> + <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>--> + </java> </target> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:52:38
|
Update of /cvsroot/mc4j/mc4j In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25895 Added Files: Tag: ems_module_separation MC4J.iml Log Message: no message --- NEW FILE: MC4J.iml --- <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="false" type="JAVA_MODULE"> <component name="ModuleRootManager" /> <component name="NewModuleRootManager"> <output url="file://$MODULE_DIR$/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/mc4j2" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="JBoss" level="project" /> <orderEntry type="library" name="JDMK" level="project" /> <orderEntry type="library" name="JFreeChart" level="project" /> <orderEntry type="library" name="JMX Remoting RI" level="project" /> <orderEntry type="library" name="MX4J" level="project" /> <orderEntry type="library" name="NetBeans" level="project" /> <orderEntry type="library" name="UtilConcurrent" level="project" /> <orderEntry type="library" name="Carbon" level="project" /> <orderEntry type="library" name="JGraph" level="project" /> <orderEntry type="module-library"> <library> <CLASSES> <root url="file://$MODULE_DIR$/src" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/animation-1.1.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module" module-name="ems" /> <orderEntry type="library" name="chires" level="project" /> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/forms-1.0.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="library" name="NetBeans" level="application" /> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/swingx.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/ognl-2.6.7.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/jcommon-1.0.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/jfreechart-1.0.1.jar!/" /> </CLASSES> <JAVADOC> <root url="http://www.jfree.org/jfreechart/api/gjdoc/" /> </JAVADOC> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> <root url="jar://$MODULE_DIR$/lib/common/zql.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntryProperties /> </component> </module> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:40:18
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/weblogic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/application/dashboards/weblogic Modified Files: Tag: ems_module_separation Weblogic_Applications.xml Weblogic_EJBPoolRuntimeTable.xml Weblogic_EJBTransactionRuntime.xml Weblogic_ExecuteQueue_Stats.xml Weblogic_ServletTable.xml Log Message: The newer style dashboards Index: Weblogic_ServletTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_ServletTable.xml,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** Weblogic_ServletTable.xml 12 Apr 2006 17:28:34 -0000 1.3.2.1 --- Weblogic_ServletTable.xml 12 Apr 2006 17:40:04 -0000 1.3.2.2 *************** *** 19,34 **** <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="(Literal)ServerRuntime"/> ! <Attribute name="AttributeName" value="(Literal)Name"/> ! <Attribute name="AttributeName" value="(Literal)ServletName"/> ! <Attribute name="AttributeName" value="(Literal)ExecutionTimeAverage"/> ! <Attribute name="AttributeName" value="(Literal)ExecutionTimeHigh"/> ! <Attribute name="AttributeName" value="(Literal)ExecutionTimeLow"/> ! <Attribute name="AttributeName" value="(Literal)ExecutionTimeTotal"/> ! <Attribute name="AttributeName" value="(Literal)InvocationTotalCount"/> </Component> --- 19,34 ---- <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="'ServerRuntime'"/> ! <Attribute name="AttributeName" value="'Name'"/> ! <Attribute name="AttributeName" value="'ServletName'"/> ! <Attribute name="AttributeName" value="'ExecutionTimeAverage'"/> ! <Attribute name="AttributeName" value="'h'"/> ! <Attribute name="AttributeName" value="'ExecutionTimeLow'"/> ! <Attribute name="AttributeName" value="'ExecutionTimeTotal'"/> ! <Attribute name="AttributeName" value="'InvocationTotalCount'"/> </Component> Index: Weblogic_EJBTransactionRuntime.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_EJBTransactionRuntime.xml,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** Weblogic_EJBTransactionRuntime.xml 12 Apr 2006 17:28:34 -0000 1.3.2.1 --- Weblogic_EJBTransactionRuntime.xml 12 Apr 2006 17:40:04 -0000 1.3.2.2 *************** *** 15,19 **** <Content> ! --- 15,19 ---- <Content> ! *************** *** 22,34 **** <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="(Literal)Location"/> ! <Attribute name="AttributeName" value="(Literal)Name"/> ! <Attribute name="AttributeName" value="(Literal)TransactionsCommittedTotalCount"/> ! <Attribute name="AttributeName" value="(Literal)TransactionsRolledBackTotalCount"/> ! <Attribute name="AttributeName" value="(Literal)TransactionsTimedOutTotalCount"/> </Component> --- 22,34 ---- <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="'Location'"/> ! <Attribute name="AttributeName" value="'Name'"/> ! <Attribute name="AttributeName" value="'TransactionsCommittedTotalCount'"/> ! <Attribute name="AttributeName" value="'TransactionsRolledBackTotalCount'"/> ! <Attribute name="AttributeName" value="'TransactionsTimedOutTotalCount'"/> </Component> Index: Weblogic_EJBPoolRuntimeTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_EJBPoolRuntimeTable.xml,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** Weblogic_EJBPoolRuntimeTable.xml 12 Apr 2006 17:28:34 -0000 1.3.2.1 --- Weblogic_EJBPoolRuntimeTable.xml 12 Apr 2006 17:40:04 -0000 1.3.2.2 *************** *** 21,41 **** <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="(Literal)Location"/> ! <Attribute name="AttributeName" value="(Literal)Name"/> ! <Attribute name="AttributeName" value="(Literal)AccessTotalCount"/> ! <Attribute name="AttributeName" value="(Literal)BeansInUseCount"/> ! <Attribute name="AttributeName" value="(Literal)BeansInUseCurrentCount"/> ! <Attribute name="AttributeName" value="(Literal)CachingDisabled"/> ! <Attribute name="AttributeName" value="(Literal)DestroyedTotalCount"/> ! <Attribute name="AttributeName" value="(Literal)IdleBeansCount"/> ! <Attribute name="AttributeName" value="(Literal)MissTotalCount"/> ! <Attribute name="AttributeName" value="(Literal)PooledBeansCurrentCount"/> ! <Attribute name="AttributeName" value="(Literal)TimeoutTotalCount"/> ! <Attribute name="AttributeName" value="(Literal)WaiterCurrentCount"/> ! <Attribute name="AttributeName" value="(Literal)WaiterTotalCount"/> --- 21,41 ---- <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="'Location'"/> ! <Attribute name="AttributeName" value="'Name'"/> ! <Attribute name="AttributeName" value="'AccessTotalCount'"/> ! <Attribute name="AttributeName" value="'BeansInUseCount'"/> ! <Attribute name="AttributeName" value="'BeansInUseCurrentCount'"/> ! <Attribute name="AttributeName" value="'CachingDisabled'"/> ! <Attribute name="AttributeName" value="'DestroyedTotalCount'"/> ! <Attribute name="AttributeName" value="'IdleBeansCount'"/> ! <Attribute name="AttributeName" value="'MissTotalCount'"/> ! <Attribute name="AttributeName" value="'PooledBeansCurrentCount'"/> ! <Attribute name="AttributeName" value="'TimeoutTotalCount'"/> ! <Attribute name="AttributeName" value="'WaiterCurrentCount'"/> ! <Attribute name="AttributeName" value="'WaiterTotalCount'"/> Index: Weblogic_Applications.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Attic/Weblogic_Applications.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Weblogic_Applications.xml 12 Apr 2006 17:28:34 -0000 1.1.2.1 --- Weblogic_Applications.xml 12 Apr 2006 17:40:04 -0000 1.1.2.2 *************** *** 20,32 **** <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="(Literal)Name"/> ! <Attribute name="AttributeName" value="(Literal)FullPath"/> ! <Attribute name="AttributeName" value="(Literal)deploy"/> ! <Attribute name="AttributeName" value="(Literal)undeploy"/> </Component> --- 20,32 ---- <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="'Name'"/> ! <Attribute name="AttributeName" value="'FullPath'"/> ! <Attribute name="AttributeName" value="'deploy'"/> ! <Attribute name="AttributeName" value="'undeploy'"/> </Component> Index: Weblogic_ExecuteQueue_Stats.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/weblogic/Weblogic_ExecuteQueue_Stats.xml,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** Weblogic_ExecuteQueue_Stats.xml 12 Apr 2006 17:28:34 -0000 1.3.2.1 --- Weblogic_ExecuteQueue_Stats.xml 12 Apr 2006 17:40:04 -0000 1.3.2.2 *************** *** 19,26 **** <!-- *** Scroll pane of info *** --> <Component type="javax.swing.JScrollPane"> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Content> <Component type="javax.swing.JPanel"> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Constraint type="BorderConstraints" direction="CENTER"/> --- 19,26 ---- <!-- *** Scroll pane of info *** --> <Component type="javax.swing.JScrollPane"> ! <Attribute name="background" value="'0xFFFFFF'"/> <Content> <Component type="javax.swing.JPanel"> ! <Attribute name="background" value="'0xFFFFFF'"/> <Constraint type="BorderConstraints" direction="CENTER"/> *************** *** 31,71 **** <Content> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Pending Requests"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="ExecuteQueueRuntimeBean"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)PendingRequestCurrentCount"/> </Component> </Content> </Component> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Requests Information"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="ExecuteQueueRuntimeBean"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)ServicedRequestTotalCount"/> </Component> </Content> </Component> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Requests Information"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="ExecuteQueueRuntimeBean"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)ExecuteThreadCurrentIdleCount"/> </Component> </Content> </Component> <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="(Literal)VERTICAL_GLUE_SHAPE"/> </Component> </Content> --- 31,71 ---- <Content> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Pending Requests'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <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> </Component> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Requests Information'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <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> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Requests Information'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <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> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:40:18
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/jboss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/application/dashboards/jboss Modified Files: Tag: ems_module_separation JBoss_WebTable.xml JBoss_Web_Jetty.xml JBoss_Web_JettyNew.xml Log Message: The newer style dashboards Index: JBoss_Web_JettyNew.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_Web_JettyNew.xml,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** JBoss_Web_JettyNew.xml 12 Apr 2006 17:28:34 -0000 1.4.2.1 --- JBoss_Web_JettyNew.xml 12 Apr 2006 17:40:04 -0000 1.4.2.2 *************** *** 20,24 **** <Constraint type="BorderConstraints" direction="NORTH"/> <LayoutManager type="java.awt.BorderLayout"/> ! <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/> <Content> <Component type="javax.swing.JPanel"> --- 20,24 ---- <Constraint type="BorderConstraints" direction="NORTH"/> <LayoutManager type="java.awt.BorderLayout"/> ! <Border type="javax.swing.border.EmptyBorder" top="'2'" left="'5'" bottom="'2'" right="'5'"/> <Content> <Component type="javax.swing.JPanel"> *************** *** 29,41 **** <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="text" value="DashboardName"/> ! <Attribute name="font" value="(Literal)SansSerif bold 20"/> ! <Attribute name="foreground" value="(Literal)0x666666"/> </Component> <Component type="javax.swing.JTextArea"> <Constraint type="BorderConstraints" direction="SOUTH"/> <Attribute name="text" value="DashboardDescription"/> ! <Attribute name="font" value="(Literal)DialogInput bold 14"/> ! <Attribute name="opaque" value="(Literal)false"/> ! <Attribute name="editable" value="(Literal)false"/> </Component> </Content> --- 29,41 ---- <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="text" value="DashboardName"/> ! <Attribute name="font" value="'SansSerif bold 20'"/> ! <Attribute name="foreground" value="'0x666666'"/> </Component> <Component type="javax.swing.JTextArea"> <Constraint type="BorderConstraints" direction="SOUTH"/> <Attribute name="text" value="DashboardDescription"/> ! <Attribute name="font" value="'DialogInput bold 14'"/> ! <Attribute name="opaque" value="'false'"/> ! <Attribute name="editable" value="'false'"/> </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> --- 43,47 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="'1000'"/> </Component> </Content> *************** *** 51,58 **** <!-- *** Scroll pane of info *** --> <Component type="javax.swing.JScrollPane"> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Content> <Component type="javax.swing.JPanel"> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Constraint type="BorderConstraints" direction="CENTER"/> --- 51,58 ---- <!-- *** Scroll pane of info *** --> <Component type="javax.swing.JScrollPane"> ! <Attribute name="background" value="'0xFFFFFF'"/> <Content> <Component type="javax.swing.JPanel"> ! <Attribute name="background" value="'0xFFFFFF'"/> <Constraint type="BorderConstraints" direction="CENTER"/> *************** *** 63,110 **** <Content> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Connection Information"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="2"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="Jetty"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)connections"/> ! <Attribute name="attributeName" value="(Literal)connectionsOpen"/> ! <Attribute name="attributeName" value="(Literal)connectionsOpenMax"/> ! <Attribute name="attributeName" value="(Literal)connectionsRequestsAve"/> ! <Attribute name="attributeName" value="(Literal)connectionsRequestsMax"/> </Component> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="Jetty"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)connectionsDurationAve"/> ! <Attribute name="attributeName" value="(Literal)connectionsDurationMax"/> </Component> </Content> </Component> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Requests Information"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="2"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="Jetty"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)requests"/> ! <Attribute name="attributeName" value="(Literal)requestsActive"/> ! <Attribute name="attributeName" value="(Literal)requestsActiveMax"/> </Component> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="Jetty"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)requestsDurationAve"/> ! <Attribute name="attributeName" value="(Literal)requestsDurationMax"/> </Component> </Content> </Component> <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="(Literal)VERTICAL_GLUE_SHAPE"/> </Component> </Content> --- 63,110 ---- <Content> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Connection Information'"/> ! <Attribute name="background" value="'F'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="2"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#Jetty"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'connections'"/> ! <Attribute name="attributeName" value="'connectionsOpen'"/> ! <Attribute name="attributeName" value="'connectionsOpenMax'"/> ! <Attribute name="attributeName" value="'connectionsRequestsAve'"/> ! <Attribute name="attributeName" value="'connectionsRequestsMax'"/> </Component> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#Jetty"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'connectionsDurationAve'"/> ! <Attribute name="attributeName" value="'connectionsDurationMax'"/> </Component> </Content> </Component> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Requests Information'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="2"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#Jetty"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'requests'"/> ! <Attribute name="attributeName" value="'requestsActive'"/> ! <Attribute name="attributeName" value="'requestsActiveMax'"/> </Component> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#Jetty"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'requestsDurationAve'"/> ! <Attribute name="attributeName" value="'requestsDurationMax'"/> </Component> </Content> </Component> <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="'VERTICAL_GLUE_SHAPE'"/> </Component> </Content> Index: JBoss_Web_Jetty.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_Web_Jetty.xml,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** JBoss_Web_Jetty.xml 12 Apr 2006 17:28:34 -0000 1.4.2.1 --- JBoss_Web_Jetty.xml 12 Apr 2006 17:40:04 -0000 1.4.2.2 *************** *** 20,24 **** <Constraint type="BorderConstraints" direction="NORTH"/> <LayoutManager type="java.awt.BorderLayout"/> ! <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/> <Content> <Component type="javax.swing.JPanel"> --- 20,24 ---- <Constraint type="BorderConstraints" direction="NORTH"/> <LayoutManager type="java.awt.BorderLayout"/> ! <Border type="javax.swing.border.EmptyBorder" top="'2'" left="'5'" bottom="'2'" right="'5'"/> <Content> <Component type="javax.swing.JPanel"> *************** *** 29,41 **** <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="text" value="DashboardName"/> ! <Attribute name="font" value="(Literal)SansSerif bold 20"/> ! <Attribute name="foreground" value="(Literal)0x666666"/> </Component> <Component type="javax.swing.JTextArea"> <Constraint type="BorderConstraints" direction="SOUTH"/> <Attribute name="text" value="DashboardDescription"/> ! <Attribute name="font" value="(Literal)DialogInput bold 14"/> ! <Attribute name="opaque" value="(Literal)false"/> ! <Attribute name="editable" value="(Literal)false"/> </Component> </Content> --- 29,41 ---- <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="text" value="DashboardName"/> ! <Attribute name="font" value="'SansSerif bold 20'"/> ! <Attribute name="foreground" value="'0x666666'"/> </Component> <Component type="javax.swing.JTextArea"> <Constraint type="BorderConstraints" direction="SOUTH"/> <Attribute name="text" value="DashboardDescription"/> ! <Attribute name="font" value="'DialogInput bold 14'"/> ! <Attribute name="opaque" value="'false'"/> ! <Attribute name="editable" value="'false'"/> </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> --- 43,47 ---- <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> <Constraint type="BorderConstraints" direction="EAST"/> ! <Attribute name="refreshDelay" value="'1000'"/> </Component> </Content> *************** *** 51,58 **** <!-- *** Scroll pane of info *** --> <Component type="javax.swing.JScrollPane"> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Content> <Component type="javax.swing.JPanel"> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Constraint type="BorderConstraints" direction="CENTER"/> --- 51,58 ---- <!-- *** Scroll pane of info *** --> <Component type="javax.swing.JScrollPane"> ! <Attribute name="background" value="'0xFFFFFF'"/> <Content> <Component type="javax.swing.JPanel"> ! <Attribute name="background" value="'0xFFFFFF'"/> <Constraint type="BorderConstraints" direction="CENTER"/> *************** *** 63,110 **** <Content> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Connection Information"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="2"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="Jetty"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)connections"/> ! <Attribute name="attributeName" value="(Literal)connectionsOpen"/> ! <Attribute name="attributeName" value="(Literal)connectionsOpenMax"/> ! <Attribute name="attributeName" value="(Literal)connectionsRequestsAve"/> ! <Attribute name="attributeName" value="(Literal)connectionsRequestsMax"/> </Component> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="Jetty"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)connectionsDurationAve"/> ! <Attribute name="attributeName" value="(Literal)connectionsDurationMax"/> </Component> </Content> </Component> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Requests Information"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="2"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="Jetty"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)requests"/> ! <Attribute name="attributeName" value="(Literal)requestsActive"/> ! <Attribute name="attributeName" value="(Literal)requestsActiveMax"/> </Component> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="Jetty"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)requestsDurationAve"/> ! <Attribute name="attributeName" value="(Literal)requestsDurationMax"/> </Component> </Content> </Component> <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="(Literal)VERTICAL_GLUE_SHAPE"/> </Component> </Content> --- 63,110 ---- <Content> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Connection Information'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="2"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#Jetty"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'connections'"/> ! <Attribute name="attributeName" value="'connectionsOpen'"/> ! <Attribute name="attributeName" value="'connectionsOpenMax'"/> ! <Attribute name="attributeName" value="'connectionsRequestsAve'"/> ! <Attribute name="attributeName" value="'connectionsRequestsMax'"/> </Component> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#Jetty"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'connectionsDurationAve'"/> ! <Attribute name="attributeName" value="'connectionsDurationMax'"/> </Component> </Content> </Component> <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Requests Information'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="2"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#Jetty"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'requests'"/> ! <Attribute name="attributeName" value="'requestsActive'"/> ! <Attribute name="attributeName" value="'requestsActiveMax'"/> </Component> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#Jetty"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'requestsDurationAve'"/> ! <Attribute name="attributeName" value="'requestsDurationMax'"/> </Component> </Content> </Component> <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="'VERTICAL_GLUE_SHAPE'"/> </Component> </Content> Index: JBoss_WebTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jboss/JBoss_WebTable.xml,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** JBoss_WebTable.xml 12 Apr 2006 17:28:34 -0000 1.4.2.1 --- JBoss_WebTable.xml 12 Apr 2006 17:40:04 -0000 1.4.2.2 *************** *** 18,32 **** <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="(Literal)vhost"/> ! <Attribute name="AttributeName" value="(Literal)context"/> ! <Attribute name="AttributeName" value="(Literal)Name"/> ! <Attribute name="AttributeName" value="(Literal)RequestCount"/> ! <Attribute name="AttributeName" value="(Literal)MinTime"/> ! <Attribute name="AttributeName" value="(Literal)MaxTime"/> ! <Attribute name="AttributeName" value="(Literal)ProcessingTime"/> ! <Attribute name="AttributeName" value="(Literal)ErrorCount"/> --- 18,32 ---- <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="'vhost'"/> ! <Attribute name="AttributeName" value="'context'"/> ! <Attribute name="AttributeName" value="'Name'"/> ! <Attribute name="AttributeName" value="'RequestCount'"/> ! <Attribute name="AttributeName" value="'MinTime'"/> ! <Attribute name="AttributeName" value="'MaxTime'"/> ! <Attribute name="AttributeName" value="'ProcessingTime'"/> ! <Attribute name="AttributeName" value="'ErrorCount'"/> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:40:12
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/chires In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/application/dashboards/chires Modified Files: Tag: ems_module_separation Chires_JDBCQueryStats.xml Chires_Profiler.xml Log Message: The newer style dashboards Index: Chires_JDBCQueryStats.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/chires/Chires_JDBCQueryStats.xml,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** Chires_JDBCQueryStats.xml 12 Apr 2006 17:28:33 -0000 1.2.2.1 --- Chires_JDBCQueryStats.xml 12 Apr 2006 17:40:04 -0000 1.2.2.2 *************** *** 18,26 **** <Component type="org.mc4j.chires.components.JDBCQueryTableComponent"> ! <Attribute name="beanNode" value="JDBCModel"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> --- 18,26 ---- <Component type="org.mc4j.chires.components.JDBCQueryTableComponent"> ! <Attribute name="bean" value="#JDBCModel"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="100,100"/> Index: Chires_Profiler.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/chires/Chires_Profiler.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Chires_Profiler.xml 12 Apr 2006 17:28:33 -0000 1.1.2.1 --- Chires_Profiler.xml 12 Apr 2006 17:40:04 -0000 1.1.2.2 *************** *** 17,25 **** <Component type="org.mc4j.chires.components.flow.ProfilerViewComponent"> ! <Attribute name="beanNode" value="FlowModel"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> </Component> --- 17,25 ---- <Component type="org.mc4j.chires.components.flow.ProfilerViewComponent"> ! <Attribute name="bean" value="#FlowModel"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> </Component> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:40:12
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/jre15 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/application/dashboards/jre15 Modified Files: Tag: ems_module_separation JRE15_MemoryUsagePools_PieChart.xml Log Message: The newer style dashboards Index: JRE15_MemoryUsagePools_PieChart.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/jre15/JRE15_MemoryUsagePools_PieChart.xml,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** JRE15_MemoryUsagePools_PieChart.xml 12 Apr 2006 17:28:34 -0000 1.4.2.1 --- JRE15_MemoryUsagePools_PieChart.xml 12 Apr 2006 17:40:04 -0000 1.4.2.2 *************** *** 2,6 **** <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd"> ! <Dashboard version="1." name="Pool Usage Pie Chart" standardHeader="true"> <Description>Memory usage chart of pools for a 1.5 JVM.</Description> --- 2,6 ---- <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 2.0//EN" "http://mc4j.org/Dashboard_2_0.dtd"> ! <Dashboard version="2.0" name="Pool Usage Pie Chart" standardHeader="true"> <Description>Memory usage chart of pools for a 1.5 JVM.</Description> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:40:12
|
Update of /cvsroot/mc4j/mc4j/application/dashboards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/application/dashboards Modified Files: Tag: ems_module_separation HtmlDocumentTest.xml RelationsGraph.xml RelationsGraph2.xml Log Message: The newer style dashboards Index: HtmlDocumentTest.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/HtmlDocumentTest.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** HtmlDocumentTest.xml 12 Apr 2006 17:28:34 -0000 1.1.2.1 --- HtmlDocumentTest.xml 12 Apr 2006 17:40:04 -0000 1.1.2.2 *************** *** 24,28 **** <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent"> ! <Attribute name="htmlDocumentName" value="(Literal)HtmlDocumentTest.html"/> <Content> --- 24,28 ---- <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent"> ! <Attribute name="htmlDocumentName" value="'HtmlDocumentTest.html'"/> <Content> *************** *** 30,36 **** <!-- *** Notice were setting the node that we matched above by name here *** --> <Attribute name="bean" value="bean"/> ! <Border type="javax.swing.border.LineBorder" color="(Literal)0x444444" thickness="(Literal)1"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> </Component> --- 30,36 ---- <!-- *** Notice were setting the node that we matched above by name here *** --> <Attribute name="bean" value="bean"/> ! <Border type="javax.swing.border.LineBorder" color="'0x444444'" thickness="'1'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> </Component> Index: RelationsGraph.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/RelationsGraph.xml,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** RelationsGraph.xml 12 Apr 2006 17:28:34 -0000 1.4.2.1 --- RelationsGraph.xml 12 Apr 2006 17:40:04 -0000 1.4.2.2 *************** *** 32,38 **** <Component type="javax.swing.JLabel" id="titleLable"> <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTHWEST" fill="HORIZONTAL" gridx="1" gridy="1"/--> ! <Attribute name="text" value="(Literal)Relationship graph"/> ! <Attribute name="font" value="(Literal)Dialog bold 24"/> ! <Attribute name="foreground" value="(Literal)0xFF2222"/> </Component> --- 32,38 ---- <Component type="javax.swing.JLabel" id="titleLable"> <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTHWEST" fill="HORIZONTAL" gridx="1" gridy="1"/--> ! <Attribute name="text" value="'Relationship graph'"/> ! <Attribute name="font" value="'Dialog bold 24'"/> ! <Attribute name="foreground" value="'0xFF2222'"/> </Component> *************** *** 40,46 **** <Component type="javax.swing.JTextArea"> <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2"/--> ! <Attribute name="text" value="(Literal)This Dashboard displays a graph of the relations in the system."/> ! <Attribute name="opaque" value="(Literal)false"/> ! <Attribute name="editable" value="(Literal)false"/> </Component> --- 40,46 ---- <Component type="javax.swing.JTextArea"> <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2"/--> ! <Attribute name="text" value="'This Dashboard displays a graph of the relations in the system.'"/> ! <Attribute name="opaque" value="'false'"/> ! <Attribute name="editable" value="'false'"/> </Component> *************** *** 51,61 **** <Component type="javax.swing.JScrollPane"> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Content> <Component type="org.mc4j.console.dashboard.components.RelationsGraphComponent"> ! <Attribute name="beanNode" value="RelationServiceBean"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> ! <Attribute name="preferredSize" value="(Literal)800,800"/> </Component> --- 51,61 ---- <Component type="javax.swing.JScrollPane"> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Content> <Component type="org.mc4j.console.dashboard.components.RelationsGraphComponent"> ! <Attribute name="bean" value="#RelationServiceBean"/> ! <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="preferredSize" value="'0'"/> </Component> Index: RelationsGraph2.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/RelationsGraph2.xml,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** RelationsGraph2.xml 12 Apr 2006 17:28:34 -0000 1.4.2.1 --- RelationsGraph2.xml 12 Apr 2006 17:40:04 -0000 1.4.2.2 *************** *** 31,37 **** <Component type="javax.swing.JLabel" id="titleLable"> <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTHWEST" fill="HORIZONTAL" gridx="1" gridy="1"/--> ! <Attribute name="text" value="(Literal)Relationship graph2"/> ! <Attribute name="font" value="(Literal)Dialog bold 24"/> ! <Attribute name="foreground" value="(Literal)0xFF2222"/> </Component> --- 31,37 ---- <Component type="javax.swing.JLabel" id="titleLable"> <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTHWEST" fill="HORIZONTAL" gridx="1" gridy="1"/--> ! <Attribute name="text" value="'Relationship graph2'"/> ! <Attribute name="font" value="'Dialog bold 24'"/> ! <Attribute name="foreground" value="'0xFF2222'"/> </Component> *************** *** 39,44 **** <Component type="javax.swing.JTextArea"> <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2"/--> ! <Attribute name="text" value="(Literal)This Dashboard displays a graph of the relations in the system."/> ! <Attribute name="opaque" value="(Literal)false"/> </Component> --- 39,44 ---- <Component type="javax.swing.JTextArea"> <!--Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2"/--> ! <Attribute name="text" value="'This Dashboard displays a graph of the relations in the system.'"/> ! <Attribute name="opaque" value="'false'"/> </Component> *************** *** 49,59 **** <Component type="org.mc4j.console.dashboard.components.RelationsGraphComponent4"> ! <Attribute name="beanNode" value="RelationServiceBean"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> ! <Attribute name="preferredSize" value="(Literal)600,600"/> ! <Attribute name="size" value="(Literal)600,600"/> </Component> --- 49,59 ---- <Component type="org.mc4j.console.dashboard.components.RelationsGraphComponent4"> ! <Attribute name="bean" value="#RelationServiceBean"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="preferredSize" value="'600,600'"/> ! <Attribute name="size" value="'600,600'"/> </Component> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:40:11
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/websphere In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/application/dashboards/websphere Modified Files: Tag: ems_module_separation WebSphere_ServerDashboard.xml Log Message: The newer style dashboards Index: WebSphere_ServerDashboard.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/websphere/WebSphere_ServerDashboard.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** WebSphere_ServerDashboard.xml 12 Apr 2006 17:28:34 -0000 1.1.2.1 --- WebSphere_ServerDashboard.xml 12 Apr 2006 17:40:04 -0000 1.1.2.2 *************** *** 56,60 **** <Content> <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent"> ! <Attribute name="htmlDocumentName" value="(Literal)WebSphere/WebSphere_ServerDashboard.html"/> <Content> --- 56,60 ---- <Content> <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent"> ! <Attribute name="htmlDocumentName" value="'WebSphere/WebSphere_ServerDashboard.html'"/> <Content> *************** *** 67,81 **** <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter"> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="beanNode" value="JVMBean"/> ! <Attribute name="maxAttributeName" value="(Literal)heapSize"/> ! <Attribute name="currentAttributeName" value="(Literal)freeMemory"/> ! <Attribute name="label" value="(Literal)Free Memory"/> ! <Attribute name="updateInterval" value="(Literal)1000"/> ! <Attribute name="warningPoint" value="(Literal)0.15"/> ! <Attribute name="criticalPoint" value="(Literal)0.05"/> ! <Attribute name="title" value="(Literal)Available Memory"/> ! <Attribute name="units" value="(Literal)MB"/> ! <Attribute name="opaque" value="(Literal)false"/> ! <Attribute name="unitConverter" value="(Literal)org.mc4j.console.util.unit.ByteToMegaByteConverter"/> </Component> --> --- 67,81 ---- <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter"> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="bean" value="#JVMBean"/> ! <Attribute name="maxAttributeName" value="'heapSize'"/> ! <Attribute name="currentAttributeName" value="'freeMemory'"/> ! <Attribute name="label" value="'Free Memory'"/> ! <Attribute name="updateInterval" value="'1000'"/> ! <Attribute name="warningPoint" value="'0.15'"/> ! <Attribute name="criticalPoint" value="'0.05'"/> ! <Attribute name="title" value="'Available Memory'"/> ! <Attribute name="units" value="'MB'"/> ! <Attribute name="opaque" value="'false'"/> ! <Attribute name="unitConverter" value="'org.mc4j.console.util.unit.ByteToMegaByteConverter'"/> </Component> --> *************** *** 83,93 **** <!-- <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeMeter"> ! <Attribute name="beanNode" value="JBossServerInfoBean"/> ! <Attribute name="preferredSize" value="(Literal)150,150"/> ! <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"/> </Component> --- 83,93 ---- <!-- <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeMeter"> ! <Attribute name="bean" value="#JBossServerInfoBean"/> ! <Attribute name="preferredSize" value="'150,150'"/> ! <Attribute name="maxAttributeName" value="'MaxMemory'"/> ! <Attribute name="currentAttributeName" value="'FreeMemory'"/> ! <Attribute name="minimumSize" value="'50,50'"/> ! <Attribute name="label" value="'Free Memory'"/> ! <Attribute name="updateInterval" value="'0'"/> </Component> *************** *** 95,102 **** <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="JBossServerInfoBean"/> <Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2" widthx="2" weightx="0.5" weighty="0.5" fill="BOTH" insets="3,3,3,3"/> ! <Attribute name="preferredSize" value="(Literal)100,100"/> ! <Attribute name="attributeName" value="(Literal)FreeMemory"/> </Component> --> --- 95,102 ---- <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#JBossServerInfoBean"/> <Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2" widthx="2" weightx="0.5" weighty="0.5" fill="BOTH" insets="3,3,3,3"/> ! <Attribute name="preferredSize" value="'100,100'"/> ! <Attribute name="attributeName" value="'FreeMemory'"/> </Component> --> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:40:11
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/hibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/application/dashboards/hibernate Modified Files: Tag: ems_module_separation Hibernate_EntitiesTable.xml Hibernate_QueriesTable.xml Log Message: The newer style dashboards Index: Hibernate_QueriesTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/hibernate/Attic/Hibernate_QueriesTable.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Hibernate_QueriesTable.xml 12 Apr 2006 17:28:34 -0000 1.1.2.1 --- Hibernate_QueriesTable.xml 12 Apr 2006 17:40:04 -0000 1.1.2.2 *************** *** 23,43 **** <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="operationName" value="(Literal)getQueryStatistics"/> ! <Attribute name="attributeKeyListName" value="(Literal)Queries"/> ! <Attribute name="keyLabel" value="(Literal)Query"/> ! <Attribute name="AttributeName" value="(Literal)KEY"/> ! <Attribute name="AttributeName" value="(Literal)executionCount"/> ! <Attribute name="AttributeName" value="(Literal)cacheHitCount"/> ! <Attribute name="AttributeName" value="(Literal)cachePutCount"/> ! <Attribute name="AttributeName" value="(Literal)cacheMissCount"/> ! <Attribute name="AttributeName" value="(Literal)executionRowCount"/> ! <Attribute name="AttributeName" value="(Literal)executionAvgTime"/> ! <Attribute name="AttributeName" value="(Literal)executionMaxTime"/> ! <Attribute name="AttributeName" value="(Literal)executionMinTime"/> </Component> --- 23,43 ---- <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="operationName" value="'getQueryStatistics'"/> ! <Attribute name="attributeKeyListName" value="'Queries'"/> ! <Attribute name="keyLabel" value="'Query'"/> ! <Attribute name="AttributeName" value="'KEY'"/> ! <Attribute name="AttributeName" value="'executionCount'"/> ! <Attribute name="AttributeName" value="'cacheHitCount'"/> ! <Attribute name="AttributeName" value="'cachePutCount'"/> ! <Attribute name="AttributeName" value="'cacheMissCount'"/> ! <Attribute name="AttributeName" value="'executionRowCount'"/> ! <Attribute name="AttributeName" value="'executionAvgTime'"/> ! <Attribute name="AttributeName" value="'executionMaxTime'"/> ! <Attribute name="AttributeName" value="'executionMinTime'"/> </Component> Index: Hibernate_EntitiesTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/hibernate/Attic/Hibernate_EntitiesTable.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Hibernate_EntitiesTable.xml 12 Apr 2006 17:28:34 -0000 1.1.2.1 --- Hibernate_EntitiesTable.xml 12 Apr 2006 17:40:04 -0000 1.1.2.2 *************** *** 21,38 **** <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="operationName" value="(Literal)getEntityStatistics"/> ! <Attribute name="attributeKeyListName" value="(Literal)EntityNames"/> ! <Attribute name="keyLabel" value="(Literal)Entity"/> ! <Attribute name="AttributeName" value="(Literal)KEY"/> ! <Attribute name="AttributeName" value="(Literal)fetchCount"/> ! <Attribute name="AttributeName" value="(Literal)loadCount"/> ! <Attribute name="AttributeName" value="(Literal)insertCount"/> ! <Attribute name="AttributeName" value="(Literal)updateCount"/> ! <Attribute name="AttributeName" value="(Literal)deleteCount"/> </Component> --- 21,38 ---- <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="operationName" value="'getEntityStatistics'"/> ! <Attribute name="attributeKeyListName" value="'EntityNames'"/> ! <Attribute name="keyLabel" value="'Entity'"/> ! <Attribute name="AttributeName" value="'KEY'"/> ! <Attribute name="AttributeName" value="'fetchCount'"/> ! <Attribute name="AttributeName" value="'t'"/> ! <Attribute name="AttributeName" value="'insertCount'"/> ! <Attribute name="AttributeName" value="'updateCount'"/> ! <Attribute name="AttributeName" value="'deleteCount'"/> </Component> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:40:11
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/geronimo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/application/dashboards/geronimo Modified Files: Tag: ems_module_separation Geronimo_ServerInfo.xml Log Message: The newer style dashboards Index: Geronimo_ServerInfo.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/geronimo/Geronimo_ServerInfo.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Geronimo_ServerInfo.xml 12 Apr 2006 17:28:34 -0000 1.1.2.1 --- Geronimo_ServerInfo.xml 12 Apr 2006 17:40:04 -0000 1.1.2.2 *************** *** 36,40 **** <Content> <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent"> ! <Attribute name="htmlDocumentName" value="(Literal)Geronimo/Geronimo_ServerInfo.html"/> <Content> --- 36,40 ---- <Content> <Component type="org.mc4j.console.dashboard.components.html.HtmlDashboardComponent"> ! <Attribute name="htmlDocumentName" value="'Geronimo/Geronimo_ServerInfo.html'"/> <Content> *************** *** 44,58 **** <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter"> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="beanNode" value="JVM"/> ! <Attribute name="maxAttributeName" value="(Literal)maxMemory"/> ! <Attribute name="currentAttributeName" value="(Literal)freeMemory"/> ! <Attribute name="label" value="(Literal)Free Memory"/> ! <Attribute name="updateInterval" value="(Literal)1000"/> ! <Attribute name="warningPoint" value="(Literal)0.15"/> ! <Attribute name="criticalPoint" value="(Literal)0.05"/> ! <Attribute name="title" value="(Literal)Available Memory"/> ! <Attribute name="units" value="(Literal)MB"/> ! <Attribute name="opaque" value="(Literal)false"/> ! <Attribute name="unitConverter" value="(Literal)org.mc4j.console.util.unit.ByteToMegaByteConverter"/> </Component> --- 44,58 ---- <Component id="memoryMeter" type="org.mc4j.console.dashboard.components.NumericAttributeGaugeMeter"> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="bean" value="#JVM"/> ! <Attribute name="maxAttributeName" value="'maxMemory'"/> ! <Attribute name="currentAttributeName" value="'freeMemory'"/> ! <Attribute name="label" value="'Free Memory'"/> ! <Attribute name="updateInterval" value="'1000'"/> ! <Attribute name="warningPoint" value="'0.15'"/> ! <Attribute name="criticalPoint" value="'0.05'"/> ! <Attribute name="title" value="'Available Memory'"/> ! <Attribute name="units" value="'MB'"/> ! <Attribute name="opaque" value="'false'"/> ! <Attribute name="unitConverter" value="'org.mc4j.console.util.unit.ByteToMegaByteConverter'"/> </Component> *************** *** 60,67 **** <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="JBossServerInfoBean"/> <Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2" widthx="2" weightx="0.5" weighty="0.5" fill="BOTH" insets="3,3,3,3"/> ! <Attribute name="preferredSize" value="(Literal)100,100"/> ! <Attribute name="attributeName" value="(Literal)FreeMemory"/> </Component> --> --- 60,67 ---- <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#JBossServerInfoBean"/> <Constraint type="java.awt.GridBagConstraints" anchor="NORTH" gridx="1" gridy="2" widthx="2" weightx="0.5" weighty="0.5" fill="BOTH" insets="3,3,3,3"/> ! <Attribute name="preferredSize" value="'100,100'"/> ! <Attribute name="attributeName" value="'FreeMemory'"/> </Component> --> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:30:23
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/mejb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6793/src/org/mc4j/console/mejb Modified Files: Tag: ems_module_separation MBeanFilterNode.java MEJBChildren.java Log Message: Lots of changes towards the 2.0 alpha that I should've checked in a long time ago. Lots of stuff still broken. Only JBoss and JDK 1.5 have been tested. Index: MBeanFilterNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/mejb/MBeanFilterNode.java,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** MBeanFilterNode.java 15 Jan 2005 03:52:15 -0000 1.7 --- MBeanFilterNode.java 12 Apr 2006 17:28:38 -0000 1.7.2.1 *************** *** 17,27 **** package org.mc4j.console.mejb; import org.mc4j.console.bean.MBeanNode; - import org.mc4j.console.bean.RefreshAction; - import org.mc4j.console.bean.attribute.AttributeNode; import org.mc4j.console.mejb.view.ShowMEJBViewAction; - import org.mc4j.console.connection.ConnectionNode; - import org.mc4j.console.Refreshable; import org.mc4j.console.util.NodeUtil; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; --- 17,26 ---- package org.mc4j.console.mejb; + import org.mc4j.console.Refreshable; import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.mejb.view.ShowMEJBViewAction; import org.mc4j.console.util.NodeUtil; + import org.mc4j.ems.connection.bean.EmsBeanName; + import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.openide.nodes.FilterNode; import org.openide.nodes.Node; *************** *** 32,50 **** import org.openide.windows.IOProvider; ! import javax.swing.*; import javax.management.j2ee.ListenerRegistration; import javax.management.j2ee.Management; ! import javax.management.ObjectName; ! import javax.management.NotificationListener; ! import javax.management.Notification; ! import javax.management.InstanceNotFoundException; import java.util.HashMap; - import java.util.Map; - import java.util.Hashtable; import java.util.Iterator; - import java.util.ArrayList; import java.util.List; ! import java.awt.*; ! import java.rmi.RemoteException; /** --- 31,45 ---- import org.openide.windows.IOProvider; ! import javax.management.Notification; ! import javax.management.NotificationListener; import javax.management.j2ee.ListenerRegistration; import javax.management.j2ee.Management; ! import java.awt.Image; ! import java.rmi.RemoteException; ! import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; ! import java.util.Map; /** *************** *** 76,87 **** filteredNode = node; ! filteredDisplayName = filteredNode.getObjectName().getKeyProperty("name"); ! filteredDomain = this.filteredNode.getObjectName().getDomain(); ! filteredType = this.filteredNode.getObjectName().getKeyProperty("j2eeType"); //((MBeanFilterNodeChildren) getChildren()).setParentNode(this); ! Hashtable hash = node.getObjectName().getKeyPropertyList(); for (Iterator iterator = hash.entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = (Map.Entry) iterator.next(); --- 71,84 ---- filteredNode = node; ! EmsBeanName name = filteredNode.getEmsBean().getBeanName(); ! ! filteredDisplayName = name.getKeyProperty("name"); ! filteredDomain = name.getDomain(); ! filteredType = name.getKeyProperty("j2eeType"); //((MBeanFilterNodeChildren) getChildren()).setParentNode(this); ! Map<String,String> hash = name.getKeyProperties(); for (Iterator iterator = hash.entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = (Map.Entry) iterator.next(); *************** *** 137,153 **** public void loadMetadata() { ! AttributeNode attributeNode = (AttributeNode) filteredNode.getAttributeNodeMap().get("eventProvider"); ! eventProvider = ((Boolean) attributeNode.getValue()).booleanValue(); ! attributeNode = (AttributeNode) filteredNode.getAttributeNodeMap().get("stateManageable"); ! stateManageable = ((Boolean) attributeNode.getValue()).booleanValue(); ! attributeNode = (AttributeNode) filteredNode.getAttributeNodeMap().get("statisticsProvider"); ! statsProvider = ((Boolean) attributeNode.getValue()).booleanValue(); if (stateManageable) { ! AttributeNode stateAttribute = (AttributeNode) filteredNode.getAttributeNodeMap().get("state"); if (stateAttribute == null) ! stateAttribute = (AttributeNode) filteredNode.getAttributeNodeMap().get("State"); if (stateAttribute != null) { --- 134,150 ---- public void loadMetadata() { ! EmsAttribute attribute = filteredNode.getAttributeNodeMap().get("eventProvider"); ! eventProvider = ((Boolean) attribute.getValue()).booleanValue(); ! attribute = filteredNode.getAttributeNodeMap().get("stateManageable"); ! stateManageable = ((Boolean) attribute.getValue()).booleanValue(); ! attribute = filteredNode.getAttributeNodeMap().get("statisticsProvider"); ! statsProvider = ((Boolean) attribute.getValue()).booleanValue(); if (stateManageable) { ! EmsAttribute stateAttribute = filteredNode.getAttributeNodeMap().get("state"); if (stateAttribute == null) ! stateAttribute = filteredNode.getAttributeNodeMap().get("State"); if (stateAttribute != null) { *************** *** 186,190 **** /* register an event listener */ IOProvider.getDefault().getStdOut().println( ! "addNotificationListener( " + this + " ) to " + filteredNode.getObjectName()); Object managementObject = filteredNode.getConnectionNode().getMEJB(); --- 183,187 ---- /* register an event listener */ IOProvider.getDefault().getStdOut().println( ! "addNotificationListener( " + this + " ) to " + filteredNode.getEmsBean().getBeanName().getCanonicalName()); Object managementObject = filteredNode.getConnectionNode().getMEJB(); *************** *** 197,203 **** ListenerRegistration lr = mejb.getListenerRegistry(); ! lr.addNotificationListener(filteredNode.getObjectName(), this, null, "MEJB Listener"); ! } catch (InstanceNotFoundException e) { ! e.printStackTrace(); } catch (RemoteException e) { e.printStackTrace(); --- 194,201 ---- ListenerRegistration lr = mejb.getListenerRegistry(); ! // TODO!! use ems notification support ! // lr.addNotificationListener(filteredNode.getObjectName(), this, null, "MEJB Listener"); ! // } catch (InstanceNotFoundException e) { ! // e.printStackTrace(); } catch (RemoteException e) { e.printStackTrace(); *************** *** 212,216 **** IOProvider.getDefault().getStdOut().println( "Got an event (" + notification + ") on: " + ! filteredNode.getObjectName().getCanonicalName()); } --- 210,214 ---- IOProvider.getDefault().getStdOut().println( "Got an event (" + notification + ") on: " + ! filteredNode.getEmsBean().getBeanName().getCanonicalName()); } *************** *** 279,283 **** } protected void performAction(Node[] nodes) { ! filteredNode.getConnectionNode().browseToMBean(filteredNode.getObjectName()); } protected boolean enable(Node[] nodes) { --- 277,281 ---- } protected void performAction(Node[] nodes) { ! filteredNode.getConnectionNode().browseToMBean(filteredNode.getEmsBean().getBeanName().getCanonicalName()); } protected boolean enable(Node[] nodes) { Index: MEJBChildren.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/mejb/MEJBChildren.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** MEJBChildren.java 30 Nov 2004 03:38:43 -0000 1.2 --- MEJBChildren.java 12 Apr 2006 17:28:38 -0000 1.2.2.1 *************** *** 19,32 **** import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.connection.ConnectionNode; import org.openide.nodes.Children; import org.openide.nodes.Node; - import org.openide.windows.IOProvider; - import javax.management.MBeanServer; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; - import java.util.Hashtable; /** --- 19,30 ---- import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.connection.ConnectionNode; + import org.mc4j.ems.connection.EmsConnection; import org.openide.nodes.Children; import org.openide.nodes.Node; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; /** *************** *** 37,40 **** --- 35,39 ---- private ConnectionNode connectionNode; + private EmsConnection connection; private String parentType; private String parentName; *************** *** 45,48 **** --- 44,48 ---- public MEJBChildren(ConnectionNode connectionNode, MEJBNodeLayer parentNode) { this.connectionNode = connectionNode; + this.connection = connectionNode.getEmsConnection(); setFilteredNode(parentNode); } *************** *** 82,86 **** java.util.Map parentKeys = null; ! java.util.Map keys = null; if (parentNode != null) { parentKeys = parentNode.getKeys(); --- 82,86 ---- java.util.Map parentKeys = null; ! java.util.Map<String, String> keys = null; if (parentNode != null) { parentKeys = parentNode.getKeys(); *************** *** 89,92 **** --- 89,93 ---- } + for (int i = 0; childTypes != null && i < childTypes.length; i++) { String childType = childTypes[i]; *************** *** 96,100 **** AggregateNode aggregateNode = getAggregateNode(childType); - MBeanServer mgmt = connectionNode.getMBeanServer(); List allMBeans = connectionNode.getMBeanList(); --- 97,100 ---- *************** *** 104,114 **** // Check if it matches ! String canName = beanNode.getObjectName().getCanonicalName(); ! Hashtable table = beanNode.getObjectName().getKeyPropertyList(); if (keys != null && keys.size() > 0) { // If there are no keys, there isn't anything to match ! for (Iterator iterator1 = keys.entrySet().iterator(); iterator1.hasNext();) { ! java.util.Map.Entry entry = (java.util.Map.Entry) iterator1.next(); String value = (String) table.get(entry.getKey()); --- 104,113 ---- // Check if it matches ! String canName = beanNode.getEmsBean().getBeanName().getCanonicalName(); ! java.util.Map<String,String> table = beanNode.getEmsBean().getBeanName().getKeyProperties(); if (keys != null && keys.size() > 0) { // If there are no keys, there isn't anything to match ! for (java.util.Map.Entry<String,String> entry : keys.entrySet()) { String value = (String) table.get(entry.getKey()); *************** *** 149,153 **** MBeanNode beanNode = (MBeanNode) iterator.next(); ! String name = beanNode.getObjectName().getKeyProperty("name"); for (int j = 0; j < existingChildren.length; j++) { Node node = existingChildren[j]; --- 148,152 ---- MBeanNode beanNode = (MBeanNode) iterator.next(); ! String name = beanNode.getEmsBean().getBeanName().getKeyProperty("name"); for (int j = 0; j < existingChildren.length; j++) { Node node = existingChildren[j]; *************** *** 170,174 **** for (int j = 0; j < allMBeans.size(); j++) { MBeanNode beanNode = (MBeanNode) allMBeans.get(j); ! if (beanNode.getObjectName().getCanonicalName().indexOf("J2EEServer=none") > 0) { found = true; } --- 169,173 ---- for (int j = 0; j < allMBeans.size(); j++) { MBeanNode beanNode = (MBeanNode) allMBeans.get(j); ! if (beanNode.getEmsBean().getBeanName().getCanonicalName().indexOf("J2EEServer=none") > 0) { found = true; } *************** *** 191,195 **** for (int j = 0; j < allMBeans.size(); j++) { MBeanNode beanNode = (MBeanNode) allMBeans.get(j); ! if (beanNode.getObjectName().getCanonicalName().indexOf("J2EEApplication="+applicationName) > 0) { found = true; } --- 190,194 ---- for (int j = 0; j < allMBeans.size(); j++) { MBeanNode beanNode = (MBeanNode) allMBeans.get(j); ! if (beanNode.getEmsBean().getBeanName().getCanonicalName().indexOf("J2EEApplication="+applicationName) > 0) { found = true; } |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:29:59
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6793/src/org/mc4j/console/connection Modified Files: Tag: ems_module_separation ConnectionNode.java NumericIntrospectorAction.java StatsIntrospectorAction.java Removed Files: Tag: ems_module_separation JBossConnectionNode.java JDMKConnectionNode.java JSR160ConnectionNode.java Mx4jConnectionNode.java Oc4jConnectionNode.java PramatiConnectionNode.java WeblogicConnectionNode.java WebsphereConnectionNode.java Log Message: Lots of changes towards the 2.0 alpha that I should've checked in a long time ago. Lots of stuff still broken. Only JBoss and JDK 1.5 have been tested. --- WebsphereConnectionNode.java DELETED --- Index: ConnectionNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/ConnectionNode.java,v retrieving revision 1.43 retrieving revision 1.43.2.1 diff -C2 -d -r1.43 -r1.43.2.1 *** ConnectionNode.java 15 Jan 2005 03:43:54 -0000 1.43 --- ConnectionNode.java 12 Apr 2006 17:28:37 -0000 1.43.2.1 *************** *** 20,26 **** import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.connection.create.CreateMBeanAction; - import org.mc4j.console.connection.install.WeblogicConnectionTypeDescriptor; import org.mc4j.console.connection.persistence.ConnectionSetDatabase; - import org.mc4j.console.connection.persistence.ConnectionSettings; import org.mc4j.console.dashboard.global.GlobalDashboardSetNode; import org.mc4j.console.domain.DomainNode; --- 20,24 ---- *************** *** 29,35 **** import org.mc4j.console.query.NewQueryAction; import org.mc4j.console.util.NodeUtil; ! import org.openide.DialogDisplayer; import org.openide.ErrorManager; - import org.openide.NotifyDescriptor; import org.openide.actions.OpenLocalExplorerAction; import org.openide.actions.PropertiesAction; --- 27,40 ---- import org.mc4j.console.query.NewQueryAction; import org.mc4j.console.util.NodeUtil; ! import org.mc4j.console.util.ConnectionInfoAction; ! import org.mc4j.ems.connection.ConnectionFactory; ! import org.mc4j.ems.connection.EmsConnection; ! import org.mc4j.ems.connection.MBeanRegistrationEvent; ! import org.mc4j.ems.connection.MBeanRegistrationListener; ! import org.mc4j.ems.connection.EmsConnectException; ! import org.mc4j.ems.connection.bean.EmsBean; ! import org.mc4j.ems.connection.bean.attribute.EmsAttribute; ! import org.mc4j.ems.connection.settings.ConnectionSettings; import org.openide.ErrorManager; import org.openide.actions.OpenLocalExplorerAction; import org.openide.actions.PropertiesAction; *************** *** 47,53 **** import org.openide.windows.TopComponent; - import javax.management.MBeanServer; - import javax.management.ObjectInstance; - import javax.management.ObjectName; import javax.swing.*; import java.awt.*; --- 52,55 ---- *************** *** 56,62 **** import java.beans.PropertyChangeListener; import java.io.IOException; - import java.lang.reflect.InvocationTargetException; - import java.lang.reflect.UndeclaredThrowableException; - import java.rmi.ConnectException; import java.util.ArrayList; import java.util.Collections; --- 58,61 ---- *************** *** 67,74 **** import java.util.Map; import java.util.Set; - import java.util.SortedSet; import java.util.Timer; - import java.util.TimerTask; - import java.util.TreeSet; /** --- 66,70 ---- *************** *** 78,82 **** * @version $Revision$($Author$ / $Date$) */ ! public abstract class ConnectionNode extends AbstractNode implements IConnectionNode, PropertyChangeListener, Comparable { --- 74,78 ---- * @version $Revision$($Author$ / $Date$) */ ! public class ConnectionNode extends AbstractNode implements IConnectionNode, PropertyChangeListener, Comparable, MBeanRegistrationListener { *************** *** 89,94 **** protected boolean connectionFailure = false; ! /** Holds a map of ObjectNames.getCannonicalName() to MBeanNodes */ ! protected volatile Map mbeans = new HashMap(); protected Node.PropertySet[] settingsPropertySets; --- 85,90 ---- protected boolean connectionFailure = false; ! /** Holds a map of cannonical object names to MBeanNodes */ ! protected volatile Map<String, MBeanNode> mbeans = new HashMap<String, MBeanNode>(); protected Node.PropertySet[] settingsPropertySets; *************** *** 102,107 **** private Set openDashboards = new HashSet(); ! public ConnectionNode() { super(new ConnectionNodeChildren()); // Setup a working pool of up to 5 threads to process remote calls --- 98,108 ---- private Set openDashboards = new HashSet(); ! ! private EmsConnection emsConnection; ! ! ! public ConnectionNode(ConnectionSettings connectionSettings) { super(new ConnectionNodeChildren()); + this.connectionSettings = connectionSettings; // Setup a working pool of up to 5 threads to process remote calls *************** *** 114,120 **** updateIcon(); // Set FeatureDescriptor stuff: - setName("loading"); ! //addPropertyChangeListener(this); } --- 115,126 ---- updateIcon(); // Set FeatureDescriptor stuff: ! setName(connectionSettings.getConnectionName()); ! ! addPropertyChangeListener(this); ! } ! ! public EmsConnection getEmsConnection() { ! return emsConnection; } *************** *** 135,142 **** } - public ConnectionNode(Children children) { - super(children); - - } public int compareTo(Object o) { --- 141,144 ---- *************** *** 153,158 **** - public abstract MBeanServer getMBeanServer(); - // Create the popup menu: protected SystemAction[] createActions() { --- 155,158 ---- *************** *** 189,325 **** protected void loadConnectionNodeChildren(boolean showProgress) throws Exception { ! //String currentText = StatusDisplayer.getDefault().getStatusText(); ProgressDialog progressDialog = null; ! try { ! StatusDisplayer.getDefault().setStatusText("Loading nodes [" + connectionSettings.getConnectionName() + "]"); ! ! MBeanServer server = getMBeanServer(); ! Set objectNames; ! if (connectionSettings.getConnectionType() instanceof WeblogicConnectionTypeDescriptor) { ! Set objectInstances = server.queryMBeans(null,null); ! objectNames = new HashSet(); ! for (Iterator iterator = objectInstances.iterator(); iterator.hasNext();) { ! ObjectInstance objectInstance = (ObjectInstance) iterator.next(); ! objectNames.add(objectInstance.getObjectName()); ! } ! } else { ! objectNames = server.queryNames(null,null); ! } ! StatusDisplayer.getDefault().setStatusText("Loading nodes [" + connectionSettings.getConnectionName() ! + "] 0 of " + objectNames.size()); ! ! if (showProgress) ! progressDialog = new ProgressDialog(objectNames.size()); ! ! ! SortedSet sortedObjectNames = new TreeSet( new MBeanNameComparator()); ! if (objectNames != null) { ! sortedObjectNames.addAll(objectNames); ! } ! ! // Create a secondary set that will be winowed with beans ! // that are still registered. Beans left in this set at the end ! // have been deregistered. ! HashSet oldMBeans = new HashSet(mbeans.keySet()); ! ! int i = 0; ! for (Iterator iter = sortedObjectNames.iterator(); iter.hasNext();) { ! ObjectName objectName = (ObjectName) iter.next(); ! ! synchronized(this) { ! if ((this.mbeans == null) || (!this.mbeans.containsKey(objectName.getCanonicalName()))) { ! //org.openide.windows.IOProvider.getDefault().getStdOut().println("Mount MBean: " + objectInstance.getObjectName().getCanonicalName()); ! addMBean(objectName); ! } else { ! oldMBeans.remove(objectName.getCanonicalName()); ! } ! } ! ! i++; ! if (i % 20 == 0) { ! StatusDisplayer.getDefault().setStatusText("Loading nodes [" + connectionSettings.getConnectionName() ! + "] " + i + " of " + objectNames.size()); ! if (showProgress) ! progressDialog.setValue(i); ! } ! } ! ! Node parent = null; ! // Clean out beans that have been unregistered ! for (Iterator it = oldMBeans.iterator(); it.hasNext();) { ! String mbeansKey = (String) it.next(); ! ! MBeanNode node = (MBeanNode) this.mbeans.get(mbeansKey); ! parent = node.getParentNode(); ! parent.getChildren().remove(new Node[] { node }); ! ! ! mbeans.remove(mbeansKey); ! } ! if(parent != null){ //have we removed any nodes? ! //we need to get to the super parent to clean up the empty domains ! Node superParent = parent; ! while(superParent.getParentNode() != null && !(superParent instanceof ConnectionNode)) { ! superParent = superParent.getParentNode(); ! } ! ! removeEmptyDomainNodes(superParent); ! } ! ! // Reset in case there was a prior failure ! connectionFailure = false; - } catch (Exception e) { - StatusDisplayer.getDefault().setStatusText("Problem contacting server: " + - this.connectionSettings.getConnectionName()); ! Throwable probableConnectException = e; ! ! // the possible ConnectExcpetion is most likely wrapped in an UndeclaredThrowableException ! // depending on the MBeanServerProxy it may be further wrapped in an InvocationTargetException ! if (!(e instanceof ConnectException)){ ! if (e instanceof UndeclaredThrowableException) { ! probableConnectException = ((UndeclaredThrowableException)e).getUndeclaredThrowable(); ! if (probableConnectException instanceof InvocationTargetException) { ! probableConnectException = probableConnectException.getCause(); ! } ! } else { ! probableConnectException = e.getCause(); ! } ! } ! if (probableConnectException instanceof ConnectException) { ! if (connectionFailure) { ! // we know that we have a connection failure -> don't bother the user! ! ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e); ! } else { ! // first connection failure -> notify with default severity ! NotifyDescriptor d = ! new NotifyDescriptor.Message("Lost connection to server at \"" + ! this.connectionSettings.getConnectionName() + ! "\". \nPlease disconnect and connect after the server is restarted.", ! NotifyDescriptor.ERROR_MESSAGE); ! DialogDisplayer.getDefault().notify(d); ! // TODO CSC: should we disconnect here?! (and remove the if-then-case!) ! // GH: I wasn't going to disconnect in case its a temporary network issue. ! // The app doesn't really deal well with this right now though. ! } ! connectionFailure = true; ! } else { ! ErrorManager.getDefault().notify(e); ! } ! throw e; ! } finally { ! StatusDisplayer.getDefault().setStatusText(""); ! if (showProgress && progressDialog != null) ! progressDialog.close(); } } ! /** * Recursively removes empty domain nodes. --- 189,228 ---- protected void loadConnectionNodeChildren(boolean showProgress) throws Exception { ! String currentText = StatusDisplayer.getDefault().getStatusText(); ProgressDialog progressDialog = null; ! StatusDisplayer.getDefault().setStatusText("Loading nodes [" + connectionSettings.getConnectionName() + "]"); ! Set<EmsBean> emsBeans = emsConnection.getBeans(); ! StatusDisplayer.getDefault().setStatusText("Loading nodes [" + connectionSettings.getConnectionName() ! + "] 0 of " + emsBeans.size()); ! if (showProgress) ! progressDialog = new ProgressDialog(emsBeans.size()); ! } + public void registrationChanged(MBeanRegistrationEvent event) { + Set<EmsBean> registered = event.getRegistered(); + Set<EmsBean> deregistered = event.getDeregistered(); ! for (EmsBean bean : registered) { ! addMBean(bean); ! } ! Node[] oldNodes = new Node[deregistered.size()]; ! int i = 0; ! for (EmsBean bean : deregistered) { ! MBeanNode currentNode = this.mbeans.remove(bean.getBeanName().getCanonicalName()); ! oldNodes[i++] = currentNode; ! } ! getChildren().remove(oldNodes); ! if (deregistered.size() > 0) { ! // TODO removeEmptyDomainNodes() } } ! ! /** * Recursively removes empty domain nodes. *************** *** 359,375 **** } - /** - * @deprecated - * @param objectInstance - */ - protected void addMBean(ObjectInstance objectInstance) { - synchronized(this) { - this.addMBean(objectInstance.getObjectName()); - } - } ! protected void addMBean(ObjectName objectName) { synchronized(this) { ! String domain = objectName.getDomain(); DomainNode domainNode = (DomainNode) this.mbeanNode.getChildren().findChild(domain); --- 262,270 ---- } ! ! protected void addMBean(EmsBean emsBean) { synchronized(this) { ! String domain = emsBean.getBeanName().getDomain(); DomainNode domainNode = (DomainNode) this.mbeanNode.getChildren().findChild(domain); *************** *** 379,384 **** } ! MBeanNode mbeanNode = new MBeanNode(objectName, this); ! this.mbeans.put(objectName.getCanonicalName(), mbeanNode); if(domainNode.isGroupTypes()) { --- 274,279 ---- } ! MBeanNode mbeanNode = new MBeanNode(this, emsBean); ! this.mbeans.put(emsBean.getBeanName().getCanonicalName(), mbeanNode); if(domainNode.isGroupTypes()) { *************** *** 493,496 **** --- 388,411 ---- public void connect() throws Exception { + ConnectionFactory connectionFactory = new ConnectionFactory(); + + try { + emsConnection = connectionFactory.connect(connectionSettings); + } catch(EmsConnectException e) { + connectionFailure = true; + updateIcon(); + JOptionPane.showMessageDialog(null,"Unable to open connection to server: " + e.getCause().getMessage(), + "Connection Error", JOptionPane.ERROR_MESSAGE); + return; + } + // Store the last 100 values for numeric attributes + connectionSettings.getControlProperties().setProperty(EmsAttribute.CONTROL_ATTRIBUTE_HISTORY_DEPTH,"100"); + + ConnectionInfoAction.addStats(emsConnection); + + this.emsConnection.addRegistrationListener(this); + + + this.connected = true; this.connectionFailure = false; *************** *** 515,519 **** getChildren().add(new Node[] { mbeanNode }); ! loadConnectionNodeChildren(true); // Turn on domain hierarchy grouping by default --- 430,434 ---- getChildren().add(new Node[] { mbeanNode }); ! emsConnection.loadSynchronous(false); // Turn on domain hierarchy grouping by default *************** *** 529,540 **** refreshTimer = new Timer(); ! refreshTimer.schedule( ! new TimerTask() { ! public void run() { ! refresh(); ! } ! }, ! 20000, ! 10000); } --- 444,455 ---- refreshTimer = new Timer(); ! // refreshTimer.schedule( ! // new TimerTask() { ! // public void run() { ! // refresh(); ! // } ! // }, ! // 20000, ! // 10000); } *************** *** 673,677 **** ! public void browseToMBean(final ObjectName objectName) { final MBeanNode node = getMBeanNode(objectName); if (node != null) { --- 588,592 ---- ! public void browseToMBean(final String objectName) { final MBeanNode node = getMBeanNode(objectName); if (node != null) { *************** *** 680,685 **** } ! public MBeanNode getMBeanNode(ObjectName objectName) { ! return (MBeanNode) this.mbeans.get(objectName.getCanonicalName()); } --- 595,600 ---- } ! public MBeanNode getMBeanNode(String objectName) { ! return this.mbeans.get(objectName); } --- JBossConnectionNode.java DELETED --- Index: NumericIntrospectorAction.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/NumericIntrospectorAction.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** NumericIntrospectorAction.java 5 Oct 2004 05:15:59 -0000 1.2 --- NumericIntrospectorAction.java 12 Apr 2006 17:28:37 -0000 1.2.2.1 *************** *** 17,21 **** package org.mc4j.console.connection; ! import org.mc4j.console.bean.MBeanNode; import org.openide.nodes.Node; import org.openide.util.HelpCtx; --- 17,22 ---- package org.mc4j.console.connection; ! import org.mc4j.ems.connection.bean.EmsBean; ! import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.openide.nodes.Node; import org.openide.util.HelpCtx; *************** *** 24,32 **** import org.openide.windows.OutputWriter; - import javax.management.MBeanAttributeInfo; import java.math.BigDecimal; import java.math.BigInteger; import java.util.HashSet; - import java.util.List; import java.util.Set; --- 25,31 ---- *************** *** 43,64 **** OutputWriter w = IOProvider.getDefault().getIO("Stats Output", true).getOut(); ! List mbeanNodes = node.getMBeanList(); ! for (int i = 0; i < mbeanNodes.size(); i++) { ! MBeanNode beanNode = (MBeanNode) mbeanNodes.get(i); boolean beanOutput = false; ! MBeanAttributeInfo[] infos = beanNode.getMBeanInfo().getAttributes(); ! for (int j = 0; j < infos.length; j++) { ! MBeanAttributeInfo info = infos[j]; - if (STATS_TYPES.contains(info.getType()) && - !info.isWritable()) { if (!beanOutput) { ! w.println(beanNode.getObjectName().getCanonicalName()); beanOutput = true; } ! w.println("\t" + info.getName() + "[" + info.getType() + "]"); } } } --- 42,60 ---- OutputWriter w = IOProvider.getDefault().getIO("Stats Output", true).getOut(); ! for (EmsBean emsBean : node.getEmsConnection().getBeans()) { boolean beanOutput = false; ! for (EmsAttribute attribute : emsBean.getAttributes()) { ! ! if (!attribute.isWritable() && STATS_TYPES.contains(attribute.getType())) { if (!beanOutput) { ! w.println(emsBean.getBeanName().getCanonicalName()); beanOutput = true; } ! w.println("\t" + attribute.getName() + "[" + attribute.getType() + "]"); } + } } --- Oc4jConnectionNode.java DELETED --- --- JDMKConnectionNode.java DELETED --- Index: StatsIntrospectorAction.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/StatsIntrospectorAction.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** StatsIntrospectorAction.java 5 Oct 2004 05:15:59 -0000 1.2 --- StatsIntrospectorAction.java 12 Apr 2006 17:28:37 -0000 1.2.2.1 *************** *** 17,22 **** package org.mc4j.console.connection; ! import org.mc4j.console.bean.MBeanNode; ! import org.mc4j.console.bean.attribute.AttributeNode; import org.openide.nodes.Node; import org.openide.util.HelpCtx; --- 17,21 ---- package org.mc4j.console.connection; ! import org.mc4j.ems.connection.bean.EmsBean; import org.openide.nodes.Node; import org.openide.util.HelpCtx; *************** *** 25,29 **** import org.openide.windows.OutputWriter; ! import java.util.List; /** --- 24,28 ---- import org.openide.windows.OutputWriter; ! import java.util.SortedSet; /** *************** *** 39,63 **** OutputWriter w = IOProvider.getDefault().getIO("Stats Output", true).getOut(); ! List mbeanNodes = node.getMBeanList(); ! for (int i = 0; i < mbeanNodes.size(); i++) { ! MBeanNode beanNode = (MBeanNode) mbeanNodes.get(i); ! boolean beanOutput = false; ! ! AttributeNode attrNode = (AttributeNode) beanNode.getAttributeNodeMap().get("Stats"); ! if (attrNode != null) { ! if (!beanOutput) { ! w.println(beanNode.getObjectName().getCanonicalName()); ! beanOutput = true; ! } ! w.println("\t" + beanNode.getName() + "[" + "]"); } - } ! } protected boolean enable(Node[] nodes) { ! return ((nodes.length == 1) && (nodes[0] instanceof ConnectionNode) && (((ConnectionNode)nodes[0]).isConnected())); --- 38,53 ---- OutputWriter w = IOProvider.getDefault().getIO("Stats Output", true).getOut(); ! SortedSet<EmsBean> beans = node.getEmsConnection().getBeans(); ! for (EmsBean bean : beans) { ! if (bean.getAttribute("Stats") != null) { ! w.println("\t" + bean.getBeanName().getCanonicalName()); } } ! } protected boolean enable(Node[] nodes) { ! return ((nodes.length == 1) && (nodes[0] instanceof ConnectionNode) && (((ConnectionNode)nodes[0]).isConnected())); --- Mx4jConnectionNode.java DELETED --- --- JSR160ConnectionNode.java DELETED --- --- PramatiConnectionNode.java DELETED --- --- WeblogicConnectionNode.java DELETED --- |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:29:44
|
Update of /cvsroot/mc4j/mc4j/application/branding/bundle/org/netbeans/core/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6793/application/branding/bundle/org/netbeans/core/resources Modified Files: Tag: ems_module_separation splash.gif Log Message: Lots of changes towards the 2.0 alpha that I should've checked in a long time ago. Lots of stuff still broken. Only JBoss and JDK 1.5 have been tested. Index: splash.gif =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/branding/bundle/org/netbeans/core/resources/splash.gif,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 Binary files /tmp/cvscuzqII and /tmp/cvsZHxzqv differ |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:29:42
|
Update of /cvsroot/mc4j/mc4j/application/dashboards/tomcat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6793/application/dashboards/tomcat Modified Files: Tag: ems_module_separation Tomcat_RequestProcessorTable.xml Tomcat_ServletTable.xml Tomcat_SingleServlet_Graph.xml Log Message: Lots of changes towards the 2.0 alpha that I should've checked in a long time ago. Lots of stuff still broken. Only JBoss and JDK 1.5 have been tested. Index: Tomcat_SingleServlet_Graph.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/tomcat/Tomcat_SingleServlet_Graph.xml,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** Tomcat_SingleServlet_Graph.xml 8 Apr 2004 21:38:27 -0000 1.3 --- Tomcat_SingleServlet_Graph.xml 12 Apr 2006 17:28:34 -0000 1.3.2.1 *************** *** 1,6 **** <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd"> ! <Dashboard version="1.0" name="Tomcat Servlet Statistics Graph"> <Description>This dashboard shows the statistics of a Tomcat servlet.</Description> --- 1,6 ---- <?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 Servlet Statistics Graph"> <Description>This dashboard shows the statistics of a Tomcat servlet.</Description> *************** *** 8,12 **** <DashboardMatch type="Bean"> <BeanMatch id="ServletNode" type="Single"> ! <Condition type="BeanObjectNameCondition" filter="j2eeType=Servlet"/> </BeanMatch> </DashboardMatch> --- 8,12 ---- <DashboardMatch type="Bean"> <BeanMatch id="ServletNode" type="Single"> ! <Condition type="BeanObjectNameRegexCondition" filter="j2eeType=Servlet"/> </BeanMatch> </DashboardMatch> *************** *** 14,53 **** <LayoutManager type="java.awt.BorderLayout"/> <Content> ! ! <!-- *** The header section displays title and a refresh control *** --> ! <Component type="javax.swing.JPanel"> ! <Constraint type="BorderConstraints" direction="NORTH"/> ! <LayoutManager type="java.awt.BorderLayout"/> ! <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/> ! <Content> ! <Component type="javax.swing.JPanel"> ! <Constraint type="BorderConstraints" direction="CENTER"/> ! <LayoutManager type="java.awt.BorderLayout"/> ! <Content> ! <Component type="javax.swing.JLabel" id="titleLable"> ! <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="text" value="DashboardName"/> ! <Attribute name="font" value="(Literal)SansSerif bold 20"/> ! <Attribute name="foreground" value="(Literal)0x666666"/> ! </Component> ! <Component type="javax.swing.JTextArea"> ! <Constraint type="BorderConstraints" direction="SOUTH"/> ! <Attribute name="text" value="DashboardDescription"/> ! <Attribute name="font" value="(Literal)DialogInput bold 14"/> ! <Attribute name="opaque" value="(Literal)false"/> ! <Attribute name="editable" value="(Literal)false"/> ! </Component> ! </Content> ! </Component> ! </Content> ! </Component> <!-- *** Scroll pane of info *** --> <Component type="javax.swing.JScrollPane"> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Content> <Component type="javax.swing.JPanel"> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="preferredSize" value="100,100"/> --- 14,26 ---- <LayoutManager type="java.awt.BorderLayout"/> <Content> ! <!-- *** Scroll pane of info *** --> <Component type="javax.swing.JScrollPane"> ! <Attribute name="background" value="'0xFFFFFF'"/> <Content> <Component type="javax.swing.JPanel"> ! <Attribute name="background" value="'0xFFFFFF'"/> <Constraint type="BorderConstraints" direction="CENTER"/> <Attribute name="preferredSize" value="100,100"/> *************** *** 56,69 **** <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Request Counts"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="ServletNode"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)requestCount"/> ! <Attribute name="attributeName" value="(Literal)errorCount"/> </Component> </Content> --- 29,42 ---- <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Request Counts'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#ServletNode"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'requestCount'"/> ! <Attribute name="attributeName" value="'errorCount'"/> </Component> </Content> *************** *** 71,83 **** <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Execution Speed"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="ServletNode"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)minTime"/> ! <Attribute name="attributeName" value="(Literal)maxTime"/> </Component> </Content> --- 44,56 ---- <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Execution Speed'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#ServletNode"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'minTime'"/> ! <Attribute name="attributeName" value="'maxTime'"/> </Component> </Content> *************** *** 85,97 **** <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="(Literal)Processing Time"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="beanNode" value="ServletNode"/> ! <Attribute name="preferredSize" value="(Literal)400,150"/> ! <Attribute name="attributeName" value="(Literal)processingTime"/> </Component> </Content> --- 58,70 ---- <Component type="org.mc4j.console.swing.SectionHolder"> ! <Attribute name="title" value="'Processing Time'"/> ! <Attribute name="background" value="'0xFFFFFF'"/> <LayoutManager type="java.awt.GridLayout" rows="1" cols="1"/> <Content> <Component type="org.mc4j.console.dashboard.components.NumericAttributeGraph"> ! <Attribute name="bean" value="#ServletNode"/> ! <Attribute name="preferredSize" value="'400,150'"/> ! <Attribute name="attributeName" value="'processingTime'"/> </Component> </Content> *************** *** 99,103 **** <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="(Literal)VERTICAL_GLUE_SHAPE"/> </Component> </Content> --- 72,76 ---- <Component type="org.mc4j.console.dashboard.components.FillerComponent"> ! <Attribute name="type" value="'VERTICAL_GLUE_SHAPE'"/> </Component> </Content> Index: Tomcat_ServletTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/tomcat/Tomcat_ServletTable.xml,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** Tomcat_ServletTable.xml 5 Oct 2004 04:01:08 -0000 1.5 --- Tomcat_ServletTable.xml 12 Apr 2006 17:28:34 -0000 1.5.2.1 *************** *** 1,6 **** <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd"> ! <Dashboard version="1.0" name="Tomcat Servlet Statistics"> <Description>This dashboard shows the statistics of a Tomcat Servlets.</Description> --- 1,6 ---- <?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 Servlet Statistics"> <Description>This dashboard shows the statistics of a Tomcat Servlets.</Description> *************** *** 8,12 **** <DashboardMatch type="Global" location="/Tomcat/Web"> <BeanMatch id="ServletList" type="Multiple"> ! <Condition type="BeanObjectNameCondition" filter="j2eeType=Servlet"/> <Condition type="ServerAttributeCondition" serverType="MX4J"/> </BeanMatch> --- 8,12 ---- <DashboardMatch type="Global" location="/Tomcat/Web"> <BeanMatch id="ServletList" type="Multiple"> ! <Condition type="BeanObjectNameRegexCondition" filter="j2eeType=Servlet"/> <Condition type="ServerAttributeCondition" serverType="MX4J"/> </BeanMatch> *************** *** 16,74 **** <Content> - <!-- *** The header section displays title and a refresh control *** --> - <Component type="javax.swing.JPanel"> - <Constraint type="BorderConstraints" direction="NORTH"/> - <LayoutManager type="java.awt.BorderLayout"/> - <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/> - <Content> - <Component type="javax.swing.JPanel"> - <Constraint type="BorderConstraints" direction="CENTER"/> - <LayoutManager type="java.awt.BorderLayout"/> - <Content> - <Component type="javax.swing.JLabel" id="titleLable"> - <Constraint type="BorderConstraints" direction="CENTER"/> - <Attribute name="text" value="DashboardName"/> - <Attribute name="font" value="(Literal)SansSerif bold 20"/> - <Attribute name="foreground" value="(Literal)0x666666"/> - </Component> - <Component type="javax.swing.JTextArea"> - <Constraint type="BorderConstraints" direction="SOUTH"/> - <Attribute name="text" value="DashboardDescription"/> - <Attribute name="font" value="(Literal)DialogInput bold 14"/> - <Attribute name="opaque" value="(Literal)false"/> - <Attribute name="editable" value="(Literal)false"/> - </Component> - </Content> - </Component> - <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> - <Constraint type="BorderConstraints" direction="EAST"/> - <Attribute name="refreshDelay" value="(Literal)5000"/> - </Component> - </Content> - </Component> - <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent"> ! <Attribute name="beanList" value="ServletList"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="(Literal)J2EEServer"/> ! <Attribute name="AttributeName" value="(Literal)J2EEApplication"/> ! <Attribute name="AttributeName" value="(Literal)WebModule"/> ! <Attribute name="AttributeName" value="(Literal)name"/> ! <Attribute name="AttributeName" value="(Literal)requestCount"/> ! <Attribute name="AttributeName" value="(Literal)processingTime"/> ! <Attribute name="AttributeName" value="(Literal)minTime"/> ! <Attribute name="AttributeName" value="(Literal)maxTime"/> ! <Attribute name="AttributeName" value="(Literal)loadTime"/> ! <Attribute name="AttributeName" value="(Literal)classLoadTime"/> ! <Attribute name="AttributeName" value="(Literal)errorCount"/> --- 16,42 ---- <Content> <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent"> ! <Attribute name="beanList" value="#ServletList"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <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'"/> ! <Attribute name="AttributeName" value="'processingTime'"/> ! <Attribute name="AttributeName" value="'minTime'"/> ! <Attribute name="AttributeName" value="'maxTime'"/> ! <Attribute name="AttributeName" value="'loadTime'"/> ! <Attribute name="AttributeName" value="'classLoadTime'"/> ! <Attribute name="AttributeName" value="'errorCount'"/> Index: Tomcat_RequestProcessorTable.xml =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/dashboards/tomcat/Tomcat_RequestProcessorTable.xml,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** Tomcat_RequestProcessorTable.xml 5 Oct 2004 04:01:08 -0000 1.4 --- Tomcat_RequestProcessorTable.xml 12 Apr 2006 17:28:34 -0000 1.4.2.1 *************** *** 1,6 **** <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE Dashboard PUBLIC "-//MC4J//DTD Dashboard 1.0//EN" "http://mc4j.sourceforge.net/Dashboard_1_0.dtd"> ! <Dashboard version="1.0" name="Request Processor Statistics"> <Description>This dashboard shows the statistics of Tomcat Request Processors.</Description> --- 1,6 ---- <?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"> <Description>This dashboard shows the statistics of Tomcat Request Processors.</Description> *************** *** 8,12 **** <DashboardMatch type="Global" location="/Tomcat/Web"> <BeanMatch id="RequestProcessorList" type="Multiple"> ! <Condition type="BeanObjectNameCondition" filter="type=RequestProcessor"/> </BeanMatch> </DashboardMatch> --- 8,12 ---- <DashboardMatch type="Global" location="/Tomcat/Web"> <BeanMatch id="RequestProcessorList" type="Multiple"> ! <Condition type="BeanObjectNameRegexCondition" filter="type=RequestProcessor"/> </BeanMatch> </DashboardMatch> *************** *** 15,74 **** <Content> - <!-- *** The header section displays title and a refresh control *** --> - <Component type="javax.swing.JPanel"> - <Constraint type="BorderConstraints" direction="NORTH"/> - <LayoutManager type="java.awt.BorderLayout"/> - <Border type="javax.swing.border.EmptyBorder" top="(Literal)2" left="(Literal)5" bottom="(Literal)2" right="(Literal)5"/> - <Content> - <Component type="javax.swing.JPanel"> - <Constraint type="BorderConstraints" direction="CENTER"/> - <LayoutManager type="java.awt.BorderLayout"/> - <Content> - <Component type="javax.swing.JLabel" id="titleLable"> - <Constraint type="BorderConstraints" direction="CENTER"/> - <Attribute name="text" value="DashboardName"/> - <Attribute name="font" value="(Literal)SansSerif bold 20"/> - <Attribute name="foreground" value="(Literal)0x666666"/> - </Component> - <Component type="javax.swing.JTextArea"> - <Constraint type="BorderConstraints" direction="SOUTH"/> - <Attribute name="text" value="DashboardDescription"/> - <Attribute name="font" value="(Literal)DialogInput bold 14"/> - <Attribute name="opaque" value="(Literal)false"/> - <Attribute name="editable" value="(Literal)false"/> - </Component> - </Content> - </Component> - <Component type="org.mc4j.console.dashboard.components.RefreshControlComponent"> - <Constraint type="BorderConstraints" direction="EAST"/> - <Attribute name="refreshDelay" value="(Literal)5000"/> - </Component> - </Content> - </Component> - <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent"> ! <Attribute name="beanList" value="RequestProcessorList"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="(Literal)0xFFFFFF"/> ! <Attribute name="preferredSize" value="100,100"/> ! <Attribute name="AttributeName" value="(Literal)name"/> ! <Attribute name="AttributeName" value="(Literal)worker"/> ! <Attribute name="AttributeName" value="(Literal)remoteAddr"/> ! <Attribute name="AttributeName" value="(Literal)protocol"/> ! <Attribute name="AttributeName" value="(Literal)requestCount"/> ! <Attribute name="AttributeName" value="(Literal)requestProcessingTime"/> ! <Attribute name="AttributeName" value="(Literal)maxTime"/> ! <Attribute name="AttributeName" value="(Literal)bytesSent"/> ! <Attribute name="AttributeName" value="(Literal)bytesReceived"/> ! <Attribute name="AttributeName" value="(Literal)processingTime"/> ! <Attribute name="AttributeName" value="(Literal)errorCount"/> --- 15,42 ---- <Content> <Component type="org.mc4j.console.dashboard.components.AttributeTablePopupComponent"> ! <Attribute name="beanList" value="#RequestProcessorList"/> <Constraint type="BorderConstraints" direction="CENTER"/> ! <Attribute name="background" value="'0xFFFFFF'"/> ! <Attribute name="preferredSize" value="'100,100'"/> ! <Attribute name="AttributeName" value="'name'"/> ! <Attribute name="AttributeName" value="'worker'"/> ! <Attribute name="AttributeName" value="'remoteAddr'"/> ! <Attribute name="AttributeName" value="'protocol'"/> ! <Attribute name="AttributeName" value="'requestCount'"/> ! <Attribute name="AttributeName" value="'requestProcessingTime'"/> ! <Attribute name="AttributeName" value="'maxTime'"/> ! <Attribute name="AttributeName" value="'bytesSent'"/> ! <Attribute name="AttributeName" value="'bytesReceived'"/> ! <Attribute name="AttributeName" value="'processingTime'"/> ! <Attribute name="AttributeName" value="'errorCount'"/> |
|
From: Greg H. <gh...@us...> - 2006-04-12 17:29:34
|
Update of /cvsroot/mc4j/mc4j/application/branding/bundle/org/netbeans/core/windows/view/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6793/application/branding/bundle/org/netbeans/core/windows/view/ui Modified Files: Tag: ems_module_separation Bundle_mc4j.properties Log Message: Lots of changes towards the 2.0 alpha that I should've checked in a long time ago. Lots of stuff still broken. Only JBoss and JDK 1.5 have been tested. Index: Bundle_mc4j.properties =================================================================== RCS file: /cvsroot/mc4j/mc4j/application/branding/bundle/org/netbeans/core/windows/view/ui/Bundle_mc4j.properties,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** Bundle_mc4j.properties 19 Jan 2005 14:16:08 -0000 1.3 --- Bundle_mc4j.properties 12 Apr 2006 17:28:33 -0000 1.3.2.1 *************** *** 1,4 **** # {0} project name ! CTL_MainWindow_Title=MC4J 1.2 beta 8 ! CTL_MainWindow_Title_No_Project=MC4J 1.2 beta 8 --- 1,4 ---- # {0} project name ! CTL_MainWindow_Title=MC4J 1.3 ! CTL_MainWindow_Title_No_Project=MC4J 1.3 |
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6793/src/org/mc4j/console/connection/create Modified Files: Tag: ems_module_separation CallCreateVisualPanel.java CreateMBeanAction.java CreateVisualPanel.java CreateWizardDescriptor.java CreateWizardIterator.java Log Message: Lots of changes towards the 2.0 alpha that I should've checked in a long time ago. Lots of stuff still broken. Only JBoss and JDK 1.5 have been tested. Index: CallCreateVisualPanel.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CallCreateVisualPanel.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** CallCreateVisualPanel.java 5 Oct 2004 05:15:57 -0000 1.2 --- CallCreateVisualPanel.java 12 Apr 2006 17:28:37 -0000 1.2.2.1 *************** *** 21,33 **** import javax.swing.*; - import javax.swing.border.Border; import javax.swing.event.ChangeListener; - import javax.management.ObjectName; - import javax.management.NotCompliantMBeanException; - import javax.management.MBeanRegistrationException; - import javax.management.ReflectionException; - import javax.management.MBeanException; - import javax.management.MalformedObjectNameException; - import javax.management.InstanceAlreadyExistsException; import java.awt.*; --- 21,25 ---- *************** *** 55,60 **** public void executeCreate() { try { ! ObjectName objectName = new ObjectName(this.data.getObjectName()); ! this.descriptor.getServer().createMBean(this.data.getClassName(), objectName); this.textArea.setText( --- 47,51 ---- public void executeCreate() { try { ! this.descriptor.getConnection().createMBean(this.data.getClassName(), this.data.getObjectName()); this.textArea.setText( Index: CreateMBeanAction.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CreateMBeanAction.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** CreateMBeanAction.java 5 Oct 2004 05:15:57 -0000 1.2 --- CreateMBeanAction.java 12 Apr 2006 17:28:37 -0000 1.2.2.1 *************** *** 17,37 **** package org.mc4j.console.connection.create; ! import java.awt.Dialog; ! ! import javax.swing.SwingUtilities; ! import org.openide.DialogDisplayer; import org.openide.ErrorManager; - import org.openide.WizardDescriptor; import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.actions.NodeAction; ! import org.mc4j.console.connection.persistence.ConnectionSetDatabase; ! import org.mc4j.console.connection.persistence.ConnectionSettings; ! import org.mc4j.console.connection.wizard.ConnectionDescriptor; ! import org.mc4j.console.connection.ConnectionNode; ! import org.mc4j.console.ManagementNode; ! import org.mc4j.console.IConnectionNode; /** --- 17,29 ---- package org.mc4j.console.connection.create; ! import org.mc4j.console.connection.ConnectionNode; import org.openide.DialogDisplayer; import org.openide.ErrorManager; import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.actions.NodeAction; ! import javax.swing.*; ! import java.awt.*; /** *************** *** 50,54 **** ConnectionNode node = (ConnectionNode) nodes[0]; ! final CreateWizardDescriptor desc = new CreateWizardDescriptor(node.getMBeanServer()); --- 42,46 ---- ConnectionNode node = (ConnectionNode) nodes[0]; ! final CreateWizardDescriptor desc = new CreateWizardDescriptor(node.getEmsConnection()); Index: CreateVisualPanel.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CreateVisualPanel.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** CreateVisualPanel.java 5 Oct 2004 05:15:57 -0000 1.2 --- CreateVisualPanel.java 12 Apr 2006 17:28:37 -0000 1.2.2.1 *************** *** 17,26 **** package org.mc4j.console.connection.create; import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import javax.swing.event.ChangeListener; - import javax.management.ObjectName; - import javax.management.MalformedObjectNameException; import java.awt.*; --- 17,25 ---- package org.mc4j.console.connection.create; + import org.mc4j.ems.connection.EmsMalformedObjectNameException; import org.openide.WizardDescriptor; import org.openide.util.HelpCtx; import javax.swing.event.ChangeListener; import java.awt.*; *************** *** 126,132 **** private void objectNameTextLabelKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_objectNameTextLabelKeyTyped try { ! ObjectName name = ! new ObjectName(this.objectNameTextLabel.getText()); ! } catch (MalformedObjectNameException e) { this.objectNameTextLabel.setForeground(Color.red); } --- 125,132 ---- private void objectNameTextLabelKeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_objectNameTextLabelKeyTyped try { ! ! this.descriptor.getConnection().buildObjectName( ! this.objectNameTextLabel.getText()); ! } catch (EmsMalformedObjectNameException e) { this.objectNameTextLabel.setForeground(Color.red); } Index: CreateWizardIterator.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CreateWizardIterator.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** CreateWizardIterator.java 5 Oct 2004 05:15:57 -0000 1.2 --- CreateWizardIterator.java 12 Apr 2006 17:28:37 -0000 1.2.2.1 *************** *** 17,20 **** --- 17,25 ---- package org.mc4j.console.connection.create; + import org.openide.WizardDescriptor; + import org.openide.util.NbBundle; + + import javax.swing.event.ChangeEvent; + import javax.swing.event.ChangeListener; import java.io.IOException; import java.io.ObjectInputStream; *************** *** 24,41 **** import java.util.Set; - import javax.swing.event.ChangeEvent; - import javax.swing.event.ChangeListener; - import javax.management.MBeanServer; - - import org.openide.WizardDescriptor; - import org.openide.util.NbBundle; - - import org.mc4j.console.ManagementNode; - import org.mc4j.console.connection.wizard.ConnectionDescriptor; - import org.mc4j.console.connection.wizard.ConnectionVisualPanel; - import org.mc4j.console.connection.wizard.ServerInstallPanel; - import org.mc4j.console.connection.wizard.ClassPathListPanel; - import org.mc4j.console.connection.wizard.JBossConnectorChoicePanel; - /** * --- 29,32 ---- *************** *** 47,54 **** private CreateWizardDescriptor descriptor; - private MBeanServer server; // You should define what panels you want to use here: ! public CreateWizardIterator(MBeanServer server) { } --- 38,44 ---- private CreateWizardDescriptor descriptor; // You should define what panels you want to use here: ! public CreateWizardIterator() { } *************** *** 79,83 **** private transient int index = 0; ! protected final int getIndex() { return index; --- 69,73 ---- private transient int index = 0; ! protected final int getIndex() { return index; Index: CreateWizardDescriptor.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/connection/create/CreateWizardDescriptor.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** CreateWizardDescriptor.java 5 Oct 2004 05:15:57 -0000 1.2 --- CreateWizardDescriptor.java 12 Apr 2006 17:28:37 -0000 1.2.2.1 *************** *** 17,32 **** package org.mc4j.console.connection.create; ! import java.awt.Dimension; ! import java.awt.Toolkit; ! import java.net.MalformedURLException; ! import java.net.URL; ! import org.openide.WizardDescriptor; import org.openide.util.NbBundle; ! import org.mc4j.console.connection.persistence.ConnectionSettings; ! import org.mc4j.console.connection.wizard.ConnectionIterator; ! ! import javax.management.MBeanServer; /** --- 17,27 ---- package org.mc4j.console.connection.create; ! import org.mc4j.ems.connection.EmsConnection; import org.openide.WizardDescriptor; import org.openide.util.NbBundle; ! import java.awt.*; ! import java.net.MalformedURLException; ! import java.net.URL; /** *************** *** 40,44 **** private CreateMBeanData data; ! private MBeanServer server; /** Make a descriptor suited to use ConnectionIterator. --- 35,39 ---- private CreateMBeanData data; ! private EmsConnection connection; /** Make a descriptor suited to use ConnectionIterator. *************** *** 46,52 **** * style guidelines. */ ! public CreateWizardDescriptor(MBeanServer server) { ! this(new CreateWizardIterator(server)); ! this.server = server; this.data = new CreateMBeanData(); --- 41,47 ---- * style guidelines. */ ! public CreateWizardDescriptor(EmsConnection connection) { ! this(new CreateWizardIterator()); ! this.connection = connection; this.data = new CreateMBeanData(); *************** *** 58,63 **** } ! public MBeanServer getServer() { ! return server; } --- 53,58 ---- } ! public EmsConnection getConnection() { ! return connection; } |
