You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/12/17 22:16:05 UTC
svn commit: r1818516 [3/5] - in /axis/axis2/java/core/branches/AXIS2-4091:
./ modules/adb-codegen/ modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb-codegen/test/org/apache/axis2/sche...
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl Sun Dec 17 22:16:04 2017
@@ -2162,6 +2162,7 @@
<xsl:variable name="particleClassType" select="@particleClassType"></xsl:variable>
<xsl:variable name="propQName">new javax.xml.namespace.QName("<xsl:value-of select="$namespace"/>","<xsl:value-of select="$propertyName"/>")</xsl:variable>
+ <xsl:variable name="propQName2">new javax.xml.namespace.QName("","<xsl:value-of select="$propertyName"/>")</xsl:variable>
<xsl:choose>
<xsl:when test="$unordered and not($choice and $hasParticleType)"> <!-- One property per iteration if unordered -->
@@ -2186,7 +2187,7 @@
we have to sollow an excpetions : todo find a better solsution-->
try{
</xsl:if>
- if (reader.isStartElement() <xsl:if test="$simple"> || reader.hasText()</xsl:if> <xsl:if test="not($simple) and not($particleClassType)">&& <xsl:value-of select="$propQName"/>.equals(reader.getName())</xsl:if>){
+ if (reader.isStartElement() <xsl:if test="$simple"> || reader.hasText()</xsl:if> <xsl:if test="not($simple) and not($particleClassType)">&& <xsl:value-of select="$propQName"/>.equals(reader.getName()) || <xsl:value-of select="$propQName2"/>.equals(reader.getName()) </xsl:if>){
</xsl:otherwise>
</xsl:choose>
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/test/org/apache/axis2/schema/XMLSchemaTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/test/org/apache/axis2/schema/XMLSchemaTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/test/org/apache/axis2/schema/XMLSchemaTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/test/org/apache/axis2/schema/XMLSchemaTest.java Sun Dec 17 22:16:04 2017
@@ -19,6 +19,13 @@
package org.apache.axis2.schema;
+import junit.framework.TestCase;
+import org.apache.axis2.util.XMLPrettyPrinter;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.custommonkey.xmlunit.Diff;
+
+import javax.xml.transform.stream.StreamSource;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -26,18 +33,10 @@ import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.axis2.util.XMLPrettyPrinter;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.custommonkey.xmlunit.Diff;
-
public abstract class XMLSchemaTest extends TestCase {
public final String XMLSchemaNameSpace = "xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"";
@@ -85,7 +84,7 @@ public abstract class XMLSchemaTest exte
if (excludeList == null || !excludeList.contains(i)) {
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
schemas.add(schema);
}
} else {
@@ -98,7 +97,7 @@ public abstract class XMLSchemaTest exte
File file = new File(SampleSchemasDirectory + "sampleSchema" + id + ".xsd");
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
return schema;
}
@@ -107,7 +106,7 @@ public abstract class XMLSchemaTest exte
+ ".xsd");
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
return schema;
}
@@ -129,7 +128,7 @@ public abstract class XMLSchemaTest exte
public String readXMLfromSchemaFile(String path) throws Exception {
InputStream is = new FileInputStream(path);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
ByteArrayOutputStream stream = new ByteArrayOutputStream();
schema.write(stream);
is.close();
@@ -150,7 +149,7 @@ public abstract class XMLSchemaTest exte
fileWriter.close();
}
- public String schemaToString(XmlSchema schema){
+ public String schemaToString(XmlSchema schema) throws UnsupportedEncodingException {
ByteArrayOutputStream stream=new ByteArrayOutputStream();
schema.write(stream);
return stream.toString();
@@ -160,7 +159,7 @@ public abstract class XMLSchemaTest exte
File file = new File(path);
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
return schema;
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java Sun Dec 17 22:16:04 2017
@@ -58,7 +58,8 @@ public class SimpleExtensionTest extends
OMFactory factory = OMAbstractFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName(
"http://apache.org/axis2/schema/extension", "SimpleAmmountElement"));
- element.addAttribute("currency", "SLR", null);
+ element.addAttribute("currency", "SLR",
+ factory.createOMNamespace("http://apache.org/axis2/schema/extension", null));
element.setText("1000");
SimpleAmmountElement ammountElement = SimpleAmmountElement.Factory.parse(element
.getXMLStreamReader());
@@ -81,7 +82,8 @@ public class SimpleExtensionTest extends
OMFactory factory = OMAbstractFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName(
"http://apache.org/axis2/schema/extension", "PaymentAmountElement"));
- element.addAttribute("currency", "SLR", null);
+ element.addAttribute("currency", "SLR",
+ factory.createOMNamespace("http://apache.org/axis2/schema/extension", null));
element.setText("2000");
PaymentAmountElement ammountElement = PaymentAmountElement.Factory.parse(element
.getXMLStreamReader());
@@ -154,7 +156,8 @@ public class SimpleExtensionTest extends
OMFactory factory = OMAbstractFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName(
"http://apache.org/axis2/schema/extension", "ReproStringTypeElement"));
- element.addAttribute("lang", "EN", null);
+ element.addAttribute("lang", "EN",
+ factory.createOMNamespace("http://apache.org/axis2/schema/extension", null));
element.setText("Value");
ReproStringTypeElement reproStringTypeElement = ReproStringTypeElement.Factory.parse(element
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXWSWapperExtension.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXWSWapperExtension.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXWSWapperExtension.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/JAXWSWapperExtension.java Sun Dec 17 22:16:04 2017
@@ -35,9 +35,10 @@ import org.apache.ws.commons.schema.XmlS
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.apache.ws.commons.schema.XmlSchemaObject;
import org.apache.ws.commons.schema.XmlSchemaParticle;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.apache.ws.commons.schema.XmlSchemaType;
import javax.xml.namespace.QName;
@@ -189,23 +190,17 @@ public class JAXWSWapperExtension extend
xmlSchemaType = schema.getTypeByName(typeName);
if (xmlSchemaType == null) {
// try to find in an import or an include
- XmlSchemaObjectCollection includes = schema.getIncludes();
- if (includes != null) {
- Iterator includesIter = includes.getIterator();
- Object object = null;
- while (includesIter.hasNext()) {
- object = includesIter.next();
- if (object instanceof XmlSchemaImport) {
- XmlSchema schema1 = ((XmlSchemaImport) object).getSchema();
- xmlSchemaType = getSchemaType(schema1, typeName);
- }
- if (object instanceof XmlSchemaInclude) {
- XmlSchema schema1 = ((XmlSchemaInclude) object).getSchema();
- xmlSchemaType = getSchemaType(schema1, typeName);
- }
- if (xmlSchemaType != null) {
- break;
- }
+ for (XmlSchemaObject object : schema.getExternals()) {
+ if (object instanceof XmlSchemaImport) {
+ XmlSchema schema1 = ((XmlSchemaImport) object).getSchema();
+ xmlSchemaType = getSchemaType(schema1, typeName);
+ }
+ if (object instanceof XmlSchemaInclude) {
+ XmlSchema schema1 = ((XmlSchemaInclude) object).getSchema();
+ xmlSchemaType = getSchemaType(schema1, typeName);
+ }
+ if (xmlSchemaType != null) {
+ break;
}
}
}
@@ -222,8 +217,7 @@ public class JAXWSWapperExtension extend
if (schemaType instanceof XmlSchemaComplexType) {
XmlSchemaComplexType cmplxType = (XmlSchemaComplexType) schemaType;
- XmlSchemaObjectCollection xmlObjectCollection = cmplxType.getAttributes();
- if (xmlObjectCollection.getCount() != 0)
+ if (!cmplxType.getAttributes().isEmpty())
return false;
if (cmplxType.getContentModel() == null) {
@@ -261,15 +255,14 @@ public class JAXWSWapperExtension extend
QName opName = ((AxisOperation) message.getParent()).getName();
XmlSchemaSequence sequence = (XmlSchemaSequence) schemaParticle;
- XmlSchemaObjectCollection items = sequence.getItems();
+ List<XmlSchemaSequenceMember> items = sequence.getItems();
// if this is an empty sequence, return
- if (items.getCount() == 0) {
+ if (items.isEmpty()) {
/*be carefull */
return true;
}
- for (Iterator i = items.getIterator(); i.hasNext();) {
- Object item = i.next();
+ for (XmlSchemaSequenceMember item : items) {
// get each and every element in the sequence and
// traverse through them
if (item instanceof XmlSchemaElement) {
@@ -280,8 +273,8 @@ public class JAXWSWapperExtension extend
// }
XmlSchemaType schemaType = xmlSchemaElement.getSchemaType();
String partName = null;
- if (xmlSchemaElement.getRefName() != null) {
- partName = xmlSchemaElement.getRefName().getLocalPart();
+ if (xmlSchemaElement.getRef().getTargetQName() != null) {
+ partName = xmlSchemaElement.getRef().getTargetQName().getLocalPart();
} else {
partName = xmlSchemaElement.getName();
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtension.java Sun Dec 17 22:16:04 2017
@@ -46,9 +46,9 @@ import org.apache.ws.commons.schema.XmlS
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaParticle;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.apache.ws.commons.schema.XmlSchemaSimpleType;
import org.apache.ws.commons.schema.XmlSchemaType;
@@ -232,11 +232,9 @@ public class SchemaUnwrapperExtension ex
List partNameList,
String qnameSuffix) {
QName opName = message.getAxisOperation().getName();
- XmlSchemaObjectCollection xmlObjectCollection = complexType.getAttributes();
- XmlSchemaObject item;
+
XmlSchemaAttribute xmlSchemaAttribute;
- for (Iterator iter = xmlObjectCollection.getIterator(); iter.hasNext();) {
- item = (XmlSchemaObject) iter.next();
+ for (XmlSchemaObject item : complexType.getAttributes()) {
if (item instanceof XmlSchemaAttribute) {
xmlSchemaAttribute = (XmlSchemaAttribute) item;
String partName = xmlSchemaAttribute.getName();
@@ -297,23 +295,17 @@ public class SchemaUnwrapperExtension ex
xmlSchemaType = schema.getTypeByName(typeName);
if (xmlSchemaType == null) {
// try to find in an import or an include
- XmlSchemaObjectCollection includes = schema.getIncludes();
- if (includes != null) {
- Iterator includesIter = includes.getIterator();
- Object object = null;
- while (includesIter.hasNext()) {
- object = includesIter.next();
- if (object instanceof XmlSchemaImport) {
- XmlSchema schema1 = ((XmlSchemaImport) object).getSchema();
- xmlSchemaType = getSchemaType(schema1, typeName);
- }
- if (object instanceof XmlSchemaInclude) {
- XmlSchema schema1 = ((XmlSchemaInclude) object).getSchema();
- xmlSchemaType = getSchemaType(schema1, typeName);
- }
- if (xmlSchemaType != null) {
- break;
- }
+ for (XmlSchemaObject object : schema.getExternals()) {
+ if (object instanceof XmlSchemaImport) {
+ XmlSchema schema1 = ((XmlSchemaImport) object).getSchema();
+ xmlSchemaType = getSchemaType(schema1, typeName);
+ }
+ if (object instanceof XmlSchemaInclude) {
+ XmlSchema schema1 = ((XmlSchemaInclude) object).getSchema();
+ xmlSchemaType = getSchemaType(schema1, typeName);
+ }
+ if (xmlSchemaType != null) {
+ break;
}
}
}
@@ -332,14 +324,14 @@ public class SchemaUnwrapperExtension ex
QName opName = message.getAxisOperation().getName();
XmlSchemaSequence sequence = (XmlSchemaSequence) schemaParticle;
- XmlSchemaObjectCollection items = sequence.getItems();
+ List<XmlSchemaSequenceMember> items = sequence.getItems();
// if this is an empty sequence, return
- if (items.getCount() == 0) {
+ if (items.isEmpty()) {
return;
}
- for (Iterator i = items.getIterator(); i.hasNext();) {
- Object item = i.next();
+ for (XmlSchemaSequenceMember item : items) {
+
// get each and every element in the sequence and
// traverse through them
if (item instanceof XmlSchemaElement) {
@@ -347,8 +339,8 @@ public class SchemaUnwrapperExtension ex
XmlSchemaElement xmlSchemaElement = (XmlSchemaElement) item;
XmlSchemaType schemaType = xmlSchemaElement.getSchemaType();
String partName = null;
- if (xmlSchemaElement.getRefName() != null) {
- partName = xmlSchemaElement.getRefName().getLocalPart();
+ if (xmlSchemaElement.getRef().getTargetQName() != null) {
+ partName = xmlSchemaElement.getRef().getTargetQName().getLocalPart();
} else {
partName = xmlSchemaElement.getName();
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java Sun Dec 17 22:16:04 2017
@@ -38,12 +38,12 @@ public class WSDLValidatorExtension exte
for (int i = 0; i < schemaList.size(); i++) {
XmlSchema s = (XmlSchema)schemaList.get(i);
- if (s.getIncludes().getCount() != 0) {
+ if (!s.getExternals().isEmpty()) {
//there are some included - now see whether there are any
//elements or types declared!
- if (s.getElements().getCount() == 0 &&
- s.getSchemaTypes().getCount() == 0 &&
- s.getGroups().getCount() == 0 &&
+ if (s.getElements().isEmpty()&&
+ s.getSchemaTypes().isEmpty() &&
+ s.getGroups().isEmpty() &&
s.getTargetNamespace() == null) {
// if there's no targetNamespace there's probably no name, but try it anyway
throw new CodeGenerationException(
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGenerator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGenerator.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGenerator.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/src/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGenerator.java Sun Dec 17 22:16:04 2017
@@ -29,7 +29,7 @@ import org.apache.ws.commons.schema.XmlS
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.apache.ws.commons.schema.XmlSchemaObject;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -213,25 +213,19 @@ public class AxisServiceTopElementSchema
xmlSchemaElement = schema.getElementByName(elementQName);
if (xmlSchemaElement == null) {
// try to find in an import or an include
- XmlSchemaObjectCollection includes = schema.getIncludes();
- if (includes != null) {
- Iterator includesIter = includes.getIterator();
- Object object;
- while (includesIter.hasNext()) {
- object = includesIter.next();
- if (object instanceof XmlSchemaImport) {
- org.apache.ws.commons.schema.XmlSchema schema1 =
- ((XmlSchemaImport) object).getSchema();
- xmlSchemaElement = getSchemaElement(schema1,elementQName);
- }
- if (object instanceof XmlSchemaInclude) {
- org.apache.ws.commons.schema.XmlSchema schema1 =
- ((XmlSchemaInclude) object).getSchema();
- xmlSchemaElement = getSchemaElement(schema1,elementQName);
- }
- if (xmlSchemaElement != null){
- break;
- }
+ for (XmlSchemaObject object : schema.getExternals()) {
+ if (object instanceof XmlSchemaImport) {
+ org.apache.ws.commons.schema.XmlSchema schema1 =
+ ((XmlSchemaImport) object).getSchema();
+ xmlSchemaElement = getSchemaElement(schema1, elementQName);
+ }
+ if (object instanceof XmlSchemaInclude) {
+ org.apache.ws.commons.schema.XmlSchema schema1 =
+ ((XmlSchemaInclude) object).getSchema();
+ xmlSchemaElement = getSchemaElement(schema1, elementQName);
+ }
+ if (xmlSchemaElement != null) {
+ break;
}
}
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/XMLSchemaTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/XMLSchemaTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/XMLSchemaTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/XMLSchemaTest.java Sun Dec 17 22:16:04 2017
@@ -19,6 +19,13 @@
package org.apache.axis2.wsdl.codegen;
+import junit.framework.TestCase;
+import org.apache.axis2.util.XMLPrettyPrinter;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.custommonkey.xmlunit.Diff;
+
+import javax.xml.transform.stream.StreamSource;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -26,17 +33,9 @@ import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.axis2.util.XMLPrettyPrinter;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.custommonkey.xmlunit.Diff;
-
public abstract class XMLSchemaTest extends TestCase {
public final String XMLSchemaNameSpace = "xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"";
@@ -79,7 +78,7 @@ public abstract class XMLSchemaTest exte
while (file.exists()) {
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
schemas.add(schema);
i++;
file = new File(SampleSchemasDirectory + "sampleSchema" + i
@@ -93,7 +92,7 @@ public abstract class XMLSchemaTest exte
+ ".xsd");
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
return schema;
}
@@ -115,7 +114,7 @@ public abstract class XMLSchemaTest exte
public String readXMLfromSchemaFile(String path) throws Exception {
InputStream is = new FileInputStream(path);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
ByteArrayOutputStream stream = new ByteArrayOutputStream();
schema.write(stream);
is.close();
@@ -136,7 +135,7 @@ public abstract class XMLSchemaTest exte
fileWriter.close();
}
- public String schemaToString(XmlSchema schema){
+ public String schemaToString(XmlSchema schema) throws UnsupportedEncodingException {
ByteArrayOutputStream stream=new ByteArrayOutputStream();
schema.write(stream);
return stream.toString();
@@ -146,7 +145,7 @@ public abstract class XMLSchemaTest exte
File file = new File(path);
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
return schema;
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtensionTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtensionTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtensionTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/SchemaUnwrapperExtensionTest.java Sun Dec 17 22:16:04 2017
@@ -186,6 +186,6 @@ public class SchemaUnwrapperExtensionTes
private XmlSchema loadSchema(String schemaLocation) throws FileNotFoundException {
InputStream is = new FileInputStream(schemaLocation);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- return schemaCol.read(new StreamSource(is), null);
+ return schemaCol.read(new StreamSource(is));
}
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtensionTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtensionTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtensionTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtensionTest.java Sun Dec 17 22:16:04 2017
@@ -20,10 +20,6 @@
package org.apache.axis2.wsdl.codegen.extension;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.axis2.description.AxisService;
import org.apache.axis2.util.CommandLineOption;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
@@ -32,13 +28,17 @@ import org.apache.axis2.wsdl.codegen.XML
import org.apache.ws.commons.schema.XmlSchema;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
public class WSDLValidatorExtensionTest extends XMLSchemaTest {
@Test
public void testWSDLValidation() throws Exception {
XmlSchema schema = loadSingleSchemaFile(SampleSchemasDirectory + "schemaIncludes.xsd");
- if (schema.getIncludes().getCount() != 0 && schema.getElements().getCount() == 0
- && schema.getSchemaTypes().getCount() == 0 && schema.getGroups().getCount() == 0
+ if (!schema.getExternals().isEmpty() && schema.getElements().isEmpty()
+ && schema.getSchemaTypes().isEmpty() && schema.getGroups().isEmpty()
&& schema.getTargetNamespace() == null) {
try {
AxisService service = new AxisService();
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/corba/src/org/apache/axis2/corba/deployer/CorbaConstants.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/corba/src/org/apache/axis2/corba/deployer/CorbaConstants.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/corba/src/org/apache/axis2/corba/deployer/CorbaConstants.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/corba/src/org/apache/axis2/corba/deployer/CorbaConstants.java Sun Dec 17 22:16:04 2017
@@ -58,6 +58,7 @@ public interface CorbaConstants {
String DEFAULT_SCHEMA_NAMESPACE_PREFIX = "xs";
String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
String FORM_DEFAULT_UNQUALIFIED = "unqualified";
+ String FORM_DEFAULT_QUALIFIED = "qualified";
String SCHEMA_TO_IDL_MAPPING_LITERAL = "SchemaToIDLMapping";
String ANY_TYPE_NAME = "CORBA.Any";
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java Sun Dec 17 22:16:04 2017
@@ -20,19 +20,54 @@
package org.apache.axis2.corba.deployer;
import org.apache.axis2.corba.exceptions.SchemaGeneratorException;
-import org.apache.axis2.corba.idl.types.*;
+import org.apache.axis2.corba.idl.types.AbstractCollectionType;
+import org.apache.axis2.corba.idl.types.AnyType;
+import org.apache.axis2.corba.idl.types.ArrayType;
+import org.apache.axis2.corba.idl.types.CompositeDataType;
+import org.apache.axis2.corba.idl.types.DataType;
+import org.apache.axis2.corba.idl.types.EnumType;
+import org.apache.axis2.corba.idl.types.ExceptionType;
+import org.apache.axis2.corba.idl.types.FixedType;
+import org.apache.axis2.corba.idl.types.IDL;
+import org.apache.axis2.corba.idl.types.Interface;
+import org.apache.axis2.corba.idl.types.Member;
+import org.apache.axis2.corba.idl.types.Operation;
+import org.apache.axis2.corba.idl.types.PrimitiveDataType;
+import org.apache.axis2.corba.idl.types.Typedef;
+import org.apache.axis2.corba.idl.types.UnionType;
import org.apache.axis2.corba.receivers.CorbaUtil;
import org.apache.axis2.description.java2wsdl.DefaultNamespaceGenerator;
import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.description.java2wsdl.NamespaceGenerator;
import org.apache.axis2.description.java2wsdl.TypeTable;
-import org.apache.ws.commons.schema.*;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaChoice;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
+import org.apache.ws.commons.schema.XmlSchemaFacet;
+import org.apache.ws.commons.schema.XmlSchemaForm;
+import org.apache.ws.commons.schema.XmlSchemaFractionDigitsFacet;
+import org.apache.ws.commons.schema.XmlSchemaImport;
+import org.apache.ws.commons.schema.XmlSchemaObject;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSimpleType;
+import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+import org.apache.ws.commons.schema.XmlSchemaTotalDigitsFacet;
import org.apache.ws.commons.schema.utils.NamespaceMap;
import javax.xml.namespace.QName;
import java.math.BigDecimal;
import java.net.URI;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
public class SchemaGenerator implements CorbaConstants {
private static int prefixCount = 1;
@@ -291,36 +326,36 @@ public class SchemaGenerator implements
schemaTypeName = new QName(targetNameSpace, simpleName, targetNamespacePrefix);
if (dataType instanceof EnumType) {
- XmlSchemaSimpleType simpleType = new XmlSchemaSimpleType(xmlSchema);
+ XmlSchemaSimpleType simpleType = new XmlSchemaSimpleType(xmlSchema, false);
XmlSchemaSimpleTypeRestriction restriction = new XmlSchemaSimpleTypeRestriction();
restriction.setBaseTypeName(typeTable.getSimpleSchemaTypeName("java.lang.String"));
simpleType.setContent(restriction);
simpleType.setName(simpleName);
- XmlSchemaObjectCollection facets = restriction.getFacets();
+ List<XmlSchemaFacet> facets = restriction.getFacets();
EnumType enumType = (EnumType) dataType;
List enumMembers = enumType.getEnumMembers();
for (int i = 0; i < enumMembers.size(); i++) {
facets.add(new XmlSchemaEnumerationFacet(enumMembers.get(i), false));
}
- XmlSchemaElement eltOuter = new XmlSchemaElement();
+ XmlSchemaElement eltOuter = new XmlSchemaElement(xmlSchema, false);
eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
+ eltOuter.setSchemaTypeName(schemaTypeName);
xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
+ xmlSchema.getElements().put(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(simpleType.getQName());
xmlSchema.getItems().add(simpleType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, simpleType);
+ xmlSchema.getSchemaTypes().put(schemaTypeName, simpleType);
// adding this type to the table
typeTable.addComplexSchema(name, eltOuter.getQName());
} else if (dataType instanceof UnionType) {
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+ XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema, false);
XmlSchemaChoice choice = new XmlSchemaChoice();
- XmlSchemaObjectCollection items = choice.getItems();
+ List<XmlSchemaObject> items = choice.getItems();
UnionType unionType = (UnionType) dataType;
Member[] members = unionType.getMembers();
@@ -332,15 +367,15 @@ public class SchemaGenerator implements
complexType.setParticle(choice);
complexType.setName(simpleName);
- XmlSchemaElement eltOuter = new XmlSchemaElement();
+ XmlSchemaElement eltOuter = new XmlSchemaElement(xmlSchema, false);
eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
+ eltOuter.setSchemaTypeName(schemaTypeName);
xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
+ xmlSchema.getElements().put(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(complexType.getQName());
xmlSchema.getItems().add(complexType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
+ xmlSchema.getSchemaTypes().put(schemaTypeName, complexType);
typeTable.addComplexSchema(name, eltOuter.getQName());
} else {
@@ -348,21 +383,21 @@ public class SchemaGenerator implements
Typedef typedef = (Typedef) dataType;
DataType aliasType = typedef.getDataType();
if (aliasType instanceof FixedType) {
- XmlSchemaSimpleType simpleType = new XmlSchemaSimpleType(xmlSchema);
- XmlSchemaElement eltOuter = new XmlSchemaElement();
+ XmlSchemaSimpleType simpleType = new XmlSchemaSimpleType(xmlSchema, false);
+ XmlSchemaElement eltOuter = new XmlSchemaElement(xmlSchema, false);
eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
+ eltOuter.setSchemaTypeName(schemaTypeName);
simpleType.setName(simpleName);
xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
+ xmlSchema.getElements().put(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(simpleType.getQName());
xmlSchema.getItems().add(simpleType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, simpleType);
+ xmlSchema.getSchemaTypes().put(schemaTypeName, simpleType);
typeTable.addComplexSchema(name, eltOuter.getQName());
- XmlSchemaElement elt1 = new XmlSchemaElement();
+ XmlSchemaElement elt1 = new XmlSchemaElement(xmlSchema, false);
elt1.setName(name);
XmlSchemaSimpleTypeRestriction restriction = new XmlSchemaSimpleTypeRestriction();
@@ -376,39 +411,39 @@ public class SchemaGenerator implements
simpleType.setContent(restriction);
} else {
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+ XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema, false);
XmlSchemaSequence sequence = new XmlSchemaSequence();
- XmlSchemaElement eltOuter = new XmlSchemaElement();
+ XmlSchemaElement eltOuter = new XmlSchemaElement(xmlSchema, false);
eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
+ eltOuter.setSchemaTypeName(schemaTypeName);
complexType.setParticle(sequence);
complexType.setName(simpleName);
xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
+ xmlSchema.getElements().put(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(complexType.getQName());
xmlSchema.getItems().add(complexType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
+ xmlSchema.getSchemaTypes().put(schemaTypeName, complexType);
typeTable.addComplexSchema(name, eltOuter.getQName());
sequence.getItems().add(generateSchemaforFieldsandProperties(xmlSchema, aliasType, "item", false));
}
} else {
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+ XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema, false);
XmlSchemaSequence sequence = new XmlSchemaSequence();
- XmlSchemaElement eltOuter = new XmlSchemaElement();
+ XmlSchemaElement eltOuter = new XmlSchemaElement(xmlSchema, false);
eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
+ eltOuter.setSchemaTypeName(schemaTypeName);
complexType.setParticle(sequence);
complexType.setName(simpleName);
xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
+ xmlSchema.getElements().put(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(complexType.getQName());
xmlSchema.getItems().add(complexType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
+ xmlSchema.getSchemaTypes().put(schemaTypeName, complexType);
typeTable.addComplexSchema(name, eltOuter.getQName());
@@ -445,29 +480,29 @@ public class SchemaGenerator implements
String targetNamespacePrefix = (String) targetNamespacePrefixMap.get(targetNameSpace);
schemaTypeName = new QName(targetNameSpace, CorbaConstants.TYPECODE_TYPE_NAME, targetNamespacePrefix);
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+ XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema, false);
XmlSchemaSequence sequence = new XmlSchemaSequence();
- XmlSchemaElement eltOuter = new XmlSchemaElement();
+ XmlSchemaElement eltOuter = new XmlSchemaElement(xmlSchema, false);
eltOuter.setName(CorbaConstants.TYPECODE_TYPE_NAME);
- eltOuter.setQName(schemaTypeName);
+ eltOuter.setSchemaTypeName(schemaTypeName);
complexType.setParticle(sequence);
complexType.setName(CorbaConstants.TYPECODE_TYPE_NAME);
xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
+ xmlSchema.getElements().put(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(complexType.getQName());
xmlSchema.getItems().add(complexType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
+ xmlSchema.getSchemaTypes().put(schemaTypeName, complexType);
typeTable.addComplexSchema(CorbaConstants.TYPECODE_TYPE_NAME, eltOuter.getQName());
- XmlSchemaElement typeElement = new XmlSchemaElement();
+ XmlSchemaElement typeElement = new XmlSchemaElement(xmlSchema, false);
typeElement.setName("definition");
typeElement.setSchemaTypeName(typeTable.getSimpleSchemaTypeName(URI.class.getName()));
sequence.getItems().add(typeElement);
- XmlSchemaElement valueElement = new XmlSchemaElement();
+ XmlSchemaElement valueElement = new XmlSchemaElement(xmlSchema, false);
valueElement.setName("typename");
valueElement.setSchemaTypeName(typeTable.getSimpleSchemaTypeName(String.class.getName()));
sequence.getItems().add(valueElement);
@@ -482,29 +517,29 @@ public class SchemaGenerator implements
String targetNamespacePrefix = (String) targetNamespacePrefixMap.get(targetNameSpace);
schemaTypeName = new QName(targetNameSpace, CorbaConstants.ANY_TYPE_NAME, targetNamespacePrefix);
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+ XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema, false);
XmlSchemaSequence sequence = new XmlSchemaSequence();
- XmlSchemaElement eltOuter = new XmlSchemaElement();
+ XmlSchemaElement eltOuter = new XmlSchemaElement(xmlSchema, false);
eltOuter.setName(CorbaConstants.ANY_TYPE_NAME);
- eltOuter.setQName(schemaTypeName);
+ eltOuter.setSchemaTypeName(schemaTypeName);
complexType.setParticle(sequence);
complexType.setName(CorbaConstants.ANY_TYPE_NAME);
xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
+ xmlSchema.getElements().put(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(complexType.getQName());
xmlSchema.getItems().add(complexType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
+ xmlSchema.getSchemaTypes().put(schemaTypeName, complexType);
typeTable.addComplexSchema(CorbaConstants.ANY_TYPE_NAME, eltOuter.getQName());
- XmlSchemaElement typeElement = new XmlSchemaElement();
+ XmlSchemaElement typeElement = new XmlSchemaElement(xmlSchema, false);
typeElement.setName("type");
typeElement.setSchemaTypeName(typeTable.getComplexSchemaType(CorbaConstants.TYPECODE_TYPE_NAME));
sequence.getItems().add(typeElement);
- XmlSchemaElement valueElement = new XmlSchemaElement();
+ XmlSchemaElement valueElement = new XmlSchemaElement(xmlSchema, false);
valueElement.setName("value");
valueElement.setSchemaTypeName(typeTable.getSimpleSchemaTypeName(Object.class.getName()));
sequence.getItems().add(valueElement);
@@ -546,7 +581,7 @@ public class SchemaGenerator implements
propertyTypeName = "base64Binary";
}
- XmlSchemaElement elt1 = new XmlSchemaElement();
+ XmlSchemaElement elt1 = new XmlSchemaElement(xmlSchema, false);
elt1.setName(name);
if (isArryType && (!propertyTypeName.equals("base64Binary"))){
@@ -566,7 +601,7 @@ public class SchemaGenerator implements
if (!((NamespaceMap) xmlSchema.getNamespaceContext()).values().
contains(typeTable.getComplexSchemaType(propertyTypeName).getNamespaceURI())) {
- XmlSchemaImport importElement = new XmlSchemaImport();
+ XmlSchemaImport importElement = new XmlSchemaImport(xmlSchema);
importElement.setNamespace(
typeTable.getComplexSchemaType(propertyTypeName).getNamespaceURI());
xmlSchema.getItems().add(importElement);
@@ -647,7 +682,7 @@ public class SchemaGenerator implements
QName schemaTypeName,
String paraName,
boolean isArray) {
- XmlSchemaElement elt1 = new XmlSchemaElement();
+ XmlSchemaElement elt1 = new XmlSchemaElement(getXmlSchema(schemaTargetNameSpace), false);
elt1.setName(paraName);
elt1.setSchemaTypeName(schemaTypeName);
sequence.getItems().add(elt1);
@@ -663,14 +698,14 @@ public class SchemaGenerator implements
XmlSchema xmlSchema = getXmlSchema(schemaTargetNameSpace);
QName elementName =
new QName(this.schemaTargetNameSpace, localPartName, this.schema_namespace_prefix);
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+ XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema, false);
- XmlSchemaElement globalElement = new XmlSchemaElement();
+ XmlSchemaElement globalElement = new XmlSchemaElement(xmlSchema, false);
globalElement.setSchemaType(complexType);
globalElement.setName(localPartName);
- globalElement.setQName(elementName);
+// globalElement.setQName(elementName);
xmlSchema.getItems().add(globalElement);
- xmlSchema.getElements().add(elementName, globalElement);
+ xmlSchema.getElements().put(elementName, globalElement);
typeTable.addComplexSchema(localPartName, elementName);
@@ -727,7 +762,7 @@ public class SchemaGenerator implements
private void addImport(XmlSchema xmlSchema, QName schemaTypeName) {
if (!((NamespaceMap) xmlSchema.getNamespaceContext()).values().
contains(schemaTypeName.getNamespaceURI())) {
- XmlSchemaImport importElement = new XmlSchemaImport();
+ XmlSchemaImport importElement = new XmlSchemaImport(xmlSchema);
importElement.setNamespace(schemaTypeName.getNamespaceURI());
xmlSchema.getItems().add(importElement);
((NamespaceMap) xmlSchema.getNamespaceContext()).
@@ -753,17 +788,17 @@ public class SchemaGenerator implements
private XmlSchemaForm getAttrFormDefaultSetting() {
if (FORM_DEFAULT_UNQUALIFIED.equals(getAttrFormDefault())) {
- return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+ return XmlSchemaForm.schemaValueOf(FORM_DEFAULT_UNQUALIFIED);
} else {
- return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+ return XmlSchemaForm.schemaValueOf(FORM_DEFAULT_QUALIFIED);
}
}
private XmlSchemaForm getElementFormDefaultSetting() {
if (FORM_DEFAULT_UNQUALIFIED.equals(getElementFormDefault())) {
- return new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+ return XmlSchemaForm.schemaValueOf(FORM_DEFAULT_UNQUALIFIED);
} else {
- return new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+ return XmlSchemaForm.schemaValueOf(FORM_DEFAULT_QUALIFIED);
}
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/fastinfoset/pom.xml?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/fastinfoset/pom.xml Sun Dec 17 22:16:04 2017
@@ -62,8 +62,8 @@
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/integration/pom.xml?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/integration/pom.xml Sun Dec 17 22:16:04 2017
@@ -128,6 +128,11 @@
<type>mar</type>
</dependency>
<dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-impl-dom</artifactId>
+ <version>${woden.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/pom.xml?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/java2wsdl/pom.xml Sun Dec 17 22:16:04 2017
@@ -58,8 +58,8 @@
<!--added this to support to keep WSDL information in AxisService-->
<dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/CodeGenerationUtility.java Sun Dec 17 22:16:04 2017
@@ -419,7 +419,7 @@ public class CodeGenerationUtility {
return pkg;
}
- private static String getSchemaAsString(XmlSchema schema) {
+ private static String getSchemaAsString(XmlSchema schema) throws UnsupportedEncodingException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
schema.write(baos);
return baos.toString();
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/main/java/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java Sun Dec 17 22:16:04 2017
@@ -21,10 +21,16 @@ package org.apache.axis2.jaxbri;
import com.sun.xml.bind.v2.runtime.JAXBContextImpl;
import com.sun.xml.bind.v2.runtime.JaxBeanInfo;
+import org.apache.axis2.deployment.util.BeanExcludeInfo;
import org.apache.axis2.description.java2wsdl.DefaultSchemaGenerator;
import org.apache.axis2.util.Loader;
-import org.apache.axis2.deployment.util.BeanExcludeInfo;
-import org.apache.ws.commons.schema.*;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaComplexContent;
+import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
+import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaImport;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -37,11 +43,11 @@ import javax.xml.bind.SchemaOutputResolv
import javax.xml.namespace.QName;
import javax.xml.transform.Result;
import javax.xml.transform.dom.DOMResult;
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
import java.io.IOException;
import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -50,9 +56,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
public class JaxbSchemaGenerator extends DefaultSchemaGenerator {
public JaxbSchemaGenerator(ClassLoader loader, String className,
@@ -260,15 +263,15 @@ public class JaxbSchemaGenerator extends
targetNamespacePrefixMap.put(targetNameSpace, targetNamespacePrefix);
}
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema);
+ XmlSchemaComplexType complexType = new XmlSchemaComplexType(xmlSchema, false);
XmlSchemaSequence sequence = new XmlSchemaSequence();
XmlSchemaComplexContentExtension complexExtension =
new XmlSchemaComplexContentExtension();
- XmlSchemaElement eltOuter = new XmlSchemaElement();
+ XmlSchemaElement eltOuter = new XmlSchemaElement(xmlSchema, false);
schemaTypeName = new QName(targetNameSpace, simpleName, targetNamespacePrefix);
eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
+ eltOuter.setSchemaTypeName(schemaTypeName);
Class sup = javaType.getSuperclass();
if ((sup != null) && !("java.lang.Object".compareTo(sup.getName()) == 0) &&
@@ -299,7 +302,7 @@ public class JaxbSchemaGenerator extends
//if the parent class package name is differ from the child
if (!((NamespaceMap) xmlSchema.getNamespaceContext()).values().
contains(tgtNamespace)) {
- XmlSchemaImport importElement = new XmlSchemaImport();
+ XmlSchemaImport importElement = new XmlSchemaImport(xmlSchema);
importElement.setNamespace(tgtNamespace);
xmlSchema.getItems().add(importElement);
((NamespaceMap) xmlSchema.getNamespaceContext()).
@@ -320,11 +323,11 @@ public class JaxbSchemaGenerator extends
complexType.setName(simpleName);
// xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
+ xmlSchema.getElements().put(schemaTypeName, eltOuter);
eltOuter.setSchemaTypeName(complexType.getQName());
xmlSchema.getItems().add(complexType);
- xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
+ xmlSchema.getSchemaTypes().put(schemaTypeName, complexType);
// adding this type to the table
typeTable.addComplexSchema(name, eltOuter.getQName());
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxbri/src/test/java/org/temp/XMLSchemaTest.java Sun Dec 17 22:16:04 2017
@@ -19,6 +19,13 @@
package org.temp;
+import junit.framework.TestCase;
+import org.apache.axis2.util.XMLPrettyPrinter;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.custommonkey.xmlunit.Diff;
+
+import javax.xml.transform.stream.StreamSource;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -26,17 +33,9 @@ import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.axis2.util.XMLPrettyPrinter;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.custommonkey.xmlunit.Diff;
-
public abstract class XMLSchemaTest extends TestCase {
public final String XMLSchemaNameSpace = "xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"";
@@ -79,7 +78,7 @@ public abstract class XMLSchemaTest exte
while (file.exists()) {
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
schemas.add(schema);
i++;
file = new File(SampleSchemasDirectory + "sampleSchema" + i
@@ -93,7 +92,7 @@ public abstract class XMLSchemaTest exte
+ ".xsd");
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
return schema;
}
@@ -115,7 +114,7 @@ public abstract class XMLSchemaTest exte
public String readXMLfromSchemaFile(String path) throws Exception {
InputStream is = new FileInputStream(path);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
ByteArrayOutputStream stream = new ByteArrayOutputStream();
schema.write(stream);
is.close();
@@ -136,7 +135,7 @@ public abstract class XMLSchemaTest exte
fileWriter.close();
}
- public String schemaToString(XmlSchema schema){
+ public String schemaToString(XmlSchema schema) throws UnsupportedEncodingException {
ByteArrayOutputStream stream=new ByteArrayOutputStream();
schema.write(stream);
return stream.toString();
@@ -146,7 +145,7 @@ public abstract class XMLSchemaTest exte
File file = new File(path);
InputStream is = new FileInputStream(file);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
return schema;
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/jibx/src/main/java/org/apache/axis2/jibx/CodeGenerationUtility.java Sun Dec 17 22:16:04 2017
@@ -33,9 +33,9 @@ import org.apache.axis2.wsdl.util.Consta
import org.apache.axis2.wsdl.util.MessagePartInformationHolder;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaParticle;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.apache.ws.commons.schema.XmlSchemaSimpleType;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeContent;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
@@ -715,7 +715,7 @@ public class CodeGenerationUtility {
boolean complex = false;
if (type instanceof XmlSchemaComplexType) {
XmlSchemaComplexType ctype = (XmlSchemaComplexType)type;
- if (ctype.getAttributes().getCount() != 0) {
+ if (!ctype.getAttributes().isEmpty()) {
throw new RuntimeException("Cannot unwrap element " +
qname + ": attributes not allowed on type to be unwrapped");
}
@@ -736,18 +736,18 @@ public class CodeGenerationUtility {
// add child param element matching each child of wrapper element
QName opName = msg.getAxisOperation().getName();
- XmlSchemaObjectCollection items = sequence.getItems();
boolean first = true;
- for (Iterator iter = items.getIterator(); iter.hasNext();) {
+ for (XmlSchemaSequenceMember member : sequence.getItems()) {
// check that child item obeys the unwrapping rules
- XmlSchemaParticle item = (XmlSchemaParticle)iter.next();
+ XmlSchemaParticle item = (XmlSchemaParticle)member;
+
if (!(item instanceof XmlSchemaElement)) {
throw new RuntimeException("Cannot unwrap element " +
qname + ": only element items allowed in sequence");
}
XmlSchemaElement element = (XmlSchemaElement)item;
- QName refname = element.getRefName();
+ QName refname = element.getRef().getTargetQName();
QName typename = element.getSchemaTypeName();
if (refname == null && typename == null) {
throw new RuntimeException("Cannot unwrap element " +
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/json/src/org/apache/axis2/json/gson/factory/XmlNodeGenerator.java Sun Dec 17 22:16:04 2017
@@ -23,14 +23,13 @@ package org.apache.axis2.json.gson.facto
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaParticle;
import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
import org.apache.ws.commons.schema.XmlSchemaSimpleType;
import org.apache.ws.commons.schema.XmlSchemaType;
import javax.xml.namespace.QName;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
@@ -117,12 +116,9 @@ public class XmlNodeGenerator {
XmlSchemaParticle particle = complexType.getParticle();
if (particle instanceof XmlSchemaSequence) {
XmlSchemaSequence sequence = (XmlSchemaSequence)particle;
- XmlSchemaObjectCollection objectCollection = sequence.getItems();
- Iterator objectIterator = objectCollection.getIterator();
- while (objectIterator.hasNext()) {
- Object obj = objectIterator.next();
- if (obj instanceof XmlSchemaElement) {
- processElement((XmlSchemaElement)obj , parentNode , schema);
+ for (XmlSchemaSequenceMember member : sequence.getItems()) {
+ if (member instanceof XmlSchemaElement) {
+ processElement((XmlSchemaElement)member , parentNode , schema);
}
}
}
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/GsonXMLStreamReaderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/GsonXMLStreamReaderTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/GsonXMLStreamReaderTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/GsonXMLStreamReaderTest.java Sun Dec 17 22:16:04 2017
@@ -50,7 +50,7 @@ public class GsonXMLStreamReaderTest {
String fileName = "test-resources/custom_schema/testSchema_1.xsd";
InputStream is = new FileInputStream(fileName);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
List<XmlSchema> schemaList = new ArrayList<XmlSchema>();
schemaList.add(schema);
QName elementQName = new QName("http://www.w3schools.com", "response");
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/GsonXMLStreamWriterTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/GsonXMLStreamWriterTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/GsonXMLStreamWriterTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/GsonXMLStreamWriterTest.java Sun Dec 17 22:16:04 2017
@@ -53,7 +53,7 @@ public class GsonXMLStreamWriterTest {
String fileName = "test-resources/custom_schema/testSchema_1.xsd";
InputStream is = new FileInputStream(fileName);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
List<XmlSchema> schemaList = new ArrayList<XmlSchema>();
schemaList.add(schema);
QName elementQName = new QName("http://www.w3schools.com", "response");
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/JSONMessageHandlerTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/JSONMessageHandlerTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/JSONMessageHandlerTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/JSONMessageHandlerTest.java Sun Dec 17 22:16:04 2017
@@ -31,7 +31,6 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisOperationFactory;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.json.gson.factory.JsonConstant;
@@ -80,7 +79,7 @@ public class JSONMessageHandlerTest {
String fileName = "test-resources/custom_schema/testSchema_2.xsd";
InputStream is = new FileInputStream(fileName);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
QName elementQName = new QName("http://test.json.axis2.apache.org" ,"echoPerson");
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/JsonFormatterTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/JsonFormatterTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/JsonFormatterTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/JsonFormatterTest.java Sun Dec 17 22:16:04 2017
@@ -94,7 +94,7 @@ public class JsonFormatterTest {
String fileName = "test-resources/custom_schema/testSchema_1.xsd";
InputStream is = new FileInputStream(fileName);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
QName elementQName = new QName("http://www.w3schools.com", "response");
ConfigurationContext configCtxt = new ConfigurationContext(new AxisConfiguration());
outMsgContext.setConfigurationContext(configCtxt);
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/factory/XmlNodeGeneratorTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/factory/XmlNodeGeneratorTest.java?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/factory/XmlNodeGeneratorTest.java (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/json/test/org/apache/axis2/json/gson/factory/XmlNodeGeneratorTest.java Sun Dec 17 22:16:04 2017
@@ -21,9 +21,7 @@ package org.apache.axis2.json.gson.facto
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
import javax.xml.namespace.QName;
@@ -44,7 +42,7 @@ public class XmlNodeGeneratorTest {
String fileName = "test-resources/custom_schema/testSchema_2.xsd";
InputStream is = new FileInputStream(fileName);
XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+ XmlSchema schema = schemaCol.read(new StreamSource(is));
List<XmlSchema> schemaList = new ArrayList<XmlSchema>();
schemaList.add(schema);
Modified: axis/axis2/java/core/branches/AXIS2-4091/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/kernel/pom.xml?rev=1818516&r1=1818515&r2=1818516&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/kernel/pom.xml Sun Dec 17 22:16:04 2017
@@ -62,8 +62,8 @@
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.neethi</groupId>
@@ -71,8 +71,11 @@
</dependency>
<dependency>
<groupId>org.apache.woden</groupId>
- <artifactId>woden-core</artifactId>
- <version>${woden.version}</version>
+ <artifactId>woden-impl-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-impl-dom</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>