Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java?view=diff&rev=530474&r1=530473&r2=530474 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java Thu Apr 19 09:24:30 2007 @@ -20,29 +20,28 @@ */ package org.apache.qpid.management.ui.views; -import java.util.ArrayList; +import static org.apache.qpid.management.ui.Constants.BUTTON_CLEAR; +import static org.apache.qpid.management.ui.Constants.BUTTON_REFRESH; +import static org.apache.qpid.management.ui.Constants.DESCRIPTION; +import static org.apache.qpid.management.ui.Constants.FONT_BOLD; +import static org.apache.qpid.management.ui.Constants.FONT_BUTTON; +import static org.apache.qpid.management.ui.Constants.FONT_ITALIC; +import static org.apache.qpid.management.ui.Constants.SUBSCRIBE_BUTTON; +import static org.apache.qpid.management.ui.Constants.UNSUBSCRIBE_BUTTON; + import java.util.List; -import static org.apache.qpid.management.ui.Constants.*; import org.apache.qpid.management.ui.ApplicationRegistry; import org.apache.qpid.management.ui.ManagedBean; import org.apache.qpid.management.ui.ServerRegistry; import org.apache.qpid.management.ui.jmx.MBeanUtility; import org.apache.qpid.management.ui.model.NotificationInfoModel; import org.apache.qpid.management.ui.model.NotificationObject; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; @@ -52,71 +51,35 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.TabFolder; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.widgets.Form; -import org.eclipse.ui.forms.widgets.FormToolkit; /** * Creates control composite for Notifications tab * @author Bhupendra Bhardwaj */ -public class NotificationsTabControl extends TabControl -{ - private FormToolkit _toolkit; - private Form _form; - private Table table = null; - private TableViewer _tableViewer = null; - - private IStructuredContentProvider contentProvider = new ContentProviderImpl(); - private SelectionListener selectionListener = new SelectionListenerImpl(); - private SelectionListener comboListener = new ComboSelectionListener(); - - private Thread worker = null; - - private List<NotificationObject> _notifications = null; - private static final String COLUMN_SEQ = "Sequence No"; - private static final String COLUMN_TIME = "TimeStamp"; - private static final String COLUMN_TYPE = "Type"; - private static final String COLUMN_MSG = "Notification Message"; - private static final String[] _tableTitles = new String [] { - COLUMN_SEQ, - COLUMN_TIME, - COLUMN_TYPE, - COLUMN_MSG - }; +public class NotificationsTabControl extends VHNotificationsTabControl +{ + private static final String SELECT_NOTIFICATIONNAME = "Select Notification"; + private static final String SELECT_NOTIFICATIONTYPE = "Select Type"; + private SelectionListener selectionListener; + private SelectionListener comboListener; private Combo notificationNameCombo = null; private Combo typesCombo = null; private Label descriptionLabel = null; private Button _subscribeButton = null; private Button _unsubscribeButton = null; - private Button _clearButton = null; - private Button _refreshButton = null; - public NotificationsTabControl(TabFolder tabFolder) { super(tabFolder); - _toolkit = new FormToolkit(_tabFolder.getDisplay()); - _form = _toolkit.createForm(_tabFolder); - GridLayout gridLayout = new GridLayout(); - gridLayout.marginWidth = 0; - gridLayout.marginHeight = 0; - _form.getBody().setLayout(gridLayout); - - createWidgets(); - worker = new Thread(new Worker()); - worker.start(); } - private void createWidgets() + protected void createWidgets() { + selectionListener = new SelectionListenerImpl(); + comboListener = new ComboSelectionListener(); createNotificationInfoComposite(); //addFilterComposite(); addButtons(); @@ -124,14 +87,6 @@ } /** - * @see TabControl#getControl() - */ - public Control getControl() - { - return _form; - } - - /** * Creates composite and populates for displaying Notification Information (name, type, description) * and creates buttons for subscribing or unsubscribing for notifications */ @@ -205,7 +160,7 @@ /** * Creates clear buttin and refresh button */ - private void addButtons() + protected void addButtons() { Composite composite = _toolkit.createComposite(_form.getBody(), SWT.NONE); composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); @@ -224,8 +179,9 @@ if (_mbean == null) return; + IStructuredSelection ss = (IStructuredSelection)_tableViewer.getSelection(); ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean); - serverRegistry.clearNotifications(_mbean); + serverRegistry.clearNotifications(_mbean, ss.toList()); refresh(); } }); @@ -247,155 +203,13 @@ } }); } - - /** - * Creates table to display notifications - */ - private void createTable() - { - table = _toolkit.createTable(_form.getBody(), SWT.FULL_SELECTION); - table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - - TableColumn column = new TableColumn(table, SWT.NONE); - column.setText(_tableTitles[0]); - column.pack(); //column.setWidth(200); - - column = new TableColumn(table, SWT.NONE); - column.setText(_tableTitles[1]); - column.setWidth(150); - - column = new TableColumn(table, SWT.NONE); - column.setText(_tableTitles[2]); - column.setWidth(100); - - column = new TableColumn(table, SWT.NONE); - column.setText(_tableTitles[3]); - column.setWidth(500); - - table.setHeaderVisible(true); - table.setLinesVisible(true); - } - - /** - * Creates JFace viewer for the notifications table - */ - protected void createTableViewer() - { - createTable(); - _tableViewer = new TableViewer(table); - //_tableViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - _tableViewer.setUseHashlookup(true); - _tableViewer.setContentProvider(contentProvider); - _tableViewer.setLabelProvider(new LabelProviderImpl()); - _tableViewer.setColumnProperties(_tableTitles); - /* - CellEditor[] cellEditors = new CellEditor[_tableTitles.length]; - TextCellEditor textEditor = new TextCellEditor(table); - cellEditors[0] = textEditor; - textEditor = new TextCellEditor(table); - cellEditors[1] = textEditor; - textEditor = new TextCellEditor(table); - cellEditors[2] = textEditor; - textEditor = new TextCellEditor(table); - cellEditors[3] = textEditor; - - // Assign the cell editors to the viewer - _tableViewer.setCellEditors(cellEditors); - _tableViewer.setCellModifier(new TableCellModifier()); - */ - - addTableListeners(); - - //_tableViewer.addSelectionChangedListener(new ); - - //_notificationDetails = new Composite(_tabControl, SWT.BORDER); - //_notificationDetails.setLayoutData(new GridData(GridData.FILL_BOTH)); - - //_tabControl.layout(); - //viewerComposite.layout(); - } - - /** - * Adds listeners to the viewer for displaying notification details - */ - private void addTableListeners() - { - _tableViewer.addDoubleClickListener(new IDoubleClickListener() - { - Display display = null; - Shell shell = null; - public void doubleClick(DoubleClickEvent event) - { - display = Display.getCurrent(); - shell = new Shell(display, SWT.BORDER | SWT.CLOSE | SWT.MIN | - SWT.MAX | SWT.RESIZE); - shell.setText("Notification"); - - int x = display.getBounds().width; - int y = display.getBounds().height; - shell.setBounds(x/4, y/4, x/2, y/3); - StructuredSelection selection = (StructuredSelection)event.getSelection(); - createPopupContents((NotificationObject)selection.getFirstElement()); - shell.open(); - while (!shell.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - - //If you create it, you dispose it. - shell.dispose(); - } - - private void createPopupContents(NotificationObject obj) - { - shell.setLayout(new GridLayout()); - - Composite parent = new Composite(shell, SWT.NONE); - parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - GridLayout layout = new GridLayout(4, true); - parent.setLayout(layout); - - Label key = new Label(parent, SWT.TRAIL); - key.setText(COLUMN_SEQ); - GridData layoutData = new GridData(SWT.TRAIL, SWT.TOP, false, false,1,1); - key.setLayoutData(layoutData); - Text value = new Text(parent, SWT.BEGINNING | SWT.BORDER |SWT.READ_ONLY); - value.setText(""+obj.getSequenceNo()); - value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false,3,1)); - - // Time row - key = new Label(parent, SWT.TRAIL); - key.setText(COLUMN_TIME); - key.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, true, false,1,1)); - value = new Text(parent, SWT.BEGINNING | SWT.BORDER | SWT.READ_ONLY); - value.setText(""+obj.getTimeStamp()); - value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false,3,1)); - - key = new Label(parent, SWT.TRAIL); - key.setText(COLUMN_TYPE); - key.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, true, false,1,1)); - value = new Text(parent, SWT.BEGINNING | SWT.BORDER | SWT.READ_ONLY); - value.setText(""+obj.getType()); - value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false,3,1)); - - key = new Label(parent, SWT.TRAIL); - key.setText(COLUMN_MSG); - key.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, true, false,1,1)); - value = new Text(parent, SWT.MULTI | SWT.WRAP| SWT.BORDER | SWT.V_SCROLL | SWT.READ_ONLY); - value.setText(""+obj.getMessage()); - GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1); - gridData.heightHint = 100; - value.setLayoutData(gridData); - } - }); - } - + @Override public void refresh(ManagedBean mbean) { _mbean = mbean; _notifications = null; + _table.deselectAll(); _tableViewer.getTable().clearAll(); if (_mbean == null) @@ -431,9 +245,10 @@ _form.getBody().layout(true, true); } - private void refresh() + public void refresh() { _notifications = null; + _table.deselectAll(); _tableViewer.getTable().clearAll(); } @@ -444,7 +259,11 @@ { notificationNameCombo.removeAll(); NotificationInfoModel[] items = MBeanUtility.getNotificationInfo(_mbean); - notificationNameCombo.add("Select Notification"); + if (items.length > 1) + { + notificationNameCombo.add(SELECT_NOTIFICATIONNAME); + } + for (int i = 0; i < items.length; i++) { notificationNameCombo.add(items[i].getName()); @@ -457,6 +276,7 @@ typesCombo.select(0); typesCombo.setEnabled(false); + populateNotificationType(notificationNameCombo.getItem(0)); checkForEnablingButtons(); } @@ -466,7 +286,8 @@ private void checkForEnablingButtons() { int nameIndex = notificationNameCombo.getSelectionIndex(); - if (nameIndex == 0) + int itemCount = notificationNameCombo.getItems().length; + if ((itemCount > 1) && (nameIndex == 0)) { _subscribeButton.setEnabled(false); _unsubscribeButton.setEnabled(false); @@ -475,7 +296,8 @@ } int typeIndex = typesCombo.getSelectionIndex(); - if (typeIndex == 0) + itemCount = typesCombo.getItems().length; + if ((itemCount > 1) && (typeIndex == 0)) { _subscribeButton.setEnabled(false); _unsubscribeButton.setEnabled(false); @@ -560,164 +382,38 @@ Combo combo = (Combo)e.getSource(); if (combo == notificationNameCombo) { - if (combo.getSelectionIndex() == 0) - { - descriptionLabel.setText(""); - typesCombo.select(0); - typesCombo.setEnabled(false); - return; - } - String index = combo.getItem(combo.getSelectionIndex()); - NotificationInfoModel data = (NotificationInfoModel)combo.getData(index); - descriptionLabel.setText(data.getDescription()); - typesCombo.removeAll(); - typesCombo.setItems(data.getTypes()); - typesCombo.add("Select Type", 0); - typesCombo.select(0); - typesCombo.setEnabled(true); + String selectedItem = combo.getItem(combo.getSelectionIndex()); + populateNotificationType(selectedItem); } checkForEnablingButtons(); } } - /** - * Content provider class for the table viewer - */ - private class ContentProviderImpl implements IStructuredContentProvider, INotificationViewer + private void populateNotificationType(String notificationName) { - public void inputChanged(Viewer v, Object oldInput, Object newInput) - { - - } - public void dispose() - { - - } - public Object[] getElements(Object parent) + NotificationInfoModel data = (NotificationInfoModel)notificationNameCombo.getData(notificationName); + if (data == null) { - return _notifications.toArray(new NotificationObject[0]); - } - public void addNotification(NotificationObject notification) - { - _tableViewer.add(notification); - } - - public void addNotification(List<NotificationObject> notificationList) - { - _tableViewer.add(notificationList.toArray(new NotificationObject[0])); - } - } - - /** - * Label provider for the table viewer - */ - private class LabelProviderImpl implements ITableLabelProvider - { - List<ILabelProviderListener> listeners = new ArrayList<ILabelProviderListener>(); - public void addListener(ILabelProviderListener listener) - { - listeners.add(listener); - } - - public void dispose(){ - - } - - public Image getColumnImage(Object element, int columnIndex) - { - return null; - } - - public String getColumnText(Object element, int columnIndex) - { - String result = null; - NotificationObject t = (NotificationObject)element; - switch(columnIndex) - { - case 0 : - result = String.valueOf(t.getSequenceNo()); - break; - case 1 : - result = String.valueOf(t.getTimeStamp()); - break; - case 2 : - result = t.getType(); - break; - case 3 : - result = t.getMessage(); - break; - default : - result = ""; - } - - return result; - } - - public boolean isLabelProperty(Object element, String property) - { - return false; - } - - public void removeListener(ILabelProviderListener listener) - { - listeners.remove(listener); - } - } // end of LabelProviderImpl - - private boolean workerRunning = false; - private void setWorkerRunning(boolean running) - { - workerRunning = running; - } - - /** - * Worker class which keeps looking if there are new notifications coming from server for the selected mbean - */ - private class Worker implements Runnable - { - public void run() - { - Display display = _tabFolder.getDisplay(); - while(true) - { - if (!workerRunning || _mbean == null || display == null) - { - sleep(); - continue; - } - - display.syncExec(new Runnable() - { - public void run() - { - setWorkerRunning(_form.isVisible()); - if (!workerRunning) return; - - updateTableViewer(); - } - }); - - sleep(); - } + descriptionLabel.setText(""); + typesCombo.select(0); + typesCombo.setEnabled(false); + return; } - - private void sleep() + descriptionLabel.setText(data.getDescription()); + typesCombo.removeAll(); + typesCombo.setItems(data.getTypes()); + if (typesCombo.getItemCount() > 1) { - try - { - Thread.sleep(2000); - } - catch(Exception ex) - { - - } + typesCombo.add(SELECT_NOTIFICATIONTYPE, 0); } + typesCombo.select(0); + typesCombo.setEnabled(true); } /** * Updates the table with new notifications received from mbean server for the selected mbean */ - private void updateTableViewer() + protected void updateTableViewer() { ServerRegistry serverRegistry = ApplicationRegistry.getServerRegistry(_mbean); List<NotificationObject> newList = serverRegistry.getNotifications(_mbean);
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java?view=diff&rev=530474&r1=530473&r2=530474 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java Thu Apr 19 09:24:30 2007 @@ -20,10 +20,16 @@ */ package org.apache.qpid.management.ui.views; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.TabularDataSupport; + import static org.apache.qpid.management.ui.Constants.*; import org.apache.qpid.management.ui.ApplicationRegistry; import org.apache.qpid.management.ui.ManagedBean; @@ -76,7 +82,7 @@ private SelectionListener operationExecutionListener = new OperationExecutionListener(); private SelectionListener refreshListener = new RefreshListener(); private SelectionListener parameterSelectionListener = new ParameterSelectionListener(); - private SelectionListener bolleanSelectionListener = new BooleanSelectionListener(); + private SelectionListener booleanSelectionListener = new BooleanSelectionListener(); private VerifyListener verifyListener = new VerifyListenerImpl(); private KeyListener keyListener = new KeyListenerImpl(); private KeyListener headerBindingListener = new HeaderBindingKeyListener(); @@ -249,6 +255,8 @@ formData.top = new FormAttachment(0, parameterPositionOffset); formData.left = new FormAttachment(label, 5); formData.right = new FormAttachment(valueWidth); + // this will contain the list of items, if the list is to be made available to choose from + // e.g. the list of exchanges String[] items = null; if (param.getName().equals(QUEUE)) { @@ -269,6 +277,15 @@ { items = EXCHANGE_TYPE_VALUES; } + else if (_mbean.isAdmin() && param.getName().equals(OPERATION_PARAM_USERNAME) + && !_opData.getName().equals(OPERATION_CREATEUSER)) + { + List<String> list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames(); + if (list != null && !list.isEmpty()) + { + items = list.toArray(new String[0]); + } + } if (items != null) { @@ -295,12 +312,17 @@ Button booleanButton = _toolkit.createButton(_paramsComposite, "", SWT.CHECK); booleanButton.setLayoutData(formData); booleanButton.setData(param); - booleanButton.addSelectionListener(bolleanSelectionListener); + booleanButton.addSelectionListener(booleanSelectionListener); valueInCombo = true; } else { - Text text = _toolkit.createText(_paramsComposite, "", SWT.NONE); + int style = SWT.NONE; + if (PASSWORD.equalsIgnoreCase(param.getName())) + { + style = SWT.PASSWORD; + } + Text text = _toolkit.createText(_paramsComposite, "", style); formData = new FormData(); formData.top = new FormAttachment(0, parameterPositionOffset); formData.left = new FormAttachment(label, 5); @@ -530,6 +552,8 @@ ((org.eclipse.swt.widgets.List)controls[i]).deselectAll(); else if (controls[i] instanceof Text) ((Text)controls[i]).setText(""); + else if (controls[i] instanceof Button) + ((Button)controls[i]).setSelection(false); else if (controls[i] instanceof Composite) clearParameterValues((Composite)controls[i]); } @@ -557,6 +581,21 @@ } // End of custom code + + // customized for passwords + if (PASSWORD.equalsIgnoreCase(param.getName())) + { + try + { + param.setValueFromString(ViewUtility.getHashedString(param.getValue())); + } + catch (Exception ex) + { + MBeanUtility.handleException(_mbean, ex); + return; + } + } + // end of customization ViewUtility.popupInfoMessage(_form.getText(), "Please select the " + ViewUtility.getDisplayText(param.getName())); @@ -609,6 +648,17 @@ return; } + // Custom code for Admin mbean operation + /* These custome codes here are to make the GUI look more user friendly. + * Here we are adding the users to a list, which will be used to list username to be selected on + * pages like "delete user", "set password" instead of typing the username + */ + if (_mbean.isAdmin() && _opData.getName().equals(OPERATION_VIEWUSERS)) + { + ApplicationRegistry.getServerRegistry(_mbean).setUserList(extractUserList(result)); + } + // end of custom code + // Some mbeans have only "type" and no "name". String title = _mbean.getType(); if (_mbean.getName() != null && _mbean.getName().length() != 0) @@ -616,9 +666,15 @@ title = _mbean.getName(); } - if (_opData.getReturnType().equals("void") || _opData.getReturnType().equals("java.lang.Void")) + if (_opData.isReturnTypeVoid()) + { + ViewUtility.popupInfoMessage(title, OPERATION_SUCCESSFUL); + } + else if (_opData.isReturnTypeBoolean()) { - ViewUtility.popupInfoMessage(title, "Operation successful"); + boolean success = Boolean.parseBoolean(result.toString()); + String message = success ? OPERATION_SUCCESSFUL : OPERATION_UNSUCCESSFUL; + ViewUtility.popupInfoMessage(title, message); } else if (_opData.getParameters() != null && !_opData.getParameters().isEmpty()) { @@ -632,6 +688,24 @@ _form.layout(); } + } + + private List<String> extractUserList(Object result) + { + if (!(result instanceof TabularDataSupport)) + { + return null; + } + + TabularDataSupport tabularData = (TabularDataSupport)result; + Collection<CompositeData> records = tabularData.values(); + List<String> list = new ArrayList<String>(); + for (CompositeData data : records) + { + list.add(data.get(USERNAME).toString()); + } + Collections.sort(list); + return list; } /** Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java?view=diff&rev=530474&r1=530473&r2=530474 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java Thu Apr 19 09:24:30 2007 @@ -69,7 +69,18 @@ return null; } - public abstract void refresh(ManagedBean mbean); + public void refresh(ManagedBean mbean) + { + if (mbean == null) + { + refresh(); + } + } + + public void refresh() + { + + } public void refresh(ManagedBean mbean, OperationData opData) { Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java?view=diff&rev=530474&r1=530473&r2=530474 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java Thu Apr 19 09:24:30 2007 @@ -31,7 +31,6 @@ { private String _name; private String _type; - private String _url; private String _virtualHost; private TreeObject _parent; private List<TreeObject> _children = new ArrayList<TreeObject>(); @@ -88,16 +87,6 @@ { return _type; } - - public String getUrl() - { - return _url; - } - - public void setUrl(String url) - { - this._url = url; - } public String getVirtualHost() { @@ -131,7 +120,6 @@ if (parent != null) { - this._url = parent.getUrl(); parent.addChild(this); } } Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java?view=diff&rev=530474&r1=530473&r2=530474 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java Thu Apr 19 09:24:30 2007 @@ -20,8 +20,13 @@ */ package org.apache.qpid.management.ui.views; +import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Set; @@ -70,6 +75,8 @@ public static final String PREV = "Previous"; public static final String INDEX = "Index"; + private static final Comparator tabularDataComparator = new TabularDataComparator(); + private static List<String> SUPPORTED_ARRAY_DATATYPES = new ArrayList<String>(); static { @@ -121,6 +128,9 @@ text.setLayoutData(layoutData); return; } + + Collections.sort(list, tabularDataComparator); + // Attach the tabular record to be retrieved and shown later when record is traversed // using first/next/previous/last buttons composite.setData(list); @@ -547,6 +557,65 @@ for (int i = 0; i < oldControls.length; i++) { oldControls[i].dispose(); + } + } + + public static String getHashedString(Object text) throws NoSuchAlgorithmException, UnsupportedEncodingException + { + char[] chars = getHash((String)text); + return new String(chars); + } + + public static char[] getHash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException + { + byte[] data = text.getBytes("utf-8"); + + MessageDigest md = MessageDigest.getInstance("MD5"); + + for (byte b : data) + { + md.update(b); + } + + byte[] digest = md.digest(); + + char[] hash = new char[digest.length ]; + + int index = 0; + for (byte b : digest) + { + hash[index++] = (char) b; + } + + return hash; + } + + private static class TabularDataComparator implements java.util.Comparator<Map.Entry> + { + public int compare(Map.Entry data1, Map.Entry data2) + { + if (data1.getKey() instanceof List) + { + Object obj1 = ((List)data1.getKey()).get(0); + Object obj2 = ((List)data2.getKey()).get(0); + String str1 = obj1.toString(); + String str2 = obj2.toString(); + if (obj1 instanceof String) + { + return str1.compareTo(str2); + } + + try + { + return Long.valueOf(str1).compareTo(Long.valueOf(str2)); + } + catch (Exception ex) + { + return -1; + } + } + + return -1; } } } Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini?view=diff&rev=530474&r1=530473&r2=530474 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini Thu Apr 19 09:24:30 2007 @@ -22,5 +22,5 @@ osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui eclipse.product=org.apache.qpid.management.ui.product eclipse.application=org.apache.qpid.management.ui.application [EMAIL PROTECTED]:start,[EMAIL PROTECTED],com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench [EMAIL PROTECTED]:start,[EMAIL PROTECTED],com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.forms,jmxremote.optional,org.eclipse.ui.workbench osgi.bundles.defaultStartLevel=4 Propchange: incubator/qpid/trunk/qpid/java/perftests/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Apr 19 09:24:30 2007 @@ -1,2 +1,4 @@ target qpid-perftests.iml +qpid-perftests.ipr +qpid-perftests.iws Copied: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh (from r525487, incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-1.sh) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh?view=diff&rev=530474&p1=incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-1.sh&r1=525487&p2=incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh&r2=530474 ============================================================================== --- incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-1.sh (original) +++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh Thu Apr 19 09:24:30 2007 @@ -1 +1 @@ -./PQ-Qpid-1.sh & ./PQ-Qpid-1-P.sh +./PQ-Qpid-1.sh $@ & ./PQ-Qpid-1-P.sh $@ Copied: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh (from r525487, incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-2.sh) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh?view=diff&rev=530474&p1=incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-2.sh&r1=525487&p2=incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh&r2=530474 ============================================================================== --- incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-2.sh (original) +++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh Thu Apr 19 09:24:30 2007 @@ -1 +1 @@ -./PQ-Qpid-2.sh & ./PQ-Qpid-2-P.sh +./PQ-Qpid-2.sh $@ & ./PQ-Qpid-2-P.sh $@ Copied: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh (from r525487, incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-3.sh) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh?view=diff&rev=530474&p1=incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-3.sh&r1=525487&p2=incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh&r2=530474 ============================================================================== --- incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-3.sh (original) +++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh Thu Apr 19 09:24:30 2007 @@ -1 +1 @@ -./PQ-Qpid-3.sh & ./PQ-Qpid-3-P.sh +./PQ-Qpid-3.sh $@ & ./PQ-Qpid-3-P.sh $@ Copied: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh (from r525487, incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-4.sh) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh?view=diff&rev=530474&p1=incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-4.sh&r1=525487&p2=incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh&r2=530474 ============================================================================== --- incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-4.sh (original) +++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh Thu Apr 19 09:24:30 2007 @@ -1 +1 @@ -./PQ-Qpid-4.sh & ./PQ-Qpid-4-P.sh +./PQ-Qpid-4.sh $@ & ./PQ-Qpid-4-P.sh $@ Copied: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh (from r525487, incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-5.sh) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh?view=diff&rev=530474&p1=incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-5.sh&r1=525487&p2=incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh&r2=530474 ============================================================================== --- incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-5.sh (original) +++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh Thu Apr 19 09:24:30 2007 @@ -1 +1 @@ -./PQ-Qpid-5.sh & ./PQ-Qpid-5-P.sh +./PQ-Qpid-5.sh $@ & ./PQ-Qpid-5-P.sh $@ Copied: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh (from r525487, incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-6.sh) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh?view=diff&rev=530474&p1=incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-6.sh&r1=525487&p2=incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh&r2=530474 ============================================================================== --- incubator/qpid/branches/M2/java/perftests/etc/scripts/CTQ-Qpid-6.sh (original) +++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh Thu Apr 19 09:24:30 2007 @@ -1 +1 @@ -./PQ-Qpid-6.sh & ./PQ-Qpid-6-P.sh +./PQ-Qpid-6.sh $@ & ./PQ-Qpid-6-P.sh $@ Copied: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh (from r525487, incubator/qpid/branches/M2/java/perftests/etc/scripts/PT-Qpid-13.sh) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh?view=diff&rev=530474&p1=incubator/qpid/branches/M2/java/perftests/etc/scripts/PT-Qpid-13.sh&r1=525487&p2=incubator/qpid/trunk/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh&r2=530474 ============================================================================== --- incubator/qpid/branches/M2/java/perftests/etc/scripts/PT-Qpid-13.sh (original) +++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh Thu Apr 19 09:24:30 2007 @@ -10,15 +10,15 @@ done echo "Starting 6 parallel tests" -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.1 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd1 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.1 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd1 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.2 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd2 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.2 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd2 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.3 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd3 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.3 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd3 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.4 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd4 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.4 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinatioNname=newd4 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.5 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd5 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.5 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd5 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.6 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=newd6 uniqueDests=true BatchSize=250 transacted=true CommitBatchSize=50 -o $QPID_WORK/results ${ARGS} +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-13.6 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=newd6 uniqueDests=true batchSize=250 transacted=true commitBatchSize=50 -o $QPID_WORK/results ${ARGS} Copied: incubator/qpid/trunk/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh (from r525487, incubator/qpid/branches/M2/java/perftests/etc/scripts/PT-Qpid-14.sh) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh?view=diff&rev=530474&p1=incubator/qpid/branches/M2/java/perftests/etc/scripts/PT-Qpid-14.sh&r1=525487&p2=incubator/qpid/trunk/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh&r2=530474 ============================================================================== --- incubator/qpid/branches/M2/java/perftests/etc/scripts/PT-Qpid-14.sh (original) +++ incubator/qpid/trunk/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh Thu Apr 19 09:24:30 2007 @@ -10,14 +10,14 @@ done echo "Starting 6 parallel tests" -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping1 BatchSize=250 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping1 batchSize=250 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping2 BatchSize=250 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping2 batchSize=250 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping3 BatchSize=250 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping3 batchSize=250 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256destinationname=ping4 BatchSize=250 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[200] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256destinationname=ping4 batchSize=250 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping5 BatchSize=250 -o $QPID_WORK/results ${ARGS} & +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping5 batchSize=250 -o $QPID_WORK/results ${ARGS} & -java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messagesize=256 destinationname=ping6 BatchSize=250 -o $QPID_WORK/results ${ARGS} +java -Xms256m -Dlog4j.configuration=perftests.log4j -Xmx3072m -Dbadger.level=warn -Damqj.test.logging.level=info -Damqj.logging.level=warn ${JAVA_OPTS} -cp qpid-perftests-1.0-incubating-M2-SNAPSHOT-all-test-deps.jar uk.co.thebadgerset.junit.extensions.TKTestRunner -n PT-Qpid-14 -s [250] -c[100] -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true messageSize=256 destinationName=ping6 batchSize=250 -o $QPID_WORK/results ${ARGS}
