You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/11/03 23:55:57 UTC

svn commit: r1030749 - in /jakarta/jmeter/trunk: docs/images/screenshots/ src/core/org/apache/jmeter/resources/ src/protocol/http/org/apache/jmeter/protocol/http/control/gui/ xdocs/images/screenshots/ xdocs/usermanual/

Author: sebb
Date: Wed Nov  3 22:55:56 2010
New Revision: 1030749

URL: http://svn.apache.org/viewvc?rev=1030749&view=rev
Log:
Simplify WebService GUI: use tooltips instead of fixed text which takes up lots of space
Drop text regarding XML parsing as no longer very relevant

Modified:
    jakarta/jmeter/trunk/docs/images/screenshots/webservice_sampler.png
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_no.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
    jakarta/jmeter/trunk/xdocs/images/screenshots/webservice_sampler.png
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/docs/images/screenshots/webservice_sampler.png
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webservice_sampler.png?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Nov  3 22:55:56 2010
@@ -266,11 +266,6 @@ generator_illegal_msg=Could not access t
 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 Folder
-get_xml_message=Note\: Parsing XML is CPU intensive. Therefore, do not set the thread count
-get_xml_message2=too high. In general, 10 threads will consume 100% of the CPU on a 900MHz
-get_xml_message3=Pentium 3. On a Pentium 4 2.4GHz cpu, 50 threads is the upper limit. Your
-get_xml_message4=options for increasing the number of clients is to increase the number of
-get_xml_message5=machines or use multi-cpu systems.
 graph_choose_graphs=Graphs to Display
 graph_full_results_title=Graph Full Results
 graph_results_average=Average

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties Wed Nov  3 22:55:56 2010
@@ -219,11 +219,6 @@ generator_instantiate_msg=Konnte keine I
 generator=Name der Erzeuger-Klasse
 get_xml_from_file=Datei mit SOAP XML Daten (Vorrang vor obenstehendem Text)
 get_xml_from_random=Verzeichnis mit Meldungen
-get_xml_message=Hinweis\: Das parsen von XML ist Rechenaufw\u00E4ndig\! Setzen sie daher nicht die Anzahl der Threads\!
-get_xml_message2=Zu hoch. Durchschnittlich beanspruchen 10 Threads zu 100% eine 900 MHz 
-get_xml_message3=Pentium 3 CPU. Bei einer Pentium 4 CPU mit 2,4 GHz sind 50 Thread die Obergrenze. Um 
-get_xml_message4=die Anzahl der Clients zu erh\u00F6hen m\u00FCssen sie die Anzahl der 
-get_xml_message5=Rechner erh\u00F6hhen oder Multi-CPU Systeme einsetzen.
 graph_choose_graphs=Anzuzeigende Graphen
 graph_full_results_title=Vollst\u00E4ndige Ergebnisse
 graph_results_average=Durchschnitt

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties Wed Nov  3 22:55:56 2010
@@ -197,11 +197,6 @@ generator_illegal_msg=No pude acceder a 
 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
-get_xml_message=Nota\: Parsear XML es intensivo en CPU. Por lo tanto, no establezca el contador de hilo
-get_xml_message2=demasiado alto. En general, 10 hilos consumir\u00E1n el 100% de la CPU en un Pentium3
-get_xml_message3=a 900Mhz. En un pentium 4 2.4Ghz, el n\u00FAmero superior es 50 hilos. Sus
-get_xml_message4=opciones para incrementar el n\u00FAmero de clientes es incrementar el n\u00FAmero de
-get_xml_message5=m\u00E1quinas o utilizar sistemas multi-cpu.
 graph_choose_graphs=Gr\u00E1ficos a Mostrar
 graph_full_results_title=Resultados de Gr\u00E1fico Completo
 graph_results_average=Media

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Wed Nov  3 22:55:56 2010
@@ -235,11 +235,6 @@ generator_illegal_msg=N'a pas p\u00FB ac
 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 de message
-get_xml_message=Note \: l'analyseur XML consomme du temps CPU. Donc, ne mettez pas de valeur au compteur d'unit\u00E9
-get_xml_message2=trop \u00E9l\u00E9v\u00E9. En g\u00E9n\u00E9ral, 10 unit\u00E9s vont consommer 100% du CPU sur un 900MHz
-get_xml_message3=Pentium 3. Sur un Pentium 4 2.4GHz, 50 unit\u00E9s est la limite sup\u00E9rieure. Vos
-get_xml_message4=possibilit\u00E9s pour augmenter le nombre de clients est d'augmenter le nombre de
-get_xml_message5=machines ou utiliser des syst\u00E8mes multi-cpu.
 graph_choose_graphs=Graphique \u00E0 afficher
 graph_full_results_title=Graphique de r\u00E9sultats complets
 graph_results_average=Moyenne

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties Wed Nov  3 22:55:56 2010
@@ -159,11 +159,6 @@ generator_illegal_msg=IllegalAcessExcept
 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
-get_xml_message=\u6CE8\u610F\\\: XML\u89E3\u6790\u306FCPU\u306B\u8CA0\u8377\u304C\u304B\u304B\u308A\u307E\u3059\u3002\u3057\u305F\u304C\u3063\u3066\u3001\u30B9\u30EC\u30C3\u30C9\u30AB\u30A6\u30F3\u30C8\u3092\u3042\u307E\u308A
-get_xml_message2=\u9AD8\u304F\u8A2D\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\u901A\u5E38900MH\uFF5A\u306EPentium 3\u3067\u306F10\u30B9\u30EC\u30C3\u30C9\u3067 CPU
-get_xml_message3=\u4F7F\u7528\u7387\u304C100%\u306B\u306A\u308A\u307E\u3059\u30022.4GH\uFF5A\u306EPentium 4\u3067\u306F\u300150\u30B9\u30EC\u30C3\u30C9\u304C\u4E0A\u9650\u306B\u306A\u308A\u307E\u3059\u3002
-get_xml_message4=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u6570\u3092\u5897\u3084\u3059\u306B\u306F\u3001\u30DE\u30B7\u30F3\u306E\u6570\u3092\u5897\u3084\u3057\u305F\u308A\u3001\u30DE\u30EB\u30C1CPU\u306E\u30DE\u30B7\u30F3\u3092
-get_xml_message5=\u4F7F\u3046\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 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

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_no.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_no.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_no.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_no.properties Wed Nov  3 22:55:56 2010
@@ -106,7 +106,6 @@ protocol=Protokoll\:
 proxy_title=HTTP proxy server
 ramp_up=Oppstartsperiode (i sekunder)\:
 random_control_title=Random kontroller
-read_response_note=If read response is unchecked, the sampler will not the response
 remote_start=Remote start
 remote_stop=Remote stopp
 remove=Fjern

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties Wed Nov  3 22:55:56 2010
@@ -250,11 +250,6 @@ generator_illegal_msg=N\u00E3o foi poss\
 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
-get_xml_message=Nota\: Processar XML toma muita CPU. Logo, n\u00E3o altere o contador de threads.
-get_xml_message2=muito alto. Em geral, 10 threads ir\u00E1 consumir 100% da CPU em um processador de 900MHz.
-get_xml_message3=Pentium 3. Em uma CPU Pentium 4 2.4GHz, 50 threads \u00E9 o limite m\u00E1ximo. Suas
-get_xml_message4=op\u00E7\u00F5es para aumentar o n\u00FAmero de clientes \u00E9 aumentar o n\u00FAmero de
-get_xml_message5=computadores ou usar sistemas multi-CPU.
 graph_choose_graphs=Gr\u00E1ficos a serem Exibidos
 graph_full_results_title=Gr\u00E1fico de Resultados Completos
 graph_results_average=M\u00E9dia

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties Wed Nov  3 22:55:56 2010
@@ -235,11 +235,6 @@ generator_illegal_msg=IllegalAccessExcep
 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
-get_xml_message=Not\: XML ayr\u0131\u015Ft\u0131rmak i\u015Flemci t\u00FCketir. Bu y\u00FCzden i\u015F par\u00E7ac\u0131\u011F\u0131 say\u0131s\u0131n\u0131 de\u011Fi\u015Ftirmeyin
-get_xml_message2=\u00E7ok fazla. Normalde, 10 i\u015F par\u00E7ac\u0131\u011F\u0131 900mhz bir i\u015Flemciyi 100% me\u015Fgul eder
-get_xml_message3=Pentium 3. Pentium 4 2.4ghz bit i\u015Flemci i\u00E7in 50 i\u015F par\u00E7ac\u0131\u011F\u0131 \u00FCst s\u0131n\u0131rd\u0131r. Sizin
-get_xml_message4=istemci say\u0131s\u0131n\u0131 artt\u0131racak se\u00E7eneklerin artt\u0131raca\u011F\u0131 say\u0131lar
-get_xml_message5=makineler ya da \u00E7oklu i\u015Flemcili sistemler.
 graph_choose_graphs=G\u00F6sterilecek Grafikler
 graph_full_results_title=Grafik Tam Sonu\u00E7lar\u0131
 graph_results_average=Ortalama

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties Wed Nov  3 22:55:56 2010
@@ -153,11 +153,6 @@ generator_illegal_msg=\u7531\u4E8EIllega
 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
-get_xml_message=\u6CE8\u610F\uFF1A\u89E3\u6790XML\u662F\u5BC6\u96C6\u4F7F\u7528CPU\u7684\u3002\u56E0\u6B64\uFF0C\u4E0D\u8981\u8BBE\u7F6E\u7EBF\u7A0B\u6570
-get_xml_message2=\u592A\u9AD8\u3002\u4E00\u822C\u6765\u8BF4\uFF0C10\u4E2A\u7EBF\u7A0B\u5C31\u4F1A\u6D88\u8017900mhz\u673A\u5668\u7684\u5168\u90E8CPU\u80FD\u529B\u3002
-get_xml_message3=\u5954\u817E3.\u5728\u5954\u817E4 2.4ghz\u5904\u7406\u5668\u4E0A\uFF0C50\u7EBF\u7A0B\u6700\u9AD8\u4E0A\u9650\u3002\u4F60\u7684
-get_xml_message4=\u589E\u52A0\u5BA2\u6237\u7AEF\u6570\u91CF\u65B9\u6CD5\u662F\u589E\u52A0
-get_xml_message5=\u673A\u5668\u6216\u4F7F\u7528\u591A\u5904\u7406\u5668\u7CFB\u7EDF\u3002
 graph_choose_graphs=\u8981\u663E\u793A\u7684\u56FE\u5F62
 graph_full_results_title=\u56FE\u5F62\u7ED3\u679C
 graph_results_average=\u5E73\u5747

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties Wed Nov  3 22:55:56 2010
@@ -197,11 +197,6 @@ generator_illegal_msg=\u7121\u6CD5\u5B58
 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
-get_xml_message=\u5099\u8A3B\uFF1A\u7531\u65BC\u5256\u6790 XML \u76F8\u7576\u8017\u8CBB CPU \u8CC7\u6E90\uFF0C\u56E0\u6B64\uFF0C\u4E0D\u8981\u5C07\u57F7\u884C\u7DD2\u7684\u6578\u76EE
-get_xml_message2=\u8A2D\u5B9A\u592A\u591A\uFF0C\u4E00\u822C\u800C\u8A00\uFF0CPentium 900 MHz \u7684 CPU \u8655\u740610\u500B\u57F7\u884C\u7DD2\u6642\u5C31\u6703\u8DD1\u5230 100%
-get_xml_message3=Pentium 4 2.4 GHz CPU \u7684\u8A71\uFF0C50\u500B\u57F7\u884C\u7DD2\u5C31\u662F\u4E0A\u9650
-get_xml_message4=\u82E5\u5BE6\u5728\u9700\u8981\u589E\u52A0\u66F4\u591A\u7684\u57F7\u884C\u7DD2\u7684\u8A71\uFF0C\u4E00\u500B\u65B9\u5F0F\u662F\u589E\u52A0\u57F7\u884C\u96FB\u8166\u7684\u6578\u91CF\uFF1B
-get_xml_message5=\u53E6\u4E00\u500B\u65B9\u5F0F\u662F\u4F7F\u7528\u591ACPU\u7684\u7CFB\u7D71
 graph_choose_graphs=\u8981\u986F\u793A\u7684\u5716\u5F62
 graph_full_results_title=\u5B8C\u6574\u7D50\u679C\u5716\u5F62
 graph_results_average=\u5E73\u5747

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java Wed Nov  3 22:55:56 2010
@@ -20,7 +20,6 @@ package org.apache.jmeter.protocol.http.
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.event.ActionEvent;
 
 import javax.swing.JButton;
@@ -86,26 +85,6 @@ public class WebServiceSamplerGui extend
     private final JLabeledTextField connectTimeout = new JLabeledTextField(JMeterUtils.getResString("webservice_timeout")); // $NON-NLS-1$
 
     /**
-     * We create several JLabel objects to display usage instructions in the
-     * GUI. The reason there are multiple labels is to make sure it displays
-     * correctly.
-     */
-    private JLabel wsdlMessage = new JLabel(JMeterUtils.getResString("get_xml_message")); // $NON-NLS-1$
-
-    private JLabel wsdlMessage2 = new JLabel(JMeterUtils.getResString("get_xml_message2")); // $NON-NLS-1$
-
-    private JLabel wsdlMessage3 = new JLabel(JMeterUtils.getResString("get_xml_message3")); // $NON-NLS-1$
-
-    private JLabel wsdlMessage4 = new JLabel(JMeterUtils.getResString("get_xml_message4")); // $NON-NLS-1$
-
-    private JLabel wsdlMessage5 = new JLabel(JMeterUtils.getResString("get_xml_message5")); // $NON-NLS-1$
-
-    /**
-     * This is the font for the note.
-     */
-    private Font plainText = new Font("plain", Font.PLAIN, 10); // $NON-NLS-1$
-
-    /**
      * checkbox for memory cache.
      */
     private JCheckBox memCache = new JCheckBox(JMeterUtils.getResString("memory_cache"), true); // $NON-NLS-1$
@@ -133,21 +112,20 @@ public class WebServiceSamplerGui extend
     /**
      * Text note about read response and its usage.
      */
-    private JLabel readMessage = new JLabel(JMeterUtils.getResString("read_response_note")); // $NON-NLS-1$
-
-    private JLabel readMessage2 = new JLabel(JMeterUtils.getResString("read_response_note2")); // $NON-NLS-1$
-
-    private JLabel readMessage3 = new JLabel(JMeterUtils.getResString("read_response_note3")); // $NON-NLS-1$
+    private String readToolTip = JMeterUtils.getResString("read_response_note") // $NON-NLS-1$
+                                  + " " // $NON-NLS-1$
+                                  + JMeterUtils.getResString("read_response_note2") // $NON-NLS-1$
+                                  + " " // $NON-NLS-1$
+                                  + JMeterUtils.getResString("read_response_note3"); // $NON-NLS-1$
 
     /**
      * Text note for proxy
      */
-    private JLabel proxyMessage = new JLabel(JMeterUtils.getResString("webservice_proxy_note")); // $NON-NLS-1$
-
-    private JLabel proxyMessage2 = new JLabel(JMeterUtils.getResString("webservice_proxy_note2")); // $NON-NLS-1$
-
-    private JLabel proxyMessage3 = new JLabel(JMeterUtils.getResString("webservice_proxy_note3")); // $NON-NLS-1$
-
+    private String proxyToolTip = JMeterUtils.getResString("webservice_proxy_note") // $NON-NLS-1$
+                                  + " " // $NON-NLS-1$
+                                  + JMeterUtils.getResString("webservice_proxy_note2") // $NON-NLS-1$
+                                  + " " // $NON-NLS-1$
+                                  + JMeterUtils.getResString("webservice_proxy_note3"); // $NON-NLS-1$
     public WebServiceSamplerGui() {
         init();
     }
@@ -225,15 +203,6 @@ public class WebServiceSamplerGui extend
         setBorder(makeBorder());
         add(makeTitlePanel(), BorderLayout.NORTH);
 
-        wsdlMessage.setFont(plainText);
-        wsdlMessage2.setFont(plainText);
-        wsdlMessage3.setFont(plainText);
-        wsdlMessage4.setFont(plainText);
-        wsdlMessage5.setFont(plainText);
-        readMessage.setFont(plainText);
-        readMessage2.setFont(plainText);
-        readMessage3.setFont(plainText);
-
         // MAIN PANEL
         JPanel mainPanel = new JPanel();
         Border margin = new EmptyBorder(10, 10, 5, 10);
@@ -270,30 +239,17 @@ public class WebServiceSamplerGui extend
         soapXml.setPreferredSize(pref);
         mainPanel.add(soapXml);
         mainPanel.add(soapXmlFile);
-        mainPanel.add(wsdlMessage);
-        mainPanel.add(wsdlMessage2);
-        mainPanel.add(wsdlMessage3);
-        mainPanel.add(wsdlMessage4);
-        mainPanel.add(wsdlMessage5);
         mainPanel.add(randomXmlFile);
         mainPanel.add(memCache);
         mainPanel.add(readResponse);
-        mainPanel.add(readMessage);
-        mainPanel.add(readMessage2);
-        mainPanel.add(readMessage3);
+        readResponse.setToolTipText(readToolTip);
 
         // add the proxy elements
         mainPanel.add(useProxy);
         useProxy.addActionListener(this);
+        useProxy.setToolTipText(proxyToolTip);
         mainPanel.add(proxyHost);
         mainPanel.add(proxyPort);
-        // add the proxy notes
-        proxyMessage.setFont(plainText);
-        proxyMessage2.setFont(plainText);
-        proxyMessage3.setFont(plainText);
-        mainPanel.add(proxyMessage);
-        mainPanel.add(proxyMessage2);
-        mainPanel.add(proxyMessage3);
 
         this.add(mainPanel);
     }

Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/webservice_sampler.png
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/webservice_sampler.png?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1030749&r1=1030748&r2=1030749&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Wed Nov  3 22:55:56 2010
@@ -508,7 +508,7 @@ Or set Content-Length to -1 to force chu
 
 </component>
 
-<component name="WebService(SOAP) Request" index="&sect-num;.1.6"  width="536" height="934" screenshot="webservice_sampler.png">
+<component name="WebService(SOAP) Request" index="&sect-num;.1.6"  width="460" height="781" screenshot="webservice_sampler.png">
 <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



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org