You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/07 20:46:20 UTC
[08/10] git commit: Minor update to allow CXF to compile and work
with both XmlSchema 2.1 and 2.2-snap
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/68b94352
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/68b94352
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/68b94352
Branch: refs/heads/2.7.x-fixes
Commit: 68b94352b3ab623d498b5347a0301de702b0455e
Parents: d729e32
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Sep 17 13:07:19 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 14:03:20 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/68b94352/api/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java b/api/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
index 06e6240..d3dc285 100644
--- a/api/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
+++ b/api/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);
}