You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2013/09/11 20:14:15 UTC
svn commit: r1521970 - in /jmeter/trunk/src:
core/org/apache/jmeter/resources/messages.properties
core/org/apache/jmeter/resources/messages_fr.properties
protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Author: milamber
Date: Wed Sep 11 18:14:15 2013
New Revision: 1521970
URL: http://svn.apache.org/r1521970
Log:
Proxy SSL recording does not handle external embedded resources well
Add text tool tip on HTTPS Domains field to indicate the Java 7 runtime requirement to use this behavior
and some help text on the usage and comma separator when the field is enabled.
Bugzilla Id: 55507
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
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=1521970&r1=1521969&r2=1521970&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Sep 11 18:14:15 2013
@@ -724,6 +724,8 @@ proxy_content_type_include=Include\:
proxy_daemon_bind_error=Could not create proxy - port in use. Choose another port.
proxy_daemon_error=Could not create proxy - see log for details
proxy_domains=HTTPS Domains \:
+proxy_domains_dynamic_mode_tooltip=List of domain names for HTTPS url, ex. jmeter.apache.org or wildcard domain like *.apache.org. Use comma as separator.
+proxy_domains_dynamic_mode_tooltip_java6=To activate this field, use a Java 7+ runtime environment
proxy_general_settings=Global Settings
proxy_headers=Capture HTTP Headers
proxy_regex=Regex matching
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=1521970&r1=1521969&r2=1521970&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 Wed Sep 11 18:14:15 2013
@@ -717,6 +717,8 @@ proxy_content_type_include=Inclure \:
proxy_daemon_bind_error=Impossible de lancer le serveur proxy, le port est d\u00E9j\u00E0 utilis\u00E9. Choisissez un autre port.
proxy_daemon_error=Impossible de lancer le serveur proxy, voir le journal pour plus de d\u00E9tails
proxy_domains=Domaines HTTPS \:
+proxy_domains_dynamic_mode_tooltip=Liste de noms de domaine pour les url HTTPS, ex. jmeter.apache.org ou les domaines wildcard comme *.apache.org. Utiliser la virgule comme s\u00E9parateur.
+proxy_domains_dynamic_mode_tooltip_java6=Pour activer ce champ, utiliser un environnement d'ex\u00E9cution Java 7+
proxy_general_settings=Param\u00E8tres g\u00E9n\u00E9raux
proxy_headers=Capturer les ent\u00EAtes HTTP
proxy_regex=Correspondance des variables par regex ?
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1521970&r1=1521969&r2=1521970&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Wed Sep 11 18:14:15 2013
@@ -610,6 +610,11 @@ public class ProxyControlGui extends Log
sslDomains = new JLabeledTextField(JMeterUtils.getResString("proxy_domains")); // $NON-NLS-1$
sslDomains.setEnabled(ProxyControl.isDynamicMode());
+ if (ProxyControl.isDynamicMode()) {
+ sslDomains.setToolTipText(JMeterUtils.getResString("proxy_domains_dynamic_mode_tooltip"));
+ } else {
+ sslDomains.setToolTipText(JMeterUtils.getResString("proxy_domains_dynamic_mode_tooltip_java6"));
+ }
gPane.add(sslDomains, BorderLayout.CENTER);
return gPane;
}
Re: svn commit: r1521970 - in /jmeter/trunk/src: core/org/apache/jmeter/resources/messages.properties
core/org/apache/jmeter/resources/messages_fr.properties protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Posted by sebb <se...@gmail.com>.
Good idea
On 11 September 2013 19:14, <mi...@apache.org> wrote:
> Author: milamber
> Date: Wed Sep 11 18:14:15 2013
> New Revision: 1521970
>
> URL: http://svn.apache.org/r1521970
> Log:
> Proxy SSL recording does not handle external embedded resources well
> Add text tool tip on HTTPS Domains field to indicate the Java 7 runtime requirement to use this behavior
> and some help text on the usage and comma separator when the field is enabled.
> Bugzilla Id: 55507
>
> Modified:
> jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
> jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
>
> 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=1521970&r1=1521969&r2=1521970&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed Sep 11 18:14:15 2013
> @@ -724,6 +724,8 @@ proxy_content_type_include=Include\:
> proxy_daemon_bind_error=Could not create proxy - port in use. Choose another port.
> proxy_daemon_error=Could not create proxy - see log for details
> proxy_domains=HTTPS Domains \:
> +proxy_domains_dynamic_mode_tooltip=List of domain names for HTTPS url, ex. jmeter.apache.org or wildcard domain like *.apache.org. Use comma as separator.
> +proxy_domains_dynamic_mode_tooltip_java6=To activate this field, use a Java 7+ runtime environment
> proxy_general_settings=Global Settings
> proxy_headers=Capture HTTP Headers
> proxy_regex=Regex matching
>
> 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=1521970&r1=1521969&r2=1521970&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 Wed Sep 11 18:14:15 2013
> @@ -717,6 +717,8 @@ proxy_content_type_include=Inclure \:
> proxy_daemon_bind_error=Impossible de lancer le serveur proxy, le port est d\u00E9j\u00E0 utilis\u00E9. Choisissez un autre port.
> proxy_daemon_error=Impossible de lancer le serveur proxy, voir le journal pour plus de d\u00E9tails
> proxy_domains=Domaines HTTPS \:
> +proxy_domains_dynamic_mode_tooltip=Liste de noms de domaine pour les url HTTPS, ex. jmeter.apache.org ou les domaines wildcard comme *.apache.org. Utiliser la virgule comme s\u00E9parateur.
> +proxy_domains_dynamic_mode_tooltip_java6=Pour activer ce champ, utiliser un environnement d'ex\u00E9cution Java 7+
> proxy_general_settings=Param\u00E8tres g\u00E9n\u00E9raux
> proxy_headers=Capturer les ent\u00EAtes HTTP
> proxy_regex=Correspondance des variables par regex ?
>
> Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1521970&r1=1521969&r2=1521970&view=diff
> ==============================================================================
> --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
> +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Wed Sep 11 18:14:15 2013
> @@ -610,6 +610,11 @@ public class ProxyControlGui extends Log
>
> sslDomains = new JLabeledTextField(JMeterUtils.getResString("proxy_domains")); // $NON-NLS-1$
> sslDomains.setEnabled(ProxyControl.isDynamicMode());
> + if (ProxyControl.isDynamicMode()) {
> + sslDomains.setToolTipText(JMeterUtils.getResString("proxy_domains_dynamic_mode_tooltip"));
> + } else {
> + sslDomains.setToolTipText(JMeterUtils.getResString("proxy_domains_dynamic_mode_tooltip_java6"));
> + }
> gPane.add(sslDomains, BorderLayout.CENTER);
> return gPane;
> }
>
>