Author: sebb
Date: Sat May 20 06:52:03 2006
New Revision: 407999
URL: http://svn.apache.org/viewvc?rev=407999&view=rev
Log:
Move bsh.prompt redefinition to client, so ordinary telnet works as before
Modified:
jakarta/jmeter/branches/rel-2-1/extras/startup.bsh
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/BeanShellClient.java
Modified: jakarta/jmeter/branches/rel-2-1/extras/startup.bsh
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-1/extras/startup.bsh?rev=407999&r1=407998&r2=407999&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/extras/startup.bsh (original)
+++ jakarta/jmeter/branches/rel-2-1/extras/startup.bsh Sat May 20 06:52:03 2006
@@ -12,9 +12,6 @@
// Stop exit() from calling System.exit();
bsh.system.shutdownOnExit = false;
-// Disable prompt
-bsh.prompt="";
-
print("Startup script running");
import org.apache.jmeter.util.JMeterUtils;
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/BeanShellClient.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/BeanShellClient.java?rev=407999&r1=407998&r2=407999&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/BeanShellClient.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/BeanShellClient.java
Sat May 20 06:52:03 2006
@@ -57,6 +57,8 @@
new SockRead(is).start();
+ sendLine("bsh.prompt=\"\";",os);// Prompt is unnecessary
+
sendLine("String [] args={",os);
for (int i=MINARGS; i<args.length;i++){
sendLine("\""+args[i]+"\",\n",os);
@@ -67,6 +69,7 @@
while ((b=fis.read()) != -1){
os.write(b);
}
+ sendLine("bsh.prompt=\"bsh % \";",os);// Reset for other users
os.flush();
sock.shutdownOutput(); // Tell server that we are done
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
