Merge branch 'dev-sampleUpdate' of https://github.com/paypal/merchant…

…-sdk-java into dev-sampleUpdate Conflicts: merchantsample/src/main/java/com/sample/ipn/IPNListenerServlet.java merchantsample/src/main/java/com/sample/merchant/Configuration.java
shlasouski · Aug 12, 2013 · 9092bd4 · 9092bd4
2 parents 736b47e + 8238fe6
commit 9092bd4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/merchantsample/IPN-README.md b/merchantsample/IPN-README.md
@@ -16,11 +16,11 @@ IPN configuration :
 		// Endpoints are varied depending on whether sandbox OR live is chosen for mode
 		configMap.put("mode", "sandbox");
 
-		//Connection Information
-		configMap.put("http.ConnectionTimeOut", "5000");
-		configMap.put("http.Retry", "2");
-		configMap.put("http.ReadTimeOut", "30000");
-		configMap.put("http.MaxConnection", "100");
+		// Connection Information. These values are defaulted in SDK. If you want to override default values, uncomment it and add your value.
+		// configMap.put("http.ConnectionTimeOut", "5000");
+		// configMap.put("http.Retry", "2");
+		// configMap.put("http.ReadTimeOut", "30000");
+		// configMap.put("http.MaxConnection", "100");
 
 		IPNMessage ipnlistener = new IPNMessage(request,configMap);
     ```

diff --git a/merchantsample/src/main/java/com/sample/ipn/IPNListenerServlet.java b/merchantsample/src/main/java/com/sample/ipn/IPNListenerServlet.java
@@ -25,7 +25,6 @@ public class IPNListenerServlet extends HttpServlet {
 	protected void doPost(HttpServletRequest request,
 			HttpServletResponse response) throws ServletException, IOException {
 
-		// Configuration map containing signature credentials and other required configuration.
 		// For a full list of configuration parameters refer at 
 		// (https://github.com/paypal/merchant-sdk-java/wiki/SDK-Configuration-Parameters)
 		Map<String,String> configurationMap =  Configuration.getConfig();

diff --git a/merchantsample/src/main/java/com/sample/merchant/Configuration.java b/merchantsample/src/main/java/com/sample/merchant/Configuration.java
@@ -17,7 +17,6 @@ public static final Map<String,String> getAcctAndConfig(){
 		configMap.put("acct1.UserName", "jb-us-seller_api1.paypal.com");
 		configMap.put("acct1.Password", "WX4WTU3S8MY44S7F");
 		configMap.put("acct1.Signature", "AFcWxV21C7fd0v3bYYYRCpSSRl31A7yDhhsPUU2XhtMoZXsWHFxu-RWy");
-		configMap.put("acct1.AppId", "APP-80W284485P519543T");
 		// Subject is optional, only required in case of third party permission
 		//configMap.put("acct1.Subject", "");
 
@@ -37,12 +36,11 @@ public static final Map<String,String> getConfig(){
 		// Endpoints are varied depending on whether sandbox OR live is chosen for mode
 		configMap.put("mode", "sandbox");
 
+
 		// These values are defaulted in SDK. If you want to override default values, uncomment it and add your value.
 		// configMap.put("http.ConnectionTimeOut", "5000");
 		// configMap.put("http.Retry", "2");
 		// configMap.put("http.ReadTimeOut", "30000");
 		// configMap.put("http.MaxConnection", "100");
 		return configMap;
 	}
-
-}