jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1825824 - in /jmeter/trunk/src/core/org/apache/jmeter: gui/action/SSLManagerCommand.java resources/messages.properties resources/messages_es.properties resources/messages_fr.properties resources/messages_tr.properties
Date Sun, 04 Mar 2018 16:40:17 GMT
Author: pmouawad
Date: Sun Mar  4 16:40:17 2018
New Revision: 1825824

URL: http://svn.apache.org/viewvc?rev=1825824&view=rev
Log:
SSLManager works with jks and p12 files so make it explicit

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.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_tr.properties

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java?rev=1825824&r1=1825823&r2=1825824&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java Sun Mar  4 16:40:17
2018
@@ -82,13 +82,13 @@ public class SSLManagerCommand extends A
 
     /**
      * Called by sslManager button. Raises sslManager dialog.
-     * I.e. a FileChooser for PCSI12 (.p12|.P12) files.
+     * I.e. a FileChooser for PCSI12 (.p12|.P12) or JKS files.
      */
     private void sslManager() {
         SSLManager.reset();
 
         JFileChooser keyStoreChooser = new JFileChooser(System.getProperty("user.dir"));
//$NON-NLS-1$
-        keyStoreChooser.addChoosableFileFilter(new AcceptPKCS12FileFilter());
+        keyStoreChooser.addChoosableFileFilter(new AcceptPKCS12OrJKSFileFilter());
         keyStoreChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         int retVal = keyStoreChooser.showOpenDialog(GuiPackage.getInstance().getMainFrame());
 
@@ -107,7 +107,7 @@ public class SSLManagerCommand extends A
     /**
      * Internal class to add a PKCS12 file format filter for JFileChooser.
      */
-    static private class AcceptPKCS12FileFilter extends FileFilter {
+    private static class AcceptPKCS12OrJKSFileFilter extends FileFilter {
         /**
          * Get the description that shows up in JFileChooser filter menu.
          *
@@ -115,7 +115,7 @@ public class SSLManagerCommand extends A
          */
         @Override
         public String getDescription() {
-            return JMeterUtils.getResString("pkcs12_desc"); //$NON-NLS-1$
+            return JMeterUtils.getResString("keystore_desc"); //$NON-NLS-1$
         }
 
         /**
@@ -127,9 +127,10 @@ public class SSLManagerCommand extends A
          */
         @Override
         public boolean accept(File testFile) {
+            String lowerCaseName = testFile.getName().toLowerCase();
             return testFile.isDirectory()
-            || testFile.getName().endsWith(".p12")  //$NON-NLS-1$
-            || testFile.getName().endsWith(".P12"); //$NON-NLS-1$
+            || lowerCaseName.endsWith(".p12")  //$NON-NLS-1$
+            || lowerCaseName.endsWith(".jks");
         }
     }
 }

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=1825824&r1=1825823&r2=1825824&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Mar  4 16:40:17
2018
@@ -759,7 +759,7 @@ path_extension_dont_use_equals=Do not us
 path_extension_dont_use_questionmark=Do not use questionmark in path extension (Intershop
Enfinity compatibility)
 patterns_to_exclude=URL Patterns to Exclude
 patterns_to_include=URL Patterns to Include
-pkcs12_desc=PKCS 12 Key (*.p12)
+keystore_desc=Keystore Files (*.p12, *.jks)
 pl=Polish
 poisson_timer_delay=Constant Delay Offset (in milliseconds)\:
 poisson_timer_memo=Adds a random delay with a Poisson distribution

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=1825824&r1=1825823&r2=1825824&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 Mar  4 16:40:17
2018
@@ -510,7 +510,7 @@ path_extension_dont_use_equals=No utilic
 path_extension_dont_use_questionmark=No utilice el signo interrogaci\u00F3n en la extensi\u00F3n
del path (compatibilidad con Intershop Enfinity)
 patterns_to_exclude=URL Patrones a Excluir
 patterns_to_include=URL Patrones a Incluir
-pkcs12_desc=Clave PKCS (*.p12)
+keystore_desc=Archivos de almac\u00e9n de claves (*.p12, *.jks)
 pl=Polaco
 port=Puerto\:
 post_thread_group_title=Tirar abajo grupo de Hilos

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=1825824&r1=1825823&r2=1825824&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 Mar  4 16:40:17
2018
@@ -748,7 +748,7 @@ path_extension_dont_use_equals=Ne pas ut
 path_extension_dont_use_questionmark=Ne pas utiliser le point d'interrogation dans l'extension
du chemin (Compatiblit\u00E9 Intershop Enfinity)
 patterns_to_exclude=URL \: motifs \u00E0 exclure
 patterns_to_include=URL \: motifs \u00E0 inclure
-pkcs12_desc=Clef PKCS 12 (*.p12)
+keystore_desc=Fichiers keystore (*.p12, *.jks)
 pl=Polonais
 poisson_timer_delay=D\u00E9lai de d\u00E9calage bas\u00E9 sur la loi de Poisson (en millisecondes)
\:
 poisson_timer_memo=Ajoute un d\u00E9lai al\u00E9atoire avec une distribution de type Poisson

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=1825824&r1=1825823&r2=1825824&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 Mar  4 16:40:17
2018
@@ -460,7 +460,7 @@ path_extension_dont_use_equals=Yol uzatm
 path_extension_dont_use_questionmark=Yol uzatmas\u0131nda soru i\u015Fareti kullanmay\u0131n
(Intershop Enfinity uyumlulu\u011Fu)
 patterns_to_exclude=Hari\u00E7 Tutulacak URL Desenleri
 patterns_to_include=Dahil Edilecek URL Desenleri
-pkcs12_desc=PKCS 12 Anahtar (*.p12)
+keystore_desc=Anahtar deposu dosyalar\u0131 (*.p12, *.jks)
 property_default_param=\u00D6ntan\u0131ml\u0131 de\u011Fer
 property_edit=D\u00FCzenle
 property_editor.value_is_invalid_message=Girdi\u011Finiz metin bu \u00F6zellik i\u00E7in
ge\u00E7erli de\u011Fil.\n\u00D6zellik \u00F6nceki de\u011Ferine geri d\u00F6nd\u00FCr\u00FClecek.



Mime
View raw message