View | Details | Raw Unified | Return to bug 62574
Collapse All | Expand All

(-)src/core/org/apache/jmeter/resources/messages.properties (-1 / +1 lines)
Lines 803-809 Link Here
803
proxy_daemon_error_read_args=Could not add read arguments from clipboard\:
803
proxy_daemon_error_read_args=Could not add read arguments from clipboard\:
804
proxy_daemon_msg_check_details=Please check the details below when installing the certificate in the browser
804
proxy_daemon_msg_check_details=Please check the details below when installing the certificate in the browser
805
proxy_daemon_msg_created_in_bin=created in JMeter bin directory
805
proxy_daemon_msg_created_in_bin=created in JMeter bin directory
806
proxy_daemon_msg_check_expiration=Certificate has a duration validity of {0} days, <br>if the created one (see below) is newer than the last one you installed, <br>ensure you remove the old one and install the new one.
806
proxy_daemon_msg_check_expiration=<p>Certificate has a duration validity of {0} days, <br>if the created one (see below) is newer than the last one you installed, <br>ensure you remove the old one and install the new one.</p><p>The duration can be configured by setting the property <tt>proxy.cert.validity</tt>.</p>
807
proxy_daemon_msg_install_as_in_doc=You can install it following instructions in <i>Component Reference</i> documentation <br>See <i>Installing the JMeter CA certificate for HTTPS recording</i> paragraph.
807
proxy_daemon_msg_install_as_in_doc=You can install it following instructions in <i>Component Reference</i> documentation <br>See <i>Installing the JMeter CA certificate for HTTPS recording</i> paragraph.
808
proxy_daemon_msg_rootca_cert=Root CA certificate
808
proxy_daemon_msg_rootca_cert=Root CA certificate
809
proxy_domains=HTTPS Domains\:
809
proxy_domains=HTTPS Domains\:
(-)src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (-3 / +5 lines)
Lines 614-620 Link Here
614
614
615
                // Make dialog disappear after 7 seconds
615
                // Make dialog disappear after 7 seconds
616
                JLabel messageLabel = new JLabel(sb.toString());
616
                JLabel messageLabel = new JLabel(sb.toString());
617
                Timer timer = new Timer(7000, evt -> {
617
                Timer timer = new Timer(60000, evt -> {
618
                    Window window = SwingUtilities.getWindowAncestor(messageLabel);
618
                    Window window = SwingUtilities.getWindowAncestor(messageLabel);
619
                    // Window may be closed by user
619
                    // Window may be closed by user
620
                    if(window != null) {
620
                    if(window != null) {
Lines 623-634 Link Here
623
                });
623
                });
624
                timer.setRepeats(false);
624
                timer.setRepeats(false);
625
                timer.start();
625
                timer.start();
626
                JOptionPane.showMessageDialog(this,
626
                Object[] options = {"Understood"};
627
                JOptionPane.showOptionDialog(this,
627
                        messageLabel,
628
                        messageLabel,
628
                    JMeterUtils.getResString("proxy_daemon_msg_rootca_cert") + SPACE // $NON-NLS-1$
629
                    JMeterUtils.getResString("proxy_daemon_msg_rootca_cert") + SPACE // $NON-NLS-1$
629
                    + KeyToolUtils.ROOT_CACERT_CRT_PFX + SPACE
630
                    + KeyToolUtils.ROOT_CACERT_CRT_PFX + SPACE
630
                    + JMeterUtils.getResString("proxy_daemon_msg_created_in_bin"), // $NON-NLS-1$
631
                    + JMeterUtils.getResString("proxy_daemon_msg_created_in_bin"), // $NON-NLS-1$
631
                    JOptionPane.INFORMATION_MESSAGE);
632
                    JOptionPane.INFORMATION_MESSAGE,
633
                    JOptionPane.DEFAULT_OPTION, null, options, options[0]);
632
            }
634
            }
633
            return true;
635
            return true;
634
        } catch (InvalidVariableException e) {
636
        } catch (InvalidVariableException e) {

Return to bug 62574