Author: agomes
Date: Mon Oct 9 22:15:17 2017
New Revision: 1811619
URL: http://svn.apache.org/viewvc?rev=1811619&view=rev
Log:
Bug 61602 - BeanInfoSupport-based generated UI for Counter element
Added:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigBeanInfo.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources.properties
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_es.properties
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_pt_BR.properties
Removed:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/counter.png
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1811619&r1=1811618&r2=1811619&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
Mon Oct 9 22:15:17 2017
@@ -21,12 +21,12 @@ package org.apache.jmeter.modifiers;
import java.io.Serializable;
import java.text.DecimalFormat;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.event.LoopIterationListener;
import org.apache.jmeter.engine.util.NoThreadClone;
-import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.LongProperty;
+import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
import org.slf4j.Logger;
@@ -35,26 +35,24 @@ import org.slf4j.LoggerFactory;
/**
* Provides a counter per-thread(user) or per-thread group.
*/
-public class CounterConfig extends AbstractTestElement
- implements Serializable, LoopIterationListener, NoThreadClone {
+public class CounterConfig extends ConfigTestElement
+ implements TestBean, Serializable, LoopIterationListener, NoThreadClone {
private static final long serialVersionUID = 234L;
+
+ private String startValue;
- private static final String START = "CounterConfig.start"; // $NON-NLS-1$
+ private String maxValue;
- private static final String END = "CounterConfig.end"; // $NON-NLS-1$
+ private String varName;
- private static final String INCREMENT = "CounterConfig.incr"; //
$NON-NLS-1$
+ private String format;
- private static final String FORMAT = "CounterConfig.format"; // $NON-NLS-1$
+ private String increment;
- private static final String PER_USER = "CounterConfig.per_user"; //
$NON-NLS-1$
+ private boolean perUser;
- private static final String VAR_NAME = "CounterConfig.name"; // $NON-NLS-1$
-
- private static final String RESET_ON_THREAD_GROUP_ITERATION =
"CounterConfig.reset_on_tg_iteration"; // $NON-NLS-1$
-
- private static final boolean RESET_ON_THREAD_GROUP_ITERATION_DEFAULT =
false;
+ private boolean resetPerTGIteration;
// This class is not cloned per thread, so this is shared
//@GuardedBy("this")
@@ -69,10 +67,14 @@ public class CounterConfig extends Abstr
private static final Logger log =
LoggerFactory.getLogger(CounterConfig.class);
private void init() { // WARNING: called from ctor so must not be
overridden (i.e. must be private or final)
+ if (NumberUtils.toLong(getStartValue()) >
NumberUtils.toLong(getMaxValue())){
+ log.error("maximum({}) must be > minimum({})", getMaxValue(),
getStartValue());
+ return;
+ }
perTheadNumber = new ThreadLocal<Long>() {
@Override
protected Long initialValue() {
- return Long.valueOf(getStart());
+ return Long.valueOf(getStartValue());
}
};
perTheadLastIterationNumber = new ThreadLocal<Long>() {
@@ -100,9 +102,9 @@ public class CounterConfig extends Abstr
public void iterationStart(LoopIterationEvent event) {
// Cannot use getThreadContext() as not cloned per thread
JMeterVariables variables =
JMeterContextService.getContext().getVariables();
- long start = getStart();
- long end = getEnd();
- long increment = getIncrement();
+ long start = Long.valueOf(getStartValue());
+ long end = Long.valueOf(getMaxValue());
+ long increment = Long.valueOf(getIncrement());
if (!isPerUser()) {
synchronized (this) {
if (globalCounter == Long.MIN_VALUE || globalCounter > end) {
@@ -113,12 +115,12 @@ public class CounterConfig extends Abstr
}
} else {
long current = perTheadNumber.get().longValue();
- if(isResetOnThreadGroupIteration()) {
+ if(isResetPerTGIteration()) {
int iteration = variables.getIteration();
Long lastIterationNumber = perTheadLastIterationNumber.get();
if(iteration != lastIterationNumber.longValue()) {
// reset
- current = getStart();
+ current = Long.valueOf(getStartValue());
}
perTheadLastIterationNumber.set(Long.valueOf(iteration));
}
@@ -145,97 +147,75 @@ public class CounterConfig extends Abstr
return Long.toString(value);
}
- public void setStart(long start) {
- setProperty(new LongProperty(START, start));
- }
- public void setStart(String start) {
- setProperty(START, start);
- }
- public long getStart() {
- return getPropertyAsLong(START);
+ public String getStartValue() {
+ return startValue;
}
- public String getStartAsString() {
- return getPropertyAsString(START);
- }
- public void setEnd(long end) {
- setProperty(new LongProperty(END, end));
+ public void setStartValue(String startValue) {
+ this.startValue = startValue;
}
- public void setEnd(String end) {
- setProperty(END, end);
- }
- /**
- * @param value boolean indicating if counter must be reset on Thread
Group Iteration
- */
- public void setResetOnThreadGroupIteration(boolean value) {
- setProperty(RESET_ON_THREAD_GROUP_ITERATION, value,
RESET_ON_THREAD_GROUP_ITERATION_DEFAULT);
+ public String getMaxValue() {
+ if ("".equals(maxValue)) {
+ maxValue = String.valueOf(Long.MAX_VALUE);
+ }
+ return maxValue;
}
- /**
- * @return true if counter must be reset on Thread Group Iteration
- */
- public boolean isResetOnThreadGroupIteration() {
- return getPropertyAsBoolean(RESET_ON_THREAD_GROUP_ITERATION,
RESET_ON_THREAD_GROUP_ITERATION_DEFAULT);
- }
- /**
- *
- * @return counter upper limit (default Long.MAX_VALUE)
- */
- public long getEnd() {
- long propertyAsLong = getPropertyAsLong(END);
- if (propertyAsLong == 0 &&
"".equals(getProperty(END).getStringValue())) {
- propertyAsLong = Long.MAX_VALUE;
- }
- return propertyAsLong;
+ public void setMaxValue(String maxValue) {
+ this.maxValue = maxValue;
}
- public String getEndAsString(){
- return getPropertyAsString(END);
- }
- public void setIncrement(long inc) {
- setProperty(new LongProperty(INCREMENT, inc));
+ public boolean isResetPerTGIteration() {
+ return resetPerTGIteration;
}
- public void setIncrement(String incr) {
- setProperty(INCREMENT, incr);
- }
- public long getIncrement() {
- return getPropertyAsLong(INCREMENT);
+ public void setResetPerTGIteration(boolean resetPerTGIteration) {
+ this.resetPerTGIteration = resetPerTGIteration;
}
- public String getIncrementAsString() {
- return getPropertyAsString(INCREMENT);
+ public boolean isPerUser() {
+ return perUser;
}
- public void setIsPerUser(boolean isPer) {
- setProperty(new BooleanProperty(PER_USER, isPer));
+ public void setPerUser(boolean perUser) {
+ this.perUser = perUser;
}
- public boolean isPerUser() {
- return getPropertyAsBoolean(PER_USER);
+
+ public String getVarName() {
+ return varName;
}
- public void setVarName(String name) {
- setProperty(VAR_NAME, name);
+
+ public void setVarName(String varName) {
+ this.varName = varName;
}
- public String getVarName() {
- return getPropertyAsString(VAR_NAME);
+
+ public String getFormat() {
+ return format;
}
+
public void setFormat(String format) {
- setProperty(FORMAT, format);
+ this.format = format;
}
- public String getFormat() {
- return getPropertyAsString(FORMAT);
+
+ public String getIncrement() {
+ return increment;
+ }
+
+
+ public void setIncrement(String increment) {
+ this.increment = increment;
}
}
Added:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigBeanInfo.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigBeanInfo.java?rev=1811619&view=auto
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigBeanInfo.java
(added)
+++
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigBeanInfo.java
Mon Oct 9 22:15:17 2017
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ *
+ */
+
+package org.apache.jmeter.modifiers;
+
+import java.beans.PropertyDescriptor;
+import org.apache.jmeter.testbeans.BeanInfoSupport;
+
+public class CounterConfigBeanInfo extends BeanInfoSupport {
+
+
+ public CounterConfigBeanInfo() {
+
+ super(CounterConfig.class);
+
+ PropertyDescriptor p;
+
+ createPropertyGroup("variable", new String[] { "varName", "format"});
//$NON-NLS-1$
+ p = property("varName"); //$NON-NLS-1$
+ p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+ p.setValue(DEFAULT, ""); // $NON-NLS-1$
+
+ p = property("format"); //$NON-NLS-1$
+ p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+ p.setValue(DEFAULT, ""); // $NON-NLS-1$
+
+ createPropertyGroup("parameters", new String[] { "startValue",
"increment", "maxValue"}); //$NON-NLS-1$
+ p = property("startValue"); //$NON-NLS-1$
+ p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+ p.setValue(DEFAULT, "1"); // $NON-NLS-1$
+
+ p = property("increment"); //$NON-NLS-1$
+ p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+ p.setValue(DEFAULT, "1"); // $NON-NLS-1$
+
+ p = property("maxValue"); //$NON-NLS-1$
+ p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+ p.setValue(DEFAULT, String.valueOf(Long.MAX_VALUE)); // $NON-NLS-1$
+
+ createPropertyGroup("options", new String[] { "perUser",
"resetPerTGIteration" }); //$NON-NLS-1$
+ p = property("perUser"); //$NON-NLS-1$
+ p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+ p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+ p.setValue(NOT_OTHER, Boolean.TRUE);
+ p.setValue(DEFAULT, Boolean.FALSE);
+
+ p = property("resetPerTGIteration"); //$NON-NLS-1$
+ p.setValue(NOT_UNDEFINED, Boolean.TRUE);
+ p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+ p.setValue(NOT_OTHER, Boolean.TRUE);
+ p.setValue(DEFAULT, Boolean.FALSE);
+ }
+}
Added:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources.properties?rev=1811619&view=auto
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources.properties
(added)
+++
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources.properties
Mon Oct 9 22:15:17 2017
@@ -0,0 +1,35 @@
+# 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.
+
+displayName=Counter
+# Groups
+variable.displayName=Output variable
+parameters.displayName=Configure the Counter generator
+options.displayName=Options
+# fields
+startValue.displayName=Starting value
+startValue.shortDescription=The starting value for the counter. The counter
will equal this value during the first iteration.
+maxValue.displayName=Maximum Value
+maxValue.shortDescription=If the counter exceeds the maximum, then it is reset
to the Starting value. Default is Long.MAX_VALUE (2^63-1)
+varName.displayName=Reference Name
+varName.shortDescription=This controls how you refer to this value in other
elements
+format.displayName=Number format
+format.shortDescription=Optional format, e.g. 000 will format as 001, 002, etc.
+increment.displayName=Increment
+increment.shortDescription=How much to increment the counter by after each
iteration.
+perUser.displayName=Track counter independently for each user
+perUser.shortDescription=Is this a global counter, or does each user get their
own counter? If unchecked, the counter is global (i.e., user #1 will get value
"1", and user #2 will get value "2" on the first iteration).
+resetPerTGIteration.displayName=Reset counter on each Thread Group Iteration
+resetPerTGIteration.shortDescription=This option is only available when
counter is tracked per User, if checked, counter will be reset to Start value
on each Thread Group iteration.
\ No newline at end of file
Added:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_es.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_es.properties?rev=1811619&view=auto
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_es.properties
(added)
+++
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_es.properties
Mon Oct 9 22:15:17 2017
@@ -0,0 +1,35 @@
+# 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.
+
+displayName=Contador
+# Groups
+variable.displayName=Variable de salida
+parameters.displayName=Ajustar el contador
+options.displayName=Opciones
+# fields
+startValue.displayName=Valor inicial
+#startValue.shortDescription=The starting value for the counter. The counter
will equal this value during the first iteration.
+maxValue.displayName=Valor m\u00E1ximo
+#maxValue.shortDescription=If the counter exceeds the maximum, then it is
reset to the Starting value. Default is Long.MAX_VALUE (2^63-1)
+varName.displayName=Formato del n\u00FAmero
+#varName.shortDescription=This controls how you refer to this value in other
elements
+format.displayName=Nombre de Referencia
+#format.shortDescription=Optional format, e.g. 000 will format as 001, 002,
etc.
+increment.displayName=Incrementar
+#increment.shortDescription=How much to increment the counter by after each
iteration.
+perUser.displayName=Contador independiente para cada usuario
+#perUser.shortDescription=Is this a global counter, or does each user get
their own counter? If unchecked, the counter is global (i.e., user #1 will get
value "1", and user #2 will get value "2" on the first iteration).
+#resetPerTGIteration.displayName=R\u00E9initialiser le compteur \u00E0 chaque
it\u00E9ration du groupe d'unit\u00E9s
+#resetPerTGIteration.shortDescription=This option is only available when
counter is tracked per User, if checked, counter will be reset to Start value
on each Thread Group iteration.
\ No newline at end of file
Added:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties?rev=1811619&view=auto
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
(added)
+++
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
Mon Oct 9 22:15:17 2017
@@ -0,0 +1,35 @@
+# 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.
+
+displayName=Compteur
+# Groups
+variable.displayName=Variable de sortie
+parameters.displayName=Param\u00E9trer le Compteur
+options.displayName=Options
+# fields
+startValue.displayName=Valeur initiale
+#startValue.shortDescription=The starting value for the counter. The counter
will equal this value during the first iteration.
+maxValue.displayName=Valeur maximum
+#maxValue.shortDescription=If the counter exceeds the maximum, then it is
reset to the Starting value. Default is Long.MAX_VALUE (2^63-1)
+varName.displayName=Nom de r\u00E9f\u00E9rence
+#varName.shortDescription=This controls how you refer to this value in other
elements
+format.displayName=Format du nombre
+#format.shortDescription=Optional format, e.g. 000 will format as 001, 002,
etc.
+increment.displayName=Incr\u00E9ment
+#increment.shortDescription=How much to increment the counter by after each
iteration.
+perUser.displayName=Suivre le compteur ind\u00E9pendamment pour chaque
unit\u00E9 de test
+#perUser.shortDescription=Is this a global counter, or does each user get
their own counter? If unchecked, the counter is global (i.e., user #1 will get
value "1", and user #2 will get value "2" on the first iteration).
+resetPerTGIteration.displayName=R\u00E9initialiser le compteur \u00E0 chaque
it\u00E9ration du groupe d'unit\u00E9s
+#resetPerTGIteration.shortDescription=This option is only available when
counter is tracked per User, if checked, counter will be reset to Start value
on each Thread Group iteration.
\ No newline at end of file
Added:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_pt_BR.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_pt_BR.properties?rev=1811619&view=auto
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_pt_BR.properties
(added)
+++
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_pt_BR.properties
Mon Oct 9 22:15:17 2017
@@ -0,0 +1,35 @@
+# 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.
+
+displayName=Contador
+# Groups
+variable.displayName=Vari\u00e1vel de sa\u00edda
+parameters.displayName=Par\u00e2metro do contador
+options.displayName=op\u00e7\u00f5es
+# fields
+startValue.displayName=Valor inicial
+#startValue.shortDescription=The starting value for the counter. The counter
will equal this value during the first iteration.
+maxValue.displayName=Valor m\u00E1ximo
+#maxValue.shortDescription=If the counter exceeds the maximum, then it is
reset to the Starting value. Default is Long.MAX_VALUE (2^63-1)
+varName.displayName=Nome de Refer\u00EAncia
+#varName.shortDescription=This controls how you refer to this value in other
elements
+format.displayName=Formato do n\u00FAmero
+#format.shortDescription=Optional format, e.g. 000 will format as 001, 002,
etc.
+increment.displayName=Incremento
+#increment.shortDescription=How much to increment the counter by after each
iteration.
+perUser.displayName=Realiza contagem independentemente para cada usu\u00E1rio
+#perUser.shortDescription=Is this a global counter, or does each user get
their own counter? If unchecked, the counter is global (i.e., user #1 will get
value "1", and user #2 will get value "2" on the first iteration).
+#resetPerTGIteration.displayName=R\u00E9initialiser le compteur \u00E0 chaque
it\u00E9ration du groupe d'unit\u00E9s
+#resetPerTGIteration.shortDescription=This option is only available when
counter is tracked per User, if checked, counter will be reset to Start value
on each Thread Group iteration.
\ No newline at end of file
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1811619&r1=1811618&r2=1811619&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Mon
Oct 9 22:15:17 2017
@@ -215,9 +215,6 @@ cookie_manager_title=HTTP Cookie Manager
cookie_options=Options
cookies_stored=User-Defined Cookies
copy=Copy
-counter_config_title=Counter
-counter_per_user=Track counter independently for each user
-counter_reset_per_tg_iteration=Reset counter on each Thread Group Iteration
countlim=Size limit
critical_section_controller_label=Lock name
critical_section_controller_title=Critical Section Controller
@@ -437,7 +434,6 @@ ignore_subcontrollers=Ignore sub-control
include_controller=Include Controller
include_equals=Include Equals?
include_path=Include Test Plan
-increment=Increment
infinite=Forever
initial_context_factory=Initial Context Factory
insert_after=Insert After
@@ -656,7 +652,6 @@ mailer_title_smtpserver=SMTP server
mailer_visualizer_title=Mailer Visualizer
match_num_field=Match No. (0 for Random)\:
max=Maximum
-max_value=Maximum value
maximum_param=The maximum value allowed for a range of values
md5hex_assertion_failure=Error asserting MD5 sum : got {0} but should have
been {1}
md5hex_assertion_label=MD5Hex
@@ -1111,7 +1106,6 @@ ssl_port=SSL Port
sslmanager=SSL Manager
start=Start
start_no_timers=Start no pauses
-start_value=Starting value
stop=Stop
stopping_test=Shutting down all test threads. You can see number of active
threads in the upper right corner of GUI. Please be patient.
stopping_test_failed=One or more test threads won't exit; see log file.
@@ -1250,7 +1244,6 @@ validate_threadgroup=Validate
value=Value
value_to_quote_meta=Value to escape from ORO Regexp meta chars
value_to_shift=Amount of seconds/minutes/hours/days to add ( example P2D \:
plus one day ) (optional)
-var_name=Reference Name
variable_name_param=Name of variable (may include variable and function
references)
view_graph_tree_title=View Graph Tree
view_results_assertion_error=Assertion error:
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties?rev=1811619&r1=1811618&r2=1811619&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
Mon Oct 9 22:15:17 2017
@@ -136,8 +136,6 @@ cookie_manager_policy=Pol\u00EDtica de C
cookie_manager_title=Gestor de Cookies HTTP
cookies_stored=Cookies almacenadas en el Gestor de Cookies
copy=Copiar
-counter_config_title=Contador
-counter_per_user=Contador independiente para cada usuario
countlim=L\u00EDmite de tama\u00F1o
csvread_file_file_name=Archivo CSV del que obtener valores | *alias
cut=Cortar
@@ -285,7 +283,6 @@ ignore_subcontrollers=Ignorar bloques su
include_controller=Incluir Controlador
include_equals=\u00BFIncluir Equals?
include_path=Incluir Plan de Pruebas
-increment=Incrementar
infinite=Sin f\u00EDn
initial_context_factory=Factor\u00EDa Initial Context
insert_after=Insertar Despu\u00E9s
@@ -451,7 +448,6 @@ mailer_error=No pude enviar mail. Por fa
mailer_visualizer_title=Visualizador de Mailer
match_num_field=Coincidencia No. (0 para Aleatorio)\:
max=M\u00E1ximo
-max_value=Valor m\u00E1ximo
maximum_param=El valor m\u00E1ximo permitido para un rango de valores
md5hex_assertion_failure=Error validando MD5\: obtuve {0} pero deber\u00EDa
haber obtenido {1}
md5hex_assertion_label=MD5Hex
@@ -794,7 +790,6 @@ ssl_port=Puerto SSL
sslmanager=Gestor SSL
start=Arrancar
start_no_timers=Inicio no se detiene
-start_value=Valor inicial
stop=Parar
stopping_test=Parando todos los hilos. Por favor, sea paciente.
stopping_test_failed=Uno o m\u00E1s hilos de test no saldr\u00E1n; ver fichero
de log.
@@ -896,7 +891,6 @@ userdn=Nombre de Usuario
username=Nombre de Usuario
userpw=Contrase\u00F1a
value=Valor
-var_name=Nombre de Referencia
variable_name_param=Nombre de variable(puede incluir variables y referencias a
funci\u00F3n)
view_graph_tree_title=Ver \u00C1rbol Gr\u00E1fico
view_results_assertion_error=Error de aserci\u00F3n\:
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1811619&r1=1811618&r2=1811619&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Mon Oct 9 22:15:17 2017
@@ -209,10 +209,6 @@ cookie_manager_policy=Politique des cook
cookie_manager_title=Gestionnaire de cookies HTTP
cookie_options=Options
cookies_stored=Cookies stock\u00E9s
-copy=Copier
-counter_config_title=Compteur
-counter_per_user=Suivre le compteur ind\u00E9pendamment pour chaque unit\u00E9
de test
-counter_reset_per_tg_iteration=R\u00E9initialiser le compteur \u00E0 chaque
it\u00E9ration du groupe d'unit\u00E9s
countlim=Limiter le nombre d'\u00E9l\u00E9ments retourn\u00E9s \u00E0
critical_section_controller_label=Nom du verrou
critical_section_controller_title=Contr\u00F4leur Section critique
@@ -432,7 +428,6 @@ ignore_subcontrollers=Ignorer les sous-b
include_controller=Contr\u00F4leur Inclusion
include_equals=Inclure \u00E9gal ?
include_path=Plan de test \u00E0 inclure
-increment=Incr\u00E9ment \:
infinite=Infini
initial_context_factory=Fabrique de contexte initiale
insert_after=Ins\u00E9rer apr\u00E8s
@@ -646,7 +641,6 @@ mailer_title_smtpserver=Serveur SMTP
mailer_visualizer_title=R\u00E9cepteur Notification Email
match_num_field=R\u00E9cup\u00E9rer la Ni\u00E8me corresp. (0 \:
Al\u00E9atoire) \:
max=Maximum \:
-max_value=Valeur maximum \:
maximum_param=La valeur maximum autoris\u00E9e pour un \u00E9cart de valeurs
md5hex_assertion_failure=Erreur de v\u00E9rification de la somme MD5 \: obtenu
{0} mais aurait d\u00FB \u00EAtre {1}
md5hex_assertion_label=MD5Hex
@@ -1101,7 +1095,6 @@ ssl_port=Port SSL
sslmanager=Gestionnaire SSL
start=Lancer
start_no_timers=Lancer sans pauses
-start_value=Valeur initiale \:
stop=Arr\u00EAter
stopping_test=Arr\u00EAt de toutes les unit\u00E9s de tests en cours. Le
nombre d'unit\u00E9s actives est visible dans le coin haut droit de
l'interface. Soyez patient, merci.
stopping_test_failed=Au moins une unit\u00E9 non arr\u00EAt\u00E9e; voir le
journal.
@@ -1240,7 +1233,6 @@ validate_threadgroup=Valider
value=Valeur \:
value_to_quote_meta=Valeur \u00E0 \u00E9chapper des caract\u00E8res
sp\u00E9ciaux utilis\u00E8s par ORO Regexp
value_to_shift=Valeur \u00E0 ajouter ( example P2D \: plus deux jour )
(optionnel)
-var_name=Nom de r\u00E9f\u00E9rence \:
variable_name_param=Nom de variable (peut inclure une r\u00E9f\u00E9rence de
variable ou fonction)
view_graph_tree_title=Voir le graphique en arbre
view_results_assertion_error=Erreur d'assertion \:
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties?rev=1811619&r1=1811618&r2=1811619&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
Mon Oct 9 22:15:17 2017
@@ -131,8 +131,6 @@ cookie_manager_policy=Pol\u00EDtica de C
cookie_manager_title=Gerenciador de Cookie HTTP
cookies_stored=Cookies Definidos pelo Usu\u00E1rio
copy=Copiar
-counter_config_title=Contador
-counter_per_user=Realiza contagem independentemente para cada usu\u00E1rio
countlim=Tamanho limite
csvread_file_file_name=Arquivo CSV de onde os valores ser\u00E3o obtidos |
*apelido
cut=Recortar
@@ -273,7 +271,6 @@ ignore_subcontrollers=Ignorar blocos de
include_controller=Controlador de Inclus\u00E3o
include_equals=Incluir Igual?
include_path=Incluir Plano de Teste
-increment=Incremento
infinite=Infinito
initial_context_factory=F\u00E1brica de Contexto Inicial
insert_after=Inserir Depois
@@ -427,7 +424,6 @@ mailer_error=N\u00E3o foi poss\u00EDvel
mailer_visualizer_title=Vizualizador de Email
match_num_field=N\u00FAmero para Combina\u00E7\u00E3o (0 para aleat\u00F3rio)
max=M\u00E1ximo
-max_value=Valor m\u00E1ximo
maximum_param=O valor m\u00E1ximo permitido para um intervalo de valores
md5hex_assertion_failure=Erro avaliando soma MD5\: encontrado {0} mas deveria
haver {1}
md5hex_assertion_md5hex_test=MD5Hex para Asser\u00E7\u00E3o
@@ -683,7 +679,6 @@ ssl_port=Porta SSL
sslmanager=Gerenciador SSL
start=Iniciar
start_no_timers=Iniciar sem pausas
-start_value=Valor inicial
stop=Interromper
stopping_test=Interrompendo todos os usu\u00E1rios virtuais. Por favor, seja
paciente.
stopping_test_failed=Um ou mais usu\u00E1rios virtuais n\u00E3o pararam; veja
arquivo de log.
@@ -769,7 +764,6 @@ userdn=Nome do Usu\u00E1rio
username=Nome do Usu\u00E1rio
userpw=Senha
value=Valor
-var_name=Nome de Refer\u00EAncia
variable_name_param=Nome da vari\u00E1vel (pode incluir refer\u00EAncias de
vari\u00E1veis e fun\u00E7\u00F5es)
view_graph_tree_title=Ver Gr\u00E1fico de \u00C1rvore
view_results_assertion_error=Erro de asser\u00E7\u00E3o\:
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1811619&r1=1811618&r2=1811619&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Oct 9 22:15:17 2017
@@ -85,6 +85,7 @@ Summary
<h3>Other samplers</h3>
<ul>
<li><bug>61595</bug>Remove Detail, Add, Add from Clipboard, Delete buttons
in Java Request Defaults and Java Request GUI</li>
+ <li><bug>61602</bug>Counter GUI: New GUI based to BeanInfoSupport-based
generated UI.</li>
</ul>
<h3>Controllers</h3>
Modified: jmeter/trunk/xdocs/images/screenshots/counter.png
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/counter.png?rev=1811619&r1=1811618&r2=1811619&view=diff
==============================================================================
Binary files - no diff available.
