Author: veithen
Date: Sun Jul 12 19:45:55 2015
New Revision: 1690513
URL: http://svn.apache.org/r1690513
Log:
Applied Hiranya's patch to upgrade Neethi and XmlSchema to the latest releases.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1690513&r1=1690512&r2=1690513&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Sun Jul 12 19:45:55 2015
@@ -29,54 +29,8 @@ import org.apache.axis2.util.SchemaUtil;
import org.apache.axis2.util.URLProcessor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaAll;
-import org.apache.ws.commons.schema.XmlSchemaAny;
-import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;
-import org.apache.ws.commons.schema.XmlSchemaAttribute;
-import org.apache.ws.commons.schema.XmlSchemaAttributeGroup;
-import org.apache.ws.commons.schema.XmlSchemaAttributeGroupMember;
-import org.apache.ws.commons.schema.XmlSchemaAttributeGroupRef;
-import org.apache.ws.commons.schema.XmlSchemaAttributeOrGroupRef;
-import org.apache.ws.commons.schema.XmlSchemaChoice;
-import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexContent;
-import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
-import org.apache.ws.commons.schema.XmlSchemaComplexContentRestriction;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaContent;
-import org.apache.ws.commons.schema.XmlSchemaContentModel;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
-import org.apache.ws.commons.schema.XmlSchemaExternal;
-import org.apache.ws.commons.schema.XmlSchemaFacet;
-import org.apache.ws.commons.schema.XmlSchemaGroup;
-import org.apache.ws.commons.schema.XmlSchemaGroupParticle;
-import org.apache.ws.commons.schema.XmlSchemaGroupRef;
-import org.apache.ws.commons.schema.XmlSchemaImport;
-import org.apache.ws.commons.schema.XmlSchemaInclude;
-import org.apache.ws.commons.schema.XmlSchemaLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxExclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxInclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMaxLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinExclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinInclusiveFacet;
-import org.apache.ws.commons.schema.XmlSchemaMinLengthFacet;
-import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaParticle;
-import org.apache.ws.commons.schema.XmlSchemaPatternFacet;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
-import org.apache.ws.commons.schema.XmlSchemaSimpleContent;
-import org.apache.ws.commons.schema.XmlSchemaSimpleContentExtension;
-import org.apache.ws.commons.schema.XmlSchemaSimpleContentRestriction;
-import org.apache.ws.commons.schema.XmlSchemaSimpleType;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeContent;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeList;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
-import org.apache.ws.commons.schema.XmlSchemaSimpleTypeUnion;
-import org.apache.ws.commons.schema.XmlSchemaTotalDigitsFacet;
-import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.ws.commons.schema.*;
+import org.apache.ws.commons.schema.utils.XmlSchemaObjectBase;
import org.xml.sax.InputSource;
import javax.xml.namespace.QName;
@@ -2083,11 +2037,11 @@ public class SchemaCompiler {
}
} else if (particle instanceof XmlSchemaAll) {
- List<XmlSchemaElement> items = ((XmlSchemaAll)
particle).getItems();
+ List<XmlSchemaAllMember> items = ((XmlSchemaAll)
particle).getItems();
processSchemaAllItems(parentElementQName, items, metainfHolder,
false, parentSchema);
} else if (particle instanceof XmlSchemaChoice) {
XmlSchemaChoice xmlSchemaChoice = (XmlSchemaChoice) particle;
- List<XmlSchemaObject> items = ((XmlSchemaChoice)
particle).getItems();
+ List<XmlSchemaChoiceMember> items = ((XmlSchemaChoice)
particle).getItems();
if ((xmlSchemaChoice.getMaxOccurs() > 1)) {
// we have to process many sequence types
@@ -2176,18 +2130,18 @@ public class SchemaCompiler {
boolean order,
XmlSchema parentSchema) throws
SchemaCompilationException {
- Map<XmlSchemaObject, Boolean> processedElementArrayStatusMap =
- new LinkedHashMap<XmlSchemaObject, Boolean>();
+ Map<XmlSchemaObjectBase, Boolean> processedElementArrayStatusMap =
+ new LinkedHashMap<XmlSchemaObjectBase, Boolean>();
Map processedElementTypeMap = new LinkedHashMap(); // TODO: not sure
what is the correct generic type here
List<QName> localNillableList = new ArrayList<QName>();
- Map<XmlSchemaObject, QName> particleQNameMap = new
HashMap<XmlSchemaObject, QName>();
+ Map<XmlSchemaObjectBase, QName> particleQNameMap = new
HashMap<XmlSchemaObjectBase, QName>();
// this list is used to keep the details of the
// elements within a choice withing sequence
List<QName> innerChoiceElementList = new ArrayList<QName>();
- Map<XmlSchemaObject, Integer> elementOrderMap = new
HashMap<XmlSchemaObject, Integer>();
+ Map<XmlSchemaObjectBase, Integer> elementOrderMap = new
HashMap<XmlSchemaObjectBase, Integer>();
int sequenceCounter = 0;
for (XmlSchemaSequenceMember member : items) {
@@ -2205,26 +2159,26 @@ public class SchemaCompiler {
}
private void processChoiceItems(QName parentElementQName,
- List<XmlSchemaObject> items,
+ List<XmlSchemaChoiceMember> items,
BeanWriterMetaInfoHolder metainfHolder,
boolean order,
XmlSchema parentSchema) throws
SchemaCompilationException {
- Map<XmlSchemaObject, Boolean> processedElementArrayStatusMap =
- new LinkedHashMap<XmlSchemaObject, Boolean>();
+ Map<XmlSchemaObjectBase, Boolean> processedElementArrayStatusMap =
+ new LinkedHashMap<XmlSchemaObjectBase, Boolean>();
Map processedElementTypeMap = new LinkedHashMap(); // TODO: not sure
what is the correct generic type here
List<QName> localNillableList = new ArrayList<QName>();
- Map<XmlSchemaObject, QName> particleQNameMap = new
HashMap<XmlSchemaObject, QName>();
+ Map<XmlSchemaObjectBase, QName> particleQNameMap = new
HashMap<XmlSchemaObjectBase, QName>();
// this list is used to keep the details of the
// elements within a choice withing sequence
List<QName> innerChoiceElementList = new ArrayList<QName>();
- Map<XmlSchemaObject, Integer> elementOrderMap = new
HashMap<XmlSchemaObject, Integer>();
+ Map<XmlSchemaObjectBase, Integer> elementOrderMap = new
HashMap<XmlSchemaObjectBase, Integer>();
int sequenceCounter = 0;
- for (XmlSchemaObject item : items) {
+ for (XmlSchemaChoiceMember item : items) {
//recursively process the element
processElements(parentElementQName, item,
processedElementArrayStatusMap,
processedElementTypeMap, elementOrderMap,
localNillableList,
@@ -2239,26 +2193,26 @@ public class SchemaCompiler {
private void processSchemaAllItems(QName parentElementQName,
- List<XmlSchemaElement> items,
+ List<XmlSchemaAllMember> items,
BeanWriterMetaInfoHolder metainfHolder,
boolean order,
XmlSchema parentSchema) throws
SchemaCompilationException {
- Map<XmlSchemaObject, Boolean> processedElementArrayStatusMap =
- new LinkedHashMap<XmlSchemaObject, Boolean>();
+ Map<XmlSchemaObjectBase, Boolean> processedElementArrayStatusMap =
+ new LinkedHashMap<XmlSchemaObjectBase, Boolean>();
Map processedElementTypeMap = new LinkedHashMap(); // TODO: not sure
what is the correct generic type here
List<QName> localNillableList = new ArrayList<QName>();
- Map<XmlSchemaObject, QName> particleQNameMap = new
HashMap<XmlSchemaObject, QName>();
+ Map<XmlSchemaObjectBase, QName> particleQNameMap = new
HashMap<XmlSchemaObjectBase, QName>();
// this list is used to keep the details of the
// elements within a choice withing sequence
List<QName> innerChoiceElementList = new ArrayList<QName>();
- Map<XmlSchemaObject, Integer> elementOrderMap = new
HashMap<XmlSchemaObject, Integer>();
+ Map<XmlSchemaObjectBase, Integer> elementOrderMap = new
HashMap<XmlSchemaObjectBase, Integer>();
int sequenceCounter = 0;
- for (XmlSchemaObject item : items) {
+ for (XmlSchemaAllMember item : items) {
//recursively process the element
processElements(parentElementQName, item,
processedElementArrayStatusMap,
processedElementTypeMap, elementOrderMap,
localNillableList,
@@ -2273,19 +2227,19 @@ public class SchemaCompiler {
private void addProcessedItemsToMetaInfoHolder(
- Map<XmlSchemaObject, Boolean> processedElementArrayStatusMap,
+ Map<XmlSchemaObjectBase, Boolean> processedElementArrayStatusMap,
Map processedElementTypeMap,
List<QName> innerChoiceElementList,
- Map<XmlSchemaObject, Integer> elementOrderMap,
+ Map<XmlSchemaObjectBase, Integer> elementOrderMap,
List<QName> localNillableList,
- Map<XmlSchemaObject, QName> particleQNameMap,
+ Map<XmlSchemaObjectBase, QName> particleQNameMap,
BeanWriterMetaInfoHolder metainfHolder,
boolean order,
XmlSchema parentSchema) throws SchemaCompilationException {
// loop through the processed items and add them to the matainf object
int startingItemNumberOrder = metainfHolder.getOrderStartPoint();
- for (XmlSchemaObject child : processedElementArrayStatusMap.keySet()) {
+ for (XmlSchemaObjectBase child :
processedElementArrayStatusMap.keySet()) {
// process the XmlSchemaElement
if (child instanceof XmlSchemaElement) {
@@ -2503,12 +2457,12 @@ public class SchemaCompiler {
}
- private void processElements(QName parentElementQName, XmlSchemaObject
item,
- Map<XmlSchemaObject, Boolean>
processedElementArrayStatusMap,
+ private void processElements(QName parentElementQName, XmlSchemaObjectBase
item,
+ Map<XmlSchemaObjectBase, Boolean>
processedElementArrayStatusMap,
Map processedElementTypeMap,
- Map<XmlSchemaObject, Integer> elementOrderMap,
+ Map<XmlSchemaObjectBase, Integer>
elementOrderMap,
List<QName> localNillableList,
- Map<XmlSchemaObject, QName> particleQNameMap,
+ Map<XmlSchemaObjectBase, QName>
particleQNameMap,
boolean order, int sequenceCounter,
XmlSchema parentSchema) throws
SchemaCompilationException {
Modified:
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java?rev=1690513&r1=1690512&r2=1690513&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java
(original)
+++
axis/axis2/java/core/trunk/modules/corba/src/org/apache/axis2/corba/deployer/SchemaGenerator.java
Sun Jul 12 19:45:55 2015
@@ -40,21 +40,7 @@ import org.apache.axis2.description.java
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.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.*;
import org.apache.ws.commons.schema.utils.NamespaceMap;
import javax.xml.namespace.QName;
@@ -355,7 +341,7 @@ public class SchemaGenerator implements
} else if (dataType instanceof UnionType) {
XmlSchemaComplexType complexType = new
XmlSchemaComplexType(xmlSchema, false);
XmlSchemaChoice choice = new XmlSchemaChoice();
- List<XmlSchemaObject> items = choice.getItems();
+ List<XmlSchemaChoiceMember> items = choice.getItems();
UnionType unionType = (UnionType) dataType;
Member[] members = unionType.getMembers();
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1690513&r1=1690512&r2=1690513&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Sun Jul 12 19:45:55 2015
@@ -59,13 +59,7 @@ import org.apache.axis2.wsdl.WSDLConstan
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.commons.schema.XmlSchemaAll;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-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 org.apache.ws.commons.schema.*;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -161,7 +155,7 @@ public class BuilderUtil {
XmlSchemaAll sequence = (XmlSchemaAll) particle;
// now we need to know some information from the
binding operation.
- for (XmlSchemaSequenceMember sequenceMember :
sequence.getItems()) {
+ for (XmlSchemaAllMember sequenceMember :
sequence.getItems()) {
XmlSchemaElement innerElement =
(XmlSchemaElement) sequenceMember;
QName qName = innerElement.getQName();
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1690513&r1=1690512&r2=1690513&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Jul 12 19:45:55 2015
@@ -68,9 +68,9 @@
<properties>
<!-- Tracking SNAPSHOT(s) of a few projects -->
<axiom.version>1.2.16-SNAPSHOT</axiom.version>
- <neethi.version>3.0.4-SNAPSHOT</neethi.version>
+ <neethi.version>3.0.3</neethi.version>
<woden.version>1.0-SNAPSHOT</woden.version>
- <xmlschema.version>2.1.1-SNAPSHOT</xmlschema.version>
+ <xmlschema.version>2.2.1</xmlschema.version>
<!-- Use released versions for these projects -->
<ant.version>1.7.0</ant.version>
Modified:
axis/axis2/java/core/trunk/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java?rev=1690513&r1=1690512&r2=1690513&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
Sun Jul 12 19:45:55 2015
@@ -47,13 +47,7 @@ import org.apache.axis2.util.Utils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.commons.schema.XmlSchemaAll;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-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 org.apache.ws.commons.schema.*;
import org.jivesoftware.smack.Chat;
import org.jivesoftware.smack.ChatManager;
import org.jivesoftware.smack.XMPPConnection;
@@ -351,8 +345,6 @@ public class XMPPSender extends Abstract
.equals(org.apache.ws.commons.schema.constants.Constants.XSD_ANYTYPE)) {
break;
}
- long minOccurs = innerElement.getMinOccurs();
- boolean nillable = innerElement.isNillable();
String name =
qName != null ? qName.getLocalPart() :
innerElement.getName();
String type =
innerElement.getSchemaTypeName().toString();
@@ -360,14 +352,13 @@ public class XMPPSender extends Abstract
}
} else {
XmlSchemaAll xmlSchemaAll = (XmlSchemaAll) particle;
- for (XmlSchemaElement innerElement :
xmlSchemaAll.getItems()) {
+ for (XmlSchemaAllMember member :
xmlSchemaAll.getItems()) {
+ XmlSchemaElement
innerElement = (XmlSchemaElement) member;
QName qName = innerElement.getQName();
if (qName == null &&
innerElement.getSchemaTypeName()
.equals(org.apache.ws.commons.schema.constants.Constants.XSD_ANYTYPE)) {
break;
}
- long minOccurs = innerElement.getMinOccurs();
- boolean nillable = innerElement.isNillable();
String name =
qName != null ? qName.getLocalPart() :
innerElement.getName();
String type =
innerElement.getSchemaTypeName().toString();
