changes

Author: adkumar3

README.md

@@ -86,20 +86,19 @@ You do not need to download and build the source to use the SDK but if you want
        
     h. "serverURL" config parameter will take precedence over sendToProduction and sendToAkamai config parameters. By default the "serverURL" configuration is commented out. 
 
-<<<<<<< HEAD
     i. "enablejdkcert" parameter if set to true then it will read the JKS file specified at keysDirectory location. The file should be of the same name as specified in keyFilename.
 
     j. cacerts this property will be considered only if "enablejdkcert" is set to true. If it is set to true then it means the JKS file is under cacerts folder of the JDK and 
        it will read the JKS file from cacerts. 
         
     k. Please refer to the accompanying documentation for the other optional properties that you may wish to specify.
-=======
+
     i. 	"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 & 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. Refer to the "Retry Pattern" section below.
         
     j. Please refer to the accompanying documentation for the other optional properties that you may wish to specify.
->>>>>>> upstream/master
+
 
 
 4. Build this project using Maven.

java/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+    
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.sonatype.oss</groupId>
@@ -9,7 +9,7 @@
     </parent>
     <groupId>com.cybersource</groupId>
     <artifactId>cybersource-sdk-java</artifactId>
-    <version>6.2.3-SNAPSHOT</version>
+    <version>6.2.5-SNAPSHOT</version>
     <name>cybersource-sdk-java</name>
     <description>Simple Order API Client</description>
     <url>http://www.cybersource.com</url>
@@ -33,13 +33,13 @@
             <email>[email protected]</email>
         </developer>
     </developers>
-
+    
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
     <packaging>jar</packaging>
-
+    
     <profiles>
         <profile>
             <id>release-artifacts</id>
@@ -172,7 +172,7 @@
             </build>
         </profile>
     </profiles>
-
+    
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -185,11 +185,11 @@
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
             <exclusions>
-	          <exclusion>
-	            <groupId>commons-logging</groupId>
-	            <artifactId>commons-logging</artifactId>
-	          </exclusion>
-        	</exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -200,14 +200,14 @@
             <groupId>org.apache.ws.security</groupId>
             <artifactId>wss4j</artifactId>
             <version>1.6.19</version>
-        </dependency>     
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.4</version>
         </dependency>
         <dependency>
-      	    <groupId>org.mockito</groupId>
+            <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
             <version>1.10.19</version>
             <scope>test</scope>

java/src/main/resources/cybs.properties

@@ -26,7 +26,7 @@ allowRetry=true
 numberOfRetries=5
 retryInterval=5
 
-<<<<<<< HEAD
+
 # If This property is set to true then the p12 certificate must be stored in JKS format
 # program will read it from there. If it is set to false then the certificate will be read from 
 # the location specified above from the key directory location
@@ -38,10 +38,10 @@ cacert=false
 cacertpassword=changeit
 # Mechanism to differentiate whether Payload is encrypted or not
 #useSignAndEncrypted=<-- Set it to true for MLE[MessageLevelEncryption] -->
-=======
+
 # Mechanism to differentiate whether Payload is encrypted or not
 useSignAndEncrypted=<-- Set it to true for MLE[MessageLevelEncryption] -->
->>>>>>> upstream/master
+
 
 timeout=1000
 

pom.xml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
-
+    
     <name>cybersource-sdk-java-master</name>
-
+    
     <modules>
         <module>zip</module>
         <module>java</module>
     </modules>
-
+    
     <packaging>pom</packaging>
-
+    
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
         <version>7</version>
     </parent>
-
+    
     <groupId>com.cybersource</groupId>
     <artifactId>cybersource-sdk-master</artifactId>
-    <version>6.2.4</version>
-
-
+    <version>6.2.5</version>
+    
+    
 </project>

samples/nvp/compileSample.sh

@@ -8,7 +8,7 @@ LOCAL_CP=
 # -----------------------------------------------------------------------------
 
 if test -d ../../lib
-then LOCAL_CP=$LOCAL_CP:../../lib/cybersource-sdk-java-6.2.4.jar
+then LOCAL_CP=$LOCAL_CP:../../lib/cybersource-sdk-java-6.2.5-SNAPSHOT.jar
 fi
 
 if test ! -d ../../lib

samples/nvp/cybs.properties

@@ -1,17 +1,18 @@
-merchantID=
-keysDirectory=
-keyAlias=
-keyPassword=
-targetAPIVersion=1.129
-
+merchantID=< ---merchant_id ---->
+keysDirectory=<--- P12 key directory location -->
+keyAlias=<--- key alias name for P12 key --->
+keyPassword=<--- P12 key password --->
+targetAPIVersion=<-- API Version Number -->
+# KeyFilename is the name of the JKS file
+keyFilename=<--JKS_file_name -->
 # the following flags can be used to control the endpoint to which requests will be sent. 
 # Set sendToProduction=true to send requests to Cybersource production environment.
 # Set sendToAkamai=true to send requests through Akamai to Cybersource.
 # If serverURL is provided then it takes precedence over the above settings. By default
-# the serverURL config is commented out. 
-sendToProduction=false
-sendToAkamai=true
-#serverURL=https://ics2wstesta.ic3.com/commerce/1.x/transactionProcessor
+# the serverURL config is commented out.
+sendToProduction=<-- Set it to true for Production -->
+sendToAkamai=<-- Set it to true for Akamai -->
+#serverURL=< -- Service URL or Transaction Processor URL -->
 
 #useHttpClient=false
 
@@ -25,15 +26,29 @@ allowRetry=true
 numberOfRetries=5
 retryInterval=5
 
+
+# If This property is set to true then the p12 certificate must be stored in JKS format
+# program will read it from there. If it is set to false then the certificate will be read from 
+# the location specified above from the key directory location
+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
+# Enter the password for cacert file. By default it will use the default password for JDK
+cacertpassword=changeit
 # Mechanism to differentiate whether Payload is encrypted or not
-useSignAndEncrypted=false
+#useSignAndEncrypted=<-- Set it to true for MLE[MessageLevelEncryption] -->
+
+# Mechanism to differentiate whether Payload is encrypted or not
+useSignAndEncrypted=<-- Set it to true for MLE[MessageLevelEncryption] -->
+
 
 timeout=1000
 
 # logging should normally be disabled in production as it would slow down the
 # processing.  Enable it only when troubleshooting an issue.
 enableLog=true
-logDirectory=./logs
+logDirectory=<-- Directory where cybs.log file will be created -->
 logMaximumSize=10
 
 # Optional proxy server settings

samples/nvp/logs/cybs.log

@@ -452,3 +452,56 @@ com.cybersource.ws.client.ConfigException: The file "/.p12" is missing or is not
 	at com.cybersource.sample.RunSample.runAuth(RunSample.java:152)
 	at com.cybersource.sample.RunSample.main(RunSample.java:57)
 
+
+2017-03-01 14:19:58.031 main TRANSTART> =======================================
+2017-03-01 14:19:58.038 main MERCHCFG > merchantID=, keysDirectory=, keyAlias=, keyPassword=, sendToProduction=false, sendToAkamai=true, targetAPIVersion=1.129, keyFilename=(null), serverURL=(null), namespaceURI=(null), enableLog=true, logDirectory=./logs, logFilename=(null), logMaximumSize=10, useHttpClient=false, timeout=1000, useSignAndEncrypted=false
+2017-03-01 14:19:58.043 main PROXYCFG > https.proxyHost=userproxy.visa.com, https.proxyPort=443, https.proxyUser=(null), https.proxyPassword=(null)
+2017-03-01 14:19:58.078 main REQUEST  > 
+UUID   >  c2958df3-6321-4d2e-b1eb-ddaee4d8dd94
+Input request is
+======================================= 
+purchaseTotals_currency=USD
+billTo_city=Mountain View 
+shipTo_lastName=xxx
+billTo_email=noboxxxxxxxxxxxxxxxcom 
+clientLibrary=Java Basic
+billTo_country=US
+billTo_lastName=xxx
+billTo_street1=1295xxxxxxxxxxxxxoad 
+shipTo_state=CA
+clientLibraryVersion=6.2.3
+ccAuthService_run=true
+shipTo_city=San Mateo 
+shipTo_street1=10xxxxxxxxxxxt 
+clientEnvironment=Mac OS X/10.11.6/Oracle Corporation/1.8.0_74
+shipTo_postalCode=94401 
+shipTo_country=US
+card_accountNumber=4111xxxxxxxxx111 
+merchantReferenceCode=MRC-14344 
+shipTo_firstName=xxxxx
+item_1_unitPrice=56.78
+billTo_postalCode=94043 
+billTo_state=CA
+billTo_firstName=xxxxx
+card_expirationMonth=xx
+item_0_unitPrice=12.34
+merchantID=
+billTo_ipAddress=10.7.7.7
+card_expirationYear=xxxx
+billTo_phoneNumber=65xxxxxxxxx0 
+
+2017-03-01 14:19:58.091 main INFO     > Client, End of soapWrap   85ms
+2017-03-01 14:19:58.386 main EXCEPTION> Exception while loading KeyStore, 'null'
+2017-03-01 14:19:58.393 main EXCEPTION> 
+ClientException details:
+innerException: 
+com.cybersource.ws.client.ConfigException: The file "/.p12" is missing or is not a file.
+	at com.cybersource.ws.client.MerchantConfig.getKeyFile(MerchantConfig.java:339)
+	at com.cybersource.ws.client.SecurityUtil.readAndStoreCertificateAndPrivateKey(SecurityUtil.java:115)
+	at com.cybersource.ws.client.SecurityUtil.loadMerchantP12File(SecurityUtil.java:92)
+	at com.cybersource.ws.client.Client.soapWrapAndSign(Client.java:205)
+	at com.cybersource.ws.client.Client.runTransaction(Client.java:120)
+	at com.cybersource.ws.client.Client.runTransaction(Client.java:75)
+	at com.cybersource.sample.RunSample.runAuth(RunSample.java:152)
+	at com.cybersource.sample.RunSample.main(RunSample.java:57)
+