You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2002/08/07 04:15:30 UTC
cvs commit: jakarta-jmeter/src_1/org/apache/jmeter/gui/util JMeterMenuBar.java
mstover1 2002/08/06 19:15:30
Modified: bin jmeter.properties
src_1/org/apache/jmeter/engine ClientJMeterEngine.java
JMeterEngine.java RemoteJMeterEngine.java
RemoteJMeterEngineImpl.java
StandardJMeterEngine.java
src_1/org/apache/jmeter/gui MainFrame.java
src_1/org/apache/jmeter/gui/action Start.java
src_1/org/apache/jmeter/gui/util JMeterMenuBar.java
Log:
Fixing hanging dialog box on closing test
GUI can now run multiple remote clients
Revision Changes Path
1.40 +1 -1 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- jmeter.properties 12 Jul 2002 02:05:49 -0000 1.39
+++ jmeter.properties 7 Aug 2002 02:15:29 -0000 1.40
@@ -58,7 +58,7 @@
config.tree.icon=leafnode.gif
# Remote Hosts - comma delimited
-remote_hosts=127.0.0.1
+#remote_hosts=127.0.0.1
#Components to not display in JMeter GUI
not_in_menu=Remote Method Configuration,JNDI Configuration,JNDI Lookup Configuration,JNDI Request,Default Controller,org.apache.jmeter.control.DynamicController, org.apache.jmeter.protocol.http.control.Cookie,org.apache.jmeter.protocol.http.control.Authorization,org.apache.jmeter.config.LoginConfig,Header,org.apache.jmeter.protocol.http.config.UrlConfigFull,org.apache.jmeter.protocol.http.config.MultipartUrlConfig
1.4 +10 -2 jakarta-jmeter/src_1/org/apache/jmeter/engine/ClientJMeterEngine.java
Index: ClientJMeterEngine.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/engine/ClientJMeterEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClientJMeterEngine.java 23 May 2002 15:47:04 -0000 1.3
+++ ClientJMeterEngine.java 7 Aug 2002 02:15:29 -0000 1.4
@@ -77,6 +77,7 @@
ListedHashTree test;
SearchByClass testListeners;
ConvertListeners sampleListeners;
+ private String host;
/************************************************************
* !ToDo (Constructor description)
@@ -90,6 +91,7 @@
throws MalformedURLException, NotBoundException, RemoteException
{
this((RemoteJMeterEngine)Naming.lookup("//" + host + "/JMeterEngine"));
+ this.host = host;
}
/************************************************************
@@ -111,6 +113,11 @@
{
test = testTree;
}
+
+ public void setHost(String host)
+ {
+ this.host = host;
+ }
/************************************************************
* !ToDo (Method description)
@@ -123,6 +130,7 @@
getTestTree().traverse(sampleListeners);
try
{
+ remote.setHost(host);
remote.configure(test);
remote.runTest();
}
1.5 +3 -1 jakarta-jmeter/src_1/org/apache/jmeter/engine/JMeterEngine.java
Index: JMeterEngine.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/engine/JMeterEngine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JMeterEngine.java 1 Jun 2002 13:21:26 -0000 1.4
+++ JMeterEngine.java 7 Aug 2002 02:15:29 -0000 1.5
@@ -75,4 +75,6 @@
void stopTest();
void reset();
+
+ void setHost(String host);
}
1.5 +2 -0 jakarta-jmeter/src_1/org/apache/jmeter/engine/RemoteJMeterEngine.java
Index: RemoteJMeterEngine.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/engine/RemoteJMeterEngine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RemoteJMeterEngine.java 31 May 2002 01:34:56 -0000 1.4
+++ RemoteJMeterEngine.java 7 Aug 2002 02:15:29 -0000 1.5
@@ -74,4 +74,6 @@
void stopTest() throws RemoteException;
void reset() throws RemoteException;
+
+ void setHost(String host) throws RemoteException;
}
1.6 +5 -0 jakarta-jmeter/src_1/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
Index: RemoteJMeterEngineImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RemoteJMeterEngineImpl.java 31 May 2002 01:34:56 -0000 1.5
+++ RemoteJMeterEngineImpl.java 7 Aug 2002 02:15:29 -0000 1.6
@@ -89,6 +89,11 @@
ex.printStackTrace();
}
}
+
+ public void setHost(String host)
+ {
+ backingEngine.setHost(host);
+ }
/************************************************************
* Adds a feature to the ThreadGroup attribute of the RemoteJMeterEngineImpl
1.14 +11 -3 jakarta-jmeter/src_1/org/apache/jmeter/engine/StandardJMeterEngine.java
Index: StandardJMeterEngine.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/engine/StandardJMeterEngine.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StandardJMeterEngine.java 30 Jul 2002 03:02:09 -0000 1.13
+++ StandardJMeterEngine.java 7 Aug 2002 02:15:29 -0000 1.14
@@ -104,6 +104,11 @@
{
test = testTree;
}
+
+ public void setHost(String host)
+ {
+ this.host = host;
+ }
protected ListedHashTree getTestTree()
{
@@ -137,7 +142,10 @@
// and the listeners, and the timer
JMeterThread[] threads;
Iterator iter = searcher.getSearchResults().iterator();
- notifyTestListenersOfStart();
+ if(iter.hasNext())
+ {
+ notifyTestListenersOfStart();
+ }
JMeterVariables.initialize();
while(iter.hasNext())
{
1.15 +3 -42 jakarta-jmeter/src_1/org/apache/jmeter/gui/MainFrame.java
Index: MainFrame.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/MainFrame.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MainFrame.java 11 Jul 2002 00:26:52 -0000 1.14
+++ MainFrame.java 7 Aug 2002 02:15:29 -0000 1.15
@@ -132,7 +132,6 @@
JLabel stopLabel = new JLabel(JMeterUtils.getResString("stopping_test"));
stopLabel.setBorder(BorderFactory.createEmptyBorder(20,20,20,20));
stoppingMessage.getContentPane().add(stopLabel);
- stoppingMessage.setDefaultCloseOperation(stoppingMessage.DO_NOTHING_ON_CLOSE);
stoppingMessage.pack();
ComponentUtil.centerComponentInComponent(this,stoppingMessage);
stoppingMessage.show();
@@ -255,25 +254,6 @@
return tree;
}
- /****************************************
- * !ToDo (Method description)
- *
- *@param newRunning !ToDo (Parameter description)
- *@param host !ToDo (Parameter description)
- ***************************************/
- public void setRunning(boolean newRunning, String host)
- {
- if(newRunning)
- {
- hosts.add(host);
- }
- else
- {
- hosts.remove(host);
- }
- this.menuBar.setRunning(newRunning, host);
- }
-
public void testStarted(String host)
{
runningIndicator.setIcon(runningIcon);
@@ -305,25 +285,6 @@
runningIndicator.setIcon(stoppedIcon);
}
menuBar.setRunning(false,host);
- }
-
- /****************************************
- * !ToDo (Method description)
- *
- *@param newRunning !ToDo (Parameter description)
- ***************************************/
- public void setRunning(boolean newRunning)
- {
- if(newRunning)
- {
- runningIndicator.setIcon(runningIcon);
- }
- else
- {
- runningIndicator.setIcon(stoppedIcon);
- }
- running = newRunning;
- this.menuBar.setEnabled(newRunning);
}
private void init()
1.11 +0 -1 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Start.java
Index: Start.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Start.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Start.java 29 Jun 2002 00:37:00 -0000 1.10
+++ Start.java 7 Aug 2002 02:15:29 -0000 1.11
@@ -133,7 +133,6 @@
convertSubTree(testTree);
testTree.add(testTree.getArray()[0],gui.getMainFrame());
engine.configure(testTree);
- gui.getMainFrame().setRunning(true);
try {
engine.runTest();
} catch(JMeterEngineException e) {
1.9 +13 -3 jakarta-jmeter/src_1/org/apache/jmeter/gui/util/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/util/JMeterMenuBar.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JMeterMenuBar.java 17 Jul 2002 01:27:46 -0000 1.8
+++ JMeterMenuBar.java 7 Aug 2002 02:15:29 -0000 1.9
@@ -400,8 +400,17 @@
Iterator iter2 = remote_engine_stop.iterator();
while(iter.hasNext() && iter2.hasNext())
{
- ((JMenuItem)iter.next()).setEnabled(!running);
- ((JMenuItem)iter2.next()).setEnabled(running);
+ JMenuItem start = (JMenuItem)iter.next();
+ JMenuItem stop = (JMenuItem)iter2.next();
+ System.out.println("host = "+host+" start = "+start.getText());
+ if(start.getText().equals(host))
+ {
+ start.setEnabled(!running);
+ }
+ if(stop.getText().equals(host))
+ {
+ stop.setEnabled(running);
+ }
}
}
@@ -436,6 +445,7 @@
item.setActionCommand("remote_stop");
item.setName(remoteHosts[i]);
item.addActionListener(ActionRouter.getInstance());
+ item.setEnabled(false);
remote_engine_stop.add(item);
remote_stop.add(item);
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>