You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by th...@apache.org on 2007/04/17 16:15:54 UTC
svn commit: r529620 - in /webservices/axis2/branches/java/1_2/modules/json:
project.xml src/org/apache/axis2/json/JSONBadgerfishDataSource.java
src/org/apache/axis2/json/JSONDataSource.java
test/org/apache/axis2/json/JSONDataSourceTest.java
Author: thilina
Date: Tue Apr 17 07:15:53 2007
New Revision: 529620
URL: http://svn.apache.org/viewvc?view=rev&rev=529620
Log:
Fixing AXIS2-2546.. Including the test back.. Upgrading the dependency to jettison-1.0-RC1
Modified:
webservices/axis2/branches/java/1_2/modules/json/project.xml
webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONBadgerfishDataSource.java
webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONDataSource.java
webservices/axis2/branches/java/1_2/modules/json/test/org/apache/axis2/json/JSONDataSourceTest.java
Modified: webservices/axis2/branches/java/1_2/modules/json/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/json/project.xml?view=diff&rev=529620&r1=529619&r2=529620
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/json/project.xml (original)
+++ webservices/axis2/branches/java/1_2/modules/json/project.xml Tue Apr 17 07:15:53 2007
@@ -182,9 +182,7 @@
<includes>
<include>**/*Test.java</include>
</includes>
- <excludes>
- <exclude>**/*JSONDataSourceTest.java</exclude>
- </excludes>
+
</unitTest>
<resources>
<resource>
Modified: webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONBadgerfishDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONBadgerfishDataSource.java?view=diff&rev=529620&r1=529619&r2=529620
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONBadgerfishDataSource.java (original)
+++ webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONBadgerfishDataSource.java Tue Apr 17 07:15:53 2007
@@ -17,10 +17,10 @@
package org.apache.axis2.json;
-import org.codehaus.jettison.badgerfish.BadgerFishXMLInputFactory;
-import org.json.JSONTokener;
-
import java.io.InputStream;
+
+import org.codehaus.jettison.badgerfish.BadgerFishXMLInputFactory;
+import org.codehaus.jettison.json.JSONTokener;
/**
* JSONDataSource keeps the JSON String inside and consumes it when needed. This is to be kept in
Modified: webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONDataSource.java?view=diff&rev=529620&r1=529619&r2=529620
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONDataSource.java (original)
+++ webservices/axis2/branches/java/1_2/modules/json/src/org/apache/axis2/json/JSONDataSource.java Tue Apr 17 07:15:53 2007
@@ -16,19 +16,20 @@
package org.apache.axis2.json;
-import org.apache.axiom.om.OMDataSource;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMOutputFormat;
-import org.codehaus.jettison.mapped.MappedXMLInputFactory;
-import org.json.JSONTokener;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Writer;
import java.util.HashMap;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMDataSource;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMOutputFormat;
+import org.codehaus.jettison.json.JSONTokener;
+import org.codehaus.jettison.mapped.MappedXMLInputFactory;
/**
* JSONDataSource keeps the JSON String inside and consumes it when needed. This is to be kept in
Modified: webservices/axis2/branches/java/1_2/modules/json/test/org/apache/axis2/json/JSONDataSourceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/json/test/org/apache/axis2/json/JSONDataSourceTest.java?view=diff&rev=529620&r1=529619&r2=529620
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/json/test/org/apache/axis2/json/JSONDataSourceTest.java (original)
+++ webservices/axis2/branches/java/1_2/modules/json/test/org/apache/axis2/json/JSONDataSourceTest.java Tue Apr 17 07:15:53 2007
@@ -15,19 +15,20 @@
*/
package org.apache.axis2.json;
-import org.apache.axiom.om.util.StAXUtils;
-import org.custommonkey.xmlunit.XMLTestCase;
-import org.json.JSONException;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.axiom.om.util.StAXUtils;
+import org.codehaus.jettison.json.JSONException;
+import org.custommonkey.xmlunit.XMLTestCase;
+import org.xml.sax.SAXException;
public class JSONDataSourceTest extends XMLTestCase {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org