activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r379619 [28/30] - in /incubator/activemq/trunk: ./ activecluster/ activecluster/src/java/org/apache/activecluster/ activecluster/src/java/org/apache/activecluster/election/ activecluster/src/java/org/apache/activecluster/election/impl/ acti...
Date Tue, 21 Feb 2006 23:14:17 GMT
Modified: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java (original)
+++ incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java Tue Feb 21 15:12:56 2006
@@ -1,112 +1,112 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * 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.activemq.sampler.control.gui;
-
-import org.apache.jmeter.gui.util.VerticalPanel;
-import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
-import org.apache.jmeter.testelement.TestElement;
-import org.activemq.sampler.config.gui.ConsumerSysTestConfigGui;
-import org.activemq.sampler.ConsumerSysTest;
-
-import java.awt.BorderLayout;
-
-/**
- * Form in JMeter to enter default values for generating the sampler set.
- */
-public class ConsumerSysTestSamplerGui extends AbstractSamplerGui {
-
-    //private LoginConfigGui loginPanel;
-    private ConsumerSysTestConfigGui TcpDefaultPanel;
-
-    /**
-     * Constructor for the ConsumerSamplerGui object
-     */
-    public ConsumerSysTestSamplerGui() {
-
-        init();
-    }
-
-    /**
-     * Method for configuring the COnsumerSamplerGui
-     *
-     * @param element
-     */
-    public void configure(TestElement element) {
-
-        super.configure(element);
-        //loginPanel.configure(element);
-        TcpDefaultPanel.configure(element);
-    }
-
-    /**
-     * Method for creating test elements
-     *
-     * @return returns a sampler
-     */
-    public TestElement createTestElement() {
-
-        ConsumerSysTest sampler = new ConsumerSysTest();
-        modifyTestElement(sampler);
-        return sampler;
-    }
-
-    /**
-     * Method to modify test elements
-     *
-     * @param sampler
-     */
-    public void modifyTestElement(TestElement sampler) {
-
-        sampler.clear();
-        ((ConsumerSysTest) sampler).addTestElement(TcpDefaultPanel.createTestElement());
-        //((Consumer) sampler).addTestElement(loginPanel.createTestElement());
-        this.configureTestElement(sampler);
-    }
-
-    /**
-     * Getter method for the LabelResource property.
-     *
-     * @return String constant "consumer_sample_title"
-     */
-    public String getLabelResource() {
-
-        return "consumer_sys_test_sample_title";
-    }
-
-    /**
-     * Method to initialize ConsumerSamplerGui. Sets up the layout of the GUI.
-     */
-    private void init() {
-
-        setLayout(new BorderLayout(0, 5));
-        setBorder(makeBorder());
-
-        add(makeTitlePanel(), BorderLayout.NORTH);
-
-        VerticalPanel mainPanel = new VerticalPanel();
-
-        TcpDefaultPanel = new ConsumerSysTestConfigGui(false);
-        mainPanel.add(TcpDefaultPanel);
-
-        //loginPanel = new LoginConfigGui(false);
-        //loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config")));
-        //mainPanel.add(loginPanel);
-
-        add(mainPanel, BorderLayout.CENTER);
-    }
-
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * 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.activemq.sampler.control.gui;
+
+import org.apache.jmeter.gui.util.VerticalPanel;
+import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
+import org.apache.jmeter.testelement.TestElement;
+import org.activemq.sampler.config.gui.ConsumerSysTestConfigGui;
+import org.activemq.sampler.ConsumerSysTest;
+
+import java.awt.BorderLayout;
+
+/**
+ * Form in JMeter to enter default values for generating the sampler set.
+ */
+public class ConsumerSysTestSamplerGui extends AbstractSamplerGui {
+
+    //private LoginConfigGui loginPanel;
+    private ConsumerSysTestConfigGui TcpDefaultPanel;
+
+    /**
+     * Constructor for the ConsumerSamplerGui object
+     */
+    public ConsumerSysTestSamplerGui() {
+
+        init();
+    }
+
+    /**
+     * Method for configuring the COnsumerSamplerGui
+     *
+     * @param element
+     */
+    public void configure(TestElement element) {
+
+        super.configure(element);
+        //loginPanel.configure(element);
+        TcpDefaultPanel.configure(element);
+    }
+
+    /**
+     * Method for creating test elements
+     *
+     * @return returns a sampler
+     */
+    public TestElement createTestElement() {
+
+        ConsumerSysTest sampler = new ConsumerSysTest();
+        modifyTestElement(sampler);
+        return sampler;
+    }
+
+    /**
+     * Method to modify test elements
+     *
+     * @param sampler
+     */
+    public void modifyTestElement(TestElement sampler) {
+
+        sampler.clear();
+        ((ConsumerSysTest) sampler).addTestElement(TcpDefaultPanel.createTestElement());
+        //((Consumer) sampler).addTestElement(loginPanel.createTestElement());
+        this.configureTestElement(sampler);
+    }
+
+    /**
+     * Getter method for the LabelResource property.
+     *
+     * @return String constant "consumer_sample_title"
+     */
+    public String getLabelResource() {
+
+        return "consumer_sys_test_sample_title";
+    }
+
+    /**
+     * Method to initialize ConsumerSamplerGui. Sets up the layout of the GUI.
+     */
+    private void init() {
+
+        setLayout(new BorderLayout(0, 5));
+        setBorder(makeBorder());
+
+        add(makeTitlePanel(), BorderLayout.NORTH);
+
+        VerticalPanel mainPanel = new VerticalPanel();
+
+        TcpDefaultPanel = new ConsumerSysTestConfigGui(false);
+        mainPanel.add(TcpDefaultPanel);
+
+        //loginPanel = new LoginConfigGui(false);
+        //loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config")));
+        //mainPanel.add(loginPanel);
+
+        add(mainPanel, BorderLayout.CENTER);
+    }
+
+}

Propchange: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSamplerGui.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java (original)
+++ incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java Tue Feb 21 15:12:56 2006
@@ -1,117 +1,117 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * 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.activemq.sampler.control.gui;
-
-import org.apache.jmeter.config.gui.LoginConfigGui;
-import org.apache.jmeter.gui.util.VerticalPanel;
-import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
-import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.util.JMeterUtils;
-import org.activemq.sampler.config.gui.ProducerConfigGui;
-import org.activemq.sampler.config.gui.ProducerSysTestConfigGui;
-import org.activemq.sampler.Producer;
-import org.activemq.sampler.ProducerSysTest;
-
-import javax.swing.BorderFactory;
-
-import java.awt.BorderLayout;
-
-/**
- * Form in JMeter to enter default values for generating the sampler set.
- */
-public class ProducerSysTestSamplerGui extends AbstractSamplerGui {
-
-    //private LoginConfigGui loginPanel;
-    private ProducerSysTestConfigGui TcpDefaultPanel;
-
-    /**
-     * Constructor for the ProducerSamplerGui object
-     */
-    public ProducerSysTestSamplerGui() {
-
-        init();
-    }
-
-    /**
-     * Method for configuring the ProducerSamplerGui
-     *
-     * @param element
-     */
-    public void configure(TestElement element) {
-
-        super.configure(element);
-        //loginPanel.configure(element);
-        TcpDefaultPanel.configure(element);
-    }
-
-    /**
-     * Method for creating test elements
-     *
-     * @return returns a sampler
-     */
-    public TestElement createTestElement() {
-
-        ProducerSysTest sampler = new ProducerSysTest();
-        modifyTestElement(sampler);
-        return sampler;
-    }
-
-    /**
-     * Method to modify test elements
-     *
-     * @param sampler
-     */
-    public void modifyTestElement(TestElement sampler) {
-
-        sampler.clear();
-        ((ProducerSysTest) sampler).addTestElement(TcpDefaultPanel.createTestElement());
-        //((Producer) sampler).addTestElement(loginPanel.createTestElement());
-        this.configureTestElement(sampler);
-    }
-
-    /**
-     * Getter method for the LabelResource property.
-     *
-     * @return String constant "producer_sample_title"
-     */
-    public String getLabelResource() {
-
-        return "producer_sys_test_sample_title";
-    }
-
-    /**
-     * Method to initialize ProducerSamplerGui. Sets up the layout of the GUI.
-     */
-    private void init() {
-
-        setLayout(new BorderLayout(0, 5));
-        setBorder(makeBorder());
-
-        add(makeTitlePanel(), BorderLayout.NORTH);
-
-        VerticalPanel mainPanel = new VerticalPanel();
-
-        TcpDefaultPanel = new ProducerSysTestConfigGui(false);
-        mainPanel.add(TcpDefaultPanel);
-
-        //loginPanel = new LoginConfigGui(false);
-        //loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config")));
-        //mainPanel.add(loginPanel);
-
-        add(mainPanel, BorderLayout.CENTER);
-    }
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * 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.activemq.sampler.control.gui;
+
+import org.apache.jmeter.config.gui.LoginConfigGui;
+import org.apache.jmeter.gui.util.VerticalPanel;
+import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
+import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.util.JMeterUtils;
+import org.activemq.sampler.config.gui.ProducerConfigGui;
+import org.activemq.sampler.config.gui.ProducerSysTestConfigGui;
+import org.activemq.sampler.Producer;
+import org.activemq.sampler.ProducerSysTest;
+
+import javax.swing.BorderFactory;
+
+import java.awt.BorderLayout;
+
+/**
+ * Form in JMeter to enter default values for generating the sampler set.
+ */
+public class ProducerSysTestSamplerGui extends AbstractSamplerGui {
+
+    //private LoginConfigGui loginPanel;
+    private ProducerSysTestConfigGui TcpDefaultPanel;
+
+    /**
+     * Constructor for the ProducerSamplerGui object
+     */
+    public ProducerSysTestSamplerGui() {
+
+        init();
+    }
+
+    /**
+     * Method for configuring the ProducerSamplerGui
+     *
+     * @param element
+     */
+    public void configure(TestElement element) {
+
+        super.configure(element);
+        //loginPanel.configure(element);
+        TcpDefaultPanel.configure(element);
+    }
+
+    /**
+     * Method for creating test elements
+     *
+     * @return returns a sampler
+     */
+    public TestElement createTestElement() {
+
+        ProducerSysTest sampler = new ProducerSysTest();
+        modifyTestElement(sampler);
+        return sampler;
+    }
+
+    /**
+     * Method to modify test elements
+     *
+     * @param sampler
+     */
+    public void modifyTestElement(TestElement sampler) {
+
+        sampler.clear();
+        ((ProducerSysTest) sampler).addTestElement(TcpDefaultPanel.createTestElement());
+        //((Producer) sampler).addTestElement(loginPanel.createTestElement());
+        this.configureTestElement(sampler);
+    }
+
+    /**
+     * Getter method for the LabelResource property.
+     *
+     * @return String constant "producer_sample_title"
+     */
+    public String getLabelResource() {
+
+        return "producer_sys_test_sample_title";
+    }
+
+    /**
+     * Method to initialize ProducerSamplerGui. Sets up the layout of the GUI.
+     */
+    private void init() {
+
+        setLayout(new BorderLayout(0, 5));
+        setBorder(makeBorder());
+
+        add(makeTitlePanel(), BorderLayout.NORTH);
+
+        VerticalPanel mainPanel = new VerticalPanel();
+
+        TcpDefaultPanel = new ProducerSysTestConfigGui(false);
+        mainPanel.add(TcpDefaultPanel);
+
+        //loginPanel = new LoginConfigGui(false);
+        //loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config")));
+        //mainPanel.add(loginPanel);
+
+        add(mainPanel, BorderLayout.CENTER);
+    }
+}

Propchange: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/jmeter/src/java/org/activemq/util/MergeProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/jmeter/src/java/org/activemq/util/ant/MergePropertiesTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/ConsumerSysTableVisualizer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/ConsumerSysTableVisualizer.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/ConsumerSysTableVisualizer.java (original)
+++ incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/ConsumerSysTableVisualizer.java Tue Feb 21 15:12:56 2006
@@ -1,355 +1,355 @@
-package org.apache.jmeter.visualizers;
-
-import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
-import org.apache.jmeter.samplers.Clearable;
-import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.gui.ObjectTableModel;
-import org.apache.jorphan.gui.layout.VerticalLayout;
-import org.apache.jorphan.reflect.Functor;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
-
-import org.activemq.sampler.ConsumerSysTest;
-import org.activemq.sampler.ProducerSysTest;
-
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.JScrollPane;
-import javax.swing.JPanel;
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.util.*;
-
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-
-/**
- * A tableVisualizer that can display Producer System Test Output.
- */
-public class ConsumerSysTableVisualizer extends AbstractVisualizer implements Clearable {
-
-    private static Logger log = LoggingManager.getLoggerForClass();
-    public static boolean msgNotOrdered = false;
-
-    private final String[] COLUMNS = new String[]{
-            JMeterUtils.getResString("table_visualizer_sample_consumerid"),
-            JMeterUtils.getResString("table_visualizer_sample_consumerseq_number"),
-            JMeterUtils.getResString("table_visualizer_sample_prodname"),
-            JMeterUtils.getResString("table_visualizer_sample_producerseq_number"),
-            JMeterUtils.getResString("table_visualizer_sample_message")};
-
-    private ObjectTableModel model = null;
-
-    private JTable table = null;
-    private JScrollPane tableScrollPanel = null;
-    private JTextField messageField = null;
-
-    /**
-     *  Constructor for the TableVisualizer object.
-     */
-    public ConsumerSysTableVisualizer() {
-        super();
-
-        model = new ObjectTableModel(COLUMNS,
-                                     new Functor[]{new Functor("getConsumerID"),
-                                                   new Functor("getConsumerSeq"),
-                                                   new Functor("getProdName"),
-                                                   new Functor("getProducerSeq"),
-                                                   new Functor("getMsgBody")},
-                                     new Functor[]{null, null, null, null, null},
-                                     new Class[]{String.class, Integer.class, String.class, Integer.class, String.class});
-
-        init();
-    }
-
-    /**
-     * @return Label key to get from label resource
-     */
-    public String getLabelResource() {
-
-        return "view_cons_sys_results_in_table";
-    }
-
-    /**
-     * @param res SampleResult from the JMeter Sampler
-     */
-    public void add(SampleResult res) {
-        Thread timer = new Thread() {
-            public void run() {
-                timerLoop();
-            }
-        };
-
-        timer.start();
-    }
-
-    /**
-     * clear/resets the field.
-     */
-    public synchronized void clear() {
-        log.debug("Clear called", new Exception("Debug"));
-        model.clearData();
-        repaint();
-    }
-
-    /**
-     * Initialize the User Interface
-     */
-    private void init() {
-        this.setLayout(new BorderLayout());
-
-        // Main Panel
-        JPanel mainPanel = new JPanel();
-        Border margin = new EmptyBorder(10, 10, 5, 10);
-
-        mainPanel.setBorder(margin);
-        mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
-
-        // Name
-        mainPanel.add(makeTitlePanel());
-
-        // Set up the table itself
-        table = new JTable(model);
-
-        // table.getTableHeader().setReorderingAllowed(false);
-        tableScrollPanel = new JScrollPane(table);
-        tableScrollPanel.setViewportBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-
-        // Set up footer of table which displays the messages
-        JPanel messagePanel = new JPanel();
-        JLabel messageLabel =
-                 new JLabel(JMeterUtils.getResString("graph_results_message"));
-        messageLabel.setForeground(Color.black);
-
-        messageField = new JTextField(50);
-        messageField.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        messageField.setEditable(false);
-        messageField.setForeground(Color.black);
-        messageField.setBackground(getBackground());
-        messagePanel.add(messageLabel);
-        messagePanel.add(messageField);
-
-        // Set up info Panel table
-        JPanel tableMsgPanel = new JPanel();
-        tableMsgPanel.setLayout(new FlowLayout());
-        tableMsgPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        tableMsgPanel.add(messagePanel);
-
-        // Set up the table with footer
-        JPanel tablePanel = new JPanel();
-        tablePanel.setLayout(new BorderLayout());
-        tablePanel.add(tableScrollPanel, BorderLayout.CENTER);
-        tablePanel.add(tableMsgPanel, BorderLayout.SOUTH);
-
-        // Add the main panel and the graph
-        this.add(mainPanel, BorderLayout.NORTH);
-        this.add(tablePanel, BorderLayout.CENTER);
-    }
-
-    /**
-     *  Gets the number of processed messages.
-     */
-    protected synchronized void timerLoop() {
-
-        Map ProducerTextMap = new HashMap();
-        Map currentProducerMap = null;
-        String ProducerName = null;
-        String MsgBody = null;
-        String ConsumerName = null;
-        String ProdSequenceNo = null;
-        String mapKey = null;
-        int expectedNoOfMessages = ConsumerSysTest.noOfMessages;
-        int consumerCount = ConsumerSysTest.ConsumerCount;
-        boolean dowhile = true;
-        Map consumerMap = new ConcurrentHashMap();
-        Map prodNameMap = new TreeMap();
-        Map prodMsgMap = new TreeMap();
-
-        while (dowhile) {
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-            ConsumerSysTest consumer = new ConsumerSysTest();
-            currentProducerMap = Collections.synchronizedMap(consumer.resetProducerMap());
-//System.out.println("CURR MAP = " + currentProducerMap);            
-//            ConsumerSysTest.ProducerMap.clear();
-
-            if (currentProducerMap.size() == 0) {
-                dowhile = false;
-            }
-
-            // Put the map values to another map for parsing.
-            for (int i = 1; i <= currentProducerMap.size(); i++) {
-                String ProdMsg = (String) currentProducerMap.get(String.valueOf(i));
-//System.out.println("");
-                ProducerName = ProdMsg.substring(0, ProdMsg.indexOf("#"));
-                MsgBody = ProdMsg.substring(ProdMsg.indexOf("#")+1,  ProdMsg.indexOf("#", ProdMsg.indexOf("#")+1));
-                ProdSequenceNo = ProdMsg.substring(ProdMsg.indexOf("#", ProdMsg.indexOf("#", ProdMsg.indexOf("#")+1)) + 1, ProdMsg.lastIndexOf("#"));
-                ConsumerName = ProdMsg.substring(ProdMsg.lastIndexOf("#") +1, ProdMsg.length());
-
-                if (ConsumerSysTest.destination) {
-                    mapKey = ConsumerName + ProducerName;
-                } else {
-                    mapKey = ProducerName;
-                }
-
-                if (ProducerTextMap.containsKey(mapKey)) {
-                    // Increment the counter value
-                    Integer value = (Integer) ProducerTextMap.get(mapKey);
-
-                    ProducerTextMap.put(mapKey, new Integer(value.intValue()+1));
-                } else {
-                    // Put the Producer Name in the map
-                    ProducerTextMap.put(mapKey, new Integer(1));
-                }
-
-                Integer ConsumerSeqID = (Integer) ProducerTextMap.get(mapKey);
-                Integer ProducerSeqID = Integer.valueOf(ProdSequenceNo);
-
-                if (ConsumerSysTest.destination) {
-                    // Check for duplicate message.
-                    if (ConsumerSeqID.intValue() > expectedNoOfMessages) {
-                        messageField.setText(JMeterUtils.getResString("duplicate_message"));
-                    } else if (MsgBody.equals(ProducerSysTest.LAST_MESSAGE)) {
-                        // Check for message order.
-                        if (ConsumerSeqID.intValue() != expectedNoOfMessages) {
-                            messageField.setText(JMeterUtils.getResString("not_in_order_message"));
-                        } else if (currentProducerMap.size() == i) {
-                            if (messageField.getText().length() == 0) {
-                                messageField.setText(JMeterUtils.getResString("system_test_pass"));
-                            }
-                        }
-                    }
-                } else {
-                    //Create map for each consumer
-                    for (int j = 0 ; j < consumerCount ; j++) {
-                        if (!consumerMap.containsKey(new String(ConsumerName))) {
-                            consumerMap.put(new String(ConsumerName), new LinkedHashMap());
-                        }
-                    }
-
-                    //create Producer Name Map
-                    if (!prodNameMap.containsKey(ProducerName)) {
-                        prodNameMap.put(ProducerName, (null));
-                    }
-
-                    //Get the current size of consumer
-                    int seqVal = 0;
-                    Object[] cObj = consumerMap.keySet().toArray();
-                    for (int k = 0; k < cObj.length; k++) {
-                        String cMapKey = (String)cObj[k];
-                        Map cMapVal = (Map)consumerMap.get(cObj[k]);
-                        if (cMapKey.equals(ConsumerName)) {
-                            seqVal = cMapVal.size();
-                            break;
-                        }
-                    }
-
-                    //Put object to its designated consumer map
-                    Object[] consumerObj = consumerMap.keySet().toArray();
-                    for (int j = 0; j < consumerObj.length; j++) {
-                        String cMapKey = (String)consumerObj[j];
-                        Map cMapVal = (LinkedHashMap)consumerMap.get(consumerObj[j]);
-                        if (cMapKey.equals(ConsumerName)) {
-                            cMapVal.put(new Integer(seqVal), (ProducerName + "/" + ProducerSeqID));
-                        }
-                    }
-                }
-
-                // Add data to table row
-                if (ConsumerSysTest.destination) {
-                    SystemTestMsgSample msgSample = new SystemTestMsgSample(ConsumerName, ProducerName, MsgBody, ProducerSeqID, ConsumerSeqID);
-                    model.addRow(msgSample);
-                } else {
-                    String msgKey = ConsumerName + "#" + ProducerName + "#" + String.valueOf(ProducerSeqID);
-                    String msgVal = String.valueOf(ConsumerSeqID) + "#" + MsgBody;
-                    if (!prodMsgMap.containsKey(msgKey)) {
-                        prodMsgMap.put((msgKey), (msgVal));
-                    }
-                }
-            }
-        }
-        if (!ConsumerSysTest.destination) {
-            //Validate message sequence
-            validateMsg(prodNameMap, consumerMap);
-            //Populate msg sample
-            populateMsgSample(prodMsgMap);
-            if (msgNotOrdered) {
-                messageField.setText(JMeterUtils.getResString("not_in_order_message"));
-            } else {
-                messageField.setText(JMeterUtils.getResString("system_test_pass"));
-            }
-        }
-    }
-
-    private boolean validateMsg(Map prodNameMap, Map cMap) {
-        Object[]  cObj = cMap.keySet().toArray();
-        for (int j = 0; j < cObj.length; j++) {
-            Map childMap = (Map)cMap.get(cObj[j]);
-
-            Object[]  nameObj = prodNameMap.keySet().toArray();
-            for (int i = 0; i < nameObj.length; i++) {
-                String prodName = (String)nameObj[i];
-                String tempProdHolder = null;
-                String tempProdIDHolder = null;
-
-                Object[] childObj = childMap.keySet().toArray();
-                for (int k = 0; k < childObj.length; k++) {
-                    Integer childMapKey = (Integer)childObj[k];
-                    String childMapVal = (String)childMap.get(childObj[k]);
-                    String prodVal = childMapVal.substring(0, childMapVal.indexOf("/"));
-                    String prodIDVal = childMapVal.substring(childMapVal.indexOf("/")+1, childMapVal.length());
-
-                    if (prodVal.equals(prodName)) {
-                        if (tempProdHolder == null) {
-                            tempProdHolder = prodVal;
-                            tempProdIDHolder = prodIDVal;
-                            continue;
-                        }
-                        if (Integer.parseInt(prodIDVal) > Integer.parseInt(tempProdIDHolder)) {
-                            tempProdHolder = prodVal;
-                            tempProdIDHolder = prodIDVal;
-                        } else {
-                            msgNotOrdered = true;
-                            break;
-                        }
-                    } else {
-                        continue;
-                    }
-                }
-            }
-        }
-        return msgNotOrdered;
-    }
-
-    private void populateMsgSample(Map msgMap) {
-        Object[] msgObj = msgMap.keySet().toArray();
-        for(int i = 0; i < msgObj.length; i++) {
-            String mapKey = (String)msgObj[i];
-            String mapVal = (String)msgMap.get(msgObj[i]);
-
-            String ConsumerName = mapKey.substring(0, mapKey.indexOf("#"));
-            String ProducerName = mapKey.substring(mapKey.indexOf("#")+1, mapKey.indexOf("#", mapKey.lastIndexOf("#")));
-            String ProdSequenceNo = mapKey.substring(mapKey.lastIndexOf("#")+1, mapKey.length());;
-            String MsgKey = mapVal.substring(0, mapVal.indexOf("#"));
-            String MsgBody = mapVal.substring(mapVal.indexOf("#")+1, mapVal.length());
-
-            Integer ConsumerSeqID = Integer.valueOf(MsgKey);
-            Integer ProducerSeqID = Integer.valueOf(ProdSequenceNo);
-
-            SystemTestMsgSample msgSample = new SystemTestMsgSample(ConsumerName, ProducerName, MsgBody, ProducerSeqID, ConsumerSeqID);
-            model.addRow(msgSample);
-        }
-    }
-
+package org.apache.jmeter.visualizers;
+
+import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
+import org.apache.jmeter.samplers.Clearable;
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.ObjectTableModel;
+import org.apache.jorphan.gui.layout.VerticalLayout;
+import org.apache.jorphan.reflect.Functor;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
+import org.activemq.sampler.ConsumerSysTest;
+import org.activemq.sampler.ProducerSysTest;
+
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.JScrollPane;
+import javax.swing.JPanel;
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.util.*;
+
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+
+/**
+ * A tableVisualizer that can display Producer System Test Output.
+ */
+public class ConsumerSysTableVisualizer extends AbstractVisualizer implements Clearable {
+
+    private static Logger log = LoggingManager.getLoggerForClass();
+    public static boolean msgNotOrdered = false;
+
+    private final String[] COLUMNS = new String[]{
+            JMeterUtils.getResString("table_visualizer_sample_consumerid"),
+            JMeterUtils.getResString("table_visualizer_sample_consumerseq_number"),
+            JMeterUtils.getResString("table_visualizer_sample_prodname"),
+            JMeterUtils.getResString("table_visualizer_sample_producerseq_number"),
+            JMeterUtils.getResString("table_visualizer_sample_message")};
+
+    private ObjectTableModel model = null;
+
+    private JTable table = null;
+    private JScrollPane tableScrollPanel = null;
+    private JTextField messageField = null;
+
+    /**
+     *  Constructor for the TableVisualizer object.
+     */
+    public ConsumerSysTableVisualizer() {
+        super();
+
+        model = new ObjectTableModel(COLUMNS,
+                                     new Functor[]{new Functor("getConsumerID"),
+                                                   new Functor("getConsumerSeq"),
+                                                   new Functor("getProdName"),
+                                                   new Functor("getProducerSeq"),
+                                                   new Functor("getMsgBody")},
+                                     new Functor[]{null, null, null, null, null},
+                                     new Class[]{String.class, Integer.class, String.class, Integer.class, String.class});
+
+        init();
+    }
+
+    /**
+     * @return Label key to get from label resource
+     */
+    public String getLabelResource() {
+
+        return "view_cons_sys_results_in_table";
+    }
+
+    /**
+     * @param res SampleResult from the JMeter Sampler
+     */
+    public void add(SampleResult res) {
+        Thread timer = new Thread() {
+            public void run() {
+                timerLoop();
+            }
+        };
+
+        timer.start();
+    }
+
+    /**
+     * clear/resets the field.
+     */
+    public synchronized void clear() {
+        log.debug("Clear called", new Exception("Debug"));
+        model.clearData();
+        repaint();
+    }
+
+    /**
+     * Initialize the User Interface
+     */
+    private void init() {
+        this.setLayout(new BorderLayout());
+
+        // Main Panel
+        JPanel mainPanel = new JPanel();
+        Border margin = new EmptyBorder(10, 10, 5, 10);
+
+        mainPanel.setBorder(margin);
+        mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
+
+        // Name
+        mainPanel.add(makeTitlePanel());
+
+        // Set up the table itself
+        table = new JTable(model);
+
+        // table.getTableHeader().setReorderingAllowed(false);
+        tableScrollPanel = new JScrollPane(table);
+        tableScrollPanel.setViewportBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+
+        // Set up footer of table which displays the messages
+        JPanel messagePanel = new JPanel();
+        JLabel messageLabel =
+                 new JLabel(JMeterUtils.getResString("graph_results_message"));
+        messageLabel.setForeground(Color.black);
+
+        messageField = new JTextField(50);
+        messageField.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        messageField.setEditable(false);
+        messageField.setForeground(Color.black);
+        messageField.setBackground(getBackground());
+        messagePanel.add(messageLabel);
+        messagePanel.add(messageField);
+
+        // Set up info Panel table
+        JPanel tableMsgPanel = new JPanel();
+        tableMsgPanel.setLayout(new FlowLayout());
+        tableMsgPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        tableMsgPanel.add(messagePanel);
+
+        // Set up the table with footer
+        JPanel tablePanel = new JPanel();
+        tablePanel.setLayout(new BorderLayout());
+        tablePanel.add(tableScrollPanel, BorderLayout.CENTER);
+        tablePanel.add(tableMsgPanel, BorderLayout.SOUTH);
+
+        // Add the main panel and the graph
+        this.add(mainPanel, BorderLayout.NORTH);
+        this.add(tablePanel, BorderLayout.CENTER);
+    }
+
+    /**
+     *  Gets the number of processed messages.
+     */
+    protected synchronized void timerLoop() {
+
+        Map ProducerTextMap = new HashMap();
+        Map currentProducerMap = null;
+        String ProducerName = null;
+        String MsgBody = null;
+        String ConsumerName = null;
+        String ProdSequenceNo = null;
+        String mapKey = null;
+        int expectedNoOfMessages = ConsumerSysTest.noOfMessages;
+        int consumerCount = ConsumerSysTest.ConsumerCount;
+        boolean dowhile = true;
+        Map consumerMap = new ConcurrentHashMap();
+        Map prodNameMap = new TreeMap();
+        Map prodMsgMap = new TreeMap();
+
+        while (dowhile) {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+            ConsumerSysTest consumer = new ConsumerSysTest();
+            currentProducerMap = Collections.synchronizedMap(consumer.resetProducerMap());
+//System.out.println("CURR MAP = " + currentProducerMap);            
+//            ConsumerSysTest.ProducerMap.clear();
+
+            if (currentProducerMap.size() == 0) {
+                dowhile = false;
+            }
+
+            // Put the map values to another map for parsing.
+            for (int i = 1; i <= currentProducerMap.size(); i++) {
+                String ProdMsg = (String) currentProducerMap.get(String.valueOf(i));
+//System.out.println("");
+                ProducerName = ProdMsg.substring(0, ProdMsg.indexOf("#"));
+                MsgBody = ProdMsg.substring(ProdMsg.indexOf("#")+1,  ProdMsg.indexOf("#", ProdMsg.indexOf("#")+1));
+                ProdSequenceNo = ProdMsg.substring(ProdMsg.indexOf("#", ProdMsg.indexOf("#", ProdMsg.indexOf("#")+1)) + 1, ProdMsg.lastIndexOf("#"));
+                ConsumerName = ProdMsg.substring(ProdMsg.lastIndexOf("#") +1, ProdMsg.length());
+
+                if (ConsumerSysTest.destination) {
+                    mapKey = ConsumerName + ProducerName;
+                } else {
+                    mapKey = ProducerName;
+                }
+
+                if (ProducerTextMap.containsKey(mapKey)) {
+                    // Increment the counter value
+                    Integer value = (Integer) ProducerTextMap.get(mapKey);
+
+                    ProducerTextMap.put(mapKey, new Integer(value.intValue()+1));
+                } else {
+                    // Put the Producer Name in the map
+                    ProducerTextMap.put(mapKey, new Integer(1));
+                }
+
+                Integer ConsumerSeqID = (Integer) ProducerTextMap.get(mapKey);
+                Integer ProducerSeqID = Integer.valueOf(ProdSequenceNo);
+
+                if (ConsumerSysTest.destination) {
+                    // Check for duplicate message.
+                    if (ConsumerSeqID.intValue() > expectedNoOfMessages) {
+                        messageField.setText(JMeterUtils.getResString("duplicate_message"));
+                    } else if (MsgBody.equals(ProducerSysTest.LAST_MESSAGE)) {
+                        // Check for message order.
+                        if (ConsumerSeqID.intValue() != expectedNoOfMessages) {
+                            messageField.setText(JMeterUtils.getResString("not_in_order_message"));
+                        } else if (currentProducerMap.size() == i) {
+                            if (messageField.getText().length() == 0) {
+                                messageField.setText(JMeterUtils.getResString("system_test_pass"));
+                            }
+                        }
+                    }
+                } else {
+                    //Create map for each consumer
+                    for (int j = 0 ; j < consumerCount ; j++) {
+                        if (!consumerMap.containsKey(new String(ConsumerName))) {
+                            consumerMap.put(new String(ConsumerName), new LinkedHashMap());
+                        }
+                    }
+
+                    //create Producer Name Map
+                    if (!prodNameMap.containsKey(ProducerName)) {
+                        prodNameMap.put(ProducerName, (null));
+                    }
+
+                    //Get the current size of consumer
+                    int seqVal = 0;
+                    Object[] cObj = consumerMap.keySet().toArray();
+                    for (int k = 0; k < cObj.length; k++) {
+                        String cMapKey = (String)cObj[k];
+                        Map cMapVal = (Map)consumerMap.get(cObj[k]);
+                        if (cMapKey.equals(ConsumerName)) {
+                            seqVal = cMapVal.size();
+                            break;
+                        }
+                    }
+
+                    //Put object to its designated consumer map
+                    Object[] consumerObj = consumerMap.keySet().toArray();
+                    for (int j = 0; j < consumerObj.length; j++) {
+                        String cMapKey = (String)consumerObj[j];
+                        Map cMapVal = (LinkedHashMap)consumerMap.get(consumerObj[j]);
+                        if (cMapKey.equals(ConsumerName)) {
+                            cMapVal.put(new Integer(seqVal), (ProducerName + "/" + ProducerSeqID));
+                        }
+                    }
+                }
+
+                // Add data to table row
+                if (ConsumerSysTest.destination) {
+                    SystemTestMsgSample msgSample = new SystemTestMsgSample(ConsumerName, ProducerName, MsgBody, ProducerSeqID, ConsumerSeqID);
+                    model.addRow(msgSample);
+                } else {
+                    String msgKey = ConsumerName + "#" + ProducerName + "#" + String.valueOf(ProducerSeqID);
+                    String msgVal = String.valueOf(ConsumerSeqID) + "#" + MsgBody;
+                    if (!prodMsgMap.containsKey(msgKey)) {
+                        prodMsgMap.put((msgKey), (msgVal));
+                    }
+                }
+            }
+        }
+        if (!ConsumerSysTest.destination) {
+            //Validate message sequence
+            validateMsg(prodNameMap, consumerMap);
+            //Populate msg sample
+            populateMsgSample(prodMsgMap);
+            if (msgNotOrdered) {
+                messageField.setText(JMeterUtils.getResString("not_in_order_message"));
+            } else {
+                messageField.setText(JMeterUtils.getResString("system_test_pass"));
+            }
+        }
+    }
+
+    private boolean validateMsg(Map prodNameMap, Map cMap) {
+        Object[]  cObj = cMap.keySet().toArray();
+        for (int j = 0; j < cObj.length; j++) {
+            Map childMap = (Map)cMap.get(cObj[j]);
+
+            Object[]  nameObj = prodNameMap.keySet().toArray();
+            for (int i = 0; i < nameObj.length; i++) {
+                String prodName = (String)nameObj[i];
+                String tempProdHolder = null;
+                String tempProdIDHolder = null;
+
+                Object[] childObj = childMap.keySet().toArray();
+                for (int k = 0; k < childObj.length; k++) {
+                    Integer childMapKey = (Integer)childObj[k];
+                    String childMapVal = (String)childMap.get(childObj[k]);
+                    String prodVal = childMapVal.substring(0, childMapVal.indexOf("/"));
+                    String prodIDVal = childMapVal.substring(childMapVal.indexOf("/")+1, childMapVal.length());
+
+                    if (prodVal.equals(prodName)) {
+                        if (tempProdHolder == null) {
+                            tempProdHolder = prodVal;
+                            tempProdIDHolder = prodIDVal;
+                            continue;
+                        }
+                        if (Integer.parseInt(prodIDVal) > Integer.parseInt(tempProdIDHolder)) {
+                            tempProdHolder = prodVal;
+                            tempProdIDHolder = prodIDVal;
+                        } else {
+                            msgNotOrdered = true;
+                            break;
+                        }
+                    } else {
+                        continue;
+                    }
+                }
+            }
+        }
+        return msgNotOrdered;
+    }
+
+    private void populateMsgSample(Map msgMap) {
+        Object[] msgObj = msgMap.keySet().toArray();
+        for(int i = 0; i < msgObj.length; i++) {
+            String mapKey = (String)msgObj[i];
+            String mapVal = (String)msgMap.get(msgObj[i]);
+
+            String ConsumerName = mapKey.substring(0, mapKey.indexOf("#"));
+            String ProducerName = mapKey.substring(mapKey.indexOf("#")+1, mapKey.indexOf("#", mapKey.lastIndexOf("#")));
+            String ProdSequenceNo = mapKey.substring(mapKey.lastIndexOf("#")+1, mapKey.length());;
+            String MsgKey = mapVal.substring(0, mapVal.indexOf("#"));
+            String MsgBody = mapVal.substring(mapVal.indexOf("#")+1, mapVal.length());
+
+            Integer ConsumerSeqID = Integer.valueOf(MsgKey);
+            Integer ProducerSeqID = Integer.valueOf(ProdSequenceNo);
+
+            SystemTestMsgSample msgSample = new SystemTestMsgSample(ConsumerName, ProducerName, MsgBody, ProducerSeqID, ConsumerSeqID);
+            model.addRow(msgSample);
+        }
+    }
+
 }

Propchange: incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/ConsumerSysTableVisualizer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/ConsumerTableVisualizer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/MessageSample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/ProducerTableVisualizer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/SystemTestMsgSample.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/SystemTestMsgSample.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/SystemTestMsgSample.java (original)
+++ incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/SystemTestMsgSample.java Tue Feb 21 15:12:56 2006
@@ -1,105 +1,105 @@
-package org.apache.jmeter.visualizers;
-
-import java.io.Serializable;
-
-public class SystemTestMsgSample implements Serializable, Comparable {
-    public String consumerid;
-    public String prodName;
-    public String msgBody;
-    public Integer producerSeqID;
-    public Integer consumerSeqID;
-
-    public SystemTestMsgSample(String consumerid, String prodName, String msgBody, Integer prodSeq, Integer conSeq) {
-        this.consumerid = consumerid;
-        this.prodName = prodName;
-        this.msgBody = msgBody;
-        this.producerSeqID = prodSeq;
-        this.consumerSeqID = conSeq;
-    }
-
-    /**
-     *
-     * @return get consumer identifier.
-     */
-    public String getConsumerID() {
-        return consumerid;
-    }
-
-    /**
-     *
-     * @param consumerid  - sets consumer identifier
-     */
-    public void setConsumerID(String consumerid) {
-        this.consumerid = consumerid;
-    }
-
-    /**
-     *
-     * @return Returns the Producer name.
-     */
-    public String getProdName() {
-        return prodName;
-    }
-
-    /**
-     *
-     * @param prodName - The Producer name to set.
-     */
-    public void setProdName(String prodName) {
-        this.prodName = prodName;
-    }
-
-    /**
-     *
-     * @return Return the Producer message.
-     */
-    public String getMsgBody() {
-        return msgBody;
-    }
-
-    /**
-     *
-     * @param msgBody - The Producer message to set.
-     */
-    public void setMSgBody(String msgBody) {
-        this.msgBody = msgBody;
-    }
-
-    /**
-     *
-     * @return Returns the current producer message count.
-     */
-    public Integer getProducerSeq() {
-        return producerSeqID;
-    }
-
-    /**
-     *
-     * @param count - The message count to set.
-     */
-    public void setProducerSeq(Integer count) {
-        this.producerSeqID = count;
-    }
-
-    /**
-     *
-     * @return Returns the current consumer message count.
-     */
-    public Integer getConsumerSeq() {
-        return consumerSeqID;
-    }
-
-    /**
-     *
-     * @param count - The message count to set.
-     */
-    public void setConsumerSeq(Integer count) {
-        this.consumerSeqID = count;
-    }
-
-
-    public int compareTo(Object o) {
-        return -1;
-    }
-
-}
+package org.apache.jmeter.visualizers;
+
+import java.io.Serializable;
+
+public class SystemTestMsgSample implements Serializable, Comparable {
+    public String consumerid;
+    public String prodName;
+    public String msgBody;
+    public Integer producerSeqID;
+    public Integer consumerSeqID;
+
+    public SystemTestMsgSample(String consumerid, String prodName, String msgBody, Integer prodSeq, Integer conSeq) {
+        this.consumerid = consumerid;
+        this.prodName = prodName;
+        this.msgBody = msgBody;
+        this.producerSeqID = prodSeq;
+        this.consumerSeqID = conSeq;
+    }
+
+    /**
+     *
+     * @return get consumer identifier.
+     */
+    public String getConsumerID() {
+        return consumerid;
+    }
+
+    /**
+     *
+     * @param consumerid  - sets consumer identifier
+     */
+    public void setConsumerID(String consumerid) {
+        this.consumerid = consumerid;
+    }
+
+    /**
+     *
+     * @return Returns the Producer name.
+     */
+    public String getProdName() {
+        return prodName;
+    }
+
+    /**
+     *
+     * @param prodName - The Producer name to set.
+     */
+    public void setProdName(String prodName) {
+        this.prodName = prodName;
+    }
+
+    /**
+     *
+     * @return Return the Producer message.
+     */
+    public String getMsgBody() {
+        return msgBody;
+    }
+
+    /**
+     *
+     * @param msgBody - The Producer message to set.
+     */
+    public void setMSgBody(String msgBody) {
+        this.msgBody = msgBody;
+    }
+
+    /**
+     *
+     * @return Returns the current producer message count.
+     */
+    public Integer getProducerSeq() {
+        return producerSeqID;
+    }
+
+    /**
+     *
+     * @param count - The message count to set.
+     */
+    public void setProducerSeq(Integer count) {
+        this.producerSeqID = count;
+    }
+
+    /**
+     *
+     * @return Returns the current consumer message count.
+     */
+    public Integer getConsumerSeq() {
+        return consumerSeqID;
+    }
+
+    /**
+     *
+     * @param count - The message count to set.
+     */
+    public void setConsumerSeq(Integer count) {
+        this.consumerSeqID = count;
+    }
+
+
+    public int compareTo(Object o) {
+        return -1;
+    }
+
+}

Propchange: incubator/activemq/trunk/jmeter/src/java/org/apache/jmeter/visualizers/SystemTestMsgSample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java (original)
+++ incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java Tue Feb 21 15:12:56 2006
@@ -1,125 +1,125 @@
-package org.activemq.usecases;
-
-import javax.jms.*;
-import java.util.HashMap;
-import java.util.Collections;
-import java.util.Map;
-import java.net.URI;
-
-import junit.framework.TestCase;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.TransportConnector;
-
-/**
-* This Unit Test is created to test the memory leakage when a new producer is created and closed for each message that was sent.
-* The error occured after sending and receiving messages 65536 times.
-* This test validate if the messages sent by producer is being received by the consumer.
-* A new producer is created and closed for each message that was sent.
-* The said procedure is done fore more than 65536 times.
-*/
-
-
-public final class NoDestinationErrorTest extends TestCase {
-    public static final String ACTIVEMQ_SERVER = "ActiveMQ Server";
-    public static final boolean TRANSACTED_FALSE = false;
-    public static final String TOOL_DEFAULT = "TOOL.DEFAULT";
-    public static final String LAST_MESSAGE = "LAST";
-
-    public String userName;
-    public String password;
-
-    private MessageProducer producer;
-    private MessageConsumer consumer;
-
-    public static Map ProducerMap = Collections.synchronizedMap(new HashMap());
-    protected BrokerService broker;
-    private boolean isTopic = false;
-
-    protected ConnectionFactory factory;
-    protected ActiveMQConnection connection;
-
-
-    public NoDestinationErrorTest() {
-        super();
-    }
-
-    public void doTest() throws Exception {
-        ConnectionFactory factory = createConnectionFactory();
-        ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection(userName, password);
-        connection.start();
-
-        Session session = createSession(connection, TRANSACTED_FALSE);
-        Destination destination = createDestination(session, "subject", isTopic);
-        consumer = session.createConsumer(destination);
-
-        for (int i=0; i<70000; i++) {
-            TextMessage sentMessage;
-            sentMessage = session.createTextMessage("message " + i);
-            producer = session.createProducer(destination);
-            producer.send(sentMessage);
-            producer.close();
-
-            TextMessage rcvMessage = null;
-            rcvMessage = (TextMessage)consumer.receive(i);
-            String message = rcvMessage.getText();
-            assertNotNull("Message received should not be null", message);
-            System.out.println(message);
-        }
-
-        connection.close();
-    }
-
-    /**
-     *  Creates the connection to the broker.
-     *
-     *  @return Connection - broker connection.
-     */
-    protected ConnectionFactory createConnectionFactory() throws JMSException {
-        return new ActiveMQConnectionFactory("vm://localhost?broker.persistent=true");
-    }
-
-    /**
-     * Creates the connection session.
-     *
-     * @param connection   - broker connection.
-     * @param isTransacted - true if the session will be session transacted.
-     *                     otherwise the the session will be using auto acknowledge.
-     * @return Session - connection session.
-     */
-    private static Session createSession(Connection connection,
-                                         boolean isTransacted) throws JMSException {
-        if (isTransacted) {
-            return connection.createSession(true, Session.SESSION_TRANSACTED);
-        } else {
-            return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        }
-    }
-
-    /**
-     * Creates the session destination.
-     *
-     * @param session - connection session.
-     * @param subject - destination name.
-     * @param isTopic - true if the destination is a topic,
-     *                otherwise the destination is a queue.
-     * @return Destination - session destination.
-     */
-    private static Destination createDestination(Session session,
-                                                 String subject,
-                                                 boolean isTopic) throws JMSException {
-        if (isTopic) {
-            return session.createTopic(subject);
-        } else {
-            return session.createQueue(subject);
-        }
-    }
-
-    public void testSendReceive() throws Exception {
-        doTest();
-    }
-
-}
+package org.activemq.usecases;
+
+import javax.jms.*;
+import java.util.HashMap;
+import java.util.Collections;
+import java.util.Map;
+import java.net.URI;
+
+import junit.framework.TestCase;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.TransportConnector;
+
+/**
+* This Unit Test is created to test the memory leakage when a new producer is created and closed for each message that was sent.
+* The error occured after sending and receiving messages 65536 times.
+* This test validate if the messages sent by producer is being received by the consumer.
+* A new producer is created and closed for each message that was sent.
+* The said procedure is done fore more than 65536 times.
+*/
+
+
+public final class NoDestinationErrorTest extends TestCase {
+    public static final String ACTIVEMQ_SERVER = "ActiveMQ Server";
+    public static final boolean TRANSACTED_FALSE = false;
+    public static final String TOOL_DEFAULT = "TOOL.DEFAULT";
+    public static final String LAST_MESSAGE = "LAST";
+
+    public String userName;
+    public String password;
+
+    private MessageProducer producer;
+    private MessageConsumer consumer;
+
+    public static Map ProducerMap = Collections.synchronizedMap(new HashMap());
+    protected BrokerService broker;
+    private boolean isTopic = false;
+
+    protected ConnectionFactory factory;
+    protected ActiveMQConnection connection;
+
+
+    public NoDestinationErrorTest() {
+        super();
+    }
+
+    public void doTest() throws Exception {
+        ConnectionFactory factory = createConnectionFactory();
+        ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection(userName, password);
+        connection.start();
+
+        Session session = createSession(connection, TRANSACTED_FALSE);
+        Destination destination = createDestination(session, "subject", isTopic);
+        consumer = session.createConsumer(destination);
+
+        for (int i=0; i<70000; i++) {
+            TextMessage sentMessage;
+            sentMessage = session.createTextMessage("message " + i);
+            producer = session.createProducer(destination);
+            producer.send(sentMessage);
+            producer.close();
+
+            TextMessage rcvMessage = null;
+            rcvMessage = (TextMessage)consumer.receive(i);
+            String message = rcvMessage.getText();
+            assertNotNull("Message received should not be null", message);
+            System.out.println(message);
+        }
+
+        connection.close();
+    }
+
+    /**
+     *  Creates the connection to the broker.
+     *
+     *  @return Connection - broker connection.
+     */
+    protected ConnectionFactory createConnectionFactory() throws JMSException {
+        return new ActiveMQConnectionFactory("vm://localhost?broker.persistent=true");
+    }
+
+    /**
+     * Creates the connection session.
+     *
+     * @param connection   - broker connection.
+     * @param isTransacted - true if the session will be session transacted.
+     *                     otherwise the the session will be using auto acknowledge.
+     * @return Session - connection session.
+     */
+    private static Session createSession(Connection connection,
+                                         boolean isTransacted) throws JMSException {
+        if (isTransacted) {
+            return connection.createSession(true, Session.SESSION_TRANSACTED);
+        } else {
+            return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        }
+    }
+
+    /**
+     * Creates the session destination.
+     *
+     * @param session - connection session.
+     * @param subject - destination name.
+     * @param isTopic - true if the destination is a topic,
+     *                otherwise the destination is a queue.
+     * @return Destination - session destination.
+     */
+    private static Destination createDestination(Session session,
+                                                 String subject,
+                                                 boolean isTopic) throws JMSException {
+        if (isTopic) {
+            return session.createTopic(subject);
+        } else {
+            return session.createQueue(subject);
+        }
+    }
+
+    public void testSendReceive() throws Exception {
+        doTest();
+    }
+
+}

Propchange: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentDurableTopicSystemTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentDurableTopicSystemTest.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentDurableTopicSystemTest.java (original)
+++ incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentDurableTopicSystemTest.java Tue Feb 21 15:12:56 2006
@@ -1,58 +1,58 @@
-package org.activemq.usecases;
-
-public class NonPersistentDurableTopicSystemTest extends SystemTestSupport {
-
-    /**
-     * Unit test for non-persistent durable topic messages with the following settings:
-     * 1 Producer, 1 Consumer, 1 Subject, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testNonPersistentDurableTopicMessageA() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                    false,
-                                                    true,
-                                                     1,
-                                                     1,
-                                                     1,
-                                                    10,
-                                                    "testNonPersistentDurableTopicMessageA()");
-        st.doTest();
-    }
-
-    /**
-     * Unit test for non-persistent durable topic messages with the following settings:
-     * 10 Producers, 10 Consumers, 1 Subject, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testNonPersistentDurableTopicMessageB() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     false,
-                                                     true,
-                                                     10,
-                                                     10,
-                                                     1,
-                                                     10,
-                                                     "testNonPersistentDurableTopicMessageB()");
-        st.doTest();
-    }
-
-    /**
-     * Unit test for non-persistent durable topic messages with the following settings:
-     * 10 Producers, 10 Consumers, 10 Subjects, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testNonPersistentDurableTopicMessageC() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     false,
-                                                     true,
-                                                     10,
-                                                     10,
-                                                     10,
-                                                     10,
-                                                     "testNonPersistentDurableTopicMessageC()");
-        st.doTest();
-    }
+package org.activemq.usecases;
+
+public class NonPersistentDurableTopicSystemTest extends SystemTestSupport {
+
+    /**
+     * Unit test for non-persistent durable topic messages with the following settings:
+     * 1 Producer, 1 Consumer, 1 Subject, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testNonPersistentDurableTopicMessageA() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                    false,
+                                                    true,
+                                                     1,
+                                                     1,
+                                                     1,
+                                                    10,
+                                                    "testNonPersistentDurableTopicMessageA()");
+        st.doTest();
+    }
+
+    /**
+     * Unit test for non-persistent durable topic messages with the following settings:
+     * 10 Producers, 10 Consumers, 1 Subject, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testNonPersistentDurableTopicMessageB() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     false,
+                                                     true,
+                                                     10,
+                                                     10,
+                                                     1,
+                                                     10,
+                                                     "testNonPersistentDurableTopicMessageB()");
+        st.doTest();
+    }
+
+    /**
+     * Unit test for non-persistent durable topic messages with the following settings:
+     * 10 Producers, 10 Consumers, 10 Subjects, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testNonPersistentDurableTopicMessageC() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     false,
+                                                     true,
+                                                     10,
+                                                     10,
+                                                     10,
+                                                     10,
+                                                     "testNonPersistentDurableTopicMessageC()");
+        st.doTest();
+    }
 }

Propchange: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentDurableTopicSystemTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentNonDurableTopicSystemTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentNonDurableTopicSystemTest.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentNonDurableTopicSystemTest.java (original)
+++ incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentNonDurableTopicSystemTest.java Tue Feb 21 15:12:56 2006
@@ -1,58 +1,58 @@
-package org.activemq.usecases;
-
-public class NonPersistentNonDurableTopicSystemTest extends SystemTestSupport {
-
-    /**
-     * Unit test for non-persistent non-durable topic messages with the following settings:
-     * 1 Producer, 1 Consumer, 1 Subject, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testNonPersistentNonDurableTopicMessageA() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     false,
-                                                     false,
-                                                      1,
-                                                      1,
-                                                      1,
-                                                     10,
-                                                     "testNonPersistentNonDurableTopicMessageA()");
-        st.doTest();
-    }
-
-    /**
-     * Unit test for non-persistent non-durable topic messages with the following settings:
-     * 10 Producers, 10 Consumers, 1 Subject, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testNonPersistentNonDurableTopicMessageB() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     false,
-                                                     false,
-                                                     10,
-                                                     10,
-                                                      1,
-                                                     10,
-                                                     "testNonPersistentNonDurableTopicMessageB()");
-        st.doTest();
-    }
-
-    /**
-     * Unit test for non-persistent non-durable topic messages with the following settings:
-     * 10 Producers, 10 Consumers, 10 Subjects, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testNonPersistentNonDurableTopicMessageC() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     false,
-                                                     false,
-                                                     10,
-                                                     10,
-                                                     10,
-                                                     10,
-                                                     "testNonPersistentNonDurableTopicMessageC()");
-        st.doTest();
-    }
+package org.activemq.usecases;
+
+public class NonPersistentNonDurableTopicSystemTest extends SystemTestSupport {
+
+    /**
+     * Unit test for non-persistent non-durable topic messages with the following settings:
+     * 1 Producer, 1 Consumer, 1 Subject, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testNonPersistentNonDurableTopicMessageA() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     false,
+                                                     false,
+                                                      1,
+                                                      1,
+                                                      1,
+                                                     10,
+                                                     "testNonPersistentNonDurableTopicMessageA()");
+        st.doTest();
+    }
+
+    /**
+     * Unit test for non-persistent non-durable topic messages with the following settings:
+     * 10 Producers, 10 Consumers, 1 Subject, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testNonPersistentNonDurableTopicMessageB() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     false,
+                                                     false,
+                                                     10,
+                                                     10,
+                                                      1,
+                                                     10,
+                                                     "testNonPersistentNonDurableTopicMessageB()");
+        st.doTest();
+    }
+
+    /**
+     * Unit test for non-persistent non-durable topic messages with the following settings:
+     * 10 Producers, 10 Consumers, 10 Subjects, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testNonPersistentNonDurableTopicMessageC() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     false,
+                                                     false,
+                                                     10,
+                                                     10,
+                                                     10,
+                                                     10,
+                                                     "testNonPersistentNonDurableTopicMessageC()");
+        st.doTest();
+    }
 }

Propchange: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NonPersistentNonDurableTopicSystemTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentDurableTopicSystemTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentDurableTopicSystemTest.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentDurableTopicSystemTest.java (original)
+++ incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentDurableTopicSystemTest.java Tue Feb 21 15:12:56 2006
@@ -1,58 +1,58 @@
-package org.activemq.usecases;
-
-public class PersistentDurableTopicSystemTest extends SystemTestSupport {
-
-    /**
-     * Unit test for persistent durable topic messages with the following settings:
-     * 1 Producer, 1 Consumer, 1 Subject, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testPersistentDurableTopicMessageA() throws Exception {
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     true,
-                                                     true,
-                                                     1,
-                                                     1,
-                                                     1,
-                                                     10,
-                                                     "testPersistentDurableTopicMessageA()");
-        st.doTest();
-    }
-
-    /**
-     * Unit test for persistent durable topic messages with the following settings:
-     * 10 Producers, 10 Consumers, 1 Subject, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testPersistentDurableTopicMessageB() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     true,
-                                                     true,
-                                                     10,
-                                                     10,
-                                                      1,
-                                                     10,
-                                                     "testPersistentDurableTopicMessageB()");
-        st.doTest();
-    }
-
-    /**
-     * Unit test for persistent durable topic messages with the following settings:
-     * 10 Producers, 10 Consumers, 10 Subjects, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testPersistentDurableTopicMessageC() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     true,
-                                                     true,
-                                                     10,
-                                                     10,
-                                                     10,
-                                                     10,
-                                                     "testPersistentDurableTopicMessageC()");
-        st.doTest();
-     }
+package org.activemq.usecases;
+
+public class PersistentDurableTopicSystemTest extends SystemTestSupport {
+
+    /**
+     * Unit test for persistent durable topic messages with the following settings:
+     * 1 Producer, 1 Consumer, 1 Subject, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testPersistentDurableTopicMessageA() throws Exception {
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     true,
+                                                     true,
+                                                     1,
+                                                     1,
+                                                     1,
+                                                     10,
+                                                     "testPersistentDurableTopicMessageA()");
+        st.doTest();
+    }
+
+    /**
+     * Unit test for persistent durable topic messages with the following settings:
+     * 10 Producers, 10 Consumers, 1 Subject, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testPersistentDurableTopicMessageB() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     true,
+                                                     true,
+                                                     10,
+                                                     10,
+                                                      1,
+                                                     10,
+                                                     "testPersistentDurableTopicMessageB()");
+        st.doTest();
+    }
+
+    /**
+     * Unit test for persistent durable topic messages with the following settings:
+     * 10 Producers, 10 Consumers, 10 Subjects, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testPersistentDurableTopicMessageC() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     true,
+                                                     true,
+                                                     10,
+                                                     10,
+                                                     10,
+                                                     10,
+                                                     "testPersistentDurableTopicMessageC()");
+        st.doTest();
+     }
 }

Propchange: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentDurableTopicSystemTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentNonDurableTopicSystemTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentNonDurableTopicSystemTest.java?rev=379619&r1=379618&r2=379619&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentNonDurableTopicSystemTest.java (original)
+++ incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentNonDurableTopicSystemTest.java Tue Feb 21 15:12:56 2006
@@ -1,58 +1,58 @@
-package org.activemq.usecases;
-
-public class PersistentNonDurableTopicSystemTest extends SystemTestSupport {
-
-    /**
-     * Unit test for persistent non-durable topic messages with the following settings:
-     * 1 Producer, 1 Consumer, 1 Subject, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testPersistentNonDurableTopicMessageA() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     true,
-                                                     false,
-                                                      1,
-                                                      1,
-                                                      1,
-                                                     10,
-                                                     "testPersistentNonDurableTopicMessageA()");
-        st.doTest();
-    }
-
-    /**
-     * Unit test for persistent non-durable topic messages with the following settings:
-     * 10 Producers, 10 Consumers, 1 Subject, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testPersistentNonDurableTopicMessageB() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     true,
-                                                     false,
-                                                     10,
-                                                     10,
-                                                      1,
-                                                     10,
-                                                     "testPersistentNonDurableTopicMessageB()");
-        st.doTest();
-    }
-
-    /**
-     * Unit test for persistent non-durable topic messages with the following settings:
-     * 10 Producers, 10 Consumers, 10 Subjects, 10 Messages
-     *
-     * @throws Exception
-     */
-    public void testPersistentNonDurableTopicMessageC() throws Exception{
-        SystemTestSupport st = new SystemTestSupport(true,
-                                                     true,
-                                                     false,
-                                                     10,
-                                                     10,
-                                                     10,
-                                                     10,
-                                                     "testPersistentNonDurableTopicMessageC()");
-        st.doTest();
-    }
+package org.activemq.usecases;
+
+public class PersistentNonDurableTopicSystemTest extends SystemTestSupport {
+
+    /**
+     * Unit test for persistent non-durable topic messages with the following settings:
+     * 1 Producer, 1 Consumer, 1 Subject, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testPersistentNonDurableTopicMessageA() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     true,
+                                                     false,
+                                                      1,
+                                                      1,
+                                                      1,
+                                                     10,
+                                                     "testPersistentNonDurableTopicMessageA()");
+        st.doTest();
+    }
+
+    /**
+     * Unit test for persistent non-durable topic messages with the following settings:
+     * 10 Producers, 10 Consumers, 1 Subject, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testPersistentNonDurableTopicMessageB() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     true,
+                                                     false,
+                                                     10,
+                                                     10,
+                                                      1,
+                                                     10,
+                                                     "testPersistentNonDurableTopicMessageB()");
+        st.doTest();
+    }
+
+    /**
+     * Unit test for persistent non-durable topic messages with the following settings:
+     * 10 Producers, 10 Consumers, 10 Subjects, 10 Messages
+     *
+     * @throws Exception
+     */
+    public void testPersistentNonDurableTopicMessageC() throws Exception{
+        SystemTestSupport st = new SystemTestSupport(true,
+                                                     true,
+                                                     false,
+                                                     10,
+                                                     10,
+                                                     10,
+                                                     10,
+                                                     "testPersistentNonDurableTopicMessageC()");
+        st.doTest();
+    }
 }

Propchange: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/PersistentNonDurableTopicSystemTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message