jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1544701 - /jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
Date Fri, 22 Nov 2013 22:28:01 GMT
Author: sebb
Date: Fri Nov 22 22:28:01 2013
New Revision: 1544701

URL: http://svn.apache.org/r1544701
Log:
Extract keytool constant

Modified:
    jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java?rev=1544701&r1=1544700&r2=1544701&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Fri Nov 22 22:28:01
2013
@@ -48,6 +48,9 @@ public class KeyToolUtils {
 
     private static final String DNAME_ROOT_CA_KEY;
 
+    private static final String KEYTOOL = "keytool";
+
+    /** Name of property that can be used to override the default keytool location */
     private static final String KEYTOOL_DIRECTORY = "keytool.directory"; // $NON-NLS-1$
 
     /**
@@ -77,17 +80,17 @@ public class KeyToolUtils {
 
         String keytoolPath; // work field
         if (keytoolDir != null) {
-        	keytoolPath = new File(new File(keytoolDir),"keytool").getPath(); // $NON-NLS-1$
-			if (!checkKeytool(keytoolPath)) { // $NON-NLS-1$
+        	keytoolPath = new File(new File(keytoolDir),KEYTOOL).getPath();
+        if (!checkKeytool(keytoolPath)) {
         		log.error("Cannot find keytool using property " + KEYTOOL_DIRECTORY + "="+keytoolDir);
         		keytoolPath = null; // don't try anything else if the property is provided
         	}
         } else {
-        	keytoolPath = "keytool"; // $NON-NLS-1$
+        	keytoolPath = KEYTOOL;
         	if (!checkKeytool(keytoolPath)) { // Not found on PATH, check Java Home
         		File javaHome = SystemUtils.getJavaHome();
         		if (javaHome != null) {
-        			keytoolPath = new File(new File(javaHome,"bin"),"keytool").getPath(); // $NON-NLS-1$
$NON-NLS-2$
+        			keytoolPath = new File(new File(javaHome,"bin"),KEYTOOL).getPath(); // $NON-NLS-1$
 					if (!checkKeytool(keytoolPath)) {
             			keytoolPath = null;
             		}



Mime
View raw message