Replace json.org dependency with json4j

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1527418 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 5 deletions

diff --git a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
index 049907786c..d2232eeaec 100644
--- a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
+++ b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
@@ -48,9 +48,9 @@ import org.codehaus.jackson.map.util.StdDateFormat;
 import org.codehaus.jackson.xc.JaxbAnnotationIntrospector;
 import org.codehaus.jackson.xc.XmlAdapterJsonDeserializer;
 import org.codehaus.jackson.xc.XmlAdapterJsonSerializer;
-import org.json.JSONObject;
+import org.apache.wink.json4j.JSONObject;
 
-import com.fasterxml.jackson.module.jsonorg.JsonOrgModule;
+//import com.fasterxml.jackson.module.jsonorg.JsonOrgModule;
 
 /**
  * 
@@ -91,7 +91,7 @@ public class JacksonHelper {
                             StdDeserializerProvider deserializerProvider =
                                 new StdDeserializerProvider(deserializerFactory);
                             mapper = new ObjectMapper();
-                            mapper.registerModule(new JsonOrgModule());
+                            //mapper.registerModule(new JsonOrgModule());
 
                             mapper.setSerializerFactory(serializerFactory);
                             mapper.setDeserializerProvider(deserializerProvider);
@@ -105,7 +105,7 @@ public class JacksonHelper {
         }
         if (mapper == null) {
             mapper = new ObjectMapper();
-            mapper.registerModule(new JsonOrgModule());
+            //mapper.registerModule(new JsonOrgModule());
         }
         // Let's honor the Jackson annotations first
         AnnotationIntrospector primary = new JacksonAnnotationIntrospector();
@@ -202,7 +202,7 @@ public class JacksonHelper {
     }
 
     /**
-     * Read from String into a org.json.JSONObject
+     * Read from String into a org.apache.wink.json4j.JSONObject
      * @param json
      * @return
      */