Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 073d2dd84 -> 2de6f1409
Minor update to allow CXF to compile and work with both XmlSchema 2.1 and 2.2-snap Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/587a0870 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/587a0870 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/587a0870 Branch: refs/heads/3.0.x-fixes Commit: 587a0870e6acd26d1301f86002c45381c0def9cd Parents: 073d2dd8 Author: Daniel Kulp <dk...@apache.org> Authored: Wed Sep 17 13:07:19 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Wed Sep 24 14:06:16 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/cxf/common/xmlschema/SchemaCollection.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/587a0870/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java index 0932913..a9b6a1c 100644 --- a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java +++ b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java @@ -43,7 +43,6 @@ 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.XmlSchemaObject; import org.apache.ws.commons.schema.XmlSchemaParticle; import org.apache.ws.commons.schema.XmlSchemaSequence; import org.apache.ws.commons.schema.XmlSchemaSequenceMember; @@ -54,6 +53,7 @@ import org.apache.ws.commons.schema.extensions.ExtensionRegistry; import org.apache.ws.commons.schema.resolver.URIResolver; import org.apache.ws.commons.schema.utils.NamespaceMap; import org.apache.ws.commons.schema.utils.NamespacePrefixList; +import org.apache.ws.commons.schema.utils.XmlSchemaObjectBase; /** * Wrapper class for XmlSchemaCollection that deals with various quirks and bugs. @@ -312,7 +312,7 @@ public class SchemaCollection { } } private void addCrossImports(XmlSchema schema, XmlSchemaAll all) { - for (XmlSchemaObject seqMember : all.getItems()) { + for (XmlSchemaObjectBase seqMember : all.getItems()) { if (seqMember instanceof XmlSchemaElement) { addElementCrossImportsElement(schema, (XmlSchemaElement)seqMember); } @@ -320,7 +320,7 @@ public class SchemaCollection { } private void addCrossImports(XmlSchema schema, XmlSchemaChoice choice) { - for (XmlSchemaObject seqMember : choice.getItems()) { + for (XmlSchemaObjectBase seqMember : choice.getItems()) { if (seqMember instanceof XmlSchemaElement) { addElementCrossImportsElement(schema, (XmlSchemaElement)seqMember); }
