svn commit: r1578111 - in /axis/axis2/java/core/trunk/modules/json: src/org/apache/axis2/json/gson/ src/org/apache/axis2/json/gson/factory/ test-resources/custom_schema/ test/org/apache/axis2/json/gso

2014-03-16 Thread shameera 
Author: shameera
Date: Sun Mar 16 16:43:06 2014
New Revision: 1578111

URL: http://svn.apache.org/r1578111
Log:
Improved XML Stream based JSON to generate intermediate structure when schema 
has ref elements and added a new test case too

Added:

axis/axis2/java/core/trunk/modules/json/test-resources/custom_schema/testSchema_3.xsd
Modified:

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java

axis/axis2/java/core/trunk/modules/json/test-resources/custom_schema/testSchema_2.xsd

axis/axis2/java/core/trunk/modules/json/test/org/apache/axis2/json/gson/factory/XmlNodeGeneratorTest.java

Modified: 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java?rev=1578111&r1=1578110&r2=1578111&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamReader.java
 Sun Mar 16 16:43:06 2014
@@ -21,6 +21,7 @@ package org.apache.axis2.json.gson;
 
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.json.gson.factory.JSONType;
 import org.apache.axis2.json.gson.factory.JsonConstant;
@@ -87,7 +88,7 @@ public class GsonXMLStreamReader impleme
 }
 
 public GsonXMLStreamReader(JsonReader jsonReader, QName elementQname, 
List xmlSchemaList,
-   ConfigurationContext configContext) {
+   ConfigurationContext configContext) throws 
AxisFault {
 this.jsonReader = jsonReader;
 initXmlStreamReader(elementQname, xmlSchemaList, configContext);
 }
@@ -96,16 +97,20 @@ public class GsonXMLStreamReader impleme
 return jsonReader;
 }
 
-public void initXmlStreamReader(QName elementQname, List 
xmlSchemaList, ConfigurationContext configContext) {
+public void initXmlStreamReader(QName elementQname, List 
xmlSchemaList, ConfigurationContext configContext) throws AxisFault {
 this.elementQname = elementQname;
 this.xmlSchemaList = xmlSchemaList;
 this.configContext = configContext;
-process();
+try {
+process();
+} catch (AxisFault axisFault) {
+throw new AxisFault("Error while initializing XMLStreamReader ", 
axisFault);
+}
 isProcessed = true;
 
 }
 
-private void process() {
+private void process() throws AxisFault {
 Object ob = configContext.getProperty(JsonConstant.XMLNODES);
 if (ob != null) {
 Map nodeMap = (Map) ob;

Modified: 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java?rev=1578111&r1=1578110&r2=1578111&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/GsonXMLStreamWriter.java
 Sun Mar 16 16:43:06 2014
@@ -653,9 +653,11 @@ public class GsonXMLStreamWriter impleme
 
 public void writeStartDocument(String encoding, String version) throws 
XMLStreamException {
 if (!isProcessed) {
-xmlNodeGenerator.getMainXmlNode();
-queue = xmlNodeGenerator.getQueue(mainXmlNode);
-isProcessed = true;
+try {
+process();
+} catch (IOException e) {
+throw new XMLStreamException("Error occur while trying to 
write start document element", e);
+}
 }
 }
 
@@ -672,7 +674,7 @@ public class GsonXMLStreamWriter impleme
 try {
 process();
 } catch (IOException e) {
-throw new XMLStreamException("Error occur while trying to 
write first begin object ");
+throw new XMLStreamException("Error occur while trying to 
write first begin object ", e);
 }
 }
 try {

Modified: 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java?rev=1

svn commit: r1578136 - in /axis/axis1/java/trunk: interop-mock/src/main/resources/uddi_v1/ interop-mock/src/main/webapp/WEB-INF/ samples/jaxm-sample/src/main/java/samples/jaxm/ samples/jaxm-sample/src

2014-03-16 Thread veithen 
Author: veithen
Date: Sun Mar 16 18:43:16 2014
New Revision: 1578136

URL: http://svn.apache.org/r1578136
Log:
Reenabled an old test case (using a mock service).

Added:
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt   
(with props)

axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
   (with props)

axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
   (with props)
Modified:

axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml

axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java

axis/axis1/java/trunk/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java

Added: axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt?rev=1578136&view=auto
==
--- axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt 
(added)
+++ axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt 
Sun Mar 16 18:43:16 2014
@@ -0,0 +1 @@
+Request/response constructed from samples found on the Internet.
\ No newline at end of file

Propchange: 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/README.txt
--
svn:eol-style = native

Added: 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml?rev=1578136&view=auto
==
--- 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
 (added)
+++ 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
 Sun Mar 16 18:43:16 2014
@@ -0,0 +1,8 @@
+
+
+
+
+Microsoft
+
+
+

Propchange: 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
--
svn:eol-style = native

Added: 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml?rev=1578136&view=auto
==
--- 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
 (added)
+++ 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
 Sun Mar 16 18:43:16 2014
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+Microsoft Corporation
+Empowering people through great 
software - any time, any place and on any device.
+
+
+Electronic Business Integration 
Services
+
+
+UDDI Web Services
+
+
+
+
+
+
+

Propchange: 
axis/axis1/java/trunk/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
--
svn:eol-style = native

Modified: 
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1578136&r1=1578135&r2=1578136&view=diff
==
--- 
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
 (original)
+++ 
axis/axis1/java/trunk/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
 Sun Mar 16 18:43:16 2014
@@ -306,4 +306,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 

Modified: 
axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java?rev=1578136&r1=1578135&r2=1578136&view=diff
==
--- 
axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java
 (original)
+++ 
axis/axis1/java/trunk/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPi