svn commit: r907209 - in /jakarta/jmeter/trunk/bin: mirror-server.cmd mirror-server.sh shutdown.cmd shutdown.sh stoptest.cmd stoptest.sh
Author: sebb Date: Sat Feb 6 13:19:50 2010 New Revision: 907209 URL: http://svn.apache.org/viewvc?rev=907209view=rev Log: Add comments Modified: jakarta/jmeter/trunk/bin/mirror-server.cmd jakarta/jmeter/trunk/bin/mirror-server.sh jakarta/jmeter/trunk/bin/shutdown.cmd jakarta/jmeter/trunk/bin/shutdown.sh jakarta/jmeter/trunk/bin/stoptest.cmd jakarta/jmeter/trunk/bin/stoptest.sh Modified: jakarta/jmeter/trunk/bin/mirror-server.cmd URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/mirror-server.cmd?rev=907209r1=907208r2=907209view=diff == --- jakarta/jmeter/trunk/bin/mirror-server.cmd (original) +++ jakarta/jmeter/trunk/bin/mirror-server.cmd Sat Feb 6 13:19:50 2010 @@ -15,6 +15,9 @@ rem See the License for the specific language governing permissions and rem limitations under the License. +rem Run the JMeter mirror server in non-GUI mode +rem P1 = port to use (default 8080) + setlocal cd /D %~dp0 Modified: jakarta/jmeter/trunk/bin/mirror-server.sh URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/mirror-server.sh?rev=907209r1=907208r2=907209view=diff == --- jakarta/jmeter/trunk/bin/mirror-server.sh (original) +++ jakarta/jmeter/trunk/bin/mirror-server.sh Sat Feb 6 13:19:50 2010 @@ -15,6 +15,9 @@ ## See the License for the specific language governing permissions and ## limitations under the License. +# Run the JMeter mirror server in non-GUI mode +# P1 = port to use (default 8080) + cd `dirname $0` CP=../lib/ext/ApacheJMeter_http.jar;../lib/ext/ApacheJMeter_core.jar;../lib/jorphan.jar Modified: jakarta/jmeter/trunk/bin/shutdown.cmd URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/shutdown.cmd?rev=907209r1=907208r2=907209view=diff == --- jakarta/jmeter/trunk/bin/shutdown.cmd (original) +++ jakarta/jmeter/trunk/bin/shutdown.cmd Sat Feb 6 13:19:50 2010 @@ -15,7 +15,9 @@ rem See the License for the specific language governing permissions and rem limitations under the License. -rem Run the Shutdown client +rem Run the Shutdown client to stop a non-GUI instance gracefully + +rem P1 = command port for JMeter instance (defaults to 4445) java -cp %~dp0ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient Shutdown %* pause \ No newline at end of file Modified: jakarta/jmeter/trunk/bin/shutdown.sh URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/shutdown.sh?rev=907209r1=907208r2=907209view=diff == --- jakarta/jmeter/trunk/bin/shutdown.sh (original) +++ jakarta/jmeter/trunk/bin/shutdown.sh Sat Feb 6 13:19:50 2010 @@ -15,7 +15,9 @@ ## See the License for the specific language governing permissions and ## limitations under the License. -# Run the JMeter shutdown client +# Run the Shutdown client to stop a non-GUI instance gracefully + +# P1 = command port for JMeter instance (defaults to 4445) DIRNAME=`dirname $0` Modified: jakarta/jmeter/trunk/bin/stoptest.cmd URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/stoptest.cmd?rev=907209r1=907208r2=907209view=diff == --- jakarta/jmeter/trunk/bin/stoptest.cmd (original) +++ jakarta/jmeter/trunk/bin/stoptest.cmd Sat Feb 6 13:19:50 2010 @@ -15,7 +15,9 @@ rem See the License for the specific language governing permissions and rem limitations under the License. -rem Run the Shutdown client +rem Run the Shutdown client to stop a non-GUI instance abruptly + +rem P1 = command port for JMeter instance (defaults to 4445) java -cp %~dp0ApacheJMeter.jar org.apache.jmeter.util.ShutdownClient StopTestNow %* pause \ No newline at end of file Modified: jakarta/jmeter/trunk/bin/stoptest.sh URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/stoptest.sh?rev=907209r1=907208r2=907209view=diff == --- jakarta/jmeter/trunk/bin/stoptest.sh (original) +++ jakarta/jmeter/trunk/bin/stoptest.sh Sat Feb 6 13:19:50 2010 @@ -15,7 +15,9 @@ ## See the License for the specific language governing permissions and ## limitations under the License. -# Run the JMeter shutdown client +# Run the Shutdown client to stop a non-GUI instance abruptly + +# P1 = command port for JMeter instance (defaults to 4445) DIRNAME=`dirname $0` - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r907212 - in /jakarta/jmeter/trunk: docs/images/screenshots/ docs/images/screenshots/webtest/ xdocs/images/screenshots/ xdocs/images/screenshots/webtest/ xdocs/usermanual/
Author: sebb Date: Sat Feb 6 13:26:56 2010 New Revision: 907212 URL: http://svn.apache.org/viewvc?rev=907212view=rev Log: Updating docs with new images etc. Added: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http_login.png (with props) jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http_login.png (with props) Removed: jakarta/jmeter/trunk/docs/images/screenshots/http_login.png jakarta/jmeter/trunk/xdocs/images/screenshots/http_login.png Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-defaults1.png jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-defaults2.png jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request1.png jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request2.png jakarta/jmeter/trunk/docs/images/screenshots/webtest/threadgroup.png jakarta/jmeter/trunk/docs/images/screenshots/webtest/threadgroup2.png jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults1.png jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults2.png jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-request1.png jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-request2.png jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/threadgroup.png jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/threadgroup2.png jakarta/jmeter/trunk/xdocs/usermanual/build-web-test-plan.xml jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml jakarta/jmeter/trunk/xdocs/usermanual/test_plan.xml Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-defaults1.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-defaults1.png?rev=907212r1=907211r2=907212view=diff == Binary files - no diff available. Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-defaults2.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-defaults2.png?rev=907212r1=907211r2=907212view=diff == Binary files - no diff available. Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request1.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request1.png?rev=907212r1=907211r2=907212view=diff == Binary files - no diff available. Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request2.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request2.png?rev=907212r1=907211r2=907212view=diff == Binary files - no diff available. Added: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http_login.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/http_login.png?rev=907212view=auto == Binary file - no diff available. Propchange: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http_login.png -- svn:mime-type = image/png Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/threadgroup.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/threadgroup.png?rev=907212r1=907211r2=907212view=diff == Binary files - no diff available. Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/threadgroup2.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/threadgroup2.png?rev=907212r1=907211r2=907212view=diff == Binary files - no diff available. Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults1.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults1.png?rev=907212r1=907211r2=907212view=diff == Binary files - no diff available. Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults2.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults2.png?rev=907212r1=907211r2=907212view=diff == Binary files - no diff available. Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-request1.png URL:
svn commit: r907216 - in /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui: MultipartUrlConfigGui.java UrlConfigGui.java
Author: sebb
Date: Sat Feb 6 13:55:15 2010
New Revision: 907216
URL: http://svn.apache.org/viewvc?rev=907216view=rev
Log:
Make Follow Redirects the default (better for cookie tracking)
Easier selection of redirect options
Move Proxy panel lower down screen
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?rev=907216r1=907215r2=907216view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
Sat Feb 6 13:55:15 2010
@@ -82,6 +82,7 @@
this.add(getWebServerTimeoutPanel(), BorderLayout.NORTH);
this.add(webRequestPanel, BorderLayout.CENTER);
+this.add(getProxyServerPanel(), BorderLayout.SOUTH);
}
private JPanel getHTTPFileArgsPanel() {
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=907216r1=907215r2=907216view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Sat Feb 6 13:55:15 2010
@@ -106,8 +106,8 @@
public void clear() {
domain.setText(); // $NON-NLS-1$
if (notConfigOnly){
-followRedirects.setSelected(false);
-autoRedirects.setSelected(true);
+followRedirects.setSelected(true);
+autoRedirects.setSelected(false);
method.setText(HTTPSamplerBase.DEFAULT_METHOD);
useKeepAlive.setSelected(true);
useMultipartForPost.setSelected(false);
@@ -221,6 +221,7 @@
this.add(getWebServerTimeoutPanel(), BorderLayout.NORTH);
this.add(webRequestPanel, BorderLayout.CENTER);
+this.add(getProxyServerPanel(), BorderLayout.SOUTH);
}
/**
@@ -250,6 +251,17 @@
webServerTimeoutPanel.add(webServerPanel, BorderLayout.CENTER);
webServerTimeoutPanel.add(timeOut, BorderLayout.EAST);
+JPanel bigPanel = new VerticalPanel();
+bigPanel.add(webServerTimeoutPanel);
+return bigPanel;
+}
+
+/**
+ * Create a panel containing the proxy server details
+ *
+ * @return the panel
+ */
+protected final JPanel getProxyServerPanel(){
JPanel proxyServer = new HorizontalPanel();
proxyServer.add(getProxyHostPanel(), BorderLayout.CENTER);
proxyServer.add(getProxyPortPanel(), BorderLayout.EAST);
@@ -264,10 +276,7 @@
proxyServerPanel.add(proxyServer, BorderLayout.CENTER);
proxyServerPanel.add(proxyLogin, BorderLayout.EAST);
-JPanel bigPanel = new VerticalPanel();
-bigPanel.add(webServerTimeoutPanel);
-bigPanel.add(proxyServerPanel);
-return bigPanel;
+return proxyServerPanel;
}
private JPanel getPortPanel() {
@@ -385,11 +394,12 @@
if (notConfigOnly){
followRedirects = new
JCheckBox(JMeterUtils.getResString(follow_redirects)); // $NON-NLS-1$
-followRedirects.setSelected(false);
+followRedirects.setSelected(true);
+followRedirects.addChangeListener(this);
autoRedirects = new
JCheckBox(JMeterUtils.getResString(follow_redirects_auto)); //$NON-NLS-1$
autoRedirects.addChangeListener(this);
-autoRedirects.setSelected(true);// Default changed in 2.3
+autoRedirects.setSelected(false);// Default changed in 2.3 and
again in 2.4
useKeepAlive = new
JCheckBox(JMeterUtils.getResString(use_keepalive)); // $NON-NLS-1$
useKeepAlive.setSelected(true);
@@ -457,13 +467,16 @@
return argsPanel;
}
-// Disable follow redirects if Autoredirect is selected
+// autoRedirects and followRedirects cannot both be selected
public void stateChanged(ChangeEvent e) {
if (e.getSource() == autoRedirects){
if (autoRedirects.isSelected()) {
-followRedirects.setEnabled(false);
-} else {
-followRedirects.setEnabled(true);
+
svn commit: r907218 - /jakarta/jmeter/trunk/xdocs/changes.xml
Author: sebb Date: Sat Feb 6 13:59:34 2010 New Revision: 907218 URL: http://svn.apache.org/viewvc?rev=907218view=rev Log: Make Follow Redirects the default (better for cookie tracking) Modified: jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=907218r1=907217r2=907218view=diff == --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Feb 6 13:59:34 2010 @@ -60,6 +60,12 @@ h2Incompatible changes/h2 p +HTTP Redirect now defaults to Follow Redirects rather than Redirect Automatically. +This is to enable JMeter to track cookies that may be sent during redirects. +This does not affect existing test plans; it only affects the default for new HTTP Samplers. +/p + +p The Avalon file format for JMX and JTL files is no longer supported. Any such files will need to be converted by reading them in JMeter 2.3.4 and resaving them. /p - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
[g...@vmgump]: Project jakarta-jmeter-svn (in module jakarta-jmeter) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project jakarta-jmeter-svn has an issue affecting its community integration. This issue affects 2 projects, and has been outstanding for 10 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-jmeter-svn : Pure Java load testing and performance measurement tool. ... - jakarta-jmeter-test : Pure Java load testing and performance measurement tool. ... Full details are available at: http://vmgump.apache.org/gump/public/jakarta-jmeter/jakarta-jmeter-svn/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Made directory [/srv/gump/public/workspace/jakarta-jmeter/build/core] -INFO- Made directory [/srv/gump/public/workspace/jakarta-jmeter/build/jorphan] -INFO- Made directory [/srv/gump/public/workspace/jakarta-jmeter/build/components] -INFO- Made directory [/srv/gump/public/workspace/jakarta-jmeter/build/protocol/http] -INFO- Made directory [/srv/gump/public/workspace/jakarta-jmeter/build/monitor/model] -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/jakarta-jmeter/jakarta-jmeter-svn/gump_work/build_jakarta-jmeter_jakarta-jmeter-svn.html Work Name: build_jakarta-jmeter_jakarta-jmeter-svn (Type: Build) Work ended in a state of : Failed Elapsed: 10 secs Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true -Xbootclasspath/p:/srv/gump/public/workspace/xml-xalan/build/serializer.jar:/srv/gump/public/workspace/xml-xalan/build/xalan-unbundled.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/srv/gump/public/workspace/xml-xerces2/build/xercesImpl.jar org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only '-Dversion.projectfile=$Revision: 888330 $' -Djmeter.version=06022010 -Dgump.run=true '-Ddate.projectfile=$Date: 2009-12-08 03:17:10 -0800 (Tue, 08 Dec 2009) $' gump-build [Working Directory: /srv/gump/public/workspace/jakarta-jmeter] CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/jakarta-jmeter/build/core:/srv/gump/public/workspace/jakarta-jmeter/build/jorphan:/srv/gump/public/workspace/jakarta-jmeter/build/components:/srv/gump/public/workspace/jakarta-jmeter/build/protocol/http:/srv/gump/public/workspace/jakarta-jmeter/build/monitor/model:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/dist/lib/ant-trax.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/package s/jsse1.0.3/lib/jcert.jar:/srv/gump/packages/jsse1.0.3/lib/jnet.jar:/srv/gump/packages/jsse1.0.3/lib/jsse.jar:/srv/gump/packages/jms1.1/lib/jms.jar:/srv/gump/public/workspace/rhino/build/rhino_06022010/js.jar:/srv/gump/public/workspace/jakarta-bsf/build/lib/bsf.jar:/srv/gump/public/workspace/apache-commons/codec/dist/commons-codec-06022010.jar:/srv/gump/public/workspace/apache-commons/io/target/commons-io-06022010.jar:/srv/gump/public/workspace/commons-lang-2.x/target/commons-lang-2.4.jar:/srv/gump/public/workspace/commons-jexl-1.x/target/commons-jexl-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/httpcomponents/oac.hc3x/dist/commons-httpclient.jar:/srv/gump/public/workspace/apache-commons/net/dist/commons-net-06022010.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-06022010.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api
