Merge pull request #81 from CyberSource/future

includes changes to java keystore

Author: gauravmokhasi

README.md

@@ -174,12 +174,22 @@
     </profiles>
 
     <dependencies>
-        <dependency>
+      <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+       <dependency>
+              <groupId>xalan</groupId>
+             <artifactId>xalan</artifactId>
+             <version>2.7.2</version>
+        </dependency>
+        <dependency>
+    		<groupId>org.apache.santuario</groupId>
+    		<artifactId>xmlsec</artifactId>
+    		<version>1.4.3</version>
+		</dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>

java/pom.xml

@@ -26,13 +26,20 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import javax.security.cert.X509Certificate;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.StringReader;
+import java.security.KeyStore;
+import java.security.cert.PKIXParameters;
+import java.security.cert.TrustAnchor;
 import java.text.MessageFormat;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
@@ -191,8 +198,9 @@ private static Document soapWrapAndSign(
         logger.log(Logger.LT_INFO, "Client, End of soapWrap   ",true); 
 
         Document resultDocument = null;
+        
         SecurityUtil.loadMerchantP12File(mc,logger);
-        logger.log(Logger.LT_INFO, "Client, End of loadMerchantP12File   ", true);       
+        logger.log(Logger.LT_INFO, "Client, End of loading Merchant Certificates ", true);       
 
         // sign Document object
         resultDocument = SecurityUtil.createSignedDoc(wrappedDoc, mc.getMerchantID(), mc.getKeyPassword(), logger);