svn commit: r735187 - in /ofbiz/trunk/framework/webapp: lib/ src/org/ofbiz/webapp/event/

[byersa-3]

Author: byersa
Date: Fri Jan 16 16:25:21 2009
New Revision: 735187

URL: http://svn.apache.org/viewvc?rev=735187&view=rev
Log:
Updating JSON lib and changing the three places that "fromMap" was used.

Added:
    ofbiz/trunk/framework/webapp/lib/json-lib-2.2.3-jdk15.jar   (with props)
Removed:
    ofbiz/trunk/framework/webapp/lib/json-lib-0.9.jar
Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java

Added: ofbiz/trunk/framework/webapp/lib/json-lib-2.2.3-jdk15.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/lib/json-lib-2.2.3-jdk15.jar?rev=735187&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/webapp/lib/json-lib-2.2.3-jdk15.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java?rev=735187&r1=735186&r2=735187&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/AbstractJSONEventHandler.java Fri Jan 16 16:25:21 2009
@@ -51,7 +51,7 @@
         Map<String, Object> attrMap = getAttributesAsMap(request);
             
         // create a JSON Object for return
-        JSONObject json = JSONObject.fromMap(attrMap); //amb, test case
+        JSONObject json = JSONObject.fromObject(attrMap); //amb, test case
         String jsonStr = json.toString();
         if (jsonStr == null) {
             throw new EventHandlerException("JSON Object was empty; fatal error!");

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java?rev=735187&r1=735186&r2=735187&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONJavaEventHandler.java Fri Jan 16 16:25:21 2009
@@ -54,7 +54,7 @@
         Map<String, Object> attrMap = getAttributesAsMap(request);
 
         // create a JSON Object for return
-        JSONObject json = JSONObject.fromMap(attrMap);
+        JSONObject json = JSONObject.fromObject(attrMap);
         String jsonStr = json.toString();
         if (jsonStr == null) {
             throw new EventHandlerException("JSON Object was empty; fatal error!");

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java?rev=735187&r1=735186&r2=735187&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/JSONServiceEventHandler.java Fri Jan 16 16:25:21 2009
@@ -54,7 +54,7 @@
         Map<String, Object> attrMap = getAttributesAsMap(request);
 
         // create a JSON Object for return
-        JSONObject json = JSONObject.fromMap(attrMap);
+        JSONObject json = JSONObject.fromObject(attrMap);
         String jsonStr = json.toString();
         if (jsonStr == null) {
             throw new EventHandlerException("JSON Object was empty; fatal error!");