jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1722757 - in /jmeter/trunk: bin/ bin/testfiles/ src/core/org/apache/jmeter/resources/ src/core/org/apache/jmeter/save/ src/protocol/http/org/apache/jmeter/protocol/http/control/gui/ src/protocol/http/org/apache/jmeter/protocol/http/modifie...
Date Sun, 03 Jan 2016 22:01:38 GMT
Author: pmouawad
Date: Sun Jan  3 22:01:37 2016
New Revision: 1722757

URL: http://svn.apache.org/viewvc?rev=1722757&view=rev
Log:
Drop previously deprecated elements in 2.13:
- WebService(SOAP) Request
- HTML Parameter Mask

Removed:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamModifier.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/bin/saveservice.properties
    jmeter/trunk/bin/testfiles/GenTest27.jmx
    jmeter/trunk/bin/testfiles/GuiTest.jmx
    jmeter/trunk/bin/testfiles/GuiTest231.jmx
    jmeter/trunk/bin/upgrade.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.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_ja.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
    jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun Jan  3 22:01:37 2016
@@ -175,7 +175,7 @@ jmeter.laf.mac=System
 
 #Components to not display in JMeter GUI (GUI class name or static label)
 # These elements are deprecated: HTML Parameter Mask,HTTP User Parameter Modifier, Webservice (SOAP) Request
-not_in_menu=org.apache.jmeter.protocol.http.modifier.gui.ParamModifierGui, HTTP User Parameter Modifier, org.apache.jmeter.protocol.http.control.gui.WebServiceSamplerGui, org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler, org.apache.jmeter.protocol.mongodb.config.MongoSourceElement
+not_in_menu=org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler, org.apache.jmeter.protocol.mongodb.config.MongoSourceElement, org.apache.jmeter.visualizers.DistributionGraphVisualizer, org.apache.jmeter.visualizers.SplineVisualizer
 
 # Number of items in undo history
 # Feature is disabled by default (0)

Modified: jmeter/trunk/bin/saveservice.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/saveservice.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/bin/saveservice.properties (original)
+++ jmeter/trunk/bin/saveservice.properties Sun Jan  3 22:01:37 2016
@@ -234,7 +234,9 @@ ObsoleteGui=org.apache.jmeter.config.gui
 OnceOnlyController=org.apache.jmeter.control.OnceOnlyController
 OnceOnlyControllerGui=org.apache.jmeter.control.gui.OnceOnlyControllerGui
 ParamMask=org.apache.jmeter.protocol.http.modifier.ParamMask
+# removed in 3.0
 ParamModifier=org.apache.jmeter.protocol.http.modifier.ParamModifier
+# removed in 3.0
 ParamModifierGui=org.apache.jmeter.protocol.http.modifier.gui.ParamModifierGui
 PoissonRandomTimer=org.apache.jmeter.timers.PoissonRandomTimer
 PoissonRandomTimerGui=org.apache.jmeter.timers.gui.PoissonRandomTimerGui
@@ -327,7 +329,9 @@ UserParameterModifierGui=org.apache.jmet
 UserParameters=org.apache.jmeter.modifiers.UserParameters
 UserParametersGui=org.apache.jmeter.modifiers.gui.UserParametersGui
 ViewResultsFullVisualizer=org.apache.jmeter.visualizers.ViewResultsFullVisualizer
+# removed in 3.0
 WebServiceSampler=org.apache.jmeter.protocol.http.sampler.WebServiceSampler
+# removed in 3.0
 WebServiceSamplerGui=org.apache.jmeter.protocol.http.control.gui.WebServiceSamplerGui
 WhileController=org.apache.jmeter.control.WhileController
 WhileControllerGui=org.apache.jmeter.control.gui.WhileControllerGui

Modified: jmeter/trunk/bin/testfiles/GenTest27.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/GenTest27.jmx?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/GenTest27.jmx (original)
+++ jmeter/trunk/bin/testfiles/GenTest27.jmx Sun Jan  3 22:01:37 2016
@@ -758,28 +758,6 @@
             <stringProp name="ActionProcessor.duration"></stringProp>
           </TestAction>
           <hashTree/>
-          <WebServiceSampler guiclass="WebServiceSamplerGui" testclass="WebServiceSampler" testname="WebService(SOAP) Request" enabled="true">
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-              <collectionProp name="Arguments.arguments"/>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"></stringProp>
-            <stringProp name="HTTPSampler.port"></stringProp>
-            <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <stringProp name="HTTPSampler.path"></stringProp>
-            <stringProp name="WebserviceSampler.wsdl_url"></stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <stringProp name="Soap.Action"></stringProp>
-            <stringProp name="HTTPSamper.xml_data"></stringProp>
-            <stringProp name="WebServiceSampler.xml_data_file"></stringProp>
-            <stringProp name="WebServiceSampler.xml_path_loc"></stringProp>
-            <stringProp name="WebserviceSampler.timeout"></stringProp>
-            <stringProp name="WebServiceSampler.memory_cache">true</stringProp>
-            <stringProp name="WebServiceSampler.read_response">false</stringProp>
-            <stringProp name="WebServiceSampler.use_proxy">false</stringProp>
-            <stringProp name="WebServiceSampler.proxy_host"></stringProp>
-            <stringProp name="WebServiceSampler.proxy_port"></stringProp>
-          </WebServiceSampler>
-          <hashTree/>
         </hashTree>
         <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Post Processors" enabled="true"/>
         <hashTree>

Modified: jmeter/trunk/bin/testfiles/GuiTest.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/GuiTest.jmx?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/GuiTest.jmx (original)
+++ jmeter/trunk/bin/testfiles/GuiTest.jmx Sun Jan  3 22:01:37 2016
@@ -529,17 +529,6 @@
         <hashTree>
           <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="Anchor Modifier" enabled="true"/>
           <hashTree/>
-          <ParamModifier guiclass="ParamModifierGui" testclass="ParamModifier" testname="Param Modifier" enabled="true">
-            <elementProp name="ParamModifier.mask" elementType="ParamMask">
-              <stringProp name="ParamModifier.field_name"></stringProp>
-              <stringProp name="ParamModifier.prefix"></stringProp>
-              <longProp name="ParamModifier.lower_bound">0</longProp>
-              <longProp name="ParamModifier.upper_bound">10</longProp>
-              <longProp name="ParamModifier.increment">1</longProp>
-              <stringProp name="ParamModifier.suffix"></stringProp>
-            </elementProp>
-          </ParamModifier>
-          <hashTree/>
           <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="URL Rewriting Modifier" enabled="true">
             <boolProp name="path_extension">false</boolProp>
             <boolProp name="path_extension_no_questionmark">false</boolProp>
@@ -581,28 +570,6 @@
             <stringProp name="SoapSampler.URL_DATA"></stringProp>
           </SoapSampler>
           <hashTree/>
-          <WebServiceSampler guiclass="WebServiceSamplerGui" testclass="WebServiceSampler" testname="WebService (SOAP) Request" enabled="true">
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-              <collectionProp name="Arguments.arguments"/>
-            </elementProp>
-            <stringProp name="HTTPSampler.path">/</stringProp>
-            <stringProp name="HTTPSampler.encoded_path">/</stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <stringProp name="WebServiceSampler.proxy_host"></stringProp>
-            <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <stringProp name="WebServiceSampler.proxy_port"></stringProp>
-            <intProp name="HTTPSampler.port">80</intProp>
-            <stringProp name="WebServiceSampler.use_proxy">false</stringProp>
-            <stringProp name="Soap.Action"></stringProp>
-            <stringProp name="WebServiceSampler.xml_data_file"></stringProp>
-            <stringProp name="WebServiceSampler.read_response">false</stringProp>
-            <stringProp name="WebServiceSampler.xml_path_loc"></stringProp>
-            <stringProp name="WebserviceSampler.wsdl_url"></stringProp>
-            <stringProp name="WebServiceSampler.memory_cache">false</stringProp>
-            <stringProp name="HTTPSampler.domain"></stringProp>
-            <stringProp name="HTTPSamper.xml_data"></stringProp>
-          </WebServiceSampler>
-          <hashTree/>
           <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Tomcat Access Log Sampler" enabled="true">
             <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
               <collectionProp name="Arguments.arguments"/>

Modified: jmeter/trunk/bin/testfiles/GuiTest231.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/GuiTest231.jmx?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/GuiTest231.jmx (original)
+++ jmeter/trunk/bin/testfiles/GuiTest231.jmx Sun Jan  3 22:01:37 2016
@@ -366,17 +366,6 @@
           <hashTree/>
           <AnchorModifier guiclass="AnchorModifierGui" testclass="AnchorModifier" testname="HTML Link Parser" enabled="true"/>
           <hashTree/>
-          <ParamModifier guiclass="ParamModifierGui" testclass="ParamModifier" testname="HTML Parameter Mask" enabled="true">
-            <elementProp name="ParamModifier.mask" elementType="ParamMask">
-              <stringProp name="ParamModifier.field_name">name</stringProp>
-              <stringProp name="ParamModifier.prefix">prefix</stringProp>
-              <longProp name="ParamModifier.lower_bound">11</longProp>
-              <longProp name="ParamModifier.upper_bound">100</longProp>
-              <longProp name="ParamModifier.increment">12</longProp>
-              <stringProp name="ParamModifier.suffix">suffix</stringProp>
-            </elementProp>
-          </ParamModifier>
-          <hashTree/>
           <URLRewritingModifier guiclass="URLRewritingModifierGui" testclass="URLRewritingModifier" testname="HTTP URL Re-writing Modifier" enabled="true">
             <stringProp name="argument_name">JSESSION</stringProp>
             <boolProp name="path_extension">false</boolProp>
@@ -486,28 +475,6 @@
             <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
           </SoapSampler>
           <hashTree/>
-          <WebServiceSampler guiclass="WebServiceSamplerGui" testclass="WebServiceSampler" testname="WebService(SOAP) Request" enabled="true">
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-              <collectionProp name="Arguments.arguments"/>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain">server</stringProp>
-            <stringProp name="HTTPSampler.port">port</stringProp>
-            <stringProp name="HTTPSampler.protocol">http</stringProp>
-            <stringProp name="HTTPSampler.path">path</stringProp>
-            <stringProp name="WebserviceSampler.wsdl_url">wsdl</stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <stringProp name="Soap.Action">action</stringProp>
-            <stringProp name="HTTPSamper.xml_data">Data</stringProp>
-            <stringProp name="WebServiceSampler.xml_data_file">File</stringProp>
-            <stringProp name="WebServiceSampler.xml_path_loc">Folder</stringProp>
-            <stringProp name="WebserviceSampler.timeout">timeout</stringProp>
-            <stringProp name="WebServiceSampler.memory_cache">true</stringProp>
-            <stringProp name="WebServiceSampler.read_response">false</stringProp>
-            <stringProp name="WebServiceSampler.use_proxy">true</stringProp>
-            <stringProp name="WebServiceSampler.proxy_host">Host</stringProp>
-            <stringProp name="WebServiceSampler.proxy_port">9999</stringProp>
-          </WebServiceSampler>
-          <hashTree/>
           <AccessLogSampler guiclass="TestBeanGUI" testclass="AccessLogSampler" testname="Access Log Sampler" enabled="true">
             <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
               <collectionProp name="Arguments.arguments"/>

Modified: jmeter/trunk/bin/upgrade.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/upgrade.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/bin/upgrade.properties (original)
+++ jmeter/trunk/bin/upgrade.properties Sun Jan  3 22:01:37 2016
@@ -96,4 +96,12 @@ org.apache.jmeter.protocol.http.modifier
 org.apache.jmeter.protocol.http.modifier.gui.UserParameterModifierGui=org.apache.jmeter.config.gui.ObsoleteGui
 
 # Obsolete Graph Full Results listener
-org.apache.jmeter.visualizers.GraphAccumVisualizer=org.apache.jmeter.config.gui.ObsoleteGui
\ No newline at end of file
+org.apache.jmeter.visualizers.GraphAccumVisualizer=org.apache.jmeter.config.gui.ObsoleteGui
+# Removed in 3.0
+org.apache.jmeter.protocol.http.sampler.WebServiceSampler=org.apache.jmeter.config.ConfigTestElement
+# Removed in 3.0
+org.apache.jmeter.protocol.http.control.gui.WebServiceSamplerGui=org.apache.jmeter.config.gui.ObsoleteGui
+# Removed in 3.0
+org.apache.jmeter.protocol.http.modifier.ParamModifier=org.apache.jmeter.config.ConfigTestElement
+# Removed in 3.0
+org.apache.jmeter.protocol.http.modifier.gui.ParamModifierGui=org.apache.jmeter.config.gui.ObsoleteGui
\ 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=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Jan  3 22:01:37 2016
@@ -192,7 +192,6 @@ comparison_unit=\ ms
 comparison_visualizer_title=Comparison Assertion Visualizer
 config_element=Config Element
 config_save_settings=Configure
-configure_wsdl=Configure
 confirm=Confirm
 constant_throughput_timer_memo=Add a delay between sampling to attain constant throughput
 constant_timer_delay=Thread Delay (in milliseconds)\:
@@ -351,8 +350,6 @@ generator=Name of Generator class
 generator_cnf_msg=Could not find the generator class. Please make sure you place your jar file in the /lib directory.
 generator_illegal_msg=Could not access the generator class due to IllegalAccessException.
 generator_instantiate_msg=Could not create an instance of the generator parser. Please make sure the generator implements Generator interface.
-get_xml_from_file=File with SOAP XML Data (overrides above text)
-get_xml_from_random=Message(s) Folder
 graph_apply_filter=Apply filter
 graph_choose_graphs=Graphs to Display
 graph_full_results_title=Graph Full Results
@@ -397,7 +394,6 @@ html_assertion_label=HTML Assertion
 html_assertion_title=HTML Assertion
 html_extractor_title=CSS/JQuery Extractor
 html_extractor_type=CSS/JQuery Extractor Implementation
-html_parameter_mask=HTML Parameter Mask (DEPRECATED)
 http_implementation=Implementation:
 http_response_code=HTTP response code
 http_url_rewriting_modifier_title=HTTP URL Re-writing Modifier
@@ -569,7 +565,6 @@ ldapext_sample_title=LDAP Extended Reque
 ldapext_testing_title=LDAP Extended Request
 library=Library
 load=Load
-load_wsdl=Load WSDL
 log_errors_only=Errors
 log_file=Location of log File
 log_function_comment=Additional comment (optional)
@@ -635,7 +630,6 @@ md5hex_assertion_label=MD5Hex
 md5hex_assertion_md5hex_test=MD5Hex to Assert
 md5hex_assertion_title=MD5Hex Assertion
 mechanism=Mechanism
-memory_cache=Memory Cache
 menu_assertions=Assertions
 menu_close=Close
 menu_collapse_all=Collapse All
@@ -785,11 +779,6 @@ random_control_title=Random Controller
 random_order_control_title=Random Order Controller
 random_string_chars_to_use=Chars to use for random string generation
 random_string_length=Random string length
-read_response_message=Read response is not checked. To see the response, please check the box in the sampler.
-read_response_note=If read response is unchecked, the sampler will not read the response
-read_response_note2=or set the SampleResult. This improves performance, but it means
-read_response_note3=the response content won't be logged.
-read_soap_response=Read SOAP Response
 realm=Realm
 record_controller_title=Recording Controller
 redo=Redo
@@ -1306,26 +1295,9 @@ web_testing_source_ip_device_ipv4=Device
 web_testing_source_ip_device_ipv6=Device IPv6
 web_testing_source_ip_hostname=IP/Hostname
 web_testing_title=HTTP Request
-webservice_configuration_wizard=WSDL helper
-webservice_get_xml_from_random_title=Use random messages SOAP
-webservice_maintain_session=Maintain HTTP Session
-webservice_message_soap=WebService message
-webservice_methods=Web Methods
-webservice_proxy_host=Proxy Host
-webservice_proxy_note=If Use HTTP Proxy is checked, but no host or port are provided, the sampler
-webservice_proxy_note2=will look at command line options. If no proxy host or port are provided by
-webservice_proxy_note3=either, it will fail silently.
-webservice_proxy_port=Proxy Port
-webservice_sampler_title=WebService(SOAP) Request (DEPRECATED)
-webservice_soap_action=SOAPAction
-webservice_timeout=Timeout:
-webservice_use_proxy=Use HTTP Proxy
 while_controller_label=Condition (function or variable)
 while_controller_title=While Controller
 workbench_title=WorkBench
-wsdl_helper_error=The WSDL was not valid, please double check the url.
-wsdl_url=WSDL URL
-wsdl_url_error=The WSDL was emtpy.
 xml_assertion_title=XML Assertion
 xml_download_dtds=Fetch external DTDs
 xml_namespace_button=Use Namespaces

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties Sun Jan  3 22:01:37 2016
@@ -99,7 +99,6 @@ compare=Vergleichen
 comparefilt=Vergleichsfilter
 config_element=Konfigurations Element
 config_save_settings=Konfigurieren
-configure_wsdl=Konfigurieren
 constant_throughput_timer_memo=Geben sie eine Pause zwischen den Proben an um einen konstanten Durchsatz zu gew\u00E4hrleisten
 constant_timer_delay=Thread-Pause (in Millisekunden)
 constant_timer_memo=Geben sie eine Pause zwischen den Proben an
@@ -211,8 +210,6 @@ generator=Name der Erzeuger-Klasse
 generator_cnf_msg=Kann die Erzeuger-Klasse (Generator) nicht finden. Vergewissern sie sich, dass die das .jar Archiv in das /lib Verzeichnis gelegt haben.
 generator_illegal_msg=Konnte wegen einer "IllegalAcessException" nicht auf die Erzeuger-Klasse (Generator) zugreifen.
 generator_instantiate_msg=Konnte keine Instanz der Erzeuger-Klasse ertsllen. Stellen sie sicher, dass der Erzeuger das "Generator"-Interface implementiert\!
-get_xml_from_file=Datei mit SOAP XML Daten (Vorrang vor obenstehendem Text)
-get_xml_from_random=Verzeichnis mit Meldungen
 graph_choose_graphs=Anzuzeigende Graphen
 graph_full_results_title=Vollst\u00E4ndige Ergebnisse
 graph_results_average=Durchschnitt
@@ -235,7 +232,6 @@ help_node=Wof\u00FCr ist das?
 html_assertion_file=Schreibe JTidy Bericht in eine Datei
 html_assertion_label=HTML Bericht
 html_assertion_title=Titel des HTML Bericht
-html_parameter_mask=HTML Parameter Maske
 http_url_rewriting_modifier_title=HTTP URL Re-writing Bezeichner
 http_user_parameter_modifier=HTTP User Parameter Bezeichner
 httpmirror_title=HTTP Spiegel
@@ -270,7 +266,6 @@ jms_auth_required=Ben\u00F6tigt
 jndi_config_title=JNDI Konfiguration
 jndi_url_jndi_props=JNDI Eigenschaften
 load=Laden
-load_wsdl=Lade WSDL
 log_errors_only=Fehler
 log_file=Ort der Log-Datei
 log_function_comment=Zus\u00E4tzliche Kommentare (optional)
@@ -401,8 +396,6 @@ proxy_target=Ziel-Controller (Target-Con
 proxy_test_plan_content=Test-Plan Inhalt\:
 random_control_title=Zufalls-Controller
 random_order_control_title=Zufalls-Reihenfolgen-Controller
-read_response_message=Empfange Antwort wurde nicht gepr\u00FCft. Um die Antwort anzusehen aktivieren Sie die Checkbox im Sampler.
-read_soap_response=SOAP-Antwort lesen
 realm=Bereich
 regexfunc_param_1=Regul\u00E4re Ausdr\u00FCcke zum Suchen in den Results der vorherigen Requests
 regexfunc_param_2=Beispiel f\u00FCr Ersetzungs Strings, benuzte Gruppen von den regul\u00E4ren Ausdr\u00FCcken

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=1722757&r1=1722756&r2=1722757&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 Sun Jan  3 22:01:37 2016
@@ -126,7 +126,6 @@ comparison_unit=ms
 comparison_visualizer_title=Visualizador de la aserci\u00F3n de comparaci\u00F3n
 config_element=Elemento de Configuraci\u00F3n
 config_save_settings=Configurar
-configure_wsdl=Configurar
 constant_throughput_timer_memo=A\u00F1ade un retardo entre muestras para obtener un rendimiento constante
 constant_timer_delay=Retardo de Hilo (en milisegundos)\:
 constant_timer_memo=A\u00F1ade un retardo constante entre muestras
@@ -249,8 +248,6 @@ generator=Nombre de la clase Generadora
 generator_cnf_msg=No pude encontrar la clase generadora. Por favor aseg\u00FArese de que puso el archivo jar en el directorio /lib
 generator_illegal_msg=No pude acceder a la clase generadora debido a una "IllegalAcessException".
 generator_instantiate_msg=No pude crear una instancia del parser generador. Por favor aseg\u00FArese de que el generador implementa la interfaz Generator.
-get_xml_from_file=Archivo con datos SOAP XML (sobreescribe el texto anterior)
-get_xml_from_random=Carpeta de Mensaje
 graph_choose_graphs=Gr\u00E1ficos a Mostrar
 graph_full_results_title=Resultados de Gr\u00E1fico Completo
 graph_results_average=Media
@@ -275,7 +272,6 @@ help_node=\u00BFQu\u00E9 es este nodo?
 html_assertion_file=Escribir el reporte JTidy en fichero
 html_assertion_label=Aserci\u00F3n HTML
 html_assertion_title=Aserci\u00F3n HTML
-html_parameter_mask=M\u00E1scara de Par\u00E1metro HTML
 http_implementation=Implementaci\u00F3n HTTP\:
 http_response_code=c\u00F3digo de respuesta HTTP
 http_url_rewriting_modifier_title=Modificador de re-escritura HTTP URL
@@ -418,7 +414,6 @@ ldapext_sample_title=Valores por defecto
 ldapext_testing_title=Petici\u00F3n Extendida LDAP
 library=Librer\u00EDa
 load=Cargar
-load_wsdl=Cargar WSDL
 log_errors_only=Escribir en Log S\u00F3lo Errores
 log_file=Ubicaci\u00F3n del archivo de logs
 log_function_comment=Comentario adicional (opcional)
@@ -463,7 +458,6 @@ md5hex_assertion_failure=Error validando
 md5hex_assertion_label=MD5Hex
 md5hex_assertion_md5hex_test=MD5Hex a Comprobar
 md5hex_assertion_title=Aserci\u00F3n MD5Hex
-memory_cache=Cach\u00E9 en Memoria
 menu_assertions=Aserciones
 menu_close=Cerrar
 menu_collapse_all=Colapsar todo
@@ -583,11 +577,6 @@ pt_br=Portugu\u00E9s (Brasile\u00F1o)
 ramp_up=Periodo de Subida (en segundos)\:
 random_control_title=Controlador Aleatorio
 random_order_control_title=Controlador Orden Aleatorio
-read_response_message=La lectura de respuesta no est\u00E1 activada. Para ver la respuesta, por favor marque la caja en el sampler.
-read_response_note=Si "leer respuesta" est\u00E1 desactivado, el muestreador no leer\u00E1 la respuesta
-read_response_note2=ni establecer\u00E1 el "SampleResult". Esto mejora el rendimiento, pero significa
-read_response_note3=que el contenido de respuesta no ser\u00E1 logado.
-read_soap_response=Leer Respuesta SOAP
 realm=Dominio (realm)
 record_controller_title=Controlador Grabaci\u00F3n
 ref_name_field=Nombre de Referencia\:
@@ -1012,21 +1001,9 @@ web_testing_embedded_url_pattern=Las URL
 web_testing_retrieve_images=Recuperar Todos los Recursos Empotrados de Archivos HTML
 web_testing_source_ip=Direcci\u00F3n IP fuente\:
 web_testing_title=Petici\u00F3n HTTP
-webservice_proxy_host=Host Proxy
-webservice_proxy_note=Si est\u00E1 seleccionado "Utilizar Proxy HTTP", pero no se proporciona host o puerto, el muestreador
-webservice_proxy_note2=buscar\u00E1 opciones en la l\u00EDnea de comandos. Si no se proporcionan host o puerto
-webservice_proxy_note3=all\u00ED, finalmente fallar\u00E1 silenciosamente.
-webservice_proxy_port=Puerto Proxy
-webservice_sampler_title=Petici\u00F3n WebService(SOAP)
-webservice_soap_action=Acci\u00F3n SOAP
-webservice_timeout=Timeout\:
-webservice_use_proxy=Utilizar Proxy HTTP
 while_controller_label=Condici\u00F3n (funci\u00F3n o variable)
 while_controller_title=Controlador While
 workbench_title=Banco de Trabajo
-wsdl_helper_error=El WSDL no es v\u00E1lido, por favor compruebe la url.
-wsdl_url=URL del WSDL
-wsdl_url_error=El WSDL est\u00E1 vacio.
 xml_assertion_title=Aserci\u00F3n XML
 xml_download_dtds=Recuperar DTDs externos
 xml_namespace_button=Utilizar NameSpaces

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=1722757&r1=1722756&r2=1722757&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 Sun Jan  3 22:01:37 2016
@@ -185,7 +185,6 @@ comparison_unit=ms
 comparison_visualizer_title=R\u00E9cepteur d'assertions de comparaison
 config_element=El\u00E9ment de configuration
 config_save_settings=Configurer
-configure_wsdl=Configurer
 confirm=Confirmer
 constant_throughput_timer_memo=Ajouter un d\u00E9lai entre les \u00E9chantillions pour obtenir un d\u00E9bit constant
 constant_timer_delay=D\u00E9lai d'attente (en millisecondes) \:
@@ -344,8 +343,6 @@ generator=Nom de la classe g\u00E9n\u00E
 generator_cnf_msg=N'a pas p\u00FB trouver la classe g\u00E9n\u00E9ratrice. Assurez-vous que vous avez plac\u00E9 votre fichier jar dans le r\u00E9pertoire /lib
 generator_illegal_msg=N'a pas p\u00FB acc\u00E9der \u00E0 la classes g\u00E9n\u00E9ratrice \u00E0 cause d'une IllegalAccessException.
 generator_instantiate_msg=N'a pas p\u00FB cr\u00E9er une instance du parseur g\u00E9n\u00E9rateur. Assurez-vous que le g\u00E9n\u00E9rateur impl\u00E9mente l'interface Generator.
-get_xml_from_file=Fichier avec les donn\u00E9es XML SOAP (remplace le texte ci-dessus)
-get_xml_from_random=R\u00E9pertoire contenant les fichier(s) \:
 graph_apply_filter=Appliquer le filtre
 graph_choose_graphs=Graphique \u00E0 afficher
 graph_full_results_title=Graphique de r\u00E9sultats complets
@@ -390,7 +387,6 @@ html_assertion_label=Assertion HTML
 html_assertion_title=Assertion HTML
 html_extractor_title=Extracteur CSS/JQuery
 html_extractor_type=Impl\u00E9mentation de l'extracteur CSS/JQuery
-html_parameter_mask=Masque de param\u00E8tre HTML (DEPRECATED)
 http_implementation=Impl\u00E9mentation \:
 http_response_code=Code de r\u00E9ponse HTTP
 http_url_rewriting_modifier_title=Transcripteur d'URL HTTP
@@ -559,7 +555,6 @@ ldapext_sample_title=Requ\u00EAte LDAP \
 ldapext_testing_title=Requ\u00EAte LDAP \u00E9tendue
 library=Librairie
 load=Charger
-load_wsdl=Charger WSDL
 log_errors_only=Erreurs
 log_file=Emplacement du fichier de journal (log)
 log_function_comment=Commentaire (facultatif)
@@ -625,7 +620,6 @@ md5hex_assertion_label=MD5Hex
 md5hex_assertion_md5hex_test=MD5Hex \u00E0 v\u00E9rifier
 md5hex_assertion_title=Assertion MD5Hex
 mechanism=M\u00E9canisme
-memory_cache=Cache de m\u00E9moire
 menu_assertions=Assertions
 menu_close=Fermer
 menu_collapse_all=R\u00E9duire tout
@@ -770,11 +764,6 @@ random_control_title=Contr\u00F4leur Al\
 random_order_control_title=Contr\u00F4leur d'Ordre al\u00E9atoire
 random_string_chars_to_use=Caract\u00E8res \u00E0 utiliser pour la g\u00E9n\u00E9ration de la cha\u00EEne al\u00E9atoire
 random_string_length=Longueur de cha\u00EEne al\u00E9atoire
-read_response_message='Lire la r\u00E9ponse SOAP' n'est pas coch\u00E9. Pour voir la r\u00E9ponse, cocher la case dans la requ\u00EAte WebService svp.
-read_response_note=Si 'Lire la r\u00E9ponse SOAP' n'est pas coch\u00E9, la requ\u00EAte WebService ne lira pas la r\u00E9ponse.
-read_response_note2=et ne remplira pas l'objet SampleResult. Cela am\u00E9liore les performances, mais signifie que 
-read_response_note3=le contenu de la r\u00E9ponse ne sera pas tra\u00E7\u00E9.
-read_soap_response=Lire la r\u00E9ponse SOAP
 realm=Univers (realm)
 record_controller_title=Contr\u00F4leur Enregistreur
 redo=R\u00E9tablir
@@ -1291,26 +1280,9 @@ web_testing_source_ip_device_ipv4=Interf
 web_testing_source_ip_device_ipv6=Interface IPv6
 web_testing_source_ip_hostname=IP/Nom d'h\u00F4te
 web_testing_title=Requ\u00EAte HTTP
-webservice_configuration_wizard=Assistant de configuration WSDL
-webservice_get_xml_from_random_title=Utiliser al\u00E9atoirement des messages SOAP
-webservice_maintain_session=Maintenir la Session HTTP
-webservice_message_soap=Message WebService
-webservice_methods=M\u00E9thode(s) WebService \:
-webservice_proxy_host=H\u00F4te proxy
-webservice_proxy_note=Si 'utiliser un proxy HTTP' est coch\u00E9e, mais qu'aucun h\u00F4te ou port est fournit, l'\u00E9chantillon
-webservice_proxy_note2=regardera les options de ligne de commandes. Si aucun h\u00F4te ou port du proxy sont fournit 
-webservice_proxy_note3=non plus, il \u00E9chouera silencieusement.
-webservice_proxy_port=Port proxy
-webservice_sampler_title=Requ\u00EAte WebService (SOAP) (DEPRECATED)
-webservice_soap_action=Action SOAP \:
-webservice_timeout=D\u00E9lai expiration \:
-webservice_use_proxy=Utiliser un proxy HTTP
 while_controller_label=Condition (fonction ou variable) \:
 while_controller_title=Contr\u00F4leur Tant Que
 workbench_title=Plan de travail
-wsdl_helper_error=Le WSDL n'est pas valide, veuillez rev\u00E9rifier l'URL.
-wsdl_url=URL du WSDL
-wsdl_url_error=Le WSDL est vide.
 xml_assertion_title=Assertion XML
 xml_download_dtds=R\u00E9cup\u00E9rer les DTD externes
 xml_namespace_button=Utiliser les espaces de noms

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties Sun Jan  3 22:01:37 2016
@@ -72,7 +72,6 @@ clear_cookies_per_iter=\u7E70\u308A\u8FD
 column_delete_disallowed=\u3053\u306E\u30AB\u30E9\u30E0\u306E\u524A\u9664\u6A29\u9650\u304C\u3042\u308A\u307E\u305B\u3093
 column_number=CSV\u30D5\u30A1\u30A4\u30EB\u306E\u30AB\u30E9\u30E0\u756A\u53F7
 config_element=\u8A2D\u5B9A\u30A8\u30EC\u30E1\u30F3\u30C8
-configure_wsdl=\u8A2D\u5B9A
 constant_throughput_timer_memo=\u4E00\u5B9A\u306E\u30B9\u30EB\u30FC\u30D7\u30C3\u30C8\u306B\u5230\u9054\u3057\u305F\u3089\u30B5\u30F3\u30D7\u30EA\u30F3\u30B0\u9593\u306B\u9045\u5EF6\u3092\u8FFD\u52A0
 constant_timer_delay=\u30B9\u30EC\u30C3\u30C9\u9045\u5EF6\u6642\u9593 (\u30DF\u30EA\u79D2)\:
 constant_timer_memo=\u30B5\u30F3\u30D7\u30EA\u30F3\u30B0\u9593\u306B\u4E00\u5B9A\u306E\u9045\u5EF6\u3092\u8FFD\u52A0
@@ -157,8 +156,6 @@ generator=\u751F\u6210\u30AF\u30E9\u30B9
 generator_cnf_msg=\u751F\u6210\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002/lib\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u751F\u6210\u30AF\u30E9\u30B9\u3092\u542B\u3080jar\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
 generator_illegal_msg=IllegalAcessException\u306B\u3088\u308A\u751F\u6210\u30AF\u30E9\u30B9\u3078\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 generator_instantiate_msg=\u751F\u6210\u30D1\u30FC\u30B5\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002Generator\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3092\u5B9F\u88C5\u3059\u308B\u751F\u6210\u30AF\u30E9\u30B9\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
-get_xml_from_file=SOAP XML\u30C7\u30FC\u30BF\u306E\u30D5\u30A1\u30A4\u30EB\uFF08\u4E0A\u8A18\u30C6\u30AD\u30B9\u30C8\u306F\u7121\u8996\u3055\u308C\u307E\u3059\uFF09
-get_xml_from_random=\u30E1\u30C3\u30BB\u30FC\u30B8\u30D5\u30A9\u30EB\u30C0
 graph_choose_graphs=\u8868\u793A\u3059\u308B\u30B0\u30E9\u30D5
 graph_full_results_title=\u7D50\u679C\u3092\u30B0\u30E9\u30D5\u8868\u793A(\u8A73\u7D30)
 graph_results_average=\u5E73\u5747
@@ -178,7 +175,6 @@ grouping_store_first_only=\u5404\u30B0\u
 header_manager_title=HTTP \u30D8\u30C3\u30C0\u30DE\u30CD\u30FC\u30B8\u30E3
 headers_stored=\u30D8\u30C3\u30C0\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u308B\u30D8\u30C3\u30C0
 help=\u30D8\u30EB\u30D7
-html_parameter_mask=HTML\u30D1\u30E9\u30E1\u30FC\u30BF\u30DE\u30B9\u30AF
 http_response_code=HTTP\u5FDC\u7B54\u30B3\u30FC\u30C9
 http_url_rewriting_modifier_title=HTTP URL-Rewriting \u4FEE\u98FE\u5B50
 http_user_parameter_modifier=HTTP\u30E6\u30FC\u30B6\u30FC\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u5909\u66F4
@@ -220,7 +216,6 @@ ja=\u65E5\u672C\u8A9E
 ldap_sample_title=LDAP\u30EA\u30AF\u30A8\u30B9\u30C8\u521D\u671F\u5024\u8A2D\u5B9A
 ldap_testing_title=LDAP\u30EA\u30AF\u30A8\u30B9\u30C8
 load=\u8AAD\u8FBC
-load_wsdl=WSDL\u306E\u30ED\u30FC\u30C9
 log_errors_only=\u30ED\u30B0\u30A8\u30E9\u30FC\u306E\u307F
 log_file=\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u306E\u5834\u6240
 log_parser=Log\u30D1\u30FC\u30B5\u30AF\u30E9\u30B9\u540D
@@ -243,7 +238,6 @@ maximum_param=\u5024\u57DF\u306E\u6700\u
 md5hex_assertion_failure=MD5 sum \u30A2\u30B5\u30FC\u30C8\u30A8\u30E9\u30FC \:  \u7D50\u679C\u306F {0} \u3067\u3057\u305F\u304C\u3001{1}\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093\u3002
 md5hex_assertion_md5hex_test=\u30A2\u30B5\u30FC\u30C8\u5BFE\u8C61\u306EMD5Hex
 md5hex_assertion_title=MD5Hex\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3
-memory_cache=\u30E1\u30E2\u30EA\u30FC\u30AD\u30E3\u30C3\u30B7\u30E5
 menu_assertions=\u30A2\u30B5\u30FC\u30B7\u30E7\u30F3
 menu_close=\u9589\u3058\u308B
 menu_config_element=\u8A2D\u5B9A\u30A8\u30EC\u30E1\u30F3\u30C8
@@ -314,11 +308,6 @@ proxy_title=HTTP \u30D7\u30ED\u30AD\u30B
 ramp_up=Ramp-Up \u671F\u9593 (\u79D2)\:
 random_control_title=\u4E71\u6570\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
 random_order_control_title=\u30E9\u30F3\u30C0\u30E0\u9806\u5E8F\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
-read_response_message=\u5FDC\u7B54\u8AAD\u307F\u8FBC\u307F\u304C\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5FDC\u7B54\u3092\u898B\u308B\u305F\u3081\u306B\u306F\u30B5\u30F3\u30D7\u30E9\u30FC\u306E\u5FDC\u7B54\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-read_response_note=\u5FDC\u7B54\u8AAD\u307F\u8FBC\u307F\u304C\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u3066\u3044\u306A\u3051\u308C\u3070\u3001\u30B5\u30F3\u30D7\u30E9\u30FC\u306F\u5FDC\u7B54\u305B\u305A\u3001
-read_response_note2=SampleResult\u3092\u8A2D\u5B9A\u3057\u307E\u305B\u3093\u3002\u3053\u308C\u306F\u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9\u3092\u826F\u304F\u3057\u307E\u3059\u304C\u3001
-read_response_note3=\u5FDC\u7B54\u5185\u5BB9\u306F\u30ED\u30B0\u306B\u6B8B\u3055\u308C\u306A\u3044\u3053\u3068\u306B\u306A\u308A\u307E\u3059\u3002
-read_soap_response=SOAP\u30EC\u30B9\u30DD\u30F3\u30B9\u8AAD\u8FBC
 record_controller_title=\u8A18\u9332\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
 ref_name_field=\u53C2\u7167\u540D\uFF1A
 regex_extractor_title=\u6B63\u898F\u8868\u73FE\u62BD\u51FA
@@ -465,16 +454,6 @@ web_server_domain=\u30B5\u30FC\u30D0\u54
 web_server_port=\u30DD\u30FC\u30C8\u756A\u53F7\:
 web_testing_retrieve_images=\u5168\u3066\u306E\u30A4\u30E1\u30FC\u30B8\u3068\u30A2\u30D7\u30EC\u30C3\u30C8\u3092\u7E70\u308A\u8FD4\u3057\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3059\u308B(HTML \u30D5\u30A1\u30A4\u30EB\u306E\u307F)
 web_testing_title=HTTP \u30EA\u30AF\u30A8\u30B9\u30C8
-webservice_proxy_host=\u30D7\u30ED\u30AD\u30B7\u30DB\u30B9\u30C8
-webservice_proxy_note=HTTP\u30D7\u30ED\u30AD\u30B7\u304C\u30C1\u30A7\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001\u30DB\u30B9\u30C8\u540D\u3068\u30DD\u30FC\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u3068\u30B5\u30F3\u30D7\u30E9\u30FC\u306F
-webservice_proxy_note2=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u53C2\u7167\u3057\u307E\u3059\u3002\u30D7\u30ED\u30AD\u30B7\u30DB\u30B9\u30C8\u3084\u30D7\u30ED\u30AD\u30B7\u30DD\u30FC\u30C8\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u306F
-webservice_proxy_note3=\u3060\u307E\u3063\u305F\u307E\u307E\u7D42\u4E86\u3057\u307E\u3059\u3002
-webservice_proxy_port=\u30D7\u30ED\u30AD\u30B7\u30DD\u30FC\u30C8
-webservice_sampler_title=Web\u30B5\u30FC\u30D3\u30B9(SOAP)\u30EA\u30AF\u30A8\u30B9\u30C8 (DEPRECATED)
-webservice_soap_action=Soap\u30A2\u30AF\u30B7\u30E7\u30F3
-webservice_use_proxy=HTTP\u30D7\u30ED\u30AD\u30B7\u306E\u4F7F\u7528
 workbench_title=\u30EF\u30FC\u30AF\u30D9\u30F3\u30C1
-wsdl_helper_error=WSDL\u304C\u4E0D\u9069\u5207\u3067\u3059\u3002URL\u3092\uFF12\u91CD\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-wsdl_url_error=WSDL\u304C\u7A7A\u3067\u3059\u3002
 xml_assertion_title=XML \u30A2\u30B5\u30FC\u30B7\u30E7\u30F3
 you_must_enter_a_valid_number=\u9069\u5207\u306A\u6570\u5024\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties Sun Jan  3 22:01:37 2016
@@ -82,7 +82,6 @@ column_delete_disallowed=Tej kolumny nie
 compare=Por\u00F3wnaj
 config_element=Element konfiguruj\u0105cy
 config_save_settings=Konfiguruj
-configure_wsdl=Konfiguruj
 controller=Kontroler
 copy=Kopiuj
 counter_config_title=Licznik
@@ -136,7 +135,6 @@ jms_pwd=Has\u0142o
 jms_queue=Kolejka
 jms_user=U\u017Cytkownik
 load=Wczytaj
-load_wsdl=Wczytaj WSDL
 log_errors_only=B\u0142\u0119dy
 log_file=Po\u0142o\u017Cenie pliku log\u00F3w
 log_function_comment=Dodatkowy komentarz (opcjonalnie)

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=1722757&r1=1722756&r2=1722757&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 Sun Jan  3 22:01:37 2016
@@ -121,7 +121,6 @@ compare=Comparar
 comparefilt=Filtro de compara\u00E7\u00E3o
 config_element=Elemento de Configura\u00E7\u00E3o
 config_save_settings=Configurar
-configure_wsdl=Configurar
 constant_throughput_timer_memo=Adicionar um atraso entre amostragens para obter vaz\u00E3o constante
 constant_timer_delay=Atraso do usu\u00E1rio virtual (em milisegundos)
 constant_timer_memo=Adicionar um atraso constante entre amostragens
@@ -240,8 +239,6 @@ generator=Nome da classe Geradora
 generator_cnf_msg=N\u00E3o foi poss\u00EDvel encontrar a classe geradora. Verifique se voc\u00EA colocou o jar correto no diret\u00F3rio  /lib.
 generator_illegal_msg=N\u00E3o foi poss\u00EDvel acessar a classe geradora devido a uma IllegalAccessException.
 generator_instantiate_msg=N\u00E3o foi poss\u00EDvel criar uma inst\u00E2ncia do processador gerador. Verifique se o gerador implementa a interface Generator.
-get_xml_from_file=Arquivo com dados XML SOAP (substitui o texto acima)
-get_xml_from_random=Diret\u00F3rio das Mensagens
 graph_choose_graphs=Gr\u00E1ficos a serem Exibidos
 graph_full_results_title=Gr\u00E1fico de Resultados Completos
 graph_results_average=M\u00E9dia
@@ -264,7 +261,6 @@ help_node=O que \u00E9 este n\u00F3?
 html_assertion_file=Escrever relat\u00F3rio do JTidy em arquivo
 html_assertion_label=Asser\u00E7\u00E3o HTML
 html_assertion_title=Asser\u00E7\u00E3o HTML
-html_parameter_mask=M\u00E1scara de Par\u00E2metro HTML
 http_implementation=Implementa\u00E7\u00E3o\:
 http_response_code=C\u00F3digo da Resposta HTTP
 http_url_rewriting_modifier_title=Modificador de Re-escrita de URL HTTP
@@ -396,7 +392,6 @@ ldapext_sample_title=Padr\u00F5es de Req
 ldapext_testing_title=Requisi\u00E7\u00E3o LDAP Estendida
 library=Biblioteca
 load=Carregar
-load_wsdl=Carregar WSDL
 log_errors_only=Erros
 log_file=Localiza\u00E7\u00E3o do arquivo de log
 log_function_comment=Coment\u00E1rios adicionais (opcional)
@@ -439,7 +434,6 @@ maximum_param=O valor m\u00E1ximo permit
 md5hex_assertion_failure=Erro avaliando soma MD5\: encontrado {0} mas deveria haver {1}
 md5hex_assertion_md5hex_test=MD5Hex para Asser\u00E7\u00E3o
 md5hex_assertion_title=Asser\u00E7\u00E3o MD5Hex
-memory_cache=Cache em Mem\u00F3ria
 menu_assertions=Asser\u00E7\u00F5es
 menu_close=Fechar
 menu_collapse_all=Fechar Todos
@@ -545,11 +539,6 @@ pt_br=Portugu\u00EAs (Brasileiro)
 ramp_up=Tempo de inicializa\u00E7\u00E3o (em segundos)
 random_control_title=Controlador Aleat\u00F3rio
 random_order_control_title=Controlador de Ordem Aleat\u00F3ria
-read_response_message=N\u00E3o est\u00E1 configurado para ler a resposta. Para ver a resposta, favor marcar esta op\u00E7\u00E3o no testador.
-read_response_note=Se ler resposta est\u00E1 desmarcado, o testador n\u00E3o ir\u00E1 ler a resposta
-read_response_note2=ou configurar o SampleResult. Isto melhora o desempenho, mas significa que
-read_response_note3=o conte\u00FAdo da resposta n\u00E3o ser\u00E1 logado.
-read_soap_response=Ler Respostas SOAP
 realm=Reino (realm)
 record_controller_title=Controlador de Grava\u00E7\u00E3o
 ref_name_field=Nome de Refer\u00EAncia\:
@@ -855,19 +844,9 @@ web_testing2_title=Cliente HTTP de Requi
 web_testing_embedded_url_pattern=URLs embutidas precisam combinar\:
 web_testing_retrieve_images=Recuperar todos recursos embutidos a partir de arquivos HTML
 web_testing_title=Requisi\u00E7\u00E3o HTTP
-webservice_proxy_note=Se Usar Proxy HTTP estiver marcado, mas nenhum host ou porta s\u00E3o fornecidos, o testador
-webservice_proxy_note2=ir\u00E1 analizar as op\u00E7\u00F5es de linha de comando. Se nenhum host proxy ou portas forem providos
-webservice_proxy_note3=tamb\u00E9m, ele ir\u00E1 falhar em modo silencioso.
-webservice_proxy_port=Porta do Proxy
-webservice_sampler_title=Requisi\u00E7\u00E3o (SOAP) Requisi\u00E7\u00E3o (DEPRECATED)
-webservice_soap_action=A\u00E7\u00E3o SOAP
-webservice_timeout=Tempo limite\:
-webservice_use_proxy=Usar Proxy HTTP
 while_controller_label=Condi\u00E7\u00F5e (fun\u00E7\u00E3o ou vari\u00E1vel)
 while_controller_title=Controlador de Enquanto
 workbench_title=\u00C1rea de Trabalho
-wsdl_helper_error=O WSDL \u00E9 inv\u00E1lido, favor verificar a url.
-wsdl_url_error=O WSDL estava vazio.
 xml_assertion_title=Asser\u00E7\u00E3o XML
 xml_namespace_button=Usar Espa\u00E7o de Nome (namespace)
 xml_tolerant_button=Processador de XML/HTML Tolerante

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties Sun Jan  3 22:01:37 2016
@@ -108,7 +108,6 @@ compare=Kar\u015F\u0131la\u015Ft\u0131r
 comparefilt=Filtreyi kar\u015F\u0131la\u015Ft\u0131r
 config_element=Ayar Eleman\u0131
 config_save_settings=Ayarla
-configure_wsdl=Ayarla
 constant_throughput_timer_memo=Sabit bir transfer oran\u0131 elde etmek i\u00E7in \u00F6rneklemeler aras\u0131na gecikme ekle
 constant_timer_delay=\u0130\u015F Par\u00E7ac\u0131\u011F\u0131 Gecikmesi (milisaniyeler)
 constant_timer_memo=\u00D6rneklemeler aras\u0131na sabit bir gecikme ekle
@@ -225,8 +224,6 @@ generator=\u00DCretici S\u0131n\u0131f\u
 generator_cnf_msg=\u00DCretici s\u0131n\u0131f\u0131 bulamad\u0131. L\u00FCtfen jar dosyas\u0131n\u0131 /lib dizini alt\u0131na yerle\u015Ftirdi\u011Finizden emin olun.
 generator_illegal_msg=IllegalAccessException nedeniyle \u00FCretici s\u0131n\u0131fa eri\u015Femedi.
 generator_instantiate_msg=\u00DCretici ayr\u0131\u015Ft\u0131r\u0131c\u0131 i\u00E7in \u00F6rnek yaratamad\u0131. L\u00FCtfen \u00FCreticinin "Generator" arabirimini ger\u00E7ekledi\u011Finden emin olun.
-get_xml_from_file=SOAP XML Verisini i\u00E7eren Dosya (A\u015Fa\u011F\u0131daki metnin \u00FCzerine yazar)
-get_xml_from_random=Mesaj Klas\u00F6r\u00FC
 graph_choose_graphs=G\u00F6sterilecek Grafikler
 graph_full_results_title=Grafik Tam Sonu\u00E7lar\u0131
 graph_results_average=Ortalama
@@ -249,7 +246,6 @@ help_node=Bu d\u00FC\u011F\u00FCm nedir?
 html_assertion_file=JTidy raporunu dosyaya yaz
 html_assertion_label=HTML Do\u011Frulama
 html_assertion_title=HTML Do\u011Frulama
-html_parameter_mask=HTML Parametre Maskesi
 http_implementation=Uygulamas\u0131\:
 http_response_code=HTTP cevap kodu
 http_url_rewriting_modifier_title=HTTP URL Yeniden Yazma Niteleyicisi
@@ -376,7 +372,6 @@ ldap_testing_title=LDAP \u0130ste\u011Fi
 ldapext_sample_title=LDAP Geli\u015Fmi\u015F \u0130ste\u011Fi \u00D6ntan\u0131ml\u0131 De\u011Ferleri
 ldapext_testing_title=LDAP Geli\u015Fmi\u015F \u0130ste\u011Fi
 load=Y\u00FCkle
-load_wsdl=WSDL Y\u00FCkle
 log_errors_only=Hatalar
 log_file=Log Dosyas\u0131 Yolu
 log_function_comment=Ek yorum (iste\u011Fe ba\u011Fl\u0131)
@@ -419,7 +414,6 @@ md5hex_assertion_failure=MD5 toplam\u013
 md5hex_assertion_label=MDBHex
 md5hex_assertion_md5hex_test=Do\u011Frulanacak MD5Hex
 md5hex_assertion_title=MD5Hex Do\u011Frulamas\u0131
-memory_cache=\u00D6nbellek
 menu_assertions=Do\u011Frulamalar
 menu_close=Kapat
 menu_collapse_all=Hepsini Kapat
@@ -521,11 +515,6 @@ proxy_title=HTTP Vekil Sunucusu
 ramp_up=Rampa S\u00FCresi (saniyeler)\:
 random_control_title=Rastgele Denet\u00E7isi
 random_order_control_title=Rastgele S\u0131ra Denet\u00E7isi
-read_response_message="Cevap Oku" se\u00E7ene\u011Fi i\u015Faretli de\u011Fil. Cevab\u0131 g\u00F6rmek i\u00E7in, l\u00FCtfen \u00F6rnekleyicideki ilgili kutuyu i\u015Faretleyin.
-read_response_note=E\u011Fer "cevap oku" se\u00E7ene\u011Fi se\u00E7ili de\u011Filse, \u00F6rnekleyici cevab\u0131 okumaz
-read_response_note2=ya da  SampleResult'\u0131 kur. Bu ba\u015Far\u0131m\u0131 artt\u0131r\u0131r, ama \u015Fu anlama gelir
-read_response_note3=cevap i\u00E7eri\u011Fi loglanmayacak.
-read_soap_response=SOAP Cevab\u0131n\u0131 Oku
 realm=Alan (Realm)
 record_controller_title=Kaydetme Denet\u00E7isi
 ref_name_field=Referans \u0130smi\:
@@ -791,20 +780,9 @@ web_testing2_title=HTTP \u0130ste\u011Fi
 web_testing_embedded_url_pattern=G\u00F6m\u00FCl\u00FC Adresler (URL) \u00F6rt\u00FC\u015Fmeli\:
 web_testing_retrieve_images=HTML Dosyalardan T\u00FCm G\u00F6m\u00FCl\u00FC Kaynaklar\u0131 Al
 web_testing_title=HTTP \u0130ste\u011Fi
-webservice_proxy_host=Vekil Makine
-webservice_proxy_note=E\u011Fer "HTTP Vekil Sunucu kullan" se\u00E7iliyse, ama sunucu veya port belirtilmemi\u015Fse, \u00F6rnekleyici
-webservice_proxy_note2=komut sat\u0131r\u0131 se\u00E7eneklerine bakacakt\u0131r. E\u011Fer vekil sunucu veya port belirtilmediyse
-webservice_proxy_note3=ya da, sessizce ba\u015Far\u0131s\u0131z olacakt\u0131r.
-webservice_proxy_port=Vekil Port
-webservice_sampler_title=WebService(SOAP) \u0130ste\u011Fi (DEPRECATED)
-webservice_timeout=Zaman A\u015F\u0131m\u0131\:
-webservice_use_proxy=HTTP Vekil Sunucusunu kullan
 while_controller_label=Ko\u015Ful (fonksiyon veya de\u011Fi\u015Fken)
 while_controller_title=While Denet\u00E7isi
 workbench_title=Tezgah
-wsdl_helper_error=WSDL ge\u00E7erli de\u011Fil, l\u00FCtfen url adresini iki defa kontrol edin.
-wsdl_url=WSDL Adresi
-wsdl_url_error=WSDL bo\u015F.
 xml_assertion_title=XML Do\u011Frulamas\u0131
 xml_namespace_button=Namespace kullan
 xml_tolerant_button=Ho\u015Fg\u00F6r\u00FClen XML/HTML Ayr\u0131\u015Ft\u0131r\u0131c\u0131

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties Sun Jan  3 22:01:37 2016
@@ -67,7 +67,6 @@ clear_all=\u6E05\u9664\u5168\u90E8
 clear_cookies_per_iter=\u6BCF\u6B21\u53CD\u590D\u6E05\u9664Cookies \uFF1F
 column_delete_disallowed=\u4E0D\u5141\u8BB8\u5220\u9664\u6B64\u5217
 column_number=CSV\u6587\u4EF6\u5217\u53F7| next| *alias
-configure_wsdl=\u914D\u7F6E
 constant_throughput_timer_memo=\u5728\u53D6\u6837\u95F4\u6DFB\u52A0\u5EF6\u8FDF\u6765\u83B7\u5F97\u56FA\u5B9A\u7684\u541E\u5410\u91CF
 constant_timer_delay=\u7EBF\u7A0B\u5EF6\u8FDF\uFF08\u6BEB\u79D2\uFF09\uFF1A
 constant_timer_memo=\u5728\u53D6\u6837\u95F4\u6DFB\u52A0\u56FA\u5B9A\u5EF6\u8FDF
@@ -151,8 +150,6 @@ generator=\u751F\u6210\u5668\u7C7B\u540D
 generator_cnf_msg=\u4E0D\u80FD\u627E\u5230\u751F\u6210\u5668\u7C7B\u3002\u8BF7\u786E\u5B9A\u4F60\u5C06jar\u6587\u4EF6\u653E\u7F6E\u5728/lib\u76EE\u5F55\u4E2D\u3002
 generator_illegal_msg=\u7531\u4E8EIllegalAcessException\uFF0C\u4E0D\u80FD\u8BBF\u95EE\u751F\u6210\u5668\u7C7B\u3002
 generator_instantiate_msg=\u4E0D\u80FD\u521B\u5EFA\u751F\u6210\u5668\u89E3\u6790\u5668\u7684\u5B9E\u4F8B\u3002\u8BF7\u786E\u4FDD\u751F\u6210\u5668\u5B9E\u73B0\u4E86Generator\u63A5\u53E3\u3002
-get_xml_from_file=\u5E26SOAP XML \u6570\u636E\u7684\u6587\u4EF6\uFF08\u8986\u76D6\u4E0A\u9762\u7684\u6587\u672C\uFF09
-get_xml_from_random=\u6D88\u606F\u6587\u4EF6\u5939
 graph_choose_graphs=\u8981\u663E\u793A\u7684\u56FE\u5F62
 graph_full_results_title=\u56FE\u5F62\u7ED3\u679C
 graph_results_average=\u5E73\u5747
@@ -171,7 +168,6 @@ grouping_store_first_only=\u53EA\u5B58\u
 header_manager_title=HTTP\u4FE1\u606F\u5934\u7BA1\u7406\u5668
 headers_stored=\u4FE1\u606F\u5934\u5B58\u50A8\u5728\u4FE1\u606F\u5934\u7BA1\u7406\u5668\u4E2D
 help=\u5E2E\u52A9
-html_parameter_mask=HTML\u53C2\u6570\u63A9\u7801
 http_response_code=HTTP\u578B\u5E94\u4EE3\u7801
 http_url_rewriting_modifier_title=HTTP URL \u91CD\u5199\u4FEE\u9970\u7B26
 http_user_parameter_modifier=HTTP \u7528\u6237\u53C2\u6570\u4FEE\u9970\u7B26
@@ -213,7 +209,6 @@ ja=\u65E5\u8BED
 ldap_sample_title=LDAP\u8BF7\u6C42\u9ED8\u8BA4\u503C
 ldap_testing_title=LDAP\u8BF7\u6C42
 load=\u8F7D\u5165
-load_wsdl=\u8F7D\u5165WSDL
 log_errors_only=\u4EC5\u65E5\u5FD7\u9519\u8BEF
 log_file=\u65E5\u5FD7\u6587\u4EF6\u4F4D\u7F6E
 log_parser=\u65E5\u5FD7\u89E3\u6790\u5668\u7C7B\u540D
@@ -236,7 +231,6 @@ maximum_param=\u4E00\u4E2A\u8303\u56F4\u
 md5hex_assertion_failure=MD5\u603B\u5408\u65AD\u8A00\u9519\u8BEF\uFF1A\u5F97\u5230\u4E86{0}\uFF0C\u4F46\u5E94\u8BE5\u662F{1}
 md5hex_assertion_md5hex_test=\u8981\u65AD\u8A00\u7684MD5Hex
 md5hex_assertion_title=MD5Hex\u65AD\u8A00
-memory_cache=\u5185\u5B58\u7F13\u5B58
 menu_assertions=\u65AD\u8A00
 menu_close=\u5173\u95ED
 menu_config_element=\u914D\u7F6E\u5143\u4EF6
@@ -308,11 +302,6 @@ proxy_target=\u76EE\u6807\u63A7\u5236\u5
 proxy_title=HTTP\u4EE3\u7406\u670D\u52A1\u5668
 random_control_title=\u968F\u673A\u63A7\u5236\u5668
 random_order_control_title=\u968F\u673A\u987A\u5E8F\u63A7\u5236\u5668
-read_response_message=\u8BFB\u53D6\u54CD\u5E94\u6CA1\u6709\u9009\u4E2D\u3002\u8981\u770B\u5230\u54CD\u5E94\uFF0C\u8BF7\u5728\u53D6\u6837\u5668\u4E2D\u9009\u4E2D\u8BFB\u53D6\u54CD\u5E94\u590D\u9009\u6846\u3002
-read_response_note=\u5982\u679C\u8BFB\u53D6\u54CD\u5E94\u6CA1\u6709\u9009\u4E2D\uFF0C\u53D6\u6837\u5668\u4E0D\u4F1A\u8BFB\u53D6\u54CD\u5E94\u3002
-read_response_note2=\u6216\u8BBE\u7F6E\u6837\u672C\u7ED3\u679C\u3002\u8FD9\u4F1A\u63D0\u9AD8\u6027\u80FD\u3002
-read_response_note3=\u54CD\u5E94\u5185\u5BB9\u4E0D\u4F1A\u8BB0\u5F55\u3002
-read_soap_response=\u8BFB\u53D6SOAP\u54CD\u5E94
 record_controller_title=\u5F55\u5236\u63A7\u5236\u5668
 ref_name_field=\u5F15\u7528\u540D\u79F0\uFF1A
 regex_extractor_title=\u6B63\u5219\u8868\u8FBE\u5F0F\u63D0\u53D6\u5668
@@ -428,12 +417,7 @@ web_server_domain=\u670D\u52A1\u5668\u54
 web_server_port=\u7AEF\u53E3\u53F7\uFF1A
 web_testing_retrieve_images=\u4ECEHTML\u6587\u4EF6\u83B7\u53D6\u6240\u6709\u5185\u542B\u7684\u8D44\u6E90
 web_testing_title=HTTP\u8BF7\u6C42
-webservice_proxy_host=\u4EE3\u7406\u670D\u52A1\u5668\u4E3B\u673A
-webservice_proxy_port=\u4EE3\u7406\u670D\u52A1\u5668\u7AEF\u53E3
-webservice_use_proxy=\u4F7F\u7528\u4EE3\u7406\u670D\u52A1\u5668
 workbench_title=\u5DE5\u4F5C\u53F0
-wsdl_helper_error=WSDL\u65E0\u6548\uFF0C\u8BF7\u68C0\u67E5URL\u3002
-wsdl_url_error=WSDL\u662F\u7A7A\u7684\u3002
 xml_assertion_title=XML\u65AD\u8A00
 you_must_enter_a_valid_number=\u5FC5\u987B\u8F93\u5165\u6709\u6548\u7684\u6570\u5B57
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties Sun Jan  3 22:01:37 2016
@@ -86,7 +86,6 @@ compare=\u6BD4\u8F03
 comparefilt=\u6BD4\u8F03\u904E\u6FFE\u5668
 config_element=\u8A2D\u5B9A
 config_save_settings=\u8A2D\u5B9A
-configure_wsdl=\u8A2D\u5B9A
 constant_throughput_timer_memo=\u70BA\u4F7F\u8655\u7406\u91CF\u70BA\u56FA\u5B9A\u503C, \u5728\u53D6\u6A23\u9593\u52A0\u5165\u5EF6\u9072\u6642\u9593
 constant_timer_delay=\u5EF6\u9072\u6642\u9593(\u55AE\u4F4D\u662F\u5343\u5206\u4E4B\u4E00\u79D2)
 constant_timer_memo=\u5728\u53D6\u6A23\u9593\u52A0\u5165\u56FA\u5B9A\u7684\u5EF6\u9072\u6642\u9593
@@ -187,8 +186,6 @@ generator=\u9AD8\u65AF\u6CD5 class \u540
 generator_cnf_msg=\u627E\u4E0D\u5230\u7522\u751F\u5668 class. \u8ACB\u78BA\u8A8D jar \u6A94\u653E\u5728 /lib \u76EE\u9304
 generator_illegal_msg=\u7121\u6CD5\u5B58\u53D6\u7522\u751F\u5668 class (iIllegalAcessException)
 generator_instantiate_msg=\u7121\u6CD5\u4F7F\u7528\u7522\u751F\u5668, \u8ACB\u78BA\u8A8D\u5DF2\u5BE6\u4F5C Generator \u4ECB\u9762
-get_xml_from_file=SOAP XML \u6A94(\u53D6\u4EE3\u4E0A\u9762\u6587\u5B57)
-get_xml_from_random=\u8A0A\u606F\u8CC7\u6599\u593E
 graph_choose_graphs=\u8981\u986F\u793A\u7684\u5716\u5F62
 graph_full_results_title=\u5B8C\u6574\u7D50\u679C\u5716\u5F62
 graph_results_average=\u5E73\u5747
@@ -210,7 +207,6 @@ headers_stored=\u6A19\u982D\u7BA1\u7406\
 help=\u8F14\u52A9\u8AAA\u660E
 html_assertion_label=HTML \u9A57\u8B49
 html_assertion_title=HTML \u9A57\u8B49
-html_parameter_mask=HTML \u53C3\u6578\u906E\u7F69
 http_response_code=HTTP \u56DE\u61C9\u4EE3\u78BC
 http_url_rewriting_modifier_title=HTTP URL \u91CD\u5C0E\u4FEE\u98FE\u8A5E
 http_user_parameter_modifier=HTTP \u4F7F\u7528\u8005\u53C3\u6578\u4FEE\u98FE\u8A5E
@@ -300,7 +296,6 @@ ldap_testing_title=LDAP \u8981\u6C42
 ldapext_sample_title=LDAP \u5EF6\u4F38\u8981\u6C42\u9810\u8A2D\u503C
 ldapext_testing_title=LDAP \u5EF6\u4F38\u8981\u6C42
 load=\u8F09\u5165
-load_wsdl=\u8F09\u5165 WSDL
 log_errors_only=\u53EA\u8A18\u9304\u932F\u8AA4
 log_file=\u6B77\u7A0B\u6A94\u4F4D\u7F6E
 log_parser=\u6B77\u7A0B\u6A94\u5256\u6790\u7A0B\u5F0F
@@ -333,7 +328,6 @@ maximum_param=\u5141\u8A31\u7BC4\u570D\u
 md5hex_assertion_failure=\u9A57\u8B49 MD5 \u932F\u8AA4,\u61C9\u8A72\u662F{1}\u537B\u5F97\u5230{0}
 md5hex_assertion_md5hex_test=\u88AB\u9A57\u8B49\u7684 MD5Hex
 md5hex_assertion_title=MD5Hex \u9A57\u8B49
-memory_cache=\u8A18\u61B6\u5FEB\u53D6
 menu_assertions=\u9A57\u8B49
 menu_close=\u95DC\u9589
 menu_config_element=\u8A2D\u5B9A\u5143\u7D20
@@ -417,11 +411,6 @@ proxy_title=HTTP \u4EE3\u7406\u4F3A\u670
 ramp_up=\u555F\u52D5\u5EF6\u9072(\u79D2)
 random_control_title=\u96A8\u6A5F\u63A7\u5236\u5668
 random_order_control_title=\u96A8\u6A5F\u9806\u5E8F\u63A7\u5236\u5668
-read_response_message=\u56DE\u8986\u4E0D\u6703\u88AB\u6AA2\u67E5. \u8981\u770B\u5230\u56DE\u8986\u7684\u8A71, \u8ACB\u9078\u53D6\u53D6\u6A23\u4E2D\u7684\u9078\u53D6\u5340
-read_response_note=\u5982\u679C\u6C92\u9EDE\u9078 read response, \u53D6\u6A23\u5C07\u4E0D\u6703\u8B80\u53D6\u56DE\u8986\u8CC7\u6599
-read_response_note2=\u4E5F\u4E0D\u6703\u8A2D\u5B9A SampleResult. \u5982\u6B64\u53EF\u4EE5\u6539\u5584\u6548\u80FD, \u4F46\u4E5F\u8868\u793A
-read_response_note3=\u5C07\u4E0D\u6703\u8A18\u9304\u56DE\u8986\u7684\u5167\u5BB9
-read_soap_response=\u8B80\u53D6 SOAP \u56DE\u8986
 record_controller_title=\u9304\u88FD\u63A7\u5236\u5668
 ref_name_field=\u53C3\u7167\u540D\u7A31
 regex_extractor_title=\u6B63\u898F\u8868\u793A\u5F0F\u5256\u6790\u5668
@@ -618,18 +607,9 @@ web_server_domain=\u4E3B\u6A5F\u540D\u7A
 web_server_port=\u7AEF\u53E3\u865F\u78BC
 web_testing_retrieve_images=\u53D6\u56DE\u6240\u6709\u5D4C\u5165 HTML \u7684\u8CC7\u6E90
 web_testing_title=HTTP \u8981\u6C42
-webservice_proxy_host=\u4EE3\u7406\u4F3A\u670D\u5668
-webservice_proxy_note=\u5982\u679C\u9078\u7528HTTP\u4EE3\u7406\u4F3A\u670D\u5668,\u537B\u6C92\u6709\u6307\u5B9A\u4E3B\u6A5F\u548C\u7AEF\u53E3\u7684\u8A71
-webservice_proxy_note2=\u53D6\u6A23\u6703\u7531\u57F7\u884C\u547D\u4EE4\u5217\u53C3\u6578\u53D6\u5F97, \u5982\u679C\u547D\u4EE4\u5217\u53C3\u6578
-webservice_proxy_note3=\u4E5F\u6C92\u8A2D\u5B9A, \u5373\u6703\u5931\u6557
-webservice_proxy_port=\u4EE3\u7406\u4F3A\u670D\u5668\u7AEF\u53E3
-webservice_sampler_title=WebService(SOAP) \u8981\u6C42 (DEPRECATED)
-webservice_use_proxy=\u4F7F\u7528 HTTP \u4EE3\u7406\u4F3A\u670D\u5668
 while_controller_label=\u689D\u4EF6 (blank/LAST \u6216 true)
 while_controller_title=\u7576.. \u63A7\u5236\u5668
 workbench_title=\u5DE5\u4F5C\u53F0
-wsdl_helper_error=\u7121\u6548\u7684 WSDL,\u8ACB\u78BA\u8A8D URL \u7121\u8AA4
-wsdl_url_error=WSDL \u662F\u7A7A\u7684
 xml_assertion_title=XML \u9A57\u8B49
 xml_namespace_button=\u4F7F\u7528\u540D\u7A31\u7A7A\u9593
 xml_tolerant_button=Tolerant XML/HTML \u5256\u6790\u5668

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sun Jan  3 22:01:37 2016
@@ -192,7 +192,7 @@ public class SaveService {
     private static String fileVersion = ""; // computed from saveservice.properties file// $NON-NLS-1$
     // Must match the sha1 checksum of the file saveservice.properties (without newline character),
     // used to ensure saveservice.properties and SaveService are updated simultaneously
-    static final String FILEVERSION = "7bc78392d5d18fc977b789d99aea6e790f9816f2"; // Expected value $NON-NLS-1$
+    static final String FILEVERSION = "1e7d41832b89d6436a366b621d03d7888d9dfd1d"; // Expected value $NON-NLS-1$
 
     private static String fileEncoding = ""; // read from properties file// $NON-NLS-1$
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Jan  3 22:01:37 2016
@@ -83,7 +83,8 @@ Summary
     <li>Property <code>jmeterengine.startlistenerslater</code> has been removed. See <bugzilla>58728</bugzilla></li>   
     <li>Property <code>jmeterthread.reversePostProcessors</code> has been removed. See <bugzilla>58728</bugzilla></li>  
     <li>MongoDB elements (MongoDB Source Config, MongoDB Script) have been deprecated and will be removed in next version of jmeter. They do not appear anymore in the menu, if you need them modify <code>not_in_menu</code> property. JMeter team advises not to use them anymore. See <bugzilla>58772</bugzilla></li>
-    <li>Summariser listener now outputs a formated duration in HH:mm:ss (Hour:Minute:Second), it previously outputed seconds. See <bugzilla>58776</bugzilla></li> 
+    <li>Summariser listener now outputs a formated duration in HH:mm:ss (Hour:Minute:Second), it previously outputed seconds. See <bugzilla>58776</bugzilla></li>
+    <li>WebService(SOAP) Request and HTML Parameter Mask which were deprecated in 2.13 version, have now been removed following our deprecation strategy</li> 
 </ul>
 
 <!-- =================== Improvements =================== -->

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1722757&r1=1722756&r2=1722757&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sun Jan  3 22:01:37 2016
@@ -701,89 +701,6 @@ Or set <code>Content-Length</code> to <c
         </property>
         <property name="Filename" required="No">If specified, then the contents of the file are sent, and the Data field is ignored</property>
         </properties>
-
-</component>
-
-<component name="WebService(SOAP) Request (DEPRECATED)" useinstead="HTTP_Request" index="&sect-num;.1.6" width="943" height="648" screenshot="webservice_sampler.png">
-<note>
-See <a href="build-ws-test-plan.html">Building a WebService Test Plan</a> for up to date way of test SOAP and REST Webservices
-</note>
-<description><p>This sampler has been tested with IIS Webservice running .NET 1.0 and .NET 1.1.
- It has been tested with SUN JWSDP, IBM webservices, Axis and gSoap toolkit for C/C++.
- The sampler uses Apache SOAP driver to serialize the message and set the header
- with the correct SOAPAction. Right now the sampler doesn't support automatic WSDL
- handling, since Apache SOAP currently does not provide support for it. Both IBM
- and SUN provide WSDL drivers. There are 3 options for the post data: text area,
- external file, or directory. If you want the sampler to randomly select a message,
- use the directory. Otherwise, use the text area or a file. The if either the
- file or path are set, it will not use the message in the text area. If you need
- to test a soap service that uses different encoding, use the file or path. If you
- paste the message in to text area, it will not retain the encoding and will result
- in errors. Save your message to a file with the proper encoding, and the sampler
- will read it as java.io.FileInputStream.</p>
- <p>An important note on the sampler is it will automatically use the proxy host
- and port passed to JMeter from command line, if those fields in the sampler are
- left blank. If a sampler has values in the proxy host and port text field, it
- will use the ones provided by the user. This behavior may not be what users
- expect.</p>
- <p>By default, the webservice sampler sets SOAPHTTPConnection.setMaintainSession
- (true). If you need to maintain the session, add a blank Header Manager. The
- sampler uses the Header Manager to store the SOAPHTTPConnection object, since
- the version of apache soap does not provide a easy way to get and set the cookies.</p>
- <note>If you are using CSVDataSet, do not check "Memory Cache". If memory
- cache is checked, it will not iterate to the next value. That means all the requests
- will use the first value.</note>
- <p>Make sure you use <code>&lt;soap:Envelope</code> rather than <code>&lt;Envelope</code>. For example:</p>
- <source>
-&lt;?xml version="1.0" encoding="utf-8"?&gt;
-&lt;soap:Envelope 
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"&gt;
-&lt;soap:Body&gt;
-&lt;foo xmlns="http://clients-xlmns"/&gt;
-&lt;/soap:Body&gt;
-&lt;/soap:Envelope&gt;
-</source>
-<note>The SOAP library that is used does not support SOAP 1.2, only SOAP 1.1. 
-Also the library does not provide access to the HTTP response code (e.g. 200) or message (e.g. OK). 
-To get round this, versions of JMeter after 2.3.2 check the returned message length.
-If this is zero, then the request is marked as failed.
-</note>
-</description>
-
-<properties>
-        <property name="Name" required="No">Descriptive name for this sampler
-         that is shown in the tree.</property>
-        <property name="WSDL URL" required="No">The WSDL URL with the service description.
-        Versions of JMeter after 2.3.1 support the <code>file:</code> protocol for local WSDL files.
-        </property>
-        <property name="Web Methods" required="No">Will be populated from the WSDL when the Load WSDL button is pressed.
-        Select one of the methods and press the Configure button to populate the <code>Protocol</code>, <code>Server</code>,
-        <code>Port</code>, <code>Path</code> and <code>SOAPAction</code> fields.
-        </property>
-        <property name="Protocol" required="Yes"><code>HTTP</code> or <code>HTTPS</code> are acceptable protocol.</property>
-        <property name="Server Name or IP" required="Yes">The hostname or IP address.</property>
-        <property name="Port Number" required="Yes">Port Number.</property>
-        <property name="Timeout" required="No">Connection timeout.</property>
-        <property name="Path" required="Yes">Path for the webservice.</property>
-        <property name="SOAPAction" required="Yes">The SOAPAction defined in the webservice description or WSDL.</property>
-        <property name="Soap/XML-RPC Data" required="Yes">The Soap XML message</property>
-        <property name="Soap file" required="No">File containing soap message</property>
-        <property name="Message(s) Folder" required="No">Folder containing soap files. Files are choose randomly during test.</property>
-        <property name="Memory cache" required="Yes">
-        When using external files, setting this causes the file to be processed once and caches the result.
-        This may use a lot of memory if there are many different large files.
-        </property>
-        <property name="Read SOAP Response" required="No">Read the SOAP response (consumes performance). Permit to have assertions or post-processors</property>
-        <property name="Use HTTP Proxy" required="No">Check box if http proxy should be used</property>
-        <property name="Server Name or IP" required="No">Proxy hostname</property>
-        <property name="Port Number" required="No">Proxy host port</property>
-        </properties>
-
-<note>
-Webservice Soap Sampler assumes that empty response means failure.
-</note>
 </component>
 
 <component name="LDAP Request" index="&sect-num;.1.7" width="621" height="462" screenshot="ldap_request.png">
@@ -5382,34 +5299,6 @@ If using distributed testing, ensure you
 
 </component>
 
-<component name="HTML Parameter Mask (DEPRECATED)" index="&sect-num;.7.3" useinstead="Counter"  width="624" height="209" screenshot="parameter_mask.png">
-<description><p>The HTML Parameter Mask is used to generate unique values for HTML arguments.  By
-specifying the name of the parameter, a value prefix and suffix, and counter parameters, this
-modifier will generate values of the form "<code>name=prefixcountersuffix</code>".  Any HTTP
-Request that it modifies, it will replace any parameter with the same name or add the appropriate
-parameter to the requests list of arguments.</p>
-<note>The value of the argument in your HTTP Request must be a '<code>*</code>' in order for the HTML Parameter Mask
-Modifier to replace it.</note>
-<p>As an example, the username for a login script could be modified to send a series of values
-such as:<br></br>
-<code>user_1</code><br></br>
-<code>user_2</code><br></br>
-<code>user_3</code><br></br>
-<code>user_4</code>, etc.</p></description>
-
-<properties>
-        <property name="Name" required="No">Descriptive name given to this element in the test tree.</property>
-        <property name="Name (second appearing)" required="Yes">The name of the parameter to
-        modify or add to the HTTP Request.</property>
-        <property name="ID Prefix" required="No">A string value to prefix to every generated value.</property>
-        <property name="Lower Bound" required="Yes">A number value to start the counter at.</property>
-        <property name="Upper Bound" required="Yes">A number value to end the counter, at which point it restarts
-        with the <code>Lower Bound</code> value.</property>
-        <property name="Increment" required="Yes">Value to increment the counter by each time through.</property>
-        <property name="ID Suffix" required="No">A string value to add as suffix to every generated value.</property>
-</properties>
-</component>
-
 <component name="User Parameters" index="&sect-num;.7.5"  width="703" height="303" screenshot="user_params.png">
 <description><p>Allows the user to specify values for User Variables specific to individual threads.</p>
 <p>User Variables can also be specified in the Test Plan but not specific to individual threads. This panel allows



Mime
View raw message