Merge pull request #66 from CyberSource/revert-65-master

Revert "changes for samples, JDK cert,"

Author: shamirwasia

README.md

@@ -86,20 +86,12 @@ 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. 
 
-    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.
 
-
 
 4. Build this project using Maven.
 
@@ -119,47 +111,38 @@ You do not need to download and build the source to use the SDK but if you want
 
 We have two ways to test, One is using maven tool and other is to download the zip and use scripts to test.
 
-
 1.) Unzip the downloaded zip file into a directory of your choice.  It will create a directory called 
     cybersource-sdk-java-master. 
-     * If in the Request, a key called "_has_escapes" is present and is set
-     * to "1", we will not escape the special characters.  Basically, the
-     * merchant is saying that they have escaped the characters themselves.
-     * This might prove useful for more advanced users of the Basic client.
-     
-     Note: The Script will take Service_name as program argument. Service Name can 
-	    be auth, auth_reversal, capture, sale, emv_auth, credit. If no argument is passed the script
-	    will terminate the program.
 
 	a. TESTING THE NAME-VALUE PAIR SAMPLE
 		. Go to the cybersource-sdk-java-master/sample/nvp directory.
 		. Use compileSample scripts to create classes directory.As it is not included in SDK.
 		. Then at a command prompt, type this line:
-			Windows 	runSample.bat <service_name>
-			Unix or Linux 	runSample.sh <service_name>
+			Windows 	runSample.bat
+			Unix or Linux 	runSample.sh
 
 			If JAVA_HOME is defined, the script uses <JAVA_HOME>/bin/java. Otherwise, it uses
 			whatever java is in the path.
 			If the client is installed correctly, the requests and replies for a credit card authorization
 			and a follow-on capture appear.
 
-		. If you make any changes to the RunSample.java sample, you
+		. If you make any changes to the AuthCaptureSample.java sample, you
 		  must rebuild the sample before using it. Use the compileSample batch file or
 	 	  shell script provided in the sample directory.
 			   
 	b. TESTING THE XML SAMPLE
 		. Go to the cybersource-sdk-java-master/sample/xml directory.
 		. Use compileSample scripts to create classes directory.As it is not included in SDK.
 		. At a command prompt, type this line:
-			Windows 	runSample.bat <Service_name>
-			Unix or Linux 	runSample.sh <service_name>
+			Windows 	runSample.bat
+			Unix or Linux 	runSample.sh
 				
 			If JAVA_HOME is defined, the script uses <JAVA_HOME>/bin/java. Otherwise, it uses
 			whatever java is in the path.
 			If the client is installed correctly, the requests and replies for a credit card authorization
 			and a follow-on capture appear.
 
-		. If you make any changes to the RunSample.java sample, you
+		. If you make any changes to the AuthSample.java sample, you
 		  must rebuild the sample before using it. Use the compileSample batch file or
 	          shell script provided in the sample directory.
 

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>
@@ -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>