svn commit: r910224 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
Author: sebb
Date: Mon Feb 15 14:24:25 2010
New Revision: 910224
URL: http://svn.apache.org/viewvc?rev=910224view=rev
Log:
Remove dependency on default encoding
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java?rev=910224r1=910223r2=910224view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
Mon Feb 15 14:24:25 2010
@@ -49,7 +49,7 @@
private static final Logger log = LoggingManager.getLoggerForClass();
-private static final byte[] XML_PFX = ?xml .getBytes(); // $NON-NLS-1$
+private static final byte[] XML_PFX = {'','?','x','m','l',' '};//?xml
public RenderAsXML(){
activateSearchExtension = false; // TODO work out how to search the
XML pane
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r910377 - /jakarta/jmeter/trunk/lib/api/
Author: sebb Date: Tue Feb 16 02:02:41 2010 New Revision: 910377 URL: http://svn.apache.org/viewvc?rev=910377view=rev Log: Allow any versions of geronimo spec jars Modified: jakarta/jmeter/trunk/lib/api/ (props changed) Propchange: jakarta/jmeter/trunk/lib/api/ -- --- svn:ignore (original) +++ svn:ignore Tue Feb 16 02:02:41 2010 @@ -1,4 +1,4 @@ -geronimo-activation_1.0.2_spec-1.1.jar -geronimo-jms_1.1_spec-1.0.jar -geronimo-javamail_1.3.1_spec-1.1.jar +geronimo-activation_*_spec-*.jar +geronimo-jms_*_spec-*.jar +geronimo-javamail_*_spec-*.jar bsf-api-*.jar - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r910379 - /jakarta/jmeter/trunk/build.properties
Author: sebb Date: Tue Feb 16 02:18:35 2010 New Revision: 910379 URL: http://svn.apache.org/viewvc?rev=910379view=rev Log: More recent versions of Geronimo spec jars Modified: jakarta/jmeter/trunk/build.properties Modified: jakarta/jmeter/trunk/build.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.properties?rev=910379r1=910378r2=910379view=diff == --- jakarta/jmeter/trunk/build.properties (original) +++ jakarta/jmeter/trunk/build.properties Tue Feb 16 02:18:35 2010 @@ -184,19 +184,17 @@ xmlgraphics-commons.md5 = E63589601D939739349A50A029DAB120 # Geronimo API jars (compile-time only) -activation.jar = geronimo-activation_1.0.2_spec-1.1.jar -activation.loc = http://mirrors.ibiblio.org/pub/mirrors/maven/org.apache.geronimo.specs/jars -# diff -activation.md5 = 6a3a594753a07b325f21d32c452c3779 +activation.jar = geronimo-activation_1.1_spec-1.0.2.jar +activation.loc = http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.2/ +activation.md5 = 9759ed85c6e767bf3dc00c4cf635c4e2 -javamail.jar= geronimo-javamail_1.3.1_spec-1.1.jar -javamail.loc= http://mirrors.ibiblio.org/pub/mirrors/maven/org.apache.geronimo.specs/jars -# diff -javamail.md5= 529c667a51cc4febdff3caeda4675cb4 +javamail.jar= geronimo-javamail_1.4_spec-1.6.jar +javamail.loc= http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.6/ +javamail.md5= 2bcb3208c8e0c8e9713d8222abb33788 -jms.jar = geronimo-jms_1.1_spec-1.0.jar -jms.loc = http://mirrors.ibiblio.org/pub/mirrors/maven/org.apache.geronimo.specs/jars -jms.md5 = 3A10BDB4AB6455AB16E4FC543BBD6B89 +jms.jar = geronimo-jms_1.1_spec-1.1.1.jar +jms.loc = http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/ +jms.md5 = d80ce71285696d36c1add1989b94f084 # The following jars are only needed for source distributions # They are used for building the documentation - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: site broken
On 13/02/2010, Luke Nezda lne...@gmail.com wrote: Hello - The server for the main page, http://jakarta.apache.org/jmeter/, seems to be misconfigured somehow. Going to that URL with Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6) I get the following error: Content Encoding Error The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. * Please contact the website owners to inform them of this problem. I was able to view the site using Safari. I think it's OK now - I have no problems using IE8, Opera10 or Firefox 3.5.x Only related thing I found when searching was http://groups.google.com/group/fusionreactor/msg/c5ccde4bd34ad6f6 which references GzipFilter servlet filter. Cheers, - Luke - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: site broken
On 13/02/2010, Rainer Jung rainer.j...@kippdata.de wrote: On 13.02.2010 16:55, sebb wrote: On 13/02/2010, Luke Nezdalne...@gmail.com wrote: Hello - The server for the main page, http://jakarta.apache.org/jmeter/, seems to be misconfigured somehow. Going to that URL with Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6) I get the following error: Content Encoding Error The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. * Please contact the website owners to inform them of this problem. I was able to view the site using Safari. I think it's OK now - I have no problems using IE8, Opera10 or Firefox 3.5.x There are people with complains also showing up on other lists, like infra, svn and tomcat. It seems it does not happen on every request and it also might be a question of which of servers you actually hit (europe or us). See http://marc.info/?t=12660725582r=1w=2 I've just tried both the us and eu mirrors, and have seen no problems with either: http://jakarta.eu.apache.org/jmeter/index.html http://jakarta.us.apache.org/jmeter/index.html Maybe the problem has been fixed, or maybe I'm just lucky... Regards, Rainer - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: HttpSampler sample per embeded resource support
On 12/02/2010, Eugene Rachitskiy professoreug...@gmail.com wrote: Hello Everyone, I'm new to this list, but have been working with JMeter for a couple of years. When one has the HTTP or HttpClient samplers configured to download all embedded resources, it would be nice to be able to configure the sampler behavior in such a way that each embedded request (GET) would count as a separate sample. For example, fetching an object that has two images would report three samples rather than one. It already reports one sample per image, it's just that the sample results are attached as child samples of the original sample. At the moment, there does not seem to be a way of doing this other than configuring a sampler/embedded resource. Is anyone interested in this functionality? If so, I've put up a patch against 2.3.4/r786921 over at http://svn.campuseai.org/patches/jmeter/samplePerRequest-2.3.4-786921.diff . What's wrong with the current behaviour? Cheers, Eugene - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r908939 - /jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Author: sebb Date: Thu Feb 11 11:46:51 2010 New Revision: 908939 URL: http://svn.apache.org/viewvc?rev=908939view=rev Log: Clarifications Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=908939r1=908938r2=908939view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Thu Feb 11 11:46:51 2010 @@ -433,7 +433,8 @@ component name=Java Request index=sect-num;.1.4 width=406 height=307 screenshot=java_request.png descriptionpThis sampler lets you control a java class that implements the -JavaSamplerClient interface. By writing your own implementation of this interface, +bcodeorg.apache.jmeter.protocol.java.sampler.JavaSamplerClient/code/b interface. +By writing your own implementation of this interface, you can use JMeter to harness multiple threads, input parameter control, and data collection./p pThe pull-down menu provides the list of all such implementations found by @@ -4371,8 +4372,17 @@ [The option does not affect CSV result files, which cannot currently store such information.] /p pAlso, an option exists here to instruct JMeter to run the complink name=Thread Group/ serially rather than in parallel./p -pTest plan now provides an easy way to add classpath setting to a specific test plan. The feature is additive, meaning that you can add jar files or directories, but removing an entry requires restarting JMeter. In the past, users had to copy all the jar files to jmeter/lib/ directory. Now that is not necessary. JMeter properties also provides an entry for loading additional classpaths./p -pIn jmeter.properties, edit user.classpath to include additional libraries./p/description +p +Test plan now provides an easy way to add classpath setting to a specific test plan. +The feature is additive, meaning that you can add jar files or directories, but removing an entry requires restarting JMeter. +Note that this cannot be used to add JMeter GUI plugins, because they are processed earlier. +However it can be useful for utility jars such as JDBC drivers. +/p +p +JMeter properties also provides an entry for loading additional classpaths. +In jmeter.properties, edit user.classpath to include additional libraries. +/p +/description /component component name=Thread Group index=sect-num;.9.2 width=411 height=419 screenshot=threadgroup.png - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r909130 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/assertions/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/modifiers/ src/components/org/
Author: sebb Date: Thu Feb 11 20:19:06 2010 New Revision: 909130 URL: http://svn.apache.org/viewvc?rev=909130view=rev Log: Bug 48714 - add new French messages Added: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties (with props) jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties (with props) jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources_fr.properties (with props) Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessorResources_fr.properties jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/JSR223ListenerResources_fr.properties jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties jakarta/jmeter/trunk/xdocs/changes.xml Added: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties?rev=909130view=auto == --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties (added) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties Thu Feb 11 20:19:06 2010 @@ -0,0 +1,29 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + +#Stored by I18NEdit, may be edited! +displayName=Assertion JSR223 +filename.displayName=Nom de fichier +filename.shortDescription=Fichier de script (remplace le script) +filenameGroup.displayName=Fichier de script (remplace le script) +parameterGroup.displayName=Param\u00E8tres \u00E0 passer au script (\= String Parameters and String []args) +parameters.displayName=Param\u00E8tres +parameters.shortDescription=Param\u00E8tres \u00E0 passer au fichier ou au script +script.displayName=Script +script.shortDescription=Script dans le langage JSR223 appropri\u00E9 +scriptLanguage.displayName=Langage +scriptLanguage.shortDescription=Nom du langage JSR223, i.e. groovy, jython, jruby, etc. +scripting.displayName=Script (variables\: ctx vars props SampleResult (avant prev) AssertionResult sampler log Label Filename Parameters args[] OUT) +scriptingLanguage.displayName=Langage de script (i.e. groovy, javascript, jexl, etc.) Propchange: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources_fr.properties -- svn:eol-style = native Added: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties?rev=909130view=auto == --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties (added) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/JSR223PostProcessorResources_fr.properties Thu Feb 11 20:19:06 2010 @@ -0,0 +1,29 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. + +#Stored by I18NEdit, may be edited! +displayName
svn commit: r908128 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Author: sebb
Date: Tue Feb 9 17:50:00 2010
New Revision: 908128
URL: http://svn.apache.org/viewvc?rev=908128view=rev
Log:
Thread-safety fixes
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=908128r1=908127r2=908128view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Tue Feb 9 17:50:00 2010
@@ -122,7 +122,7 @@
//@GuardedBy(LOCK)
private static int instanceCount; // Keep track of how many instances are
active
-// Instance variables
+// Instance variables (guarded by volatile)
private transient volatile PrintWriter out;
@@ -131,7 +131,7 @@
private volatile boolean isStats = false;
/** the summarizer to which this result collector will forward the samples
*/
-private Summariser summariser;
+private volatile Summariser summariser;
/**
* No-arg constructor.
@@ -170,11 +170,11 @@
return getPropertyAsBoolean(ERROR_LOGGING);
}
-public void setErrorLogging(boolean errorLogging) {
+public final void setErrorLogging(boolean errorLogging) {
setProperty(new BooleanProperty(ERROR_LOGGING, errorLogging));
}
-public void setSuccessOnlyLogging(boolean value) {
+public final void setSuccessOnlyLogging(boolean value) {
if (value) {
setProperty(new BooleanProperty(SUCCESS_ONLY_LOGGING, true));
} else {
@@ -248,7 +248,7 @@
}
}
-public synchronized void testStarted(String host) {
+public void testStarted(String host) {
synchronized(LOCK){
instanceCount++;
try {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r908129 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads: JMeterContextService.java JMeterThread.java
Author: sebb
Date: Tue Feb 9 17:50:44 2010
New Revision: 908129
URL: http://svn.apache.org/viewvc?rev=908129view=rev
Log:
Clear JMeterContext ThreadLocal on thread end
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java?rev=908129r1=908128r2=908129view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
Tue Feb 9 17:50:44 2010
@@ -57,6 +57,15 @@
}
/**
+ * Allows the thread Context to be completely cleared.
+ * br/
+ * Invokes {...@link ThreadLocal#remove()}.
+ */
+static void removeContext(){ // Currently only used by JMeterThread
+threadContext.remove();
+}
+
+/**
* Method is called by the JMeterEngine class when a test run is started.
* Zeroes numberOfActiveThreads.
* Saves current time in a field and in the JMeter property TESTSTART.MS
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=908129r1=908128r2=908129view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Tue Feb 9 17:50:44 2010
@@ -268,6 +268,7 @@
log.info(Thread finished: + threadName);
threadFinished();
monitor.threadFinished(this); // Tell the engine we are done
+JMeterContextService.removeContext(); // Remove the ThreadLocal
entry
}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r908130 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Tue Feb 9 17:51:08 2010
New Revision: 908130
URL: http://svn.apache.org/viewvc?rev=908130view=rev
Log:
Oops - comparing the wrong files
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=908130r1=908129r2=908130view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Tue Feb 9 17:51:08 2010
@@ -1753,12 +1753,16 @@
/condition
fail unless=BatchTestLocal.csv.OK
CSV Files are not identical.
+ ${batchtest.inp}/${batchtest.name}.csv
+ ${batchtest.out}/${batchtest.name}.csv
/fail
condition property=BatchTestLocal.xml.OK
- filesmatch file1=${batchtest.inp}/${batchtest.name}.csv
file2=${batchtest.out}/${batchtest.name}.csv/
+ filesmatch file1=${batchtest.inp}/${batchtest.name}.xml
file2=${batchtest.out}/${batchtest.name}.xml/
/condition
fail unless=BatchTestLocal.xml.OK
XML Files are not identical.
+ ${batchtest.inp}/${batchtest.name}.xml
+ ${batchtest.out}/${batchtest.name}.xml
/fail
echo level=info${batchtest.name} output files compared OK/echo
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r908165 - /jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java
Author: sebb
Date: Tue Feb 9 19:24:04 2010
New Revision: 908165
URL: http://svn.apache.org/viewvc?rev=908165view=rev
Log:
Better ordering of elements
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java?rev=908165r1=908164r2=908165view=diff
==
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java
Tue Feb 9 19:24:04 2010
@@ -39,10 +39,6 @@
private static final Logger log = LoggingManager.getLoggerForClass();
-private FileRowColContainer container;
-
-private int currentRow;
-
private static final int NO_LINE = -1;
private static volatile String defaultFile = ; // for omitted file names
//$NON-NLS-1$
@@ -55,15 +51,6 @@
private static final MapString, FileRowColContainer fileContainers =
new HashMapString, FileRowColContainer();
-/*
- * Only needed locally
- */
-private FileWrapper(FileRowColContainer fdc) {
-super();
-container = fdc;
-currentRow = -1;
-}
-
/* The cache of file packs - used to improve thread access */
private static final ThreadLocalMapString, FileWrapper filePacks =
new ThreadLocalMapString, FileWrapper() {
@@ -73,6 +60,19 @@
}
};
+private final FileRowColContainer container;
+
+private int currentRow;
+
+/*
+ * Only needed locally
+ */
+private FileWrapper(FileRowColContainer fdc) {
+super();
+container = fdc;
+currentRow = -1;
+}
+
private static String checkDefault(String file) {
if (file.length() == 0) {
if (fileContainers.size() == 1 defaultFile.length() 0) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r908166 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
Author: sebb
Date: Tue Feb 9 19:24:33 2010
New Revision: 908166
URL: http://svn.apache.org/viewvc?rev=908166view=rev
Log:
Thread-safety
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java?rev=908166r1=908165r2=908166view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
Tue Feb 9 19:24:33 2010
@@ -59,10 +59,10 @@
private static final String DEFAULT_BASE =
JMeterUtils.getProperty(user.dir);
+//@GuardedBy(this)
private File base;
-//TODO - make files and random static as the class is a singleton?
-
+//@GuardedBy(this)
private final MapString, FileEntry files = new HashMapString,
FileEntry();
private static final FileServer server = new FileServer();
@@ -254,7 +254,7 @@
return new BufferedWriter(osw);
}
-public void closeFiles() throws IOException {
+public synchronized void closeFiles() throws IOException {
IteratorMap.EntryString, FileEntry iter =
files.entrySet().iterator();
while (iter.hasNext()) {
Map.EntryString, FileEntry me = iter.next();
@@ -286,7 +286,7 @@
}
}
-protected boolean filesOpen() {
+boolean filesOpen() { // package access for test code only
IteratorFileEntry iter = files.values().iterator();
while (iter.hasNext()) {
FileEntry fileEntry = iter.next();
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r908191 - in /jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client: ClientPool.java InitialContextFactory.java
Author: sebb
Date: Tue Feb 9 20:07:58 2010
New Revision: 908191
URL: http://svn.apache.org/viewvc?rev=908191view=rev
Log:
Thread-safety
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java?rev=908191r1=908190r2=908191view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
Tue Feb 9 20:07:58 2010
@@ -33,6 +33,7 @@
*/
public class ClientPool {
+//GuardedBy(this)
private static final ArrayListObject clients = new ArrayListObject();
private static final MapObject, Object client_map = new HashMapObject,
Object();
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java?rev=908191r1=908190r2=908191view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
Tue Feb 9 20:07:58 2010
@@ -36,6 +36,7 @@
*/
public class InitialContextFactory {
+//GuardedBy(this)
private static final HashMapString, Context MAP = new HashMapString,
Context();
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -91,7 +92,7 @@
/**
* clear all the InitialContext objects.
*/
-public static void close() {
+public synchronized static void close() { // TODO - why is this not used?
Iterator? itr = MAP.keySet().iterator();
while (itr.hasNext()) {
Context ctx = MAP.get(itr.next());
@@ -101,6 +102,7 @@
log.error(e.getMessage());
}
}
+MAP.clear();
log.info(InitialContextFactory.close() called and Context instances
cleaned up);
}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r908219 [2/2] - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/assertions/ src/components/org/apache/jmeter/control/ src/components/org/apache/jmeter/control/gui/ src/component
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java?rev=908219r1=908218r2=908219view=diff
==
---
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
(original)
+++
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
Tue Feb 9 21:09:23 2010
@@ -53,19 +53,15 @@
init();
}
-/*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#getStaticLabel()
+/**
+ * {...@inheritdoc}
*/
public String getLabelResource() {
return example_title; // $NON-NLS-1$
}
-/*
- * (non-Javadoc) Copy the data from the test element to the GUI
- *
- * @see
org.apache.jmeter.gui.JMeterGUIComponent#configure(org.apache.jmeter.testelement.TestElement)
+/**
+ * {...@inheritdoc}
*/
@Override
public void configure(TestElement element) {
@@ -73,10 +69,8 @@
super.configure(element);
}
-/*
- * (non-Javadoc) Create the corresponding Test Element and set up its data
- *
- * @see org.apache.jmeter.gui.JMeterGUIComponent#createTestElement()
+/**
+ * {...@inheritdoc}
*/
public TestElement createTestElement() {
ExampleSampler sampler = new ExampleSampler();
@@ -84,11 +78,8 @@
return sampler;
}
-/*
- * (non-Javadoc) Modifies a given TestElement to mirror the data in the gui
- * components.
- *
- * @see
org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
+/**
+ * {...@inheritdoc}
*/
public void modifyTestElement(TestElement te) {
te.clear();
@@ -128,6 +119,9 @@
return dataPanel;
}
+/**
+ * {...@inheritdoc}
+ */
@Override
public void clearGui() {
super.clearGui();
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java?rev=908219r1=908218r2=908219view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
Tue Feb 9 21:09:23 2010
@@ -75,28 +75,30 @@
return this.rootNode;
}
-/* (non-Javadoc)
- * @see org.apache.jorphan.gui.TreeTableModel#getValueAt(java.lang.Object,
int)
+/**
+ * {...@inheritdoc}
*/
public Object getValueAt(Object node, int col) {
return null;
}
-/* (non-Javadoc)
- * @see
org.apache.jorphan.gui.TreeTableModel#isCellEditable(java.lang.Object, int)
+/**
+ * {...@inheritdoc}
*/
public boolean isCellEditable(Object node, int col) {
return false;
}
-/* (non-Javadoc)
- * @see org.apache.jorphan.gui.TreeTableModel#setValueAt(java.lang.Object,
java.lang.Object, int)
+/**
+ * {...@inheritdoc}
*/
public void setValueAt(Object val, Object node, int column) {
}
/**
* The implementation is exactly the same as
ObjectTableModel.getColumnCount.
+ * p
+ * {...@inheritdoc}
*/
@Override
public int getColumnCount() {
@@ -105,6 +107,8 @@
/**
* The implementation is exactly the same as ObjectTableModel.getRowCount.
+ * p
+ * {...@inheritdoc}
*/
@Override
public int getRowCount() {
@@ -117,12 +121,17 @@
/**
* By default the abstract class returns true. It is up to subclasses
* to override the implementation.
+ * p
+ * {...@inheritdoc}
*/
@Override
public boolean isCellEditable(int rowIndex, int columnIndex) {
return true;
}
+/**
+ * {...@inheritdoc}
+ */
@Override
public Class? getColumnClass(int arg0) {
return classes.get(arg0);
@@ -131,6 +140,8 @@
/**
* Subclasses need to implement the logic for the method and
* return the value at the specific cell.
+ * p
+ * {...@inheritdoc}
*/
@Override
public Object getValueAt(int rowIndex, int columnIndex) {
@@ -138,7 +149,7 @@
}
/**
- *
+ * {...@inheritdoc}
*/
@Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
@@ -146,7 +157,7 @@
}
/**
- *
+ * {...@inheritdoc}
*/
@Override
public String getColumnName(int columnIndex) {
@@ -176,7 +187,7 @@
}
/**
- *
+ * {...@inheritdoc}
*/
@Override
public void
svn commit: r907679 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
Author: sebb Date: Mon Feb 8 15:10:56 2010 New Revision: 907679 URL: http://svn.apache.org/viewvc?rev=907679view=rev Log: Javadoc clarification Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java?rev=907679r1=907678r2=907679view=diff == --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java Mon Feb 8 15:10:56 2010 @@ -36,6 +36,12 @@ private String method; +/** + * The raw value of the Location: header; may be null. + * This is supposed to be an absolute URL: + * a href=http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.30;RFC2616 sec14.30/a + * but is often relative. + */ private String redirectLocation; private String queryString = ; // never null - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r907684 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
Author: sebb
Date: Mon Feb 8 15:17:33 2010
New Revision: 907684
URL: http://svn.apache.org/viewvc?rev=907684view=rev
Log:
Use IP address rather than name to avoid DNS queries
Add basic redirect test
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java?rev=907684r1=907683r2=907684view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
Mon Feb 8 15:17:33 2010
@@ -125,14 +125,38 @@
assertEquals(http://www.apache.org/index.html?param1=value1;,
config.getUrl().toString());
}
+public void testRedirect() throws Exception {
+HTTPSamplerBase config = new HTTPNullSampler();
+config.setProtocol(http);
+config.setMethod(HTTPSamplerBase.GET);
+config.setDomain(192.168.0.1);
+HTTPSampleResult res = new HTTPSampleResult();
+res.sampleStart();
+res.setURL(config.getUrl());
+res.setResponseCode(301);
+res.sampleEnd();
+
+res.setRedirectLocation(./);
+config.followRedirects(res , 0);
+assertEquals(http://192.168.0.1/;, config.getUrl().toString());
+
+res.setRedirectLocation(.);
+config.followRedirects(res , 0);
+assertEquals(http://192.168.0.1/;, config.getUrl().toString());
+
+res.setRedirectLocation(../);
+config.followRedirects(res , 0);
+assertEquals(http://192.168.0.1/;, config.getUrl().toString());
+}
+
public void testMakingUrl2() throws Exception {
HTTPSamplerBase config = new HTTPNullSampler();
config.setProtocol(http);
config.setMethod(HTTPSamplerBase.GET);
config.addArgument(param1, value1);
config.setPath(/index.html?p1=p2);
-config.setDomain(www.apache.org);
-
assertEquals(http://www.apache.org/index.html?param1=value1p1=p2;,
config.getUrl().toString());
+config.setDomain(192.168.0.1);
+assertEquals(http://192.168.0.1/index.html?param1=value1p1=p2;,
config.getUrl().toString());
}
public void testMakingUrl3() throws Exception {
@@ -141,8 +165,8 @@
config.setMethod(HTTPSamplerBase.POST);
config.addArgument(param1, value1);
config.setPath(/index.html?p1=p2);
-config.setDomain(www.apache.org);
-assertEquals(http://www.apache.org/index.html?p1=p2;,
config.getUrl().toString());
+config.setDomain(192.168.0.1);
+assertEquals(http://192.168.0.1/index.html?p1=p2;,
config.getUrl().toString());
}
// test cases for making Url, and exercise method
@@ -154,8 +178,8 @@
config.setMethod(HTTPSamplerBase.GET);
config.addArgument(param1, value1, =);
config.setPath(/index.html);
-config.setDomain(www.apache.org);
-assertEquals(http://www.apache.org/index.html?param1=value1;,
config.getUrl().toString());
+config.setDomain(192.168.0.1);
+assertEquals(http://192.168.0.1/index.html?param1=value1;,
config.getUrl().toString());
}
public void testMakingUrl5() throws Exception {
@@ -164,8 +188,8 @@
config.setMethod(HTTPSamplerBase.GET);
config.addArgument(param1, , =);
config.setPath(/index.html);
-config.setDomain(www.apache.org);
-assertEquals(http://www.apache.org/index.html?param1=;,
config.getUrl().toString());
+config.setDomain(192.168.0.1);
+assertEquals(http://192.168.0.1/index.html?param1=;,
config.getUrl().toString());
}
public void testMakingUrl6() throws Exception {
@@ -174,8 +198,8 @@
config.setMethod(HTTPSamplerBase.GET);
config.addArgument(param1, , );
config.setPath(/index.html);
-config.setDomain(www.apache.org);
-assertEquals(http://www.apache.org/index.html?param1;,
config.getUrl().toString());
+config.setDomain(192.168.0.1);
+assertEquals(http://192.168.0.1/index.html?param1;,
config.getUrl().toString());
}
// test cases for making Url, and exercise method
@@ -187,8 +211,8 @@
config.setMethod(HTTPSamplerBase.GET);
config.parseArguments(param1=value1);
config.setPath(/index.html);
-config.setDomain
svn commit: r907839 - in /jakarta/jmeter/trunk: bin/testfiles/ src/components/org/apache/jmeter/config/ src/core/org/apache/jmeter/services/ test/src/org/apache/jmeter/config/ xdocs/ xdocs/usermanual/
Author: sebb
Date: Mon Feb 8 23:05:38 2010
New Revision: 907839
URL: http://svn.apache.org/viewvc?rev=907839view=rev
Log:
Bug 46790 - CSV Data Set Config should be able to parse CSV headers
Added:
jakarta/jmeter/trunk/bin/testfiles/testheader.csv
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Added: jakarta/jmeter/trunk/bin/testfiles/testheader.csv
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/testfiles/testheader.csv?rev=907839view=auto
==
--- jakarta/jmeter/trunk/bin/testfiles/testheader.csv (added)
+++ jakarta/jmeter/trunk/bin/testfiles/testheader.csv Mon Feb 8 23:05:38 2010
@@ -0,0 +1,5 @@
+A|B|C|D|1
+a1|b1|c1|d1
+a2|b2|c2|d2
+a3|b3|c3|d3
+a4|b4|c4|d4
\ No newline at end of file
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java?rev=907839r1=907838r2=907839view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
Mon Feb 8 23:05:38 2010
@@ -91,10 +91,9 @@
recycle = true;
return this;
}
-/*
- * (non-Javadoc)
- *
- * @see
org.apache.jmeter.engine.event.LoopIterationListener#iterationStart(org.apache.jmeter.engine.event.LoopIterationEvent)
+
+/**
+ * {...@inheritdoc}
*/
public void iterationStart(LoopIterationEvent iterEvent) {
FileServer server = FileServer.getFileServer();
@@ -117,8 +116,18 @@
alias = _fileName+@+mode; // user-specified key
break;
}
-server.reserveFile(_fileName, getFileEncoding(), alias);
-vars = JOrphanUtils.split(getVariableNames(), ,); // $NON-NLS-1$
+final String names = getVariableNames();
+if (names == null || names.length()==0) {
+String header = server.reserveFile(_fileName,
getFileEncoding(), alias, true);
+try {
+vars = CSVSaveService.csvSplitString(header,
getDelimiter().charAt(0));
+} catch (IOException e) {
+log.warn(Could not split CSV header line,e);
+}
+} else {
+server.reserveFile(_fileName, getFileEncoding(), alias);
+vars = JOrphanUtils.split(names, ,); // $NON-NLS-1$
+}
}
try {
String delim = getDelimiter();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java?rev=907839r1=907838r2=907839view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
Mon Feb 8 23:05:38 2010
@@ -118,7 +118,7 @@
* @param charsetName - the character set encoding to use for the file
(may be null)
*/
public synchronized void reserveFile(String filename, String charsetName) {
-reserveFile(filename, charsetName, filename);
+reserveFile(filename, charsetName, filename, false);
}
/**
@@ -130,23 +130,45 @@
* @param alias - the name to be used to access the object (must not be
null)
*/
public synchronized void reserveFile(String filename, String charsetName,
String alias) {
+reserveFile(filename, charsetName, alias, false);
+}
+
+/**
+ * Creates an association between a filename and a File inputOutputObject,
+ * and stores it for later use - unless it is already stored.
+ *
+ * @param filename - relative (to base) or absolute file name (must not be
null)
+ * @param charsetName - the character set encoding to use for the file
(may be null)
+ * @param alias - the name to be used to access the object (must not be
null)
+ * @param hasHeader true if the file has a header line describing the
contents
+ */
+public synchronized String reserveFile(String filename, String
charsetName, String alias, boolean hasHeader) {
if (filename == null){
throw new IllegalArgumentException(Filename must not be null);
}
if (alias == null){
throw new
svn commit: r907847 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java xdocs/usermanual/component_reference.xml
Author: sebb Date: Mon Feb 8 23:50:02 2010 New Revision: 907847 URL: http://svn.apache.org/viewvc?rev=907847view=rev Log: Bug 47622 - dummy JMeter certificate resides in the bin directory Document the properties Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=907847r1=907846r2=907847view=diff == --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Mon Feb 8 23:50:02 2010 @@ -97,10 +97,12 @@ // Proxy configuration SSL private static final String CERT_DIRECTORY = -JMeterUtils.getPropDefault(proxy.cert.directory, .); // $NON-NLS-1$ $NON-NLS-2$ +JMeterUtils.getPropDefault(proxy.cert.directory, JMeterUtils.getJMeterBinDir()); // $NON-NLS-1$ +private static final String CERT_FILE_DEFAULT = proxyserver.jks;// $NON-NLS-1$ + private static final String CERT_FILE = -JMeterUtils.getPropDefault(proxy.cert.file, proxyserver.jks); // $NON-NLS-1$ $NON-NLS-2$ +JMeterUtils.getPropDefault(proxy.cert.file, CERT_FILE_DEFAULT); // $NON-NLS-1$ private static final char[] KEYSTORE_PASSWORD = JMeterUtils.getPropDefault(proxy.cert.keystorepass, password).toCharArray(); // $NON-NLS-1$ $NON-NLS-2$ Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=907847r1=907846r2=907847view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Mon Feb 8 23:50:02 2010 @@ -4504,6 +4504,18 @@ You will need to accept the certificate in order to allow the JMeter Proxy to intercept the SSL traffic in order to record it. You should only accept the certificate temporarily. /p +p +The following properties can be used to change the certificate that is used: +ul +liproxy.cert.directory - the directory in which to find the certificate (default = JMeter bin/)/li +liproxy.cert.file - name of the keystore file (default proxyserver.jks)/li +liproxy.cert.keystorepass - keystore password (default password)/li +liproxy.cert.keypassword - certificate key password (default password)/li +liproxy.cert.type - the certificate type (default JKS)/li +liproxy.cert.factory - the factory (default SunX509)/li +liproxy.ssl.protocol - the protocol to be used (default SSLv3)/li +/ul +/p note If your browser currently uses a proxy (e.g. a company intranet may route all external requests via a proxy), then you need to a href=get-started.html#proxy_servertell JMeter to use that proxy/a before starting JMeter, - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r907850 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
Author: sebb
Date: Tue Feb 9 00:04:35 2010
New Revision: 907850
URL: http://svn.apache.org/viewvc?rev=907850view=rev
Log:
Oops! forgot to change the test case when the data file was changed
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java?rev=907850r1=907849r2=907850view=diff
==
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
Tue Feb 9 00:04:35 2010
@@ -104,13 +104,13 @@
assertEquals(a1,threadVars.get(A));
assertEquals(b1,threadVars.get(B));
assertEquals(c1,threadVars.get(C));
-assertEquals(d1,threadVars.get(D 1));
+assertEquals(d1,threadVars.get(D|1));
csv.iterationStart(null);
assertNull(threadVars.get(a));
assertEquals(a2,threadVars.get(A));
assertEquals(b2,threadVars.get(B));
assertEquals(c2,threadVars.get(C));
-assertEquals(d2,threadVars.get(D 1));
+assertEquals(d2,threadVars.get(D|1));
}
private CSVDataSet initCSV(){
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: TCPClient classname from TCP config not applied
On 23/12/2009, Andrey Pohilko a...@fininfor.ru wrote: Alright! What should I do to report this unknown bug to developers? Best to file a Bugzilla request - please see: https://issues.apache.org/bugzilla/ С уважением, Андрей Похилько -Original Message- From: sebb [mailto:seb...@gmail.com] Sent: Wednesday, December 23, 2009 1:20 AM To: JMeter Developers List Subject: Re: TCPClient classname from TCP config not applied 2009/12/22 Andrey Pohilko a...@fininfor.ru: Hello! I wrote my own TCPClient class, it successfully working when I fill TCPClient classname field in separate TCP Samplers. But it is not applied when I fill the same field in TCP Sampler Config in test plan. All other options from config (hostname, port, etc) works fine, but classname is not. Is that a feature, known or unknown bug? The last option ;-) Thanks, Andrey - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r907438 - in /jakarta/jmeter/trunk: docs/images/screenshots/ docs/images/screenshots/webtest/ xdocs/images/screenshots/ xdocs/images/screenshots/webtest/ xdocs/usermanual/
Author: sebb Date: Sun Feb 7 16:04:14 2010 New Revision: 907438 URL: http://svn.apache.org/viewvc?rev=907438view=rev Log: Updating docs with new images etc. Added: jakarta/jmeter/trunk/docs/images/screenshots/http-request.png (with props) jakarta/jmeter/trunk/xdocs/images/screenshots/http-request.png (with props) Removed: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request.png jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-request.png Modified: jakarta/jmeter/trunk/docs/images/screenshots/proxy_control.png jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png 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/http_login.png jakarta/jmeter/trunk/xdocs/images/screenshots/proxy_control.png jakarta/jmeter/trunk/xdocs/images/screenshots/regex_extractor.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/http_login.png jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Added: jakarta/jmeter/trunk/docs/images/screenshots/http-request.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/http-request.png?rev=907438view=auto == Binary file - no diff available. Propchange: jakarta/jmeter/trunk/docs/images/screenshots/http-request.png -- svn:mime-type = image/png Modified: jakarta/jmeter/trunk/docs/images/screenshots/proxy_control.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/proxy_control.png?rev=907438r1=907437r2=907438view=diff == Binary files - no diff available. Modified: jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png?rev=907438r1=907437r2=907438view=diff == Binary files - no diff available. 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=907438r1=907437r2=907438view=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=907438r1=907437r2=907438view=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=907438r1=907437r2=907438view=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=907438r1=907437r2=907438view=diff == Binary files - no diff available. Modified: 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=907438r1=907437r2=907438view=diff == Binary files - no diff available. Added: jakarta/jmeter/trunk/xdocs/images/screenshots/http-request.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/http-request.png?rev=907438view=auto == Binary file - no diff available. Propchange: jakarta/jmeter/trunk/xdocs/images/screenshots/http-request.png -- svn:mime-type = image/png Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/proxy_control.png URL: http
svn commit: r907510 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/extractor/RegexExtractor.java src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java xdocs/changes.xml x
Author: sebb
Date: Sun Feb 7 23:16:18 2010
New Revision: 907510
URL: http://svn.apache.org/viewvc?rev=907510view=rev
Log:
Regex Extractor can now be applied to a variable
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=907510r1=907509r2=907510view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Sun Feb 7 23:16:18 2010
@@ -111,7 +111,7 @@
String regex = getRegex();
try {
-ListMatchResult matches = processMatches(regex, previousResult,
matchNumber);
+ListMatchResult matches = processMatches(regex, previousResult,
matchNumber, vars);
int prevCount = 0;
String prevString = vars.get(refName + REF_MATCH_NR);
if (prevString != null) {
@@ -176,9 +176,7 @@
return inputString;
}
-private ListMatchResult processMatches(String regex, SampleResult
result, int matchNumber) {
-ListSampleResult sampleList = getSampleList(result);
-
+private ListMatchResult processMatches(String regex, SampleResult
result, int matchNumber, JMeterVariables vars) {
if (log.isDebugEnabled()) {
log.debug(Regex = + regex);
}
@@ -188,23 +186,38 @@
ListMatchResult matches = new ArrayListMatchResult();
int found = 0;
-for (SampleResult sr : sampleList) {
-String inputString = getInputString(sr);
-PatternMatcherInput input = new PatternMatcherInput(inputString);
-while (matchNumber =0 || found != matchNumber) {
-if (matcher.contains(input, pattern)) {
-log.debug(RegexExtractor: Match found!);
-matches.add(matcher.getMatch());
-found++;
-} else {
+if (isScopeVariable()){
+String inputString=vars.get(getVariableName());
+matchStrings(matchNumber, matcher, pattern, matches, found,
+inputString);
+} else {
+ListSampleResult sampleList = getSampleList(result);
+for (SampleResult sr : sampleList) {
+String inputString = getInputString(sr);
+found = matchStrings(matchNumber, matcher, pattern, matches,
found,
+inputString);
+if (matchNumber 0 found == matchNumber){// no need to
process further
break;
}
}
-if (matchNumber 0 found == matchNumber){// no need to process
further
+}
+return matches;
+}
+
+private int matchStrings(int matchNumber, Perl5Matcher matcher,
+Pattern pattern, ListMatchResult matches, int found,
+String inputString) {
+PatternMatcherInput input = new PatternMatcherInput(inputString);
+while (matchNumber =0 || found != matchNumber) {
+if (matcher.contains(input, pattern)) {
+log.debug(RegexExtractor: Match found!);
+matches.add(matcher.getMatch());
+found++;
+} else {
break;
}
}
-return matches;
+return found;
}
/**
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java?rev=907510r1=907509r2=907510view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
Sun Feb 7 23:16:18 2010
@@ -146,7 +146,7 @@
Box box = Box.createVerticalBox();
box.add(makeTitlePanel());
-box.add(createScopePanel());
+box.add(createScopePanel(true));
box.add(makeSourcePanel());
add(box, BorderLayout.NORTH);
add(makeParameterPanel(), BorderLayout.CENTER);
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=907510r1=907509r2=907510view=diff
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: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-request1.png?rev
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
svn commit: r905633 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
Author: sebb
Date: Tue Feb 2 13:48:16 2010
New Revision: 905633
URL: http://svn.apache.org/viewvc?rev=905633view=rev
Log:
Fix expected version of saveservice.properties
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=905633r1=905632r2=905633view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Tue
Feb 2 13:48:16 2010
@@ -166,7 +166,7 @@
// Internal information only
private static String fileVersion = ; // read from properties file//
$NON-NLS-1$
-private static final String FILEVERSION = 836188; // Expected value
$NON-NLS-1$
+private static final String FILEVERSION = 905484; // Expected value
$NON-NLS-1$
private static String fileEncoding = ; // read from properties file//
$NON-NLS-1$
static {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905832 - in /jakarta/jmeter/trunk: docs/images/screenshots/ docs/images/screenshots/assertion/ src/components/org/apache/jmeter/assertions/ src/components/org/apache/jmeter/assertions/gui
Author: sebb
Date: Tue Feb 2 23:09:53 2010
New Revision: 905832
URL: http://svn.apache.org/viewvc?rev=905832view=rev
Log:
Response Assertion and Size Assertion can now be applied to a JMeter variable
Added:
jakarta/jmeter/trunk/docs/images/screenshots/assertion/assertionscopevar.png
(with props)
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
(with props)
jakarta/jmeter/trunk/xdocs/images/screenshots/assertion/assertionscopevar.png
(with props)
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/assertion/assertion.png
jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png
jakarta/jmeter/trunk/docs/images/screenshots/size_assertion.png
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/AssertionGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedAssertion.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/assertion/assertion.png
jakarta/jmeter/trunk/xdocs/images/screenshots/regex_extractor.png
jakarta/jmeter/trunk/xdocs/images/screenshots/size_assertion.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/assertion/assertion.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/assertion/assertion.png?rev=905832r1=905831r2=905832view=diff
==
Binary files - no diff available.
Added:
jakarta/jmeter/trunk/docs/images/screenshots/assertion/assertionscopevar.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/assertion/assertionscopevar.png?rev=905832view=auto
==
Binary file - no diff available.
Propchange:
jakarta/jmeter/trunk/docs/images/screenshots/assertion/assertionscopevar.png
--
svn:mime-type = image/png
Modified: jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png?rev=905832r1=905831r2=905832view=diff
==
Binary files - no diff available.
Modified: jakarta/jmeter/trunk/docs/images/screenshots/size_assertion.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/size_assertion.png?rev=905832r1=905831r2=905832view=diff
==
Binary files - no diff available.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=905832r1=905831r2=905832view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
Tue Feb 2 23:09:53 2010
@@ -291,7 +291,9 @@
}
// What are we testing against?
-if (isTestFieldResponseData()) {
+if (isScopeVariable()){
+toCheck = getThreadContext().getVariables().get(getVariableName());
+} else if (isTestFieldResponseData()) {
toCheck = response.getResponseDataAsString(); // (bug25052)
} else if (isTestFieldResponseCode()) {
toCheck = response.getResponseCode();
@@ -375,7 +377,9 @@
StringBuilder sb = new StringBuilder(200);
sb.append(Test failed: );
-if (isTestFieldResponseData()) {
+if (isScopeVariable()){
+sb.append(variable().append(getVariableName()).append(')');
+} else if (isTestFieldResponseData()) {
sb.append(text);
} else if (isTestFieldResponseCode()) {
sb.append
svn commit: r905446 - in /jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http: proxy/TestHttpRequestHdr.java sampler/PostWriterTest.java
Author: sebb
Date: Mon Feb 1 23:16:10 2010
New Revision: 905446
URL: http://svn.apache.org/viewvc?rev=905446view=rev
Log:
Stop using deprecated methods
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java?rev=905446r1=905445r2=905446view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
Mon Feb 1 23:16:10 2010
@@ -31,6 +31,7 @@
import org.apache.jmeter.protocol.http.control.HeaderManager;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
+import org.apache.jmeter.protocol.http.util.HTTPFileArg;
public class TestHttpRequestHdr extends JMeterTestCase {
public TestHttpRequestHdr(String name) {
@@ -473,7 +474,6 @@
assertEquals(value,header.getValue());
}
-@SuppressWarnings(deprecation)
public void testPostMultipartFileUpload() throws Exception {
String url = http://localhost/matrix.html;;
// A HTTP POST request, multipart/form-data, simple values,
@@ -496,9 +496,10 @@
// Check arguments
Arguments arguments = s.getArguments();
assertEquals(0, arguments.getArgumentCount());
-assertEquals(fileFieldValue, s.getFileField());
-assertEquals(fileName, s.getFilename());
-assertEquals(mimeType, s.getMimetype());
+HTTPFileArg hfa = s.getHTTPFiles()[0]; // Assume there's at least one
file
+assertEquals(fileFieldValue, hfa.getParamName());
+assertEquals(fileName, hfa.getPath());
+assertEquals(mimeType, hfa.getMimeType());
}
private String createMultipartFormBody(String titleValue, String
descriptionValue, String contentEncoding, boolean includeExtraHeaders, String
boundary, String endOfLine) {
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java?rev=905446r1=905445r2=905446view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
Mon Feb 1 23:16:10 2010
@@ -36,6 +36,7 @@
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
+import org.apache.jmeter.protocol.http.util.HTTPFileArg;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -588,16 +589,9 @@
*
* @param httpSampler
*/
-@SuppressWarnings(deprecation)
private void setupFilepart(HTTPSampler httpSampler, String fileField, File
file, String mimeType) {
-httpSampler.setFileField(fileField);
-if(file != null) {
-httpSampler.setFilename(file.getAbsolutePath());
-}
-else {
-httpSampler.setFilename();
-}
-httpSampler.setMimetype(mimeType);
+HTTPFileArg[] hfa = {new HTTPFileArg(file == null ? :
file.getAbsolutePath(), fileField, mimeType)};
+httpSampler.setHTTPFiles(hfa);
}
/**
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905447 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
Author: sebb
Date: Mon Feb 1 23:16:37 2010
New Revision: 905447
URL: http://svn.apache.org/viewvc?rev=905447view=rev
Log:
Stop using deprecated methods
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java?rev=905447r1=905446r2=905447view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
Mon Feb 1 23:16:37 2010
@@ -34,6 +34,7 @@
import org.apache.jmeter.protocol.http.control.TestHTTPMirrorThread;
import org.apache.jmeter.protocol.http.util.EncoderCache;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
+import org.apache.jmeter.protocol.http.util.HTTPFileArg;
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
@@ -1091,7 +1092,6 @@
*
* @param httpSampler
*/
-@SuppressWarnings(deprecation)
private void setupFileUploadData(
HTTPSamplerBase httpSampler,
boolean isEncoded,
@@ -1105,9 +1105,9 @@
// Set the form data
setupFormData(httpSampler, isEncoded, titleField, titleValue,
descriptionField, descriptionValue);
// Set the file upload data
-httpSampler.setFileField(fileField);
-httpSampler.setFilename(fileValue.getAbsolutePath());
-httpSampler.setMimetype(fileMimeType);
+HTTPFileArg[] hfa = {new HTTPFileArg(fileValue == null ? :
fileValue.getAbsolutePath(), fileField, fileMimeType)};
+httpSampler.setHTTPFiles(hfa);
+
}
/**
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905456 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
Author: sebb
Date: Mon Feb 1 23:29:59 2010
New Revision: 905456
URL: http://svn.apache.org/viewvc?rev=905456view=rev
Log:
Stop using deprecated methods
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java?rev=905456r1=905455r2=905456view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
Mon Feb 1 23:29:59 2010
@@ -221,7 +221,6 @@
assertEquals(http://www.apache.org/index.html;,
config.getUrl().toString());
}
-@SuppressWarnings(deprecation)
public void testFileList(){
HTTPSamplerBase config = new HTTPNullSampler();
HTTPFileArg[] arg;
@@ -229,14 +228,12 @@
assertNotNull(arg);
assertEquals(0,arg.length);
-config.setFileField();
-config.setFilename();
-config.setMimetype();
+config.setHTTPFiles(new HTTPFileArg[]{new HTTPFileArg(,,)});
arg = config.getHTTPFiles();
assertNotNull(arg);
assertEquals(0,arg.length);
-config.setMimetype(text/plain);
+config.setHTTPFiles(new HTTPFileArg[]{new
HTTPFileArg(,,text/plain)});
arg = config.getHTTPFiles();
assertNotNull(arg);
assertEquals(1,arg.length);
@@ -244,8 +241,7 @@
assertEquals(,arg[0].getPath());
assertEquals(,arg[0].getParamName());
-config.setFileField(test123.tmp);
-config.setFilename(/tmp/test123.tmp);
+config.setHTTPFiles(new HTTPFileArg[]{new
HTTPFileArg(/tmp/test123.tmp,test123.tmp,text/plain)});
arg = config.getHTTPFiles();
assertNotNull(arg);
assertEquals(1,arg.length);
@@ -293,44 +289,35 @@
assertEquals(2,arg.length);
}
-@SuppressWarnings(deprecation)
public void testSetAndGetFileField() {
HTTPSamplerBase sampler = new HTTPNullSampler();
-sampler.setFileField(param);
-assertEquals(param, sampler.getFileField());
+sampler.setHTTPFiles(new HTTPFileArg[]{new
HTTPFileArg(,param,)});
HTTPFileArg file = sampler.getHTTPFiles()[0];
assertEquals(param, file.getParamName());
-sampler.setFileField(param2);
-assertEquals(param2, sampler.getFileField());
+sampler.setHTTPFiles(new HTTPFileArg[]{new
HTTPFileArg(,param2,)});
file = sampler.getHTTPFiles()[0];
assertEquals(param2, file.getParamName());
-}
+}
-@SuppressWarnings(deprecation)
public void testSetAndGetFilename() {
HTTPSamplerBase sampler = new HTTPNullSampler();
-sampler.setFilename(name);
-assertEquals(name, sampler.getFilename());
+sampler.setHTTPFiles(new HTTPFileArg[]{new HTTPFileArg(name,,)});
HTTPFileArg file = sampler.getHTTPFiles()[0];
assertEquals(name, file.getPath());
-sampler.setFilename(name2);
-assertEquals(name2, sampler.getFilename());
+sampler.setHTTPFiles(new HTTPFileArg[]{new
HTTPFileArg(name2,,)});
file = sampler.getHTTPFiles()[0];
assertEquals(name2, file.getPath());
}
-@SuppressWarnings(deprecation)
public void testSetAndGetMimetype() {
HTTPSamplerBase sampler = new HTTPNullSampler();
-sampler.setMimetype(mime);
-assertEquals(mime, sampler.getMimetype());
+sampler.setHTTPFiles(new HTTPFileArg[]{new HTTPFileArg(,,mime)});
HTTPFileArg file = sampler.getHTTPFiles()[0];
assertEquals(mime, file.getMimeType());
-sampler.setMimetype(mime2);
-assertEquals(mime2, sampler.getMimetype());
+sampler.setHTTPFiles(new HTTPFileArg[]{new
HTTPFileArg(,,mime2)});
file = sampler.getHTTPFiles()[0];
assertEquals(mime2, file.getMimeType());
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905458 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
Author: sebb
Date: Mon Feb 1 23:30:24 2010
New Revision: 905458
URL: http://svn.apache.org/viewvc?rev=905458view=rev
Log:
Stop using deprecated methods
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=905458r1=905457r2=905458view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
Mon Feb 1 23:30:24 2010
@@ -31,6 +31,7 @@
import org.apache.jmeter.protocol.http.control.CookieManager;
import org.apache.jmeter.protocol.http.control.Header;
import org.apache.jmeter.protocol.http.control.HeaderManager;
+import org.apache.jmeter.protocol.http.util.HTTPFileArg;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
@@ -197,8 +198,8 @@
AuthManager auth = getAuthManager();
int hsz = 1; // Host always
if(method.equals(POST)) {
-String fn = getFilename();
-if(fn != null fn.trim().length() 0) {
+HTTPFileArg[] hfa = getHTTPFiles();
+if(hfa.length 0) {
hsz += 3;
} else {
hsz += 2;
@@ -248,15 +249,17 @@
}
if(method.equals(POST)) {
int cl = -1;
-String fn = getFilename();
-if(fn != null fn.trim().length() 0) {
+HTTPFileArg[] hfa = getHTTPFiles();
+if(hfa.length 0) {
+HTTPFileArg fa = hfa[0];
+String fn = fa.getName();
File input = new File(fn);
cl = (int)input.length();
body = new FileInputStream(input);
setString(HEADER_CONTENT_DISPOSITION);
-setString(form-data; name=\+encode(getFileField())+
+setString(form-data; name=\+encode(fa.getParamName())+
\; filename=\ + encode(fn) +\); //$NON-NLS-1$
//$NON-NLS-2$
-String mt = getMimetype();
+String mt = fa.getMimeType();
hbuf.append(HEADER_CONTENT_TYPE).append(COLON_SPACE).append(mt).append(NEWLINE);
setInt(0xA007); // content-type
setString(mt);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905484 [2/2] - in /jakarta/jmeter/trunk: bin/ bin/testfiles/ src/protocol/http/org/apache/jmeter/protocol/http/sampler/ xdocs/
Modified: jakarta/jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx?rev=905484r1=905483r2=905484view=diff == --- jakarta/jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx (original) +++ jakarta/jmeter/trunk/bin/testfiles/SimpleTestPlan.jmx Tue Feb 2 00:55:09 2010 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=UTF-8? -jmeterTestPlan version=1.2 properties=1.8 +jmeterTestPlan version=1.2 properties=2.1 hashTree TestPlan guiclass=TestPlanGui testclass=TestPlan testname=TestPlan enabled=true collectionProp name=TestPlan.thread_groups/ @@ -18,8 +18,8 @@ stringProp name=ThreadGroup.num_threads1/stringProp boolProp name=ThreadGroup.schedulerfalse/boolProp elementProp name=ThreadGroup.main_controller elementType=LoopController guiclass=LoopControlPanel testclass=LoopController testname=LoopController enabled=true - stringProp name=LoopController.loops1/stringProp boolProp name=LoopController.continue_foreverfalse/boolProp + stringProp name=LoopController.loops1/stringProp /elementProp longProp name=ThreadGroup.end_time0/longProp stringProp name=ThreadGroup.on_sample_errorcontinue/stringProp @@ -39,40 +39,34 @@ GenericController guiclass=LogicControllerGui testclass=GenericController testname=Ant Pages enabled=true/ hashTree HTTPSampler guiclass=HttpTestSampleGui testclass=HTTPSampler testname=Home Page enabled=true +elementProp name=HTTPsampler.Arguments elementType=Arguments guiclass=HTTPArgumentsPanel testclass=Arguments enabled=true + collectionProp name=Arguments.arguments/ +/elementProp stringProp name=HTTPSampler.path/ant/index.html/stringProp stringProp name=HTTPSampler.methodGET/stringProp boolProp name=HTTPSampler.use_keepalivefalse/boolProp stringProp name=HTTPSampler.protocolhttp/stringProp boolProp name=HTTPSampler.image_parserfalse/boolProp boolProp name=HTTPSampler.follow_redirectsfalse/boolProp -elementProp name=HTTPsampler.Arguments elementType=Arguments guiclass=HTTPArgumentsPanel testclass=Arguments enabled=true - collectionProp name=Arguments.arguments/ -/elementProp stringProp name=HTTPSampler.port/stringProp -stringProp name=HTTPSampler.mimetype/stringProp -stringProp name=HTTPSampler.FILE_FIELD/stringProp stringProp name=HTTPSampler.monitorfalse/stringProp stringProp name=HTTPSampler.domain/stringProp -stringProp name=HTTPSampler.FILE_NAME/stringProp boolProp name=HTTPSampler.auto_redirectsfalse/boolProp /HTTPSampler hashTree/ HTTPSampler guiclass=HttpTestSampleGui testclass=HTTPSampler testname=News Page enabled=true +elementProp name=HTTPsampler.Arguments elementType=Arguments guiclass=HTTPArgumentsPanel testclass=Arguments enabled=true + collectionProp name=Arguments.arguments/ +/elementProp stringProp name=HTTPSampler.path/ant/antnews.html/stringProp stringProp name=HTTPSampler.methodGET/stringProp boolProp name=HTTPSampler.use_keepalivefalse/boolProp stringProp name=HTTPSampler.protocolhttp/stringProp boolProp name=HTTPSampler.image_parserfalse/boolProp boolProp name=HTTPSampler.follow_redirectsfalse/boolProp -elementProp name=HTTPsampler.Arguments elementType=Arguments guiclass=HTTPArgumentsPanel testclass=Arguments enabled=true - collectionProp name=Arguments.arguments/ -/elementProp stringProp name=HTTPSampler.port/stringProp -stringProp name=HTTPSampler.mimetype/stringProp -stringProp name=HTTPSampler.FILE_FIELD/stringProp stringProp name=HTTPSampler.monitorfalse/stringProp stringProp name=HTTPSampler.domain/stringProp -stringProp name=HTTPSampler.FILE_NAME/stringProp boolProp name=HTTPSampler.auto_redirectsfalse/boolProp /HTTPSampler hashTree/ @@ -80,46 +74,42 @@ GenericController guiclass=LogicControllerGui testclass=GenericController testname=Log4J Pages enabled=true/ hashTree HTTPSampler guiclass=HttpTestSampleGui testclass=HTTPSampler testname=Home Page enabled=true +elementProp name=HTTPsampler.Arguments elementType=Arguments guiclass=HTTPArgumentsPanel testclass=Arguments enabled=true + collectionProp name=Arguments.arguments/ +/elementProp stringProp name=HTTPSampler.path/log4j/index.html/stringProp stringProp name=HTTPSampler.methodGET/stringProp boolProp
svn commit: r904998 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Author: sebb
Date: Sun Jan 31 11:02:40 2010
New Revision: 904998
URL: http://svn.apache.org/viewvc?rev=904998view=rev
Log:
Simplify initTemplate() by doing our own splitting
[using amended version of ORO split() code]
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=904998r1=904997r2=904998view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Sun Jan 31 11:02:40 2010
@@ -20,8 +20,6 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
@@ -41,7 +39,6 @@
import org.apache.oro.text.regex.PatternMatcherInput;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
-import org.apache.oro.text.regex.Util;
// @see org.apache.jmeter.extractor.TestRegexExtractor for unit tests
@@ -83,7 +80,7 @@
private static final String UNDERSCORE = _; // $NON-NLS-1$
-private Object[] template = null;
+private ListObject template;
/**
* Parses the response data using regular expressions and saving the
results
@@ -287,14 +284,14 @@
private String generateResult(MatchResult match) {
StringBuilder result = new StringBuilder();
-for (int a = 0; a template.length; a++) {
+for (Object obj : template) {
if (log.isDebugEnabled()) {
-log.debug(RegexExtractor: Template piece # + a + = +
template[a] + +template[a].getClass().getSimpleName());
+log.debug(RegexExtractor: Template piece + obj + ( +
obj.getClass().getSimpleName() + ));
}
-if (template[a] instanceof String) {
-result.append(template[a]);
+if (obj instanceof Integer) {
+result.append(match.group(((Integer) obj).intValue()));
} else {
-result.append(match.group(((Integer) template[a]).intValue()));
+result.append(obj);
}
}
if (log.isDebugEnabled()) {
@@ -307,9 +304,8 @@
if (template != null) {
return;
}
-ListString pieces = new ArrayListString();
// Contains Strings and Integers
-ListObject combined = new LinkedListObject();
+ListObject combined = new ArrayListObject();
String rawTemplate = getTemplate();
PatternMatcher matcher = JMeterUtils.getMatcher();
Pattern templatePattern =
JMeterUtils.getPatternCache().getPattern(\\$(\\d+)\\$ // $NON-NLS-1$
@@ -319,55 +315,29 @@
log.debug(Pattern = + templatePattern.getPattern());
log.debug(template = + rawTemplate);
}
-Util.split(pieces, matcher, templatePattern, rawTemplate);
-PatternMatcherInput input = new PatternMatcherInput(rawTemplate);
-boolean startsWith = isFirstElementGroup(rawTemplate);
-if (log.isDebugEnabled()) {
-log.debug(template split into + pieces.size() + pieces,
starts with = + startsWith);
-}
-if (startsWith) {
-String dropped = pieces.remove(0);// Remove initial empty entry
-if (log.isDebugEnabled()) {
-log.debug(Dropped leading: '+dropped+');
-}
-}
-IteratorString iter = pieces.iterator();
-while (iter.hasNext()) {
-final String next = iter.next();
-boolean matchExists = matcher.contains(input, templatePattern);
-if (startsWith) {
-if (matchExists) {
-combined.add(new Integer(matcher.getMatch().group(1)));
-}
-if (next.length() 0) {
-combined.add(next);
-}
-} else {
-if (next.length() 0) {
-combined.add(next);
-}
-if (matchExists) {
-combined.add(new Integer(matcher.getMatch().group(1)));
-}
+int beginOffset = 0;
+MatchResult currentResult;
+PatternMatcherInput pinput = new PatternMatcherInput(rawTemplate);
+while(matcher.contains(pinput, templatePattern)) {
+currentResult = matcher.getMatch();
+final int beginMatch = currentResult.beginOffset(0);
+if (beginMatch beginOffset) { // string is not empty
+combined.add(rawTemplate.substring(beginOffset, beginMatch
svn commit: r904999 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Author: sebb
Date: Sun Jan 31 11:08:28 2010
New Revision: 904999
URL: http://svn.apache.org/viewvc?rev=904999view=rev
Log:
template is created as needed, so no need to clone it
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=904999r1=904998r2=904999view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Sun Jan 31 11:08:28 2010
@@ -80,7 +80,7 @@
private static final String UNDERSCORE = _; // $NON-NLS-1$
-private ListObject template;
+private transient ListObject template;
/**
* Parses the response data using regular expressions and saving the
results
@@ -275,13 +275,6 @@
}
}
-@Override
-public Object clone() {
-RegexExtractor cloned = (RegexExtractor) super.clone();
-cloned.template = this.template;
-return cloned;
-}
-
private String generateResult(MatchResult match) {
StringBuilder result = new StringBuilder();
for (Object obj : template) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905000 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Author: sebb
Date: Sun Jan 31 11:10:17 2010
New Revision: 905000
URL: http://svn.apache.org/viewvc?rev=905000view=rev
Log:
Needs serialVersionUID
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=905000r1=904999r2=905000view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Sun Jan 31 11:10:17 2010
@@ -44,6 +44,7 @@
public class RegexExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
+private static final long serialVersionUID = 240L;
private static final Logger log = LoggingManager.getLoggerForClass();
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905021 - in /jakarta/jmeter/trunk/test/src/org/apache/jmeter: junit/stubs/TestSampler.java protocol/http/sampler/HTTPNullSampler.java samplers/NullSampler.java threads/TestTestCompiler.ja
Author: sebb
Date: Sun Jan 31 12:51:41 2010
New Revision: 905021
URL: http://svn.apache.org/viewvc?rev=905021view=rev
Log:
Add serial version UIDs
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java?rev=905021r1=905020r2=905021view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/stubs/TestSampler.java
Sun Jan 31 12:51:41 2010
@@ -30,6 +30,8 @@
public class TestSampler extends AbstractSampler {
+private static final long serialVersionUID = 240L;
+
private long wait = 0;
private long samples = 0; // number of samples taken
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java?rev=905021r1=905020r2=905021view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/HTTPNullSampler.java
Sun Jan 31 12:51:41 2010
@@ -26,6 +26,8 @@
*/
public final class HTTPNullSampler extends HTTPSamplerBase {
+private static final long serialVersionUID = 240L;
+
/*
* (non-Javadoc)
*
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java?rev=905021r1=905020r2=905021view=diff
==
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/NullSampler.java
Sun Jan 31 12:51:41 2010
@@ -25,6 +25,8 @@
*/
public class NullSampler extends AbstractSampler {
+private static final long serialVersionUID = 240L;
+
public SampleResult sample(Entry e) {
return new SampleResult();
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java?rev=905021r1=905020r2=905021view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/threads/TestTestCompiler.java
Sun Jan 31 12:51:41 2010
@@ -48,6 +48,8 @@
}
class TestSampler extends AbstractSampler {
+private static final long serialVersionUID = 240L;
+
public SampleResult sample(org.apache.jmeter.samplers.Entry e) {
return null;
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905022 - in /jakarta/jmeter/trunk/src/reports/org/apache/jmeter: control/gui/ gui/ gui/util/ report/engine/ report/gui/ report/gui/tree/ report/writers/ report/writers/gui/ testelement/
Author: sebb
Date: Sun Jan 31 12:52:31 2010
New Revision: 905022
URL: http://svn.apache.org/viewvc?rev=905022view=rev
Log:
Add serial version UIDs
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/engine/StandardReportEngine.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/BarChartGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/LineGraphGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/TableGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportCellRenderer.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeNode.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/AbstractReportWriter.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/HTMLReportWriter.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractChart.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractTable.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/BarChart.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPage.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/Table.java
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java?rev=905022r1=905021r2=905022view=diff
==
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
Sun Jan 31 12:52:31 2010
@@ -48,6 +48,8 @@
*/
public class ReportGui extends AbstractReportGui {
+private static final long serialVersionUID = 240L;
+
/** A panel to contain comments on the test plan. */
private JTextField commentPanel;
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java?rev=905022r1=905021r2=905022view=diff
==
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
Sun Jan 31 12:52:31 2010
@@ -68,6 +68,8 @@
*/
public class ReportMainFrame extends JFrame implements TestListener,
Remoteable {
+private static final long serialVersionUID = 240L;
+
private static final Logger log = LoggingManager.getLoggerForClass();
// The default title for the Menu bar
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java?rev=905022r1=905021r2=905022view=diff
==
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
Sun Jan 31 12:52:31 2010
@@ -37,6 +37,8 @@
public class DirectoryPanel extends HorizontalPanel implements ActionListener {
+private static final long serialVersionUID = 240L;
+
private static final String ACTION_BROWSE = browse; // $NON-NSL-1$
private final JTextField filename = new JTextField(20);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java?rev=905022r1=905021r2=905022view=diff
==
---
jakarta/jmeter/trunk/src/reports
svn commit: r905024 - in /jakarta/jmeter/trunk/src: examples/org/apache/jmeter/examples/sampler/ examples/org/apache/jmeter/examples/sampler/gui/ examples/org/apache/jmeter/examples/testbeans/example1
Author: sebb
Date: Sun Jan 31 12:55:35 2010
New Revision: 905024
URL: http://svn.apache.org/viewvc?rev=905024view=rev
Log:
Add serial version UIDs
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/DefaultTreeTableModel.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledChoice.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledPasswordField.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledRadio.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JLabeledTextField.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/NumberRenderer.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/RateRenderer.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/RightAlignRenderer.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/layout/VerticalLayout.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/io/TextFile.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterError.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterException.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterStopTestException.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterStopTestNowException.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterStopThreadException.java
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java?rev=905024r1=905023r2=905024view=diff
==
---
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
(original)
+++
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/ExampleSampler.java
Sun Jan 31 12:55:35 2010
@@ -40,6 +40,8 @@
*/
public class ExampleSampler extends AbstractSampler {
+private static final long serialVersionUID = 240L;
+
private static final Logger log = LoggingManager.getLoggerForClass();
// The name of the property used to hold our data
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java?rev=905024r1=905023r2=905024view=diff
==
---
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
(original)
+++
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/sampler/gui/ExampleSamplerGui.java
Sun Jan 31 12:55:35 2010
@@ -45,6 +45,8 @@
*/
public class ExampleSamplerGui extends AbstractSamplerGui {
+private static final long serialVersionUID = 240L;
+
private JTextArea data;
public ExampleSamplerGui() {
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java?rev=905024r1=905023r2=905024view=diff
==
---
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
(original)
+++
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
Sun Jan 31 12:55:35 2010
@@ -31,6 +31,8 @@
*/
public class Example1 extends AbstractSampler implements TestBean {
+private static final long serialVersionUID = 240L;
+
public SampleResult sample(Entry e) {
SampleResult res = new SampleResult();
res.setSampleLabel(getName());
Modified:
jakarta/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example2
svn commit: r905029 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Author: sebb Date: Sun Jan 31 13:04:52 2010 New Revision: 905029 URL: http://svn.apache.org/viewvc?rev=905029view=rev Log: Unused Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=905029r1=905028r2=905029view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Sun Jan 31 13:04:52 2010 @@ -182,8 +182,6 @@ // TODO do contentType and/or dataEncoding belong in HTTPSampleResult instead? -private final static String TOTAL_TIME = totalTime; // $NON-NLS-1$ - private static final boolean startTimeStamp = JMeterUtils.getPropDefault(sampleresult.timestamp.start, false); // $NON-NLS-1$ - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905032 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Author: sebb Date: Sun Jan 31 13:10:37 2010 New Revision: 905032 URL: http://svn.apache.org/viewvc?rev=905032view=rev Log: Unused Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=905032r1=905031r2=905032view=diff == --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java Sun Jan 31 13:10:37 2010 @@ -24,7 +24,6 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Collections; -import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.MissingResourceException; - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r905052 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter: assertions/gui/AbstractAssertionGui.java processor/gui/AbstractPostProcessorGui.java testelement/AbstractScopedTestElement.ja
Author: sebb
Date: Sun Jan 31 15:11:00 2010
New Revision: 905052
URL: http://svn.apache.org/viewvc?rev=905052view=rev
Log:
Check for impossible conditions
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java?rev=905052r1=905051r2=905052view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
Sun Jan 31 15:11:00 2010
@@ -98,13 +98,13 @@
protected void saveScopeSettings(AbstractScopedAssertion assertion) {
if (assertionScopePanel.isScopeParent()){
assertion.setScopeParent();
-} else
-if (assertionScopePanel.isScopeChildren()){
+} else if (assertionScopePanel.isScopeChildren()){
assertion.setScopeChildren();
-} else {
+} else if (assertionScopePanel.isScopeAll()) {
assertion.setScopeAll();
+} else {
+throw new IllegalArgumentException(Unexpected scope panel state);
}
-
}
/**
@@ -118,8 +118,10 @@
assertionScopePanel.setScopeParent();
} else if (assertion.isScopeChildren(scope)){
assertionScopePanel.setScopeChildren();
-} else {
+} else if (assertion.isScopeAll(scope)){
assertionScopePanel.setScopeAll();
+} else {
+throw new IllegalArgumentException(Invalid scope: +scope);
}
}
}
\ No newline at end of file
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java?rev=905052r1=905051r2=905052view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
Sun Jan 31 15:11:00 2010
@@ -77,15 +77,15 @@
* @param testElement
*/
protected void saveScopeSettings(AbstractScopedTestElement testElement) {
-if (scopePanel.isScopeParent()){
+if (scopePanel.isScopeParent()) {
testElement.setScopeParent();
-} else
-if (scopePanel.isScopeChildren()){
+} else if (scopePanel.isScopeChildren()) {
testElement.setScopeChildren();
-} else {
+} else if (scopePanel.isScopeAll()) {
testElement.setScopeAll();
+} else {
+throw new IllegalArgumentException(Unexpected scope panel state);
}
-
}
/**
@@ -99,8 +99,10 @@
scopePanel.setScopeParent();
} else if (testElement.isScopeChildren(scope)){
scopePanel.setScopeChildren();
-} else {
+} else if (testElement.isScopeAll(scope)){
scopePanel.setScopeAll();
+} else {
+throw new IllegalArgumentException(Invalid scope: +scope);
}
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java?rev=905052r1=905051r2=905052view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
Sun Jan 31 15:11:00 2010
@@ -20,8 +20,8 @@
/**
* p
- * Super-class for all TestElements that can be applied to main sample,
sub-samples or both.
- * Test elements can use the
+ * Super-class for TestElements that can be applied to main sample,
sub-samples or both.
+ * [Assertions use a different class because they use a different value for
the {...@link #SCOPE} constant]
* /p
*
* p
@@ -38,10 +38,12 @@
private static final long serialVersionUID = 240L;
-private static final String SCOPE = Sample.scope;
-private static final String SCOPE_PARENT = parent;
-private static final String SCOPE_CHILDREN
svn commit: r905149 - in /jakarta/jmeter/trunk: docs/images/screenshots/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/extractor/gui/ src/core/org/apache/jmeter/testelem
Author: sebb
Date: Mon Feb 1 00:17:15 2010
New Revision: 905149
URL: http://svn.apache.org/viewvc?rev=905149view=rev
Log:
Add Sampler scope selection to XPathExtractor
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/xpath_extractor.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png?rev=905149r1=905148r2=905149view=diff
==
Binary files - no diff available.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=905149r1=905148r2=905149view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Mon Feb 1 00:17:15 2010
@@ -177,17 +177,7 @@
}
private ListMatchResult processMatches(String regex, SampleResult
result, int matchNumber) {
-ListSampleResult sampleList = new ArrayListSampleResult();
-
-String scope = fetchScope();
-if (isScopeParent(scope) || isScopeAll(scope)) {
-sampleList.add(result);
-}
-if (isScopeChildren(scope) || isScopeAll(scope)) {
-for (SampleResult subResult : result.getSubResults()) {
-sampleList.add(subResult);
-}
-}
+ListSampleResult sampleList = getSampleList(result);
if (log.isDebugEnabled()) {
log.debug(Regex = + regex);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=905149r1=905148r2=905149view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Mon Feb 1 00:17:15 2010
@@ -22,6 +22,8 @@
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
@@ -29,7 +31,7 @@
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.AbstractScopedTestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterVariables;
@@ -77,7 +79,7 @@
*
* See Bugzilla: 37183
*/
-public class XPathExtractor extends AbstractTestElement implements
+public class XPathExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -105,6 +107,10 @@
return new StringBuilder(s1).append(_).append(s2).toString(); //
$NON-NLS-1$
}
+private String concat(String s1, int i){
+return new StringBuilder(s1).append(_).append(i).toString(); //
$NON-NLS-1$
+}
+
/**
* Do the job - extract value from (X)HTML response using XPath Query.
* Return value as variable defined by REFNAME. Returns DEFAULT value
@@ -119,12 +125,42 @@
JMeterVariables vars = context.getVariables();
String refName = getRefName();
vars.put(refName, getDefaultValue());
-vars.put(concat(refName,MATCH_NR), 0); // In case parse fails //
$NON-NLS-1$
+final String matchNR = concat(refName,MATCH_NR);
+int prevCount=0; // number of previous matches
+try {
+prevCount=Integer.parseInt(vars.get
svn commit: r904916 - in /jakarta/jmeter/trunk: docs/images/screenshots/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/extractor/gui/ src/core/org/apache/jmeter/processo
Author: sebb
Date: Sat Jan 30 23:15:28 2010
New Revision: 904916
URL: http://svn.apache.org/viewvc?rev=904916view=rev
Log:
Bug 48511 - add parent,child,all selection to regex extractor panel
Added:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
(with props)
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/RegexExtractorGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/processor/gui/AbstractPostProcessorGui.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/regex_extractor.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/regex_extractor.png?rev=904916r1=904915r2=904916view=diff
==
Binary files - no diff available.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=904916r1=904915r2=904916view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Sat Jan 30 23:15:28 2010
@@ -27,7 +27,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.AbstractScopedTestElement;
import org.apache.jmeter.testelement.property.IntegerProperty;
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterVariables;
@@ -45,7 +45,7 @@
// @see org.apache.jmeter.extractor.TestRegexExtractor for unit tests
-public class RegexExtractor extends AbstractTestElement implements
PostProcessor, Serializable {
+public class RegexExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -110,38 +110,10 @@
vars.put(refName, defaultValue);
}
-Perl5Matcher matcher = JMeterUtils.getMatcher();
-String inputString =
- useUrl() ? previousResult.getUrlAsString() // Bug 39707
-: useHeaders() ? previousResult.getResponseHeaders()
-: useCode() ? previousResult.getResponseCode() //Bug 43451
-: useMessage() ? previousResult.getResponseMessage() //Bug 43451
-: useUnescapedBody() ?
StringEscapeUtils.unescapeHtml(previousResult.getResponseDataAsString())
-: previousResult.getResponseDataAsString() // Bug 36898
-;
- if (log.isDebugEnabled()) {
- log.debug(Input = + inputString);
- }
-PatternMatcherInput input = new PatternMatcherInput(inputString);
- String regex = getRegex();
-if (log.isDebugEnabled()) {
-log.debug(Regex = + regex);
- }
-try {
-Pattern pattern = JMeterUtils.getPatternCache().getPattern(regex,
Perl5Compiler.READ_ONLY_MASK);
-ListMatchResult matches = new ArrayListMatchResult();
-int x = 0;
-boolean done = false;
-do {
-if (matcher.contains(input, pattern)) {
-log.debug(RegexExtractor: Match found!);
-matches.add(matcher.getMatch());
-} else {
-done = true;
-}
-x++;
-} while (x != matchNumber !done);
+String regex = getRegex();
+try {
+ListMatchResult matches = processMatches(regex, previousResult,
matchNumber);
int prevCount = 0;
String prevString = vars.get(refName + REF_MATCH_NR);
if (prevString != null) {
@@ -192,6 +164,61 @@
}
}
+private String getInputString(SampleResult result) {
+String inputString = useUrl() ? result.getUrlAsString() // Bug 39707
+: useHeaders() ? result.getResponseHeaders()
+: useCode() ? result.getResponseCode() // Bug 43451
+: useMessage() ? result.getResponseMessage() // Bug 43451
+: useUnescapedBody() ?
StringEscapeUtils.unescapeHtml(result.getResponseDataAsString
svn commit: r904917 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Author: sebb
Date: Sat Jan 30 23:35:12 2010
New Revision: 904917
URL: http://svn.apache.org/viewvc?rev=904917view=rev
Log:
Better placement of save statement
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?rev=904917r1=904916r2=904917view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Sat Jan 30 23:35:12 2010
@@ -886,6 +886,8 @@
setDefaultRequestHeaders(httpMethod);
// Setup connection
client = setupConnection(url, httpMethod, res);
+savedClient = client;
+
// Handle the various methods
if (method.equals(POST)) {
String postBody = sendPostData((PostMethod)httpMethod);
@@ -895,8 +897,6 @@
res.setQueryString(putBody);
}
-
-savedClient = client;
int statusCode = client.executeMethod(httpMethod);
// Needs to be done after execute to pick up all the headers
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904918 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Author: sebb
Date: Sat Jan 30 23:36:48 2010
New Revision: 904918
URL: http://svn.apache.org/viewvc?rev=904918view=rev
Log:
Stop interrupt() from attempting disconnect whilst we are already disconnecting
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java?rev=904918r1=904917r2=904918view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Sat Jan 30 23:36:48 2010
@@ -489,6 +489,7 @@
}
log.debug(Bind exception, try again);
if (conn!=null) {
+savedConn = null; // we don't want interrupt to try
disconnection again
conn.disconnect();
}
this.setUseKeepAlive(false);
@@ -584,16 +585,18 @@
res.sampleEnd();
// We don't want to continue using this connection, even if
KeepAlive is set
if (conn != null) { // May not exist
+savedConn = null; // we don't want interrupt to try
disconnection again
conn.disconnect();
}
+savedConn = null; // we don't want interrupt to try disconnection
again
conn=null; // Don't process again
return errorResult(e, res);
} finally {
// calling disconnect doesn't close the connection immediately,
// but indicates we're through with it. The JVM should close
// it when necessary.
+savedConn = null; // we don't want interrupt to try disconnection
again
disconnect(conn); // Disconnect unless using KeepAlive
-savedConn = null;
}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904514 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Author: sebb
Date: Fri Jan 29 15:09:58 2010
New Revision: 904514
URL: http://svn.apache.org/viewvc?rev=904514view=rev
Log:
Prevent NPE in askThreadsToStop()
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=904514r1=904513r2=904514view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Fri Jan 29 15:09:58 2010
@@ -578,7 +578,9 @@
}
public void askThreadsToStop() {
-engine.stopTest(false);
+if (engine == null) { // Will be null if StopTest thread has started
+engine.stopTest(false);
+}
}
private void stopAllThreads() {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904547 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Author: sebb
Date: Fri Jan 29 16:30:50 2010
New Revision: 904547
URL: http://svn.apache.org/viewvc?rev=904547view=rev
Log:
Disable httpsMatch field unless httpsSpoof is enabled
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=904547r1=904546r2=904547view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Fri Jan 29 16:30:50 2010
@@ -130,6 +130,9 @@
*/
private JCheckBox httpsSpoof;
+/*
+ * Only spoof the URLs that match (optional)
+ */
private JTextField httpsMatch;
/**
@@ -170,6 +173,7 @@
private static final String RESTART = restart; // $NON-NLS-1$
+// This is applied to fields that should cause a restart when changed
private static final String ENABLE_RESTART = enable_restart; //
$NON-NLS-1$
private static final String ADD_INCLUDE = add_include; // $NON-NLS-1$
@@ -295,6 +299,7 @@
regexMatch.setSelected(model.getRegexMatch());
httpsSpoof.setSelected(model.getHttpsSpoof());
httpsMatch.setText(model.getHttpsSpoofMatch());
+httpsMatch.setEnabled(httpsSpoof.isSelected()); // Only valid if Spoof
is selected
contentTypeInclude.setText(model.getContentTypeInclude());
contentTypeExclude.setText(model.getContentTypeExclude());
@@ -344,6 +349,7 @@
startProxy();
} else if (command.equals(ENABLE_RESTART)){
enableRestart();
+httpsMatch.setEnabled(httpsSpoof.isSelected()); // Only valid if
Spoof is selected
} else if (command.equals(ADD_EXCLUDE)) {
excludeModel.addNewRow();
excludeModel.fireTableDataChanged();
@@ -501,6 +507,7 @@
httpsMatch = new JTextField(40);
httpsMatch.addKeyListener(this);
httpsMatch.setName(ENABLE_RESTART);
+httpsMatch.setEnabled(false); // Only valid if Spoof is selected
JLabel matchlabel = new
JLabel(JMeterUtils.getResString(proxy_httpsspoofing_match)); // $NON-NLS-1$
matchlabel.setLabelFor(httpsMatch);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904548 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Author: sebb Date: Fri Jan 29 16:31:19 2010 New Revision: 904548 URL: http://svn.apache.org/viewvc?rev=904548view=rev Log: Clarify URL match field Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=904548r1=904547r2=904548view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Fri Jan 29 16:31:19 2010 @@ -587,7 +587,7 @@ proxy_daemon_error=Could not create proxy - see log for details proxy_headers=Capture HTTP Headers proxy_httpsspoofing=Attempt HTTPS Spoofing -proxy_httpsspoofing_match=Optional URL match string: +proxy_httpsspoofing_match=Only spoof URLs matching: proxy_regex=Regex matching proxy_sampler_settings=HTTP Sampler settings proxy_sampler_type=Type\: - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904549 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties
Author: sebb Date: Fri Jan 29 16:32:57 2010 New Revision: 904549 URL: http://svn.apache.org/viewvc?rev=904549view=rev Log: Drop untranslated properties Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties?rev=904549r1=904548r2=904549view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties Fri Jan 29 16:32:57 2010 @@ -19,7 +19,6 @@ # about=O programie Apache JMeter add=Dodaj -add_as_child=Add as Child add_parameter=Dodaj parametr add_pattern=Dodaj wzorzec: add_test=Dodaj test @@ -37,7 +36,6 @@ aggregate_graph_save_table=Zapisz dane z tabeli aggregate_graph_save_table_header=Zapisz nag\u0142\u00F3wek tabeli aggregate_graph_title=Wykres skumulowany -aggregate_graph_use_group_name=Include group name in label? aggregate_graph_user_title=Tytu\u0142 wykresu aggregate_graph_width=Szeroko\u015B\u0107 aggregate_report=Dane zagregowane @@ -54,12 +52,8 @@ aggregate_report_stddev=Odch. std. aggregate_report_total_label=RAZEM ajp_sampler_title=Pr\u00F3bnik AJP/1.3 -als_message=Uwaga: The Access Log Parser is generic in design and allows you to plugin -als_message2=your own parser. To do so, implement the LogParser, add the jar to the -als_message3=/lib directory and enter the class in the sampler. analyze=Analizuj plik z danymi... anchor_modifier_title=Parser link\u00F3w HTML -appearance=Look and Feel argument_must_not_be_negative=Parametr musi by\u0107 nieujemny! assertion_assume_success=Ignoruj status assertion_code_resp=Kod odpowiedzi @@ -69,94 +63,39 @@ assertion_matches=Pasuje do assertion_message_resp=Tre\u015B\u0107 odpowiedzi assertion_not=Nie -assertion_pattern_match_rules=Pattern Matching Rules -assertion_patterns_to_test=Patterns to Test -assertion_resp_field=Response Field to Test -assertion_substring=Substring assertion_text_resp=Tekst odpowiedzi assertion_textarea_label=Asercje: -assertion_title=Response Assertion -assertion_url_samp=URL Sampled -assertion_visualizer_title=Assertion Results attribute=Atrybut attrs=Atrybuty -auth_base_url=Base URL -auth_manager_title=HTTP Authorization Manager -auths_stored=Authorizations Stored in the Authorization Manager average=\u015Arednia average_bytes=bit\u00F3w \u015Brednio -bind=Thread Bind browse=Przegl\u0105daj... bsf_sampler_title=Pr\u00F3bnik BSF -bsf_script=Script to run (variables: log, Label, FileName, Parameters, args[], SampleResult, ctx, vars, props) -bsf_script_file=Script file to run bsf_script_language=J\u0119zyk skryptowy: bsf_script_parameters=Parametry do przekazania do skryptu/pliku: bsh_assertion_script=Skrypt (see below for variables that are defined) -bsh_assertion_script_variables=The following variables are defined for the script:\nRead/Write: Failure, FailureMessage, SampleResult, vars, props, log.\nReadOnly: Response[Data|Code|Message|Headers], RequestHeaders, SampleLabel, SamplerData, ctx -bsh_assertion_title=BeanShell Assertion -bsh_function_expression=Expression to evaluate -bsh_sampler_title=BeanShell Sampler bsh_script=Skrypt (see below for variables that are defined) bsh_script_file=Plik ze skryptem -bsh_script_parameters=Parameters (- String Parameters and String []bsh.args) -bsh_script_reset_interpreter=Reset bsh.Interpreter before each call -bsh_script_variables=The following variables are defined for the script:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, FileName, ctx, vars, props, log -busy_testing=I'm busy testing, please stop the test before changing settings -cache_manager_title=HTTP Cache Manager -cache_session_id=Cache Session Id? cancel=Anuluj -cancel_exit_to_save=There are test items that have not been saved. Do you wish to save before exiting? -cancel_new_to_save=There are test items that have not been saved. Do you wish to save before clearing the test plan? -cancel_revert_project=There are test items that have not been saved. Do you wish to revert to the previously saved test plan? choose_function=Wybierz funkcj\u0119 choose_language=Wybierz j\u0119zyk clear=Wyczy\u015B\u0107 clear_all=Wyczy\u015B\u0107 wszystko clear_cache_per_iter=Czy\u015Bci\u0107 cache po ka\u017Cdej iteracji? -clear_cookies_per_iter=Clear cookies each iteration? column_delete_disallowed=Tej kolumny nie mo\u017Cna usuwa\u0107 -column_number=Column number of CSV file | next | *alias compare=Por\u00F3wnaj -comparefilt=Compare filter config_element=Element konfiguruj\u0105cy config_save_settings=Konfiguruj configure_wsdl=Konfiguruj -constant_throughput_timer_memo=Add a delay between sampling to attain constant
svn commit: r904613 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Author: sebb
Date: Fri Jan 29 20:03:26 2010
New Revision: 904613
URL: http://svn.apache.org/viewvc?rev=904613view=rev
Log:
Re-enable duplicate key checks for messages*.properties
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=904613r1=904612r2=904613view=diff
==
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Fri Jan 29 20:03:26 2010
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.Iterator;
import java.util.List;
import java.util.MissingResourceException;
import java.util.PropertyResourceBundle;
@@ -168,11 +169,18 @@
if (prb == null){
return;
}
-EnumerationString enumr = prb.getKeys();
-while (enumr.hasMoreElements()) {
-String key = enumr.nextElement();
+final ArrayListString list = Collections.list(prb.getKeys());
+Collections.sort(list);
+IteratorString enumr = list.iterator();
+final boolean mainResourceFile = resname.startsWith(messages);
+while (enumr.hasNext()) {
+String key = enumr.next();
try {
-defaultPRB.getString(key); // Check key is in default
+String val = defaultPRB.getString(key); // Also Check key
is in default
+if (mainResourceFile val.equals(prb.getString(key))){
+System.out.println(Duplicate value? +key+=+val+
in +res);
+subTestFailures++;
+}
} catch (MissingResourceException e) {
subTestFailures++;
System.out.println(resourcePrefix + _ + resname + has
unexpected key: + key);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904614 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources: messages_de.properties messages_fr.properties messages_pl.properties messages_pt_BR.properties messages_tr.properti
Author: sebb
Date: Fri Jan 29 20:03:54 2010
New Revision: 904614
URL: http://svn.apache.org/viewvc?rev=904614view=rev
Log:
Remove untranslated (or identical) key values
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties?rev=904614r1=904613r2=904614view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
Fri Jan 29 20:03:54 2010
@@ -40,11 +40,8 @@
aggregate_report_count=Anz. der Proben
aggregate_report_error%=% Fehler
aggregate_report_error=Fehler
-aggregate_report_max=Max
aggregate_report_median=Mittel
-aggregate_report_min=Min
aggregate_report_rate=Durchsatz
-aggregate_report_stddev=Std. Dev.
aggregate_report_total_label=Gesamt
aggregate_report=Report
als_message=Hinweis\: Der Zugriff-Log Parser ist allgmein gehalten. Es ist
m\u00F6glich ein Plugin zu erstellen.
@@ -83,9 +80,7 @@
bsh_assertion_script=Script (untenstehende Variablen sind definiert)
bsh_assertion_title=BeanShell Behauptung
bsh_function_expression=Auszuwertender Ausdruck
-bsh_sampler_title=BeanShell Sampler
bsh_script_file=Script-Datei
-bsh_script_parameters=Parameter (String Parameters, String []bsh.args)
bsh_script_variables=Folgende Variablen wurden f\u00FCr das Script
definiert\:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label,
FileName, ctx, vars, props, log
bsh_script=Script (untenstehende Variablen sind definiert)
busy_testing=Ich bin mit dem Testen besch\u00E4ftigt, bitte stoppen sie den
Test bevor sie die Einstellungen \u00E4ndern.
@@ -111,18 +106,14 @@
constant_timer_memo=Geben sie eine Pause zwischen den Proben an
constant_timer_title=Konstanter Timer
content_encoding=Content Kodierung\:
-controller=Controller
cookie_manager_policy=Cookie Richtlinie
-cookie_manager_title=HTTP Cookie Manager
cookies_stored=Anzahl der gespeicherten Cookies im Cookie Manager
copy=Kopieren
corba_config_title=CORBA Sampler Konfiguration
corba_input_data_file=Input Daten-Dateien\:
corba_methods=W\u00E4hlen sie eine Methode aus\:
-corba_name_server=Name Server\:
corba_port=Port Nummer\:
corba_request_data=Eingabe Daten
-corba_sample_title=CORBA Sampler
counter_config_title=Z\u00E4hler (Counter)
counter_per_user=Z\u00E4hler (Counter) f\u00FCr jeden Benutzer einzeln
f\u00FChren
countlim=Gr\u00F6\u00DFen-Beschr\u00E4nkung
@@ -256,13 +247,9 @@
html_assertion_label=HTML Bericht
html_assertion_title=Titel des HTML Bericht
html_parameter_mask=HTML Parameter Maske
-http_implementation=HTTP Implementation\:
-http_response_code=HTTP Response Code
http_url_rewriting_modifier_title=HTTP URL Re-writing Bezeichner
http_user_parameter_modifier=HTTP User Parameter Bezeichner
httpmirror_title=HTTP Spiegel
-id_prefix=ID Prefix
-id_suffix=ID Suffix
if_controller_evaluate_all=F\u00FCr alle Unterelemente auswerten?
if_controller_label=Bedingung (Javascript)
if_controller_title=If-Controller
@@ -328,7 +315,6 @@
mailer_attributes_panel=Mail Eigenschaften
mailer_error=Konnte die Mail nicht senden. Bitte korrigieren Sie jede
fehlerhafte Eingabe.
mailer_visualizer_title=Mailer-Visualisierung
-max=Maximum
maximum_param=Der maximale Wert welcher f\u00FCr einen Wertebereich erlaubt ist
md5hex_assertion_failure=Fehler beim \u00FCberpr\u00FCfen der MD5 Summe\: {0}
erhalten, sollte {1} sein
md5hex_assertion_md5hex_test=Zu pr\u00FCfender MD5 Hex String
@@ -339,7 +325,6 @@
menu_config_element=Konfigurations Element
menu_edit=Editieren
menu_expand_all=Alle \u00F6ffnen
-menu_listener=Listener
menu_logic_controller=Logik-Controller
menu_merge=Zusammenf\u00FCgen
menu_modifiers=Modifizierer
@@ -377,9 +362,7 @@
monitor_legend_memory_per=Speicher % (genutzt/gesamt)
monitor_legend_thread_per=Thread % (aktiv/maimum)
monitor_performance_servers=Server
-monitor_performance_tab_title=Performance
monitor_performance_title=Performance-Graph
-name=Name\:
new=Neu
newdn=Neuer DN (distinguished name)
no=Norwegisch
@@ -400,7 +383,6 @@
path=Pfad\:
patterns_to_exclude=Auszuschlie\u00DFende URL-Muster
patterns_to_include=Einzuschlie\u00DFende URL-Muster
-port=Port\:
property_default_param=Vorgabe-Wert
property_edit=Bearbeiten
property_editor.value_is_invalid_message=Der eingegebene Text ist f\u00FCr
diese Eigenschaft
svn commit: r904638 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Author: sebb
Date: Fri Jan 29 21:47:47 2010
New Revision: 904638
URL: http://svn.apache.org/viewvc?rev=904638view=rev
Log:
Oops! Cut-n-paste error - thanks Rahul.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=904638r1=904637r2=904638view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Fri Jan 29 21:47:47 2010
@@ -578,7 +578,7 @@
}
public void askThreadsToStop() {
-if (engine == null) { // Will be null if StopTest thread has started
+if (engine != null) { // Will be null if StopTest thread has started
engine.stopTest(false);
}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904716 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
Author: sebb
Date: Sat Jan 30 02:55:51 2010
New Revision: 904716
URL: http://svn.apache.org/viewvc?rev=904716view=rev
Log:
Fix property name
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java?rev=904716r1=904715r2=904716view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/ScopePanel.java Sat
Jan 30 02:55:51 2010
@@ -51,7 +51,7 @@
*/
private void init() {
setLayout(new BorderLayout(5, 0));
-
setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString(sample_scope_title)));
//$NON-NLS-1$
+
setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString(sample_scope)));
//$NON-NLS-1$
parentButton.setSelected(true);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904311 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Author: sebb
Date: Thu Jan 28 23:56:34 2010
New Revision: 904311
URL: http://svn.apache.org/viewvc?rev=904311view=rev
Log:
Don't attempt to process null samples
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=904311r1=904310r2=904311view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Thu Jan 28 23:56:34 2010
@@ -109,12 +109,15 @@
*/
public void process() {
JMeterContext context = getThreadContext();
+final SampleResult previousResult = context.getPreviousResult();
+if (previousResult == null){
+return;
+}
JMeterVariables vars = context.getVariables();
String refName = getRefName();
vars.put(refName, getDefaultValue());
vars.put(concat(refName,MATCH_NR), 0); // In case parse fails //
$NON-NLS-1$
vars.remove(concat(refName,1)); // In case parse fails // $NON-NLS-1$
-final SampleResult previousResult = context.getPreviousResult();
try{
Document d = parseResponse(previousResult);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r904312 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
Author: sebb
Date: Thu Jan 28 23:57:47 2010
New Revision: 904312
URL: http://svn.apache.org/viewvc?rev=904312view=rev
Log:
Don't process null samples and don't report incorrect message if BSH not found
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?rev=904312r1=904311r2=904312view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
Thu Jan 28 23:57:47 2010
@@ -49,8 +49,11 @@
JMeterContext jmctx = JMeterContextService.getContext();
SampleResult prev = jmctx.getPreviousResult();
+if (prev == null) {
+return;
+}
final BeanShellInterpreter bshInterpreter = getBeanShellInterpreter();
-if (prev == null || bshInterpreter == null) {
+if (bshInterpreter == null) {
log.error(BeanShell not found);
return;
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r903813 - in /jakarta/jmeter/trunk/src: core/org/apache/jmeter/reporters/Summariser.java protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
Author: sebb Date: Wed Jan 27 20:09:01 2010 New Revision: 903813 URL: http://svn.apache.org/viewvc?rev=903813view=rev Log: Unused imports Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=903813r1=903812r2=903813view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java Wed Jan 27 20:09:01 2010 @@ -20,7 +20,6 @@ import java.io.Serializable; import java.text.DecimalFormat; -import java.util.Hashtable; import java.util.Map; import java.util.Set; import java.util.Map.Entry; Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java?rev=903813r1=903812r2=903813view=diff == --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java Wed Jan 27 20:09:01 2010 @@ -20,7 +20,6 @@ import java.net.URL; import java.util.Collection; -import java.util.Hashtable; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r903818 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
Author: sebb
Date: Wed Jan 27 20:24:17 2010
New Revision: 903818
URL: http://svn.apache.org/viewvc?rev=903818view=rev
Log:
Useless null check
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java?rev=903818r1=903817r2=903818view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java Wed
Jan 27 20:24:17 2010
@@ -154,18 +154,16 @@
private String getPassword() {
String password = this.defaultpw;
if (null == password) {
-if (null == defaultpw) {
-this.defaultpw = System.getProperty(KEY_STORE_PASSWORD);
+this.defaultpw = System.getProperty(KEY_STORE_PASSWORD);
-if (null == defaultpw) {
-synchronized (this) {
-this.defaultpw = JOptionPane.showInputDialog(
-GuiPackage.getInstance().getMainFrame(),
-JMeterUtils.getResString(ssl_pass_prompt),
// $NON-NLS-1$
-JMeterUtils.getResString(ssl_pass_title),
// $NON-NLS-1$
-JOptionPane.QUESTION_MESSAGE);
-System.setProperty(KEY_STORE_PASSWORD, this.defaultpw);
-}
+if (null == defaultpw) {
+synchronized (this) {
+this.defaultpw = JOptionPane.showInputDialog(
+GuiPackage.getInstance().getMainFrame(),
+JMeterUtils.getResString(ssl_pass_prompt), //
$NON-NLS-1$
+JMeterUtils.getResString(ssl_pass_title), //
$NON-NLS-1$
+JOptionPane.QUESTION_MESSAGE);
+System.setProperty(KEY_STORE_PASSWORD, this.defaultpw);
}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r903825 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/reporters/ src/components/org/apache/jmeter/timers/ src/core/org/apache/jmeter/control/gui/ src/core/org/apache/jmeter/
Author: sebb
Date: Wed Jan 27 20:55:36 2010
New Revision: 903825
URL: http://svn.apache.org/viewvc?rev=903825view=rev
Log:
Tidyup
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/DoubleProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FloatProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/FunctionProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/IntegerProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/LongProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/writers/gui/HTMLReportWriterGui.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestRegexExtractor.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestJexlFunction.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestRegexFunction.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestSave.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/UrlConfigTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestProxyControl.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testbeans/gui/PackageTest.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=903825r1=903824r2=903825view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
Wed Jan 27 20:55:36 2010
@@ -78,7 +78,7 @@
private static final String DEFAULT_LIMIT = 2; //$NON-NLS-1$
/** The listener for changes. */
-transient ChangeListener changeListener;
+private transient ChangeListener changeListener;
/**
* Constructs a MailerModel.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java?rev=903825r1=903824r2=903825view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/RandomTimer.java
Wed Jan 27 20:55:36 2010
@@ -33,7 +33,7 @@
public abstract class RandomTimer extends ConstantTimer implements Timer,
Serializable {
public final static String RANGE = RandomTimer.range;
-protected Random random;
+protected final Random random;
/**
* No-arg constructor.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java?rev=903825r1=903824r2=903825view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
Wed Jan 27 20
svn commit: r902579 - in /jakarta/jmeter/trunk: build.properties build.xml
Author: sebb
Date: Sun Jan 24 15:04:27 2010
New Revision: 902579
URL: http://svn.apache.org/viewvc?rev=902579view=rev
Log:
Need javax.script support for Java 1.5
Modified:
jakarta/jmeter/trunk/build.properties
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.properties?rev=902579r1=902578r2=902579view=diff
==
--- jakarta/jmeter/trunk/build.properties (original)
+++ jakarta/jmeter/trunk/build.properties Sun Jan 24 15:04:27 2010
@@ -36,6 +36,10 @@
#apache-bsf.md5 = 162ed0b06486f75f07a7c8904bcea02a
apache-bsf.md5 = 16e82d858c648962fb5c959f21959039
+apache-bsf-api.jar = bsf-api-3.0-beta3.jar
+apache-bsf-api.loc =
http://repo2.maven.org/maven2/org/apache/bsf/bsf-api/3.0-beta3
+apache-bsf-api.md5 = db511596d6af5983494fb006674e6562
+
avalon-framework.jar= avalon-framework-4.1.4.jar
avalon-framework.loc=
http://mirrors.ibiblio.org/pub/mirrors/maven/avalon-framework/jars
avalon-framework.md5= 2C5306A09B22BD06A78343C0B55D021F
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=902579r1=902578r2=902579view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun Jan 24 15:04:27 2010
@@ -1986,6 +1986,8 @@
--
target name=_process_all_jars
process_jarfile jarname=apache-bsf/
+!-- TODO: only download if javax.script.ScriptEngine not in JVM
classlib --
+process_jarfile jarname=apache-bsf-api dest.dir=${lib.api}/
process_jarfile jarname=avalon-framework/
process_jarfile jarname=beanshell/
process_jarfile jarname=commons-codec/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r902580 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sun Jan 24 15:17:04 2010
New Revision: 902580
URL: http://svn.apache.org/viewvc?rev=902580view=rev
Log:
Show name of jar when checking if download is needed
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=902580r1=902579r2=902580view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun Jan 24 15:17:04 2010
@@ -1913,6 +1913,7 @@
target name=_check_jarfile if=_get_file
!-- Check if file exists --
fail message=Error in build file or calling sequence
if=file.exists/
+echo level=infoChecking ${jar}/echo
available file=${path}/${jar} property=file.exists/
condition property=_get_zipfile
isset property=${zipprop}/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r902585 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sun Jan 24 15:25:25 2010
New Revision: 902585
URL: http://svn.apache.org/viewvc?rev=902585view=rev
Log:
Ensure all API jars are included in builds
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=902585r1=902584r2=902585view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun Jan 24 15:25:25 2010
@@ -135,6 +135,12 @@
/fileset
/auxClasspath
+ auxClasspath
+ fileset dir=${lib.api}
+ include name=*.jar/
+ /fileset
+ /auxClasspath
+
/findbugs
antcall target=findbugs-style/
antcall target=findbugs-xsl/
@@ -385,9 +391,7 @@
!-- Generated jars --
fileset dir=${lib.dir} includes=jorphan.jar/
!-- API-only jars--
-pathelement location=${lib.api}/${activation.jar}/
-pathelement location=${lib.api}/${javamail.jar}/
-pathelement location=${lib.api}/${jms.jar}/
+pathelement location=${lib.api}/*.jar/
!-- Optional jars --
fileset dir=${lib.opt} includes=*.jar/
/path
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r902586 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sun Jan 24 15:29:22 2010
New Revision: 902586
URL: http://svn.apache.org/viewvc?rev=902586view=rev
Log:
No need to treat bsf-api specially any more
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=902586r1=902585r2=902586view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun Jan 24 15:29:22 2010
@@ -1822,8 +1822,6 @@
fileset dir=${dest.jar} includes=*.jar/
pathelement location=${build.test}/
path refid=classpath/
- !-- Needed for testing under Java 1.5 --
- fileset dir=${lib.dir} includes=bsf-api*.jar/
/classpath
jvmarg value=-server/
sysproperty key=java.awt.headless value=${test.headless}/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r902590 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sun Jan 24 15:38:17 2010
New Revision: 902590
URL: http://svn.apache.org/viewvc?rev=902590view=rev
Log:
Fix API jar reference
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=902590r1=902589r2=902590view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun Jan 24 15:38:17 2010
@@ -391,7 +391,7 @@
!-- Generated jars --
fileset dir=${lib.dir} includes=jorphan.jar/
!-- API-only jars--
-pathelement location=${lib.api}/*.jar/
+fileset dir=${lib.api} includes=*.jar/
!-- Optional jars --
fileset dir=${lib.opt} includes=*.jar/
/path
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r902592 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sun Jan 24 16:07:45 2010
New Revision: 902592
URL: http://svn.apache.org/viewvc?rev=902592view=rev
Log:
Only download bsf-api jar if javax.script not supported by JVM
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=902592r1=902591r2=902592view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun Jan 24 16:07:45 2010
@@ -1981,6 +1981,11 @@
echo level=info message=Checksum OK: ${file}/
/target
+!-- Optionally download BSF-API jar --
+target name=_process_javax_script unless=javax.script.present
+process_jarfile jarname=apache-bsf-api dest.dir=${lib.api}/
+/target
+
!--
Generic target to process all external jars.
The process_jarfile macro resolves the properties that begin with the
jarname
@@ -1989,8 +1994,9 @@
--
target name=_process_all_jars
process_jarfile jarname=apache-bsf/
-!-- TODO: only download if javax.script.ScriptEngine not in JVM
classlib --
-process_jarfile jarname=apache-bsf-api dest.dir=${lib.api}/
+!-- Only download if javax.script.ScriptEngine not in JVM classlib --
+available classpathref=classpath
classname=javax.script.ScriptEngine property=javax.script.present/
+antcall target=_process_javax_script/
process_jarfile jarname=avalon-framework/
process_jarfile jarname=beanshell/
process_jarfile jarname=commons-codec/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r902601 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/reporters/MailerModel.java src/components/org/apache/jmeter/reporters/MailerResultCollector.java xdocs/changes.xml
Author: sebb
Date: Sun Jan 24 16:59:16 2010
New Revision: 902601
URL: http://svn.apache.org/viewvc?rev=902601view=rev
Log:
Bug 48603 - Mailer Visualiser sends two emails for a single failed response
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=902601r1=902600r2=902601view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
Sun Jan 24 16:59:16 2010
@@ -94,6 +94,7 @@
changeListener = list;
}
+/** {...@inheritdoc} */
@Override
public Object clone() {
MailerModel m = (MailerModel) super.clone();
@@ -139,16 +140,28 @@
}
/**
+ * Adds a SampleResult for display in the Visualizer.
+ *
+ * @param sample
+ *the SampleResult encapsulating informations about the last
+ *sample.
+ */
+public void add(SampleResult sample) {
+add(sample, false);
+}
+
+/**
* Adds a SampleResult. If SampleResult represents a change concerning the
- * failure/success of the sampling a message might be send to the
addressies
+ * failure/success of the sampling a message might be sent to the
addressies
* according to the settings of codesuccessCount/code and
* codefailureCount/code.
*
* @param sample
- *the SampleResult encapsulating informations about the last
+ *the SampleResult encapsulating information about the last
*sample.
+ * @param sendMails whether or not to send e-mails
*/
-public synchronized void add(SampleResult sample) {
+public synchronized void add(SampleResult sample, boolean sendMails) {
// -1 is the code for a failed sample.
//
@@ -159,7 +172,7 @@
successCount++;
}
-if ((failureCount getFailureLimit()) !siteDown
!failureMsgSent) {
+if (sendMails (failureCount getFailureLimit()) !siteDown
!failureMsgSent) {
// Send the mail ...
VectorString addressVector = getAddressVector();
@@ -168,7 +181,7 @@
sendMail(getFromAddress(), addressVector,
getFailureSubject(), URL Failed:
+ sample.getSampleLabel(), getSmtpHost());
} catch (Exception e) {
-log.error(Problem sending mail, e);
+log.error(Problem sending mail: +e);
}
siteDown = true;
failureMsgSent = true;
@@ -177,7 +190,7 @@
}
}
-if (siteDown (sample.getTime() != -1) !successMsgSent) {
+if (sendMails siteDown (sample.getTime() != -1)
!successMsgSent) {
// Send the mail ...
if (successCount getSuccessLimit()) {
VectorString addressVector = getAddressVector();
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java?rev=902601r1=902600r2=902601view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerResultCollector.java
Sun Jan 24 16:59:16 2010
@@ -32,21 +32,18 @@
setProperty(new TestElementProperty(MAILER_MODEL, new MailerModel()));
}
+/** {...@inheritdoc} */
@Override
public void clear() {
super.clear();
setProperty(new TestElementProperty(MAILER_MODEL, new MailerModel()));
}
-/*
- * (non-Javadoc)
- *
- * @see SampleListener#sampleOccurred(SampleEvent)
- */
+/** {...@inheritdoc} */
@Override
public void sampleOccurred(SampleEvent e) {
-super.sampleOccurred(e);
-getMailerModel().add(e.getResult());
+super.sampleOccurred(e); // sends the result to the visualiser
+getMailerModel().add(e.getResult(), true); // updates the model used
for sending e-mails
}
public MailerModel getMailerModel() {
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=902601r1=902600r2=902601view=diff
svn commit: r902602 - /jakarta/jmeter/trunk/lib/api/
Author: sebb Date: Sun Jan 24 17:00:19 2010 New Revision: 902602 URL: http://svn.apache.org/viewvc?rev=902602view=rev Log: Ignore bsf-api jars Modified: jakarta/jmeter/trunk/lib/api/ (props changed) Propchange: jakarta/jmeter/trunk/lib/api/ -- --- svn:ignore (original) +++ svn:ignore Sun Jan 24 17:00:19 2010 @@ -1,3 +1,4 @@ geronimo-activation_1.0.2_spec-1.1.jar geronimo-jms_1.1_spec-1.0.jar geronimo-javamail_1.3.1_spec-1.1.jar +bsf-api-*.jar - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r902495 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Author: sebb
Date: Sat Jan 23 21:32:41 2010
New Revision: 902495
URL: http://svn.apache.org/viewvc?rev=902495view=rev
Log:
Minor refactor
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java?rev=902495r1=902494r2=902495view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java
Sat Jan 23 21:32:41 2010
@@ -300,11 +300,13 @@
*/
@Override
public TestElement createTestElement() {
-if (getModel() == null) {
-setModel(new MailerResultCollector());
+ResultCollector model = getModel();
+if (model == null) {
+model = new MailerResultCollector();
+setModel(model);
}
-modifyTestElement(getModel());
-return getModel();
+modifyTestElement(model);
+return model;
}
/*
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r902078 - in /jakarta/jmeter/trunk/src: core/org/apache/jmeter/gui/action/ core/org/apache/jmeter/gui/util/ core/org/apache/jmeter/samplers/ protocol/jms/org/apache/jmeter/protocol/jms/cli
Author: sebb
Date: Fri Jan 22 12:54:33 2010
New Revision: 902078
URL: http://svn.apache.org/viewvc?rev=902078view=rev
Log:
Should not ignore Error or RuntimeException
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=902078r1=902077r2=902078view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Fri
Jan 22 12:54:33 2010
@@ -139,6 +139,12 @@
} catch (Throwable ex) {
GuiPackage.getInstance().setTestPlanFile(null);
log.error(, ex);
+if (ex instanceof Error){
+throw (Error) ex;
+}
+if (ex instanceof RuntimeException){
+throw (RuntimeException) ex;
+}
throw new IllegalUserActionException(Couldn't save test plan to
file: + updateFile);
} finally {
JOrphanUtils.closeQuietly(ostream);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=902078r1=902077r2=902078view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Fri Jan 22 12:54:33 2010
@@ -148,6 +148,12 @@
initializeMenus();
} catch (Throwable e) {
log.error(, e);
+if (e instanceof Error){
+throw (Error) e;
+}
+if (e instanceof RuntimeException){
+throw (RuntimeException) e;
+}
}
}
@@ -430,6 +436,12 @@
continue;
} catch (Throwable e) {
log.warn(Could not instantiate + name, e);
+if (e instanceof Error){
+throw (Error) e;
+}
+if (e instanceof RuntimeException){
+throw (RuntimeException) e;
+}
continue;
}
if (elementsToSkip.contains(name) ||
elementsToSkip.contains(item.getStaticLabel())) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java?rev=902078r1=902077r2=902078view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
Fri Jan 22 12:54:33 2010
@@ -67,6 +67,12 @@
sampleStore.clear();
} catch (Throwable ex) {
log.warn(testEnded(), ex);
+if (ex instanceof Error){
+throw (Error) ex;
+}
+if (ex instanceof RuntimeException){
+throw (RuntimeException) ex;
+}
}
}
@@ -84,6 +90,12 @@
sampleStore.clear();
} catch (Throwable ex) {
log.error(testEnded(host), ex);
+if (ex instanceof Error){
+throw (Error) ex;
+}
+if (ex instanceof RuntimeException){
+throw (RuntimeException) ex;
+}
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java?rev=902078r1=902077r2=902078view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
Fri Jan 22 12:54:33 2010
@@ -61,6 +61,12 @@
listener.testStarted();
} catch (Throwable ex) {
log.warn(testStarted(), ex);
+if (ex instanceof Error){
+throw (Error) ex
svn commit: r901727 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java xdocs/changes.xml
Author: sebb
Date: Thu Jan 21 14:45:57 2010
New Revision: 901727
URL: http://svn.apache.org/viewvc?rev=901727view=rev
Log:
Bug 48570 - AjpSampler doesn't support query parameters (GET/POST)
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=901727r1=901726r2=901727view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
Thu Jan 21 14:45:57 2010
@@ -31,6 +31,7 @@
import org.apache.jmeter.protocol.http.control.CookieManager;
import org.apache.jmeter.protocol.http.control.Header;
import org.apache.jmeter.protocol.http.control.HeaderManager;
+import org.apache.jmeter.protocol.http.util.HTTPFileArg;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
@@ -91,6 +92,7 @@
private transient ByteArrayOutputStream responseData = new
ByteArrayOutputStream();
private int inpos = 0;
private int outpos = 0;
+private transient String stringBody = null;
private transient InputStream body = null;
public AjpSampler() {
@@ -131,6 +133,7 @@
}
channel = null;
body = null;
+stringBody = null;
}
private void setupConnection(URL url,
@@ -171,7 +174,7 @@
} else {
setString(HTTP_1_1);
}
-setString(url.getFile());
+setString(url.getPath());
setString(localAddress);
setString(localName);
setString(host);
@@ -181,7 +184,12 @@
String hdr = setConnectionHeaders(url, host, method);
res.setRequestHeaders(hdr);
res.setCookies(setConnectionCookies(url, getCookieManager()));
-setByte((byte)0xff); // Attributes not supported
+String query = url.getQuery();
+if (query != null) {
+setByte((byte)0x05); // Marker for query string attribute
+setString(query);
+}
+setByte((byte)0xff); // More general attributes not supported
}
private int getHeaderSize(String method, URL url) {
@@ -267,9 +275,10 @@
} else {
sb.append('');
}
-
sb.append(arg.getName()).append('=').append(arg.getStringValue());
+sb.append(arg.getStringValue());
}
-byte [] sbody = sb.toString().getBytes(); //FIXME - encoding
+stringBody = sb.toString();
+byte [] sbody = stringBody.getBytes(); //FIXME - encoding
cl = sbody.length;
body = new ByteArrayInputStream(sbody);
}
@@ -364,6 +373,7 @@
throws IOException {
send();
if(method.equals(POST)) {
+res.setQueryString(stringBody);
sendPostBody();
}
handshake(res);
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=901727r1=901726r2=901727view=diff
==
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Jan 21 14:45:57 2010
@@ -76,6 +76,7 @@
liBug 48451 - Error in: SoapSampler.setPostHeaders(PostMethod post) in the
else branch/li
liBug 48542 - SoapSampler uses wrong response header field to decide if
response is gzip encoded/li
liBug 48568 - CookieManager broken for AjpSampler/li
+liBug 48570 - AjpSampler doesn't support query parameters (GET/POST)/li
/ul
h3Other Samplers/h3
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901805 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Author: sebb
Date: Thu Jan 21 18:02:20 2010
New Revision: 901805
URL: http://svn.apache.org/viewvc?rev=901805view=rev
Log:
Better reporting of XPath errors
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=901805r1=901804r2=901805view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Thu Jan 21 18:02:20 2010
@@ -128,18 +128,27 @@
previousResult.addAssertionResult(ass);
previousResult.setSuccessful(false);
} catch (ParserConfigurationException e) {// Should not happen
-final String errrorMessage = error on (+getXPathQuery()+);
+final String errrorMessage = ParserConfigurationException while
processing (+getXPathQuery()+);
log.error(errrorMessage,e);
throw new JMeterError(errrorMessage,e);
} catch (SAXException e) {// Can happen for bad input document
-log.warn(error on (+getXPathQuery()+)+e.getLocalizedMessage());
+log.warn(SAXException while processing (+getXPathQuery()+)
+e.getLocalizedMessage());
+addAssertionFailure(previousResult, e, false); // Should this also
fail the sample?
} catch (TransformerException e) {// Can happen for incorrect XPath
expression
-log.warn(error on (+getXPathQuery()+)+e.getLocalizedMessage());
+log.warn(TransformerException while processing
(+getXPathQuery()+) +e.getLocalizedMessage());
+addAssertionFailure(previousResult, e, false);
} catch (TidyException e) {
-AssertionResult ass = new AssertionResult(TidyException); //
$NON-NLS-1$
-ass.setFailure(true);
-ass.setFailureMessage(e.getLocalizedMessage());
-previousResult.addAssertionResult(ass);
+addAssertionFailure(previousResult, e, true); // fail the sample
+}
+}
+
+private void addAssertionFailure(final SampleResult previousResult,
+final Throwable thrown, final boolean setFailed) {
+AssertionResult ass = new
AssertionResult(thrown.getClass().getSimpleName()); // $NON-NLS-1$
+ass.setFailure(true);
+ass.setFailureMessage(getXPathQuery()+ =
+thrown.getLocalizedMessage());
+previousResult.addAssertionResult(ass);
+if (setFailed){
previousResult.setSuccessful(false);
}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901920 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
Author: sebb Date: Thu Jan 21 23:20:56 2010 New Revision: 901920 URL: http://svn.apache.org/viewvc?rev=901920view=rev Log: Oops! remove unintended additional import (thanks to Rainer) Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=901920r1=901919r2=901920view=diff == --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Thu Jan 21 23:20:56 2010 @@ -31,7 +31,6 @@ import org.apache.jmeter.protocol.http.control.CookieManager; import org.apache.jmeter.protocol.http.control.Header; import org.apache.jmeter.protocol.http.control.HeaderManager; -import org.apache.jmeter.protocol.http.util.HTTPFileArg; import org.apache.jmeter.testelement.property.CollectionProperty; import org.apache.jmeter.testelement.property.JMeterProperty; import org.apache.jmeter.testelement.property.PropertyIterator; - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: svn commit: r901727 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java xdocs/changes.xml
On 21/01/2010, Rainer Jung rainer.j...@kippdata.de wrote: On 21.01.2010 15:45, s...@apache.org wrote: Author: sebb Date: Thu Jan 21 14:45:57 2010 New Revision: 901727 URL: http://svn.apache.org/viewvc?rev=901727view=rev Log: Bug 48570 - AjpSampler doesn't support query parameters (GET/POST) Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=901727r1=901726r2=901727view=diff == --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Thu Jan 21 14:45:57 2010 @@ -31,6 +31,7 @@ import org.apache.jmeter.protocol.http.control.CookieManager; import org.apache.jmeter.protocol.http.control.Header; import org.apache.jmeter.protocol.http.control.HeaderManager; +import org.apache.jmeter.protocol.http.util.HTTPFileArg; import org.apache.jmeter.testelement.property.CollectionProperty; import org.apache.jmeter.testelement.property.JMeterProperty; import org.apache.jmeter.testelement.property.PropertyIterator; I think this part of the commit was probably unintentional. Thanks, fixed. [I was looking at removing the deprecation warnings, and failed to remove all the temporary code.] Regards, Rainer - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901937 - in /jakarta/jmeter/trunk/src: core/org/apache/jmeter/util/NameUpdater.java monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java protocol/java/org/apache/jmeter/protoc
Author: sebb
Date: Fri Jan 22 00:16:52 2010
New Revision: 901937
URL: http://svn.apache.org/viewvc?rev=901937view=rev
Log:
Make some fields final
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java?rev=901937r1=901936r2=901937view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java Fri
Jan 22 00:16:52 2010
@@ -32,8 +32,9 @@
import org.apache.log.Logger;
public final class NameUpdater {
-private static Properties nameMap;
-
+private static final Properties nameMap;
+// Read-only access after class has been initialised
+
private static final Logger log = LoggingManager.getLoggerForClass();
static {
Modified:
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java?rev=901937r1=901936r2=901937view=diff
==
---
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
(original)
+++
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
Fri Jan 22 00:16:52 2010
@@ -28,8 +28,9 @@
*/
public class ObjectFactory {
-//@GuardedBy(this)
-private static ObjectFactory FACTORY = null;
+private static class ObjectFactoryHolder {
+static final ObjectFactory FACTORY = new ObjectFactory();
+ }
private final Parser PARSER;
@@ -41,14 +42,11 @@
PARSER = new MonitorParser(this);
}
-public static synchronized ObjectFactory getInstance() {
-if (FACTORY == null) {
-FACTORY = new ObjectFactory();
-}
-return FACTORY;
+public static ObjectFactory getInstance() {
+return ObjectFactoryHolder.FACTORY;
}
-public synchronized Status parseBytes(byte[] bytes) {
+public Status parseBytes(byte[] bytes) {
return PARSER.parseBytes(bytes);
}
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java?rev=901937r1=901936r2=901937view=diff
==
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
Fri Jan 22 00:16:52 2010
@@ -51,7 +51,7 @@
/**
* Map containing the initialization parameters for the JavaSamplerClient.
*/
-private MapString, String params = null;
+private final MapString, String params;
/**
* Create a new JavaSampler with the specified initialization parameters.
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901444 - in /jakarta/jmeter/trunk: src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.ja
Author: sebb
Date: Wed Jan 20 23:49:12 2010
New Revision: 901444
URL: http://svn.apache.org/viewvc?rev=901444view=rev
Log:
Bug 48573 - LDAPExtSampler directory context handling
Modified:
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java?rev=901444r1=901443r2=901444view=diff
==
---
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
Wed Jan 20 23:49:12 2010
@@ -33,7 +33,6 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchResult;
@@ -139,9 +138,6 @@
private static final String SEMI_COLON = ;; // $NON-NLS-1$
-private static final HashtableString, LdapExtClient ldapConnections =
-new HashtableString, LdapExtClient();
-
private static final HashtableString, DirContext ldapContexts =
new HashtableString, DirContext();
@@ -603,10 +599,10 @@
* This will do the add test for the User defined TestCase
*
**/
-private void addTest(LdapExtClient ldap, DirContext dirContext,
SampleResult res) throws NamingException {
+private void addTest(DirContext dirContext, SampleResult res) throws
NamingException {
try {
res.sampleStart();
-DirContext ctx = ldap.createTest(dirContext, getUserAttributes(),
getBaseEntryDN());
+DirContext ctx = LdapExtClient.createTest(dirContext,
getUserAttributes(), getBaseEntryDN());
ctx.close(); // the createTest() method creates an extra context
which needs to be closed
} finally {
res.sampleEnd();
@@ -617,10 +613,10 @@
* This will do the delete test for the User defined TestCase
*
**/
-private void deleteTest(LdapExtClient ldap, DirContext dirContext,
SampleResult res) throws NamingException {
+private void deleteTest(DirContext dirContext, SampleResult res) throws
NamingException {
try {
res.sampleStart();
-ldap.deleteTest(dirContext, getPropertyAsString(DELETE));
+LdapExtClient.deleteTest(dirContext, getPropertyAsString(DELETE));
} finally {
res.sampleEnd();
}
@@ -630,10 +626,10 @@
* This will do the modify test for the User defined TestCase
*
**/
-private void modifyTest(LdapExtClient ldap, DirContext dirContext,
SampleResult res) throws NamingException {
+private void modifyTest(DirContext dirContext, SampleResult res) throws
NamingException {
try {
res.sampleStart();
-ldap.modifyTest(dirContext, getUserModAttributes(),
getBaseEntryDN());
+LdapExtClient.modifyTest(dirContext, getUserModAttributes(),
getBaseEntryDN());
} finally {
res.sampleEnd();
}
@@ -644,7 +640,7 @@
* the whole context
*
**/
-private void bindOp(LdapExtClient ldap, DirContext dirContext,
SampleResult res) throws NamingException {
+private void bindOp(DirContext dirContext, SampleResult res) throws
NamingException {
DirContext ctx = ldapContexts.remove(getThreadName());
if (ctx != null) {
log.warn(Closing previous context for thread: +
getThreadName());
@@ -652,7 +648,7 @@
}
try {
res.sampleStart();
-ctx = ldap.connect(getServername(), getPort(), getRootdn(),
getUserDN(), getUserPw(),getConnTimeOut(),isSecure());
+ctx = LdapExtClient.connect(getServername(), getPort(),
getRootdn(), getUserDN(), getUserPw(),getConnTimeOut(),isSecure());
} finally {
res.sampleEnd();
}
@@ -664,12 +660,10 @@
*
**/
private void singleBindOp(SampleResult res) throws NamingException {
-LdapExtClient ldap_temp;
-ldap_temp = new LdapExtClient();
try
svn commit: r901445 - /jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
Author: sebb Date: Wed Jan 20 23:53:21 2010 New Revision: 901445 URL: http://svn.apache.org/viewvc?rev=901445view=rev Log: Use ConcurrentHashMap instead of Hashtable now we are using Java 1.5 Modified: jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java Modified: jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java?rev=901445r1=901444r2=901445view=diff == --- jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java (original) +++ jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java Wed Jan 20 23:53:21 2010 @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Hashtable; import java.util.Iterator; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.naming.NamingEnumeration; import javax.naming.NamingException; @@ -138,8 +138,8 @@ private static final String SEMI_COLON = ;; // $NON-NLS-1$ -private static final HashtableString, DirContext ldapContexts = -new HashtableString, DirContext(); +private static final ConcurrentHashMapString, DirContext ldapContexts = +new ConcurrentHashMapString, DirContext(); private static final int MAX_SORTED_RESULTS = JMeterUtils.getPropDefault(ldapsampler.max_sorted_results, 1000); // $NON-NLS-1$ - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901453 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
Author: sebb
Date: Thu Jan 21 00:15:28 2010
New Revision: 901453
URL: http://svn.apache.org/viewvc?rev=901453view=rev
Log:
Use Map interface rather than specific Hashtable
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java?rev=901453r1=901452r2=901453view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
Thu Jan 21 00:15:28 2010
@@ -26,9 +26,9 @@
import java.io.StringWriter;
import java.net.URL;
import java.net.MalformedURLException;
-import java.util.Enumeration;
+import java.util.Map;
import java.util.Random;
-import java.util.Hashtable;
+import java.util.Map.Entry;
import javax.xml.parsers.DocumentBuilder;
@@ -508,7 +508,7 @@
msg.setSOAPTransport(spconn);
msg.send(this.getUrl(), this.getSoapAction(), msgEnv);
@SuppressWarnings(unchecked) // API uses raw types
-final HashtableString, String headers = spconn.getHeaders();
+final MapString, String headers = spconn.getHeaders();
result.setResponseHeaders(convertSoapHeaders(headers));
if (this.getHeaderManager() != null) {
@@ -617,12 +617,10 @@
public void addEncodedArgument(String name, String value, String metaData)
{
}
-public String convertSoapHeaders(HashtableString, String ht) {
-EnumerationString en = ht.keys();
+public String convertSoapHeaders(MapString, String ht) {
StringBuilder buf = new StringBuilder();
-while (en.hasMoreElements()) {
-String key = en.nextElement();
-buf.append(key).append(=).append(ht.get(key)).append(\n);
//$NON-NLS-1$ //$NON-NLS-2$
+for (EntryString, String entry : ht.entrySet()) {
+
buf.append(entry.getKey()).append(=).append(entry.getValue()).append(\n);
//$NON-NLS-1$ //$NON-NLS-2$
}
return buf.toString();
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901471 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/timers/ core/org/apache/jmeter/reporters/ protocol/http/org/apache/jmeter/protocol/http/parser/ protocol/jms/org/apache
Author: sebb
Date: Thu Jan 21 00:51:00 2010
New Revision: 901471
URL: http://svn.apache.org/viewvc?rev=901471view=rev
Log:
Use ConcurrentHashMap instead of Hashtable now we are using Java 1.5
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=901471r1=901470r2=901471view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
Thu Jan 21 00:51:00 2010
@@ -18,8 +18,8 @@
package org.apache.jmeter.timers;
-import java.util.Hashtable;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.testbeans.TestBean;
@@ -72,7 +72,7 @@
//For holding the ThrougputInfo objects for all ThreadGroups. Keyed by
ThreadGroup objects
private final static MapThreadGroup, ThroughputInfo threadGroupsInfoMap =
-new HashtableThreadGroup, ThroughputInfo();
+new ConcurrentHashMapThreadGroup, ThroughputInfo();
/**
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java?rev=901471r1=901470r2=901471view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
Thu Jan 21 00:51:00 2010
@@ -29,9 +29,9 @@
import java.io.FileReader;
import java.io.IOException;
import java.text.DecimalFormat;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Map;
import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -50,7 +50,7 @@
public class FileReporter extends JPanel {
private static final Logger log = LoggingManager.getLoggerForClass();
-private final HashtableString, VectorInteger data = new
HashtableString, VectorInteger();
+private final MapString, VectorInteger data = new
ConcurrentHashMapString, VectorInteger();
/** initalize a file reporter from a file */
public void init(String file) throws IOException {
@@ -131,19 +131,15 @@
*/
private static class GraphPanel extends JPanel {
// boolean autoScale = true;
-HashtableString, VectorInteger data;
+private final MapString, VectorInteger data;
-VectorString keys = new VectorString();
+private final VectorString keys = new VectorString();
-VectorColor colorList = new VectorColor();
+private final VectorColor colorList = new VectorColor();
-public GraphPanel(HashtableString, VectorInteger data) {
+public GraphPanel(MapString, VectorInteger data) {
this.data = data;
-EnumerationString e = data.keys();
-
-while (e.hasMoreElements()) {
-String key = e.nextElement();
-
+for (String key : data.keySet()) {
keys.addElement(key);
}
for (int a = 0x33; a 0xFF; a += 0x66) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=901471r1=901470r2=901471view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
Thu Jan 21 00:51:00 2010
@@ -24,6 +24,7 @@
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.util.NoThreadClone;
@@ -89,8 +90,8 @@
/*
* This map allows summarisers with the same name to contribute to the
same totals.
*/
-//@GuardedBy(accumulators)
-private static final HashtableString, Totals accumulators = new
HashtableString, Totals();
+//@GuardedBy(accumulators) - needed to ensure
svn commit: r901489 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Author: sebb Date: Thu Jan 21 01:31:29 2010 New Revision: 901489 URL: http://svn.apache.org/viewvc?rev=901489view=rev Log: Javadoc Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=901489r1=901488r2=901489view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java Thu Jan 21 01:31:29 2010 @@ -343,7 +343,12 @@ /** * Create a JMeterProperty from an object. - * + * The object can be one of: + * ul + * liJMeterProperty - returned unchanged/li + * liTestElement = TestElementProperty with the same name/li + * liMap|Collection = Map|CollectionProperty with the name = item.hashCode/li + * /ul * @param item object to be turned into a propery * @return the JMeterProperty */ - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901490 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Author: sebb
Date: Thu Jan 21 01:32:17 2010
New Revision: 901490
URL: http://svn.apache.org/viewvc?rev=901490view=rev
Log:
Use interface
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java?rev=901490r1=901489r2=901490view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Thu Jan 21 01:32:17 2010
@@ -18,7 +18,7 @@
package org.apache.jmeter.visualizers;
-import java.util.HashMap;
+import java.util.Map;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jorphan.math.StatCalculatorLong;
@@ -259,7 +259,7 @@
return maxThroughput;
}
-public HashMapNumber, Number[] getDistribution() {
+public MapNumber, Number[] getDistribution() {
return calculator.getDistribution();
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901491 - /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Author: sebb
Date: Thu Jan 21 01:32:35 2010
New Revision: 901491
URL: http://svn.apache.org/viewvc?rev=901491view=rev
Log:
Use interface
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java?rev=901491r1=901490r2=901491view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Thu Jan 21 01:32:35 2010
@@ -20,6 +20,7 @@
import java.util.ConcurrentModificationException;
import java.util.HashMap;
+import java.util.Map;
import java.util.TreeMap;
import java.util.Map.Entry;
@@ -157,7 +158,7 @@
* @return map containing either Integer or Long keys; entries are a
Number array containing the key and the [Integer] count.
* TODO - why is the key value also stored in the entry array?
*/
-public synchronized HashMapNumber, Number[] getDistribution() {
+public synchronized MapNumber, Number[] getDistribution() {
HashMapNumber, Number[] items = new HashMap Number, Number[] ();
Number[] dis;
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901493 - in /jakarta/jmeter/trunk/src/protocol: http/org/apache/jmeter/protocol/http/util/WSDLHelper.java jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
Author: sebb Date: Thu Jan 21 01:33:53 2010 New Revision: 901493 URL: http://svn.apache.org/viewvc?rev=901493view=rev Log: Use interface Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java?rev=901493r1=901492r2=901493view=diff == --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java Thu Jan 21 01:33:53 2010 @@ -25,6 +25,7 @@ import java.net.URLConnection; import java.util.ArrayList; import java.util.HashMap; +import java.util.Map; import java.util.Set; import javax.xml.parsers.DocumentBuilder; @@ -65,7 +66,7 @@ private Object[] SOAPOPS = null; -private final HashMapString, String ACTIONS = new HashMapString, String(); +private final MapString, String ACTIONS = new HashMapString, String(); private final AuthManager AUTH; Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java?rev=901493r1=901492r2=901493view=diff == --- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java (original) +++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java Thu Jan 21 01:33:53 2010 @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; /** * @@ -34,7 +35,7 @@ private static final ArrayListObject clients = new ArrayListObject(); -private static final HashMapObject, Object client_map = new HashMapObject, Object(); +private static final MapObject, Object client_map = new HashMapObject, Object(); /** * Add a ReceiveClient to the ClientPool. This is so that we can make sure - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901494 - in /jakarta/jmeter/trunk/src: core/org/apache/jmeter/engine/util/ core/org/apache/jmeter/functions/gui/ functions/org/apache/jmeter/functions/ protocol/jdbc/org/apache/jmeter/pro
Author: sebb
Date: Thu Jan 21 01:34:10 2010
New Revision: 901494
URL: http://svn.apache.org/viewvc?rev=901494view=rev
Log:
Document thread safety
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java?rev=901494r1=901493r2=901494view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
Thu Jan 21 01:34:10 2010
@@ -47,6 +47,7 @@
private static final FunctionParser functionParser = new FunctionParser();
+// Created during class init; not modified thereafter
private static final MapString, Class? extends Function functions =
new HashMapString, Class? extends Function();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=901494r1=901493r2=901494view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Thu Jan 21 01:34:10 2010
@@ -55,6 +55,7 @@
private JLabeledTextField cutPasteFunction;
+// Not modified after initial setup
private final MapString, Class? functionMap = new HashMapString,
Class?();
private JButton generateButton;
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java?rev=901494r1=901493r2=901494view=diff
==
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
Thu Jan 21 01:34:10 2010
@@ -43,6 +43,7 @@
private static final ListString desc = new LinkedListString();
+// Only modified in class init
private static final MapString, String aliases = new HashMapString,
String();
static {
Modified:
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java?rev=901494r1=901493r2=901494view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Thu Jan 21 01:34:10 2010
@@ -78,7 +78,8 @@
// key: name (lowercase) from java.sql.Types; entry: corresponding int
value
private static final MapString, Integer mapJdbcNameToInt;
-
+// read-only after class init
+
static {
// based on e291. Getting the Name of a JDBC Type from javaalmanac.com
// http://javaalmanac.com/egs/java.sql/JdbcInt2Str.html
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r901495 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/engine/ protocol/http/org/apache/jmeter/protocol/http/util/ protocol/http/org/apach
Author: sebb
Date: Thu Jan 21 01:34:25 2010
New Revision: 901495
URL: http://svn.apache.org/viewvc?rev=901495view=rev
Log:
Use ConcurrentHashMap instead of HashMap for multi-threaded access
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/DOMPool.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SessionFilter.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=901495r1=901494r2=901495view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
Thu Jan 21 01:34:25 2010
@@ -25,10 +25,9 @@
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
import javax.swing.BoxLayout;
import javax.swing.JButton;
@@ -104,7 +103,7 @@
private transient ObjectTableModel model;
private final MapString, SamplingStatCalculator tableRows =
-Collections.synchronizedMap(new HashMapString,
SamplingStatCalculator());
+new ConcurrentHashMapString, SamplingStatCalculator();
private AxisGraph graphPanel = null;
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=901495r1=901494r2=901495view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Thu Jan 21 01:34:25 2010
@@ -25,12 +25,8 @@
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
-//import java.awt.event.MouseAdapter;
-//import java.awt.event.MouseEvent;
-//import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.swing.BoxLayout;
import javax.swing.JButton;
@@ -108,7 +104,7 @@
private transient ObjectTableModel model;
private final MapString, SamplingStatCalculator tableRows =
-Collections.synchronizedMap(new HashMapString,
SamplingStatCalculator());
+new ConcurrentHashMapString, SamplingStatCalculator();
public StatVisualizer() {
super();
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=901495r1=901494r2=901495view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
Thu Jan 21 01:34:25 2010
@@ -25,9 +25,8 @@
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.swing.BoxLayout;
import javax.swing.JButton;
@@ -102,7 +101,7 @@
private transient ObjectTableModel model;
private final MapString, Calculator tableRows =
-Collections.synchronizedMap(new HashMapString, Calculator());
+new ConcurrentHashMapString, Calculator();
// Column renderers
private static final TableCellRenderer[] RENDERERS =
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=901495r1=901494r2=901495view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine
svn commit: r901497 - in /jakarta/jmeter/trunk: src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java xdocs/changes.xml
Author: sebb
Date: Thu Jan 21 01:51:18 2010
New Revision: 901497
URL: http://svn.apache.org/viewvc?rev=901497view=rev
Log:
Bug 48579 - Single Bind does not show config information when LdapExt Sampler
is accessed
Modified:
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java?rev=901497r1=901496r2=901497view=diff
==
---
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapExtConfigGui.java
Thu Jan 21 01:51:18 2010
@@ -228,7 +228,7 @@
cl.show(cards, CARDS_BIND);
} else if (testType.equals(LDAPExtSampler.SBIND)) {
sbind.setSelected(true);
-cl.show(cards, CARDS_DEFAULT);
+cl.show(cards, CARDS_BIND);
} else if (testType.equals(LDAPExtSampler.COMPARE)) {
compare.setSelected(true);
cl.show(cards, CARDS_COMPARE);
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=901497r1=901496r2=901497view=diff
==
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Jan 21 01:51:18 2010
@@ -86,6 +86,7 @@
liBug 48144 - NPE in OnMessageSubscriber/li
liBug 47992 - JMS Point-to-Point Request - Response option doesn't work/li
liBug 48573 - LDAPExtSampler directory context handling/li
+liBug 48579 - Single Bind does not show config information when LdapExt
Sampler is accessed/li
/ul
h3Controllers/h3
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: AjpSampler, Cookies, optional filtering
On 19/01/2010, Rainer Jung rainer.j...@kippdata.de wrote: Hi Sebb, further testing reveals a related problem between AjpSampler and cookies. The AjpSampler always sends all cookies. It does not go through the match() functionality of the CookieSpec. One can argue whether that's good or not, because the AjpSampler doesn't allow to configure the additional AJP13 data, like name of the reverse proxy etc. Unfortunately with my patch applied, we now use getCookieHeaderForURL(url) (only the matching cookies) to add the data for the GUI view of the cookies in the request, but getCookies() (all cookies) for actually adding them to the AJP13 packets. The CookieManager doesn't allow an unfiltered getCookiesHeader() nor does it allow a raw getCookiesForURL(). Which way should we go? Use all for both data or filtered for both? If we decide upon that, I can write the patch. Further reasoning for HTTP as well as AJP: The CookieSpec is used for two purposes. It does parsing and formatting, and it also does validate() and match(). The property CHECK_COOKIES allows to not do the validate(). I think it would be nice to use CHECK_COOKIES also to disable the match() call against the spec and instead use all cookies. I don't like the idea of changing the behaviour; however a new property would OK. One situation where this is useful, is when you need to test against IP addresses, but your servers return cookies with actual domain set. Another situation is when you test against the individual nodes of a farm, but the servers returns cookies matching the load balancer. OK. Finally this would also help to decide the above question about the AjpSampler. It would be effectvely configurable, whether to filter or not. It would be a nice addition to add that as a checkbox in the cooki manager gui. If the GUI is amended, I think one should add two checkboxes - 1 for validation and the other for matching. As regards IP address matching for cookies, it might be worth considering an optional host file name on the GUI. This might also work for the load-balancer case, if the file syntax supported aliases. I.e. the target host id, either IP or name would be looked up in the host list as part of the matching process. Not sure how easy that would be. What do you think? If you like the idea I can provide patches. I think the idea is good. Regards, Rainer - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r900611 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java xdocs/changes.xml
Author: sebb
Date: Mon Jan 18 23:49:41 2010
New Revision: 900611
URL: http://svn.apache.org/viewvc?rev=900611view=rev
Log:
BeanInfoSupport now caches getBeanDescriptor() - should avoid an NPE on non-Sun
JVMs when using CSVDataSet (and some other TestBeans)
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java?rev=900611r1=900610r2=900611view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
Mon Jan 18 23:49:41 2010
@@ -82,7 +82,10 @@
// NOTREAD private Class beanClass;
/** The BeanInfo for our class as obtained by the introspector. */
private final BeanInfo rootBeanInfo;
-
+
+/** The descriptor for our class */
+private final BeanDescriptor beanDescriptor;
+
/** The icons for this bean. */
private final Image[] icons = new Image[5];
@@ -99,6 +102,10 @@
throw new Error(e.toString()); // Programming error: bail out.
}
+// N.B. JVMs other than Sun may return different instances each time
+// so we cache the value here (and avoid having to fetch it every time)
+beanDescriptor = rootBeanInfo.getBeanDescriptor();
+
try {
ResourceBundle resourceBundle = ResourceBundle.getBundle(
beanClass.getName() + Resources, // $NON-NLS-1$
@@ -201,7 +208,7 @@
/** {...@inheritdoc} */
@Override
public BeanDescriptor getBeanDescriptor() {
-return rootBeanInfo.getBeanDescriptor();
+return beanDescriptor;
}
/** {...@inheritdoc} */
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=900611r1=900610r2=900611view=diff
==
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Jan 18 23:49:41 2010
@@ -113,6 +113,7 @@
ul
liBug 47646 - NullPointerException in the Random Variable element/li
liDisallow adding any child elements to JDBC Configuration/li
+liBeanInfoSupport now caches getBeanDescriptor() - should avoid an NPE on
non-Sun JVMs when using CSVDataSet (and some other TestBeans)/li
/ul
!-- --
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r900622 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java
Author: sebb Date: Tue Jan 19 00:42:46 2010 New Revision: 900622 URL: http://svn.apache.org/viewvc?rev=900622view=rev Log: Mutable static field needs to be volatile Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java?rev=900622r1=900621r2=900622view=diff == --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java Tue Jan 19 00:42:46 2010 @@ -59,7 +59,7 @@ private static final String SEARCH_TEXT_COMMAND = search_text; // $NON-NLS-1$ -private static int LAST_POSITION_DEFAULT = 0; +private static volatile int LAST_POSITION_DEFAULT = 0; private int lastPosition = LAST_POSITION_DEFAULT; - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r900623 - /jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
Author: sebb
Date: Tue Jan 19 00:43:47 2010
New Revision: 900623
URL: http://svn.apache.org/viewvc?rev=900623view=rev
Log:
Document thread-safety issue
Modified:
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
Modified:
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java?rev=900623r1=900622r2=900623view=diff
==
---
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
(original)
+++
jakarta/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
Tue Jan 19 00:43:47 2010
@@ -28,6 +28,7 @@
*/
public class ObjectFactory {
+//@GuardedBy(this)
private static ObjectFactory FACTORY = null;
private final Parser PARSER;
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r900624 - in /jakarta/jmeter/trunk/src: core/org/apache/jmeter/gui/action/ core/org/apache/jmeter/samplers/ protocol/http/org/apache/jmeter/protocol/http/proxy/
Author: sebb
Date: Tue Jan 19 00:44:15 2010
New Revision: 900624
URL: http://svn.apache.org/viewvc?rev=900624view=rev
Log:
Make private fields final
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java?rev=900624r1=900623r2=900624view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
Tue Jan 19 00:44:15 2010
@@ -46,7 +46,7 @@
*
*/
public class AboutCommand implements Command {
-private static SetString commandSet;
+private static final SetString commandSet;
private static JDialog about;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=900624r1=900623r2=900624view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
Tue Jan 19 00:44:15 2010
@@ -46,10 +46,10 @@
private MapString, SetCommand commands = new HashMapString,
SetCommand();
-private MapString, HashSetActionListener preActionListeners =
+private final MapString, HashSetActionListener preActionListeners =
new HashMapString, HashSetActionListener();
-private MapString, HashSetActionListener postActionListeners =
+private final MapString, HashSetActionListener postActionListeners =
new HashMapString, HashSetActionListener();
private ActionRouter() {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java?rev=900624r1=900623r2=900624view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
Tue Jan 19 00:44:15 2010
@@ -37,7 +37,7 @@
public class AddToTree implements Command {
private static final Logger log = LoggingManager.getLoggerForClass();
-private static SetString commandSet;
+private static final SetString commandSet;
static {
HashSetString commands = new HashSetString();
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java?rev=900624r1=900623r2=900624view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java Tue
Jan 19 00:44:15 2010
@@ -53,9 +53,9 @@
private static JDialog helpWindow;
-private static HtmlPane helpDoc;
+private static final HtmlPane helpDoc;
-private static JScrollPane scroller;
+private static final JScrollPane scroller;
private static String currentPage;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java?rev=900624r1=900623r2=900624view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/KeyStrokes.java
Tue Jan 19 00:44:15 2010
@@ -33,7 +33,7 @@
}
// Bug 47064 - fixes for Mac LAF
-private static int CONTROL_MASK
=Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+private static final int CONTROL_MASK
=Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
public static final KeyStroke CUT
svn commit: r900629 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Author: sebb
Date: Tue Jan 19 00:50:01 2010
New Revision: 900629
URL: http://svn.apache.org/viewvc?rev=900629view=rev
Log:
Unused
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java?rev=900629r1=900628r2=900629view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
Tue Jan 19 00:50:01 2010
@@ -264,15 +264,14 @@
*
*/
public class SplineGraph extends JComponent {
-public boolean reinterpolated = false;
-protected final Color WAITING_COLOR = Color.darkGray;
+private final Color WAITING_COLOR = Color.darkGray;
-protected int lastWidth = -1;
+private int lastWidth = -1;
-protected int lastHeight = -1;
+private int lastHeight = -1;
-protected int[] plot = null;
+private int[] plot = null;
public SplineGraph() {
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r900634 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
Author: sebb
Date: Tue Jan 19 01:13:04 2010
New Revision: 900634
URL: http://svn.apache.org/viewvc?rev=900634view=rev
Log:
Fix raw type
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java?rev=900634r1=900633r2=900634view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
Tue Jan 19 01:13:04 2010
@@ -507,7 +507,9 @@
spconn.setMaintainSession(true);
msg.setSOAPTransport(spconn);
msg.send(this.getUrl(), this.getSoapAction(), msgEnv);
-result.setResponseHeaders(convertSoapHeaders(spconn.getHeaders()));
+@SuppressWarnings(unchecked) // API uses raw types
+final HashtableString, String headers = spconn.getHeaders();
+result.setResponseHeaders(convertSoapHeaders(headers));
if (this.getHeaderManager() != null) {
this.getHeaderManager().setSOAPHeader(spconn);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r900635 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java xdocs/changes.xml
Author: sebb
Date: Tue Jan 19 01:18:11 2010
New Revision: 900635
URL: http://svn.apache.org/viewvc?rev=900635view=rev
Log:
Bug 48568 - CookieManager broken for AjpSampler
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=900635r1=900634r2=900635view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
Tue Jan 19 01:18:11 2010
@@ -27,6 +27,7 @@
import java.net.URL;
import org.apache.jmeter.protocol.http.control.AuthManager;
+import org.apache.jmeter.protocol.http.control.Cookie;
import org.apache.jmeter.protocol.http.control.CookieManager;
import org.apache.jmeter.protocol.http.control.Header;
import org.apache.jmeter.protocol.http.control.HeaderManager;
@@ -179,7 +180,7 @@
setInt(getHeaderSize(method, url));
String hdr = setConnectionHeaders(url, host, method);
res.setRequestHeaders(hdr);
-setConnectionCookies(url, getCookieManager());
+res.setCookies(setConnectionCookies(url, getCookieManager()));
setByte((byte)0xff); // Attributes not supported
}
@@ -304,16 +305,19 @@
return newValue.toString();
}
-private void setConnectionCookies(URL url, CookieManager cookies) {
+private String setConnectionCookies(URL url, CookieManager cookies) {
+String cookieHeader = null;
if(cookies != null) {
+cookieHeader = cookies.getCookieHeaderForURL(url);
CollectionProperty coll = cookies.getCookies();
PropertyIterator i = coll.iterator();
while(i.hasNext()) {
-JMeterProperty header = i.next();
+Cookie cookie = (Cookie)(i.next().getObjectValue());
setInt(0xA009); // Cookie
-
setString(header.getName()+=+header.getStringValue());//$NON-NLS-1$
+setString(cookie.getName()+=+cookie.getValue());//$NON-NLS-1$
}
}
+return cookieHeader;
}
private int translateHeader(String n) {
@@ -484,4 +488,4 @@
inpos+= len+1;
return s;
}
-}
\ No newline at end of file
+}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=900635r1=900634r2=900635view=diff
==
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Jan 19 01:18:11 2010
@@ -75,6 +75,7 @@
liBug 47442 - Missing replacement of https by http for certain conditions
using https-spoofing/li
liBug 48451 - Error in: SoapSampler.setPostHeaders(PostMethod post) in the
else branch/li
liBug 48542 - SoapSampler uses wrong response header field to decide if
response is gzip encoded/li
+liBug 48568 - CookieManager broken for AjpSampler/li
/ul
h3Other Samplers/h3
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r899207 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java xdocs/changes.xml
Author: sebb
Date: Thu Jan 14 14:08:37 2010
New Revision: 899207
URL: http://svn.apache.org/viewvc?rev=899207view=rev
Log:
Bug 48542 - SoapSampler uses wrong response header field to decide if response
is gzip encoded
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java?rev=899207r1=899206r2=899207view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
Thu Jan 14 14:08:37 2010
@@ -260,7 +260,7 @@
if (instream != null) {// will be null for HEAD
-org.apache.commons.httpclient.Header responseHeader =
httpMethod.getResponseHeader(TRANSFER_ENCODING);
+org.apache.commons.httpclient.Header responseHeader =
httpMethod.getResponseHeader(HEADER_CONTENT_ENCODING);
if (responseHeader != null
ENCODING_GZIP.equals(responseHeader.getValue())) {
instream = new GZIPInputStream(instream);
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=899207r1=899206r2=899207view=diff
==
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Jan 14 14:08:37 2010
@@ -74,6 +74,7 @@
liBug 47445 - Using Proxy with https-spoofing secure cookies need to be
unsecured/li
liBug 47442 - Missing replacement of https by http for certain conditions
using https-spoofing/li
liBug 48451 - Error in: SoapSampler.setPostHeaders(PostMethod post) in the
else branch/li
+liBug 48542 - SoapSampler uses wrong response header field to decide if
response is gzip encoded/li
/ul
h3Other Samplers/h3
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: HTTP cookie manager
On 12/01/2010, Baudouin baudouin.dup...@ext.ec.europa.eu wrote: Is it possible to propagate cookies through different Thread Groups of the same Test Plan ? No. JMeter threads are intended to represent independent users, so cookies and variables are local to a thread. I have seen that I could add a HTTP cookie manager either at the level of the Thread Group (this works fine), but also at the level of the Test Plan. By adding it at the level of the Test Plan, I though that I could have a first Thread Group that would select the language and then the selected language would have been propagated throughout all remaining tests via the cookie. Thank you -- View this message in context: http://old.nabble.com/HTTP-cookie-manager-tp27130900p27130900.html Sent from the JMeter - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r897739 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Author: sebb
Date: Mon Jan 11 00:29:30 2010
New Revision: 897739
URL: http://svn.apache.org/viewvc?rev=897739view=rev
Log:
Set latency in error cases
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java?rev=897739r1=897738r2=897739view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Mon Jan 11 00:29:30 2010
@@ -59,6 +59,9 @@
*
*/
public class HTTPSampler extends HTTPSamplerBase implements Interruptible {
+private static final boolean OBEY_CONTENT_LENGTH =
+JMeterUtils.getPropDefault(httpsampler.obey_contentlength, false);
// $NON-NLS-1$
+
private static final long serialVersionUID = 233L;
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -233,10 +236,10 @@
final int contentLength = conn.getContentLength();
if ((contentLength == 0)
- JMeterUtils.getPropDefault(httpsampler.obey_contentlength, //
$NON-NLS-1$
-false)) {
+ OBEY_CONTENT_LENGTH) {
log.info(Content-Length: 0, not reading http-body);
res.setResponseHeaders(getResponseHeaders(conn));
+res.latencyEnd();
return NULL_BA;
}
@@ -263,6 +266,7 @@
if (errorStream == null) {
log.info(Error Response Code: +conn.getResponseCode()+,
Server sent no Errorpage);
res.setResponseHeaders(getResponseHeaders(conn));
+res.latencyEnd();
return NULL_BA;
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r897466 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sat Jan 9 14:58:56 2010
New Revision: 897466
URL: http://svn.apache.org/viewvc?rev=897466view=rev
Log:
Document tweaks
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=897466r1=897465r2=897466view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat Jan 9 14:58:56 2010
@@ -984,11 +984,14 @@
!-- Exclude any files that might be present from testing the release --
exclude name=${dest.jar.jmeter}/*.log/
include name=${dest.jar.jmeter}/examples/**/
+ !-- JMX files are in the non-native section --
exclude name=${dest.jar.jmeter}/examples/*.jmx/
include name=${dest.printable_docs}/**/
+!-- Binary file types --
exclude name=${dest.printable_docs}/**/*.pdf/
exclude name=${dest.printable_docs}/**/*.jmx/
include name=${extras.dir}/**/
+ !-- Binary file types --
exclude name=${extras.dir}/*.jar/
exclude name=${extras.dir}/*.jpg/
exclude name=${extras.dir}/*.jmx/
@@ -1033,10 +1036,12 @@
include name=NOTICE/
include name=README/
include name=${src.dir}/**/
+ !-- Exclude binary types --
exclude name=${src.dir}/**/*.gif/
exclude name=${src.dir}/**/*.jpg/
exclude name=${src.dir}/**/*.png/
include name=${src.docs}/**/
+!-- Exclude binary types (and JMX, which are not OS-dependent) --
exclude name=${src.docs}/images/**/
exclude name=${src.docs}/**/*.jmx/
exclude name=${src.docs}/**/*.pdf/
@@ -1047,6 +1052,7 @@
include name=build.properties/
include name=${dest.jar.jmeter}/testfiles/**/
exclude name=${dest.jar.jmeter}/testfiles/*.jmx/
+ !-- JTL are temporary log files --
exclude name=${dest.jar.jmeter}/testfiles/*.jtl/
!-- This one is generated with EOL=LF --
exclude name=${dest.jar.jmeter}/testfiles/BatchTestLocal.xml/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r897475 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sat Jan 9 15:19:20 2010
New Revision: 897475
URL: http://svn.apache.org/viewvc?rev=897475view=rev
Log:
Inaccurate comment
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=897475r1=897474r2=897475view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat Jan 9 15:19:20 2010
@@ -1041,7 +1041,7 @@
exclude name=${src.dir}/**/*.jpg/
exclude name=${src.dir}/**/*.png/
include name=${src.docs}/**/
-!-- Exclude binary types (and JMX, which are not OS-dependent) --
+!-- Exclude binary types (and JMX/JTL, which are not OS-dependent) --
exclude name=${src.docs}/images/**/
exclude name=${src.docs}/**/*.jmx/
exclude name=${src.docs}/**/*.pdf/
@@ -1052,7 +1052,6 @@
include name=build.properties/
include name=${dest.jar.jmeter}/testfiles/**/
exclude name=${dest.jar.jmeter}/testfiles/*.jmx/
- !-- JTL are temporary log files --
exclude name=${dest.jar.jmeter}/testfiles/*.jtl/
!-- This one is generated with EOL=LF --
exclude name=${dest.jar.jmeter}/testfiles/BatchTestLocal.xml/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r897494 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sat Jan 9 16:52:53 2010
New Revision: 897494
URL: http://svn.apache.org/viewvc?rev=897494view=rev
Log:
Unnecessary depend
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=897494r1=897493r2=897494view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat Jan 9 16:52:53 2010
@@ -437,7 +437,7 @@
/target
- target name=init-docs depends=check-anakia,report-anakia-missing
+ target name=init-docs depends=report-anakia-missing
echo level=infoeclipse.anakia = ${eclipse.anakia}/echo
/target
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
