Author: sagara
Date: Wed Jul 18 05:26:51 2012
New Revision: 1362770
URL: http://svn.apache.org/viewvc?rev=1362770&view=rev
Log:
Reverted r1362599 and reapplied r1358712, r1358530 with build fixes.
Added:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/
- copied from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
- copied, changed from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
- copied, changed from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/
- copied from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/JsonInOnlyRPCMessageReceiver.java
- copied unchanged from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/JsonInOnlyRPCMessageReceiver.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/JsonRpcMessageReceiver.java
- copied unchanged from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/JsonRpcMessageReceiver.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/
- copied from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/JsonConstant.java
- copied unchanged from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/JsonConstant.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/JsonUtils.java
- copied unchanged from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/JsonUtils.java
Modified:
axis/axis2/java/core/trunk/modules/json/pom.xml
Modified: axis/axis2/java/core/trunk/modules/json/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/pom.xml?rev=1362770&r1=1362769&r2=1362770&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/json/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/json/pom.xml Wed Jul 18 05:26:51 2012
@@ -65,7 +65,10 @@
<groupId>${project.groupId}</groupId>
<artifactId>axis2-adb</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
Copied:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
(from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java?p2=axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java&p1=axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java&r1=1362598&r2=1362770&rev=1362770&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
Wed Jul 18 05:26:51 2012
@@ -31,7 +31,6 @@ import org.apache.axis2.json.impl.utils.
import java.io.InputStream;
public class JsonBuilder implements Builder {
- @Override
public OMElement processDocument(InputStream inputStream, String s,
MessageContext messageContext) throws AxisFault {
messageContext.setProperty(JsonConstant.INPUT_STREAM ,inputStream);
messageContext.setProperty(JsonConstant.IS_JSON_STREAM , true);
Copied:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
(from r1362598,
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java?p2=axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java&p1=axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java&r1=1362598&r2=1362770&rev=1362770&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
Wed Jul 18 05:26:51 2012
@@ -41,12 +41,10 @@ import java.net.URL;
public class JsonFormatter implements MessageFormatter {
private static final Log log = LogFactory.getLog(JsonFormatter.class);
- @Override
public byte[] getBytes(MessageContext messageContext, OMOutputFormat
omOutputFormat) throws AxisFault {
return new byte[0];
}
- @Override
public void writeTo(MessageContext outMsgCtxt, OMOutputFormat
omOutputFormat, OutputStream outputStream, boolean b) throws AxisFault {
JsonWriter writer = null;
String msg;
@@ -75,19 +73,16 @@ public class JsonFormatter implements Me
}
}
- @Override
public String getContentType(MessageContext outMsgCtxt, OMOutputFormat
omOutputFormat, String s) {
String contentType =
(String)outMsgCtxt.getProperty(Constants.Configuration.CONTENT_TYPE);
outMsgCtxt.setProperty(Constants.Configuration.CONTENT_TYPE ,
"application/json-impl");
return "application/json-impl";
}
- @Override
public URL getTargetAddress(MessageContext messageContext, OMOutputFormat
omOutputFormat, URL url) throws AxisFault {
return null;
}
- @Override
public String formatSOAPAction(MessageContext messageContext,
OMOutputFormat omOutputFormat, String s) {
return null;
}
