jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1532069 - 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
Date Mon, 14 Oct 2013 20:28:02 GMT
Author: pmouawad
Date: Mon Oct 14 20:28:01 2013
New Revision: 1532069

URL: http://svn.apache.org/r1532069
Log:
Bug 55507 - Proxy SSL recording does not handle external embedded resources well
Add more information for user
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=1532069&r1=1532068&r2=1532069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Mon Oct 14 20:28:01
2013
@@ -728,6 +728,7 @@ proxy_daemon_error_not_retrieve=Could no
 proxy_daemon_error_read_args=Could not add read arguments from clipboard\:
 proxy_daemon_msg_check_details=Please check the details below when installing the certificate
in the browser
 proxy_daemon_msg_created_in_bin=created in JMeter bin directory
+proxy_daemon_msg_install_as_in_doc=You can install it following instructions in Component
Reference documentation (see Installing the JMeter CA certificate for HTTPS recording paragraph)
 proxy_daemon_msg_rootca_cert=Root CA certificate\:
 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. 

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=1532069&r1=1532068&r2=1532069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Mon Oct 14 20:28:01
2013
@@ -721,6 +721,7 @@ proxy_daemon_error_not_retrieve=Impossib
 proxy_daemon_error_read_args=Impossible de lire les arguments depuis le presse-papiers \:
 proxy_daemon_msg_check_details=Svp, v\u00E9rifier les d\u00E9tails ci-dessous lors de l'installation
du certificat dans le navigateur
 proxy_daemon_msg_created_in_bin=cr\u00E9\u00E9 dans le r\u00E9pertoire bin de JMeter
+proxy_daemon_msg_install_as_in_doc=Vous pouvez l'installer en suivant les instructions de
la documentation Component Reference (voir Installing the JMeter CA certificate for HTTPS
recording paragraph)
 proxy_daemon_msg_rootca_cert=Certificat AC ra\u00E7ine \:
 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. 

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=1532069&r1=1532068&r2=1532069&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
Mon Oct 14 20:28:01 2013
@@ -489,7 +489,11 @@ public class ProxyControlGui extends Log
             if (ProxyControl.isDynamicMode()) {
                 String details[] = model.getCertificateDetails();
                 StringBuilder sb = new StringBuilder();
-                sb.append(JMeterUtils.getResString("proxy_daemon_msg_check_details")) //
$NON-NLS-1$
+                sb.append(JMeterUtils.getResString("proxy_daemon_msg_rootca_cert"))  // $NON-NLS-1$
+                        .append(SPACE).append(KeyToolUtils.ROOT_CACERT_CRT_PFX)
+                        .append(SPACE).append(JMeterUtils.getResString("proxy_daemon_msg_created_in_bin"));
+                sb.append(NEW_LINE).append(JMeterUtils.getResString("proxy_daemon_msg_install_as_in_doc"));
// $NON-NLS-1$
+                sb.append(NEW_LINE).append(JMeterUtils.getResString("proxy_daemon_msg_check_details"))
// $NON-NLS-1$
                     .append(NEW_LINE).append(NEW_LINE);
                 for(String detail : details) {
                     sb.append(detail).append(NEW_LINE);



Mime
View raw message