Merge pull request #78 from adkumar3/future

Future

Author: shamirwasia

README.md

@@ -60,7 +60,7 @@ You do not need to download and build the source to use the SDK but if you want
     - `serverURL` config parameter will take precedence over `sendToProduction` and `sendToAkamai` config parameters. By default the `serverURL` configuration is commented out.
     - if `enablejdkcert` parameter is set to true, certificates will be read from the JKS file specified at keysDirectory location. The JKS file should be of the same name as specified in keyFilename.
       - To know how to convert p12 to JKS refer the JKS creation section of this document.
-    - `cacerts` property is considered only if `enablejdkcert` is set to true. If `cacerts` is set to true, certificates will be read from the cacerts folder under the JDK.
+    - `enableCacerts` property is considered only if `enablejdkcert` is set to true. If `enableCacerts` is set to true, certificates will be read from the cacerts folder under the JDK.
     - `allowRetry` config parameter will only work for HttpClient. Set `allowRetry` config parameter to "true" to enable retry mechanism and set merchant specific values for the retry.
     - Set integer values for config parameter `numberOfRetries` *and* `retryInterval`. Retry Interval is time delay for next retry in seconds.
       - Number of retry parameter should be set between 1 to 5. Any other value will throw an Error Message.

java/src/main/java/com/cybersource/ws/client/SecurityUtil.java

@@ -265,7 +265,7 @@ public static void readJdkCert(MerchantConfig merchantConfig, Logger logger) thr
         String pass=merchantConfig.getKeyPassword();
 
         if (merchantConfig.isCacertEnabled()){
-            path = System.getProperty("java.home") + "jre/lib/security/cacerts".replace('/', File.separatorChar);
+            path = System.getProperty("java.home") + "/lib/security/cacerts".replace('/', File.separatorChar);
             loadJavaKeystore(path, merchantConfig,logger);
 
         }

samples/nvp/cybs.properties

@@ -34,7 +34,7 @@ enableJdkCert=false
 
 # if Cacert property is enabled then it means the certificates are kept under the cacert folder of JDK
 # And it will read from JDK cert. This property will be considered only if enableJDKcert is set to true.
-cacert=false
+enableCacert=false
 # Enter the password for cacert file. Default password for JDK cacert is changeit
 cacertPassword=
 # Mechanism to differentiate whether Payload is encrypted or not

samples/xml/cybs.properties

@@ -34,7 +34,7 @@ enableJdkCert=false
 
 # if Cacert property is enabled then it means the certificates are kept under the cacert folder of JDK
 # And it will read from JDK cert. This property will be considered only if enableJDKcert is set to true.
-cacert=false
+enableCacert=false
 # Enter the password for cacert file. Default password for JDK cacert is changeit
 cacertPassword=
 # Mechanism to differentiate whether Payload is encrypted or not