Author: veithen
Date: Wed May 2 20:58:38 2012
New Revision: 1333204
URL: http://svn.apache.org/viewvc?rev=1333204&view=rev
Log:
Slightly changed the syntax of the service parameter that defines the XML to
JSON namespace mappings (introduced in r1333004).
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java?rev=1333204&r1=1333203&r2=1333204&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/JSONUtil.java
Wed May 2 20:58:38 2012
@@ -33,12 +33,12 @@ public final class JSONUtil {
public static Map<String,String> getNS2JNSMap(AxisService service) {
Map<String,String> ns2jnsMap = new HashMap<String,String>();
- Parameter param = service.getParameter("JSONNamespaceMap");
+ Parameter param = service.getParameter("xmlToJsonNamespaceMap");
if (param != null) {
for (Iterator it =
param.getParameterElement().getChildrenWithName(new QName("mapping"));
it.hasNext(); ) {
OMElement mapping = (OMElement)it.next();
- ns2jnsMap.put(mapping.getAttributeValue(new QName("uri")),
- mapping.getAttributeValue(new QName("prefix")));
+ ns2jnsMap.put(mapping.getAttributeValue(new
QName("xmlNamespace")),
+ mapping.getAttributeValue(new
QName("jsonNamespace")));
}
} else {
// If no namespace map is defined, use a default map compatible
with earlier Axis2 versions
Modified:
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml?rev=1333204&r1=1333203&r2=1333204&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
(original)
+++
axis/axis2/java/core/trunk/modules/json/test-repository/services/POJOService.aar/META-INF/services.xml
Wed May 2 20:58:38 2012
@@ -25,7 +25,7 @@
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out";
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
</messageReceivers>
<parameter
name="ServiceClass">org.apache.axis2.json.POJOService</parameter>
- <parameter name="JSONNamespaceMap">
- <mapping uri="http://example.org"; prefix=""/>
+ <parameter name="xmlToJsonNamespaceMap">
+ <mapping xmlNamespace="http://example.org"; jsonNamespace=""/>
</parameter>
</service>
\ No newline at end of file
