diff -ubrN XmlSchema-orig/.project XmlSchema/.project --- XmlSchema-orig/.project 2006-09-04 01:25:15.000000000 +0200 +++ XmlSchema/.project 2006-08-11 15:21:44.000000000 +0200 @@ -1,6 +1,6 @@ - XmlSchema-orig + XmlSchema diff -ubrN XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java --- XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java 2006-09-04 01:26:34.000000000 +0200 +++ XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java 2006-09-04 03:00:34.000000000 +0200 @@ -27,8 +27,10 @@ import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; +import org.apache.ws.commons.schema.XmlSchemaCollection.SchemaKey; import org.apache.ws.commons.schema.constants.Constants; import org.apache.ws.commons.schema.utils.NodeNamespaceContext; +import org.apache.ws.commons.schema.utils.TargetNamespaceValidator; import org.apache.ws.commons.schema.utils.XDOMUtil; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -42,16 +44,16 @@ Document doc; XmlSchema schema; XmlSchemaCollection collection; - + private final TargetNamespaceValidator validator; DocumentBuilderFactory docFac; - public static final String XMLNS_PREFIX = "xmlns"; /** * Schema builder constructor * @param collection */ - SchemaBuilder(XmlSchemaCollection collection) { + SchemaBuilder(XmlSchemaCollection collection, TargetNamespaceValidator validator) { this.collection = collection; + this.validator = validator; schema = new XmlSchema(collection); } @@ -76,14 +78,9 @@ schema.setNamespaceContext(new NodeNamespaceContext(schemaEl)); setNamespaceAttributes(schema, schemaEl); - if (uri != null) - collection.systemId2Schemas.put(uri, schema); - - collection.schemas.add(schema); - - // only populate it if it isn't already in there - if(!collection.namespaces.containsKey(schema.targetNamespace)){ - collection.namespaces.put(schema.targetNamespace, schema); + XmlSchemaCollection.SchemaKey schemaKey = new XmlSchemaCollection.SchemaKey(schema.logicalTargetNamespace, uri); + if (!collection.containsSchema(schemaKey)) { + collection.addSchema(schemaKey, schema); } schema.setElementFormDefault(this.getFormDefault(schemaEl, @@ -231,9 +228,9 @@ XmlSchemaRedefine redefine = new XmlSchemaRedefine(); redefine.schemaLocation = redefineEl.getAttribute("schemaLocation"); - //redefine has no such thing called a namespace! + final TargetNamespaceValidator validator = newIncludeValidator(schema); redefine.schema = - resolveXmlSchema(null,redefine.schemaLocation); + resolveXmlSchema(schema.logicalTargetNamespace, redefine.schemaLocation, validator); for (Element el = XDOMUtil.getFirstChildElementNS(redefineEl, XmlSchema.SCHEMA_NS) @@ -279,12 +276,13 @@ //no targetnamespace found ! if (schemaEl.getAttributeNode("targetNamespace") != null) { String contain = schemaEl.getAttribute("targetNamespace"); - - if (!contain.equals("")) - schema.targetNamespace = contain; + schema.setTargetNamespace(contain); } else { //do nothing here } + if (validator != null) { + validator.validate(schema); + } } /** @@ -505,7 +503,7 @@ if (offset == -1) { uri = pContext.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX); if (XMLConstants.NULL_NS_URI.equals(uri)) { - return new QName(schema.targetNamespace, pName); + return new QName(schema.logicalTargetNamespace, pName); } localName = pName; prefix = XMLConstants.DEFAULT_NS_PREFIX; @@ -1203,6 +1201,14 @@ return group; } + private QName newLocalQName(String pLocalName) { + String uri = schema.logicalTargetNamespace; + if (uri == null) { + uri = XMLConstants.NULL_NS_URI; + } + return new QName(uri, pLocalName); + } + private XmlSchemaAttribute handleAttribute(XmlSchema schema, Element attrEl, Element schemaEl) { //todo: need to implement different rule of attribute such as @@ -1216,7 +1222,7 @@ // "" :schema.targetNamespace; attr.name = name; - attr.qualifiedName = new QName(schema.targetNamespace, name); + attr.qualifiedName = newLocalQName(name); } if (attrEl.hasAttribute("type")) { @@ -1362,11 +1368,9 @@ isQualified = formDef.equals(XmlSchemaForm.QUALIFIED); } - String ns = (isQualified || isGlobal) ? schema.targetNamespace : - null; - - if(element.name != null) { - element.qualifiedName = new QName(ns, element.name); + if (element.name != null) { + final String name = element.name; + element.qualifiedName = (isQualified || isGlobal) ? newLocalQName(name) : new QName(XMLConstants.NULL_NS_URI, name); } Element annotationEl = @@ -1567,22 +1571,42 @@ schemaImport.setAnnotation(importAnnotation); } - schemaImport.namespace = importEl.getAttribute("namespace"); + final String uri = schemaImport.namespace = importEl.getAttribute("namespace"); schemaImport.schemaLocation = importEl.getAttribute("schemaLocation"); + TargetNamespaceValidator validator = new TargetNamespaceValidator(){ + private boolean isEmpty(String pValue) { + return pValue == null || XMLConstants.NULL_NS_URI.equals(pValue); + } + public void validate(XmlSchema pSchema) { + final boolean valid; + if (isEmpty(uri)) { + valid = isEmpty(pSchema.syntacticalTargetNamespace); + } else { + valid = pSchema.syntacticalTargetNamespace.equals(uri); + } + if (!valid) { + throw new XmlSchemaException("An imported schema was announced to have the namespace " + + uri + ", but has the namespace " + + pSchema.syntacticalTargetNamespace); + } + } + }; if ((schemaImport.schemaLocation != null) && (!schemaImport.schemaLocation.equals(""))) { if(schema.getSourceURI()!=null) { schemaImport.schema = resolveXmlSchema( - schemaImport.namespace, + uri, schemaImport.schemaLocation, - schema.getSourceURI()); + schema.getSourceURI(), + validator); } else { schemaImport.schema = resolveXmlSchema( schemaImport.namespace, - schemaImport.schemaLocation); + schemaImport.schemaLocation, + validator); } } return schemaImport; @@ -1594,7 +1618,7 @@ * @param includeEl * @param schemaEl */ - XmlSchemaInclude handleInclude(XmlSchema schema, + XmlSchemaInclude handleInclude(final XmlSchema schema, Element includeEl, Element schemaEl) { XmlSchemaInclude include = new XmlSchemaInclude(); @@ -1616,23 +1640,48 @@ // we should be passing in a null in place of the target //namespace + final TargetNamespaceValidator validator = newIncludeValidator(schema); if(schema.getSourceURI()!=null) { include.schema = resolveXmlSchema( - null, + schema.logicalTargetNamespace, include.schemaLocation, - schema.getSourceURI()); + schema.getSourceURI(), + validator); } else { include.schema = resolveXmlSchema( - null, - include.schemaLocation); + schema.logicalTargetNamespace, + include.schemaLocation, + validator); } //process extra attributes and elements processExtensibilityComponents(include,schemaEl); return include; } + private TargetNamespaceValidator newIncludeValidator(final XmlSchema schema) { + return new TargetNamespaceValidator(){ + private boolean isEmpty(String pValue) { + return pValue == null || XMLConstants.NULL_NS_URI.equals(pValue); + } + public void validate(XmlSchema pSchema) { + if (isEmpty(pSchema.syntacticalTargetNamespace)) { + pSchema.logicalTargetNamespace = schema.logicalTargetNamespace; + } else { + if (!pSchema.syntacticalTargetNamespace.equals(schema.logicalTargetNamespace)) { + String msg = "An included schema was announced to have the default target namespace"; + if (!isEmpty(schema.logicalTargetNamespace)) { + msg += " or the target namespace " + schema.logicalTargetNamespace; + } + throw new XmlSchemaException(msg + ", but has the target namespace " + + pSchema.logicalTargetNamespace); + } + } + } + }; + } + /** * Handles the annotation * Traversing if encounter appinfo or documentation @@ -1794,36 +1843,35 @@ */ XmlSchema resolveXmlSchema(String targetNamespace, String schemaLocation, - String baseUri) { + String baseUri, + TargetNamespaceValidator validator) { //use the entity resolver provided - XmlSchema schema = null; InputSource source = collection.schemaResolver. resolveEntity(targetNamespace,schemaLocation,baseUri); - if (source.getSystemId() != null) { - schema = collection.getXmlSchema(source.getSystemId()); + final String systemId = source.getSystemId() == null ? schemaLocation : source.getSystemId(); + final SchemaKey key = new XmlSchemaCollection.SchemaKey(targetNamespace, systemId); + XmlSchema schema = collection.getSchema(key); + if (schema != null) { + return schema; } - - if (schema == null) { try { - return collection.read(source, null); + return collection.read(source, null, validator); } catch (Exception e) { throw new RuntimeException(e); } } - return schema; - } - /** * Resolve the schemas * @param targetNamespace * @param schemaLocation */ XmlSchema resolveXmlSchema(String targetNamespace, - String schemaLocation) { - return resolveXmlSchema(targetNamespace,schemaLocation, - collection.baseUri); + String schemaLocation, + TargetNamespaceValidator validator) { + return resolveXmlSchema(targetNamespace, schemaLocation, + collection.baseUri, validator); } @@ -1847,7 +1895,7 @@ if (namespaceURI!= null && !"".equals(namespaceURI) && //ignore unqualified attributes - !name.startsWith(XMLNS_PREFIX) && //ignore namespaces + !name.startsWith(XMLConstants.XMLNS_ATTRIBUTE) && //ignore namespaces !Constants.URI_2001_SCHEMA_XSD.equals(namespaceURI)){ attribMap.put(new QName(namespaceURI,name), attribute.getValue()); diff -ubrN XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/utils/.svn/entries XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/.svn/entries --- XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/utils/.svn/entries 2006-09-04 01:26:34.000000000 +0200 +++ XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/.svn/entries 2006-09-04 03:01:24.000000000 +0200 @@ -2,12 +2,12 @@ @@ -15,26 +15,51 @@ name="DOMUtil.java" checksum="4698ca84b8e924b5df336801d6e26082" last-author="jochen" - committed-rev="431129" text-time="2005-09-20T22:55:02.000000Z" + committed-rev="431129" kind="file" committed-date="2006-08-13T01:25:53.047000Z"/> + + + + + diff -ubrN XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/utils/TargetNamespaceValidator.java XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/TargetNamespaceValidator.java --- XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/utils/TargetNamespaceValidator.java 1970-01-01 01:00:00.000000000 +0100 +++ XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/TargetNamespaceValidator.java 2006-09-04 01:58:14.000000000 +0200 @@ -0,0 +1,28 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.ws.commons.schema.utils; + +import org.apache.ws.commons.schema.XmlSchema; + +/** + * Interface of an object, which may validate a schemas target namespace. + */ +public interface TargetNamespaceValidator { + /** + * Called for validating the given schemas target namespace. + */ + void validate(XmlSchema pSchema); +} diff -ubrN XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java --- XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java 2006-09-04 01:26:34.000000000 +0200 +++ XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java 2006-09-04 03:09:48.000000000 +0200 @@ -16,31 +16,29 @@ package org.apache.ws.commons.schema; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; -import java.util.Collections; +import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; -import java.util.Set; +import javax.xml.XMLConstants; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.dom.DOMResult; import org.apache.ws.commons.schema.constants.Constants; import org.apache.ws.commons.schema.resolver.DefaultURIResolver; import org.apache.ws.commons.schema.resolver.URIResolver; +import org.apache.ws.commons.schema.utils.TargetNamespaceValidator; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.InputSource; @@ -51,10 +49,41 @@ * */ public final class XmlSchemaCollection { + static class SchemaKey { + private final String namespace; + private final String systemId; + SchemaKey(String pNamespace, String pSystemId) { + namespace = pNamespace == null ? XMLConstants.NULL_NS_URI : pNamespace; + systemId = pSystemId == null ? "" : pSystemId; + } + String getNamespace() { return namespace; } + String getSystemId() { return systemId; } + public int hashCode() { + final int PRIME = 31; + return (PRIME + namespace.hashCode()) * PRIME + systemId.hashCode(); + } + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final SchemaKey other = (SchemaKey) obj; + return namespace.equals(other.namespace) && systemId.equals(other.systemId); + } + public String toString() { + return XMLConstants.NULL_NS_URI.equals(namespace) ? + systemId : ("{" + namespace + "}" + systemId); + } + } + /** - * Namespaces we know about. Each one has an equivalent XmlSchema. + * Map of included schemas. */ - Map namespaces = new HashMap(); + private Map schemas = new HashMap(); + + /** * base URI is used as the base for loading the * imports @@ -66,11 +95,6 @@ Map inScopeNamespaces = new HashMap(); /** - * Schemas in this colelction sorted by system id. - */ - Map systemId2Schemas = new HashMap(); - - /** * An org.xml.sax.EntityResolver that is used to * resolve the imports/includes */ @@ -79,11 +103,6 @@ XmlSchema xsd = new XmlSchema(XmlSchema.SCHEMA_NS, this); /** - * A Set of all the scehmas in this collection. - */ - Set schemas = new HashSet(); - - /** * Set the base URI. This is used when schemas need to be * loaded from relative locations * @param baseUri @@ -208,7 +227,25 @@ addSimpleType(xsd, Constants.XSD_LANGUAGE.getLocalPart()); addSimpleType(xsd, Constants.XSD_TOKEN.getLocalPart()); - namespaces.put(XmlSchema.SCHEMA_NS, xsd); + SchemaKey key = new SchemaKey(XmlSchema.SCHEMA_NS, null); + addSchema(key, xsd); + } + + boolean containsSchema(SchemaKey pKey) { + return schemas.containsKey(pKey); + } + + XmlSchema getSchema(SchemaKey pKey) { + return (XmlSchema) schemas.get(pKey); + } + + void addSchema(SchemaKey pKey, XmlSchema pSchema) { + if (schemas.containsKey(pKey)) { + throw new IllegalStateException("A schema with target namespace " + + pKey.getNamespace() + " and system ID " + pKey.getSystemId() + + " is already present."); + } + schemas.put(pKey, pSchema); } private void addSimpleType(XmlSchema schema,String typeName){ @@ -221,13 +258,14 @@ return read(new InputSource(r), veh); } - public XmlSchema read(InputSource inputSource, ValidationEventHandler veh) { + XmlSchema read(InputSource inputSource, ValidationEventHandler veh, + TargetNamespaceValidator namespaceValidator) { try { DocumentBuilderFactory docFac = DocumentBuilderFactory.newInstance(); docFac.setNamespaceAware(true); DocumentBuilder builder = docFac.newDocumentBuilder(); Document doc = builder.parse(inputSource); - return read(doc, inputSource.getSystemId(), veh); + return read(doc, inputSource.getSystemId(), veh, namespaceValidator); } catch (ParserConfigurationException e) { throw new XmlSchemaException(e.getMessage()); } catch (IOException e) { @@ -237,39 +275,43 @@ } } + public XmlSchema read(InputSource inputSource, ValidationEventHandler veh) { + return read(inputSource, veh, null); + } + public XmlSchema read(Source source, ValidationEventHandler veh) { try { TransformerFactory trFac = TransformerFactory.newInstance(); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - StreamResult result = new StreamResult(out); - javax.xml.transform.Transformer tr = trFac.newTransformer(); - tr.setOutputProperty(OutputKeys.METHOD, "xml"); - tr.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); - tr.transform(source, result); - ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); - return read(new InputSource(in), veh); + DOMResult result = new DOMResult(); + trFac.newTransformer().transform(source, result); + return read((Document) result.getNode(), veh); } catch (TransformerException e) { - throw new XmlSchemaException(e.getMessage()); + throw new XmlSchemaException(e.getMessage(), e); } } public XmlSchema read(Document doc, ValidationEventHandler veh) { - SchemaBuilder builder = new SchemaBuilder(this); + SchemaBuilder builder = new SchemaBuilder(this, null); return builder.build(doc, null, veh); } public XmlSchema read(Element elem) { - SchemaBuilder builder = new SchemaBuilder(this); + SchemaBuilder builder = new SchemaBuilder(this, null); return builder.handleXmlSchemaElement(elem, null); } public XmlSchema read(Document doc, String uri, ValidationEventHandler veh) { - SchemaBuilder builder = new SchemaBuilder(this); + return read(doc, uri, veh, null); + } + + public XmlSchema read(Document doc, String uri, ValidationEventHandler veh, + TargetNamespaceValidator validator) { + SchemaBuilder builder = new SchemaBuilder(this, validator); return builder.build(doc, uri, veh); } public XmlSchema read(Element elem, String uri) { - SchemaBuilder builder = new SchemaBuilder(this); + SchemaBuilder builder = new SchemaBuilder(this, null); return builder.handleXmlSchemaElement(elem, uri); } @@ -281,34 +323,62 @@ } /** - * Retreive an XmlSchema from the collection by its system ID. + * Retrieve a set of XmlSchema instances with the given its system ID. + * In general, this will return a single instance, or none. However, + * if the schema has no targetNamespace attribute and was included + * from schemata with different target namespaces, then it may + * occur, that multiple schema instances with different logical + * target namespaces may be returned. * @param systemId */ - public XmlSchema getXmlSchema(String systemId) { - return (XmlSchema) systemId2Schemas.get(systemId); + public XmlSchema[] getXmlSchema(String systemId) { + if (systemId == null) { + systemId = ""; + } + final List result = new ArrayList(); + for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext(); ) { + Map.Entry entry = (Map.Entry) iter.next(); + if (((SchemaKey) entry.getKey()).getSystemId().equals(systemId)) { + result.add(entry.getValue()); + } + } + return (XmlSchema[]) result.toArray(new XmlSchema[result.size()]); } /** - * Return a Set of all the XmlSchemas in this collection. + * Returns an array of all the XmlSchemas in this collection. */ - public Set getXmlSchemas() { - return Collections.unmodifiableSet(schemas); + public XmlSchema[] getXmlSchemas() { + Collection c = schemas.values(); + return (XmlSchema[]) c.toArray(new XmlSchema[c.size()]); } public XmlSchemaElement getElementByQName(QName qname) { - XmlSchema schema = (XmlSchema)namespaces.get(qname.getNamespaceURI()); - if (schema == null) { - return null; + String uri = qname.getNamespaceURI(); + for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext(); ) { + Map.Entry entry = (Map.Entry) iter.next(); + if (((SchemaKey) entry.getKey()).getNamespace().equals(uri)) { + XmlSchemaElement element = ((XmlSchema) entry.getValue()).getElementByName(qname); + if (element != null) { + return element; + } } - return schema.getElementByName(qname); + } + return null; } public XmlSchemaType getTypeByQName(QName schemaTypeName) { - XmlSchema schema = (XmlSchema)namespaces.get(schemaTypeName.getNamespaceURI()); - if (schema == null) { - return null; + String uri = schemaTypeName.getNamespaceURI(); + for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext(); ) { + Map.Entry entry = (Map.Entry) iter.next(); + if (((SchemaKey) entry.getKey()).getNamespace().equals(uri)) { + XmlSchemaType type = ((XmlSchema) entry.getValue()).getTypeByName(schemaTypeName); + if (type != null) { + return type; + } } - return schema.getTypeByName(schemaTypeName); + } + return null; } Map unresolvedTypes = new HashMap(); diff -ubrN XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java --- XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java 2006-04-26 08:51:02.000000000 +0200 +++ XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaException.java 2006-09-04 01:44:50.000000000 +0200 @@ -33,6 +33,10 @@ super(message); } + public XmlSchemaException(String message, Throwable cause) { + super(message, cause); + } + // TODO :implement public int getLineNumer() { return 1; diff -ubrN XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchema.java XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java --- XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchema.java 2006-09-04 01:26:34.000000000 +0200 +++ XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java 2006-09-04 01:28:10.000000000 +0200 @@ -21,7 +21,6 @@ import org.apache.ws.commons.schema.utils.NamespaceContextOwner; import org.apache.ws.commons.schema.utils.NamespacePrefixList; -import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; import javax.xml.transform.OutputKeys; import javax.xml.transform.Result; @@ -63,7 +62,7 @@ XmlSchemaDerivationMethod blockDefault, finalDefault; XmlSchemaObjectCollection includes, items; boolean isCompiled; - String targetNamespace, version; + String syntacticalTargetNamespace, logicalTargetNamespace, version; String schema_ns_prefix = ""; XmlSchemaCollection parent; private NamespacePrefixList namespaceContext; @@ -89,7 +88,7 @@ public XmlSchema(String namespace, XmlSchemaCollection parent) { this(parent); - targetNamespace = namespace; + syntacticalTargetNamespace = logicalTargetNamespace = namespace; } public XmlSchemaForm getAttributeFormDefault() { @@ -169,12 +168,13 @@ } public String getTargetNamespace() { - return targetNamespace; + return syntacticalTargetNamespace; } public void setTargetNamespace(String targetNamespace) { - if (!targetNamespace.equals("")) - this.targetNamespace = targetNamespace; + if (!targetNamespace.equals("")) { + syntacticalTargetNamespace = logicalTargetNamespace = targetNamespace; + } } public String getVersion() { @@ -227,7 +227,7 @@ QName qname = type.getQName(); if (schemaTypes.contains(qname)) { throw new RuntimeException("Schema for namespace '" + - targetNamespace + "' already contains type '" + + syntacticalTargetNamespace + "' already contains type '" + qname.getLocalPart()); } schemaTypes.add(qname, type); diff -ubrN XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java --- XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java 2006-09-04 01:26:34.000000000 +0200 +++ XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java 2006-09-04 01:29:02.000000000 +0200 @@ -97,18 +97,18 @@ serializedSchema = setupNamespaces(serializedSchemaDocs, schemaObj); schemaElement = serializedSchema; - if (schemaObj.targetNamespace != null) { - serializedSchema.setAttribute("targetNamespace", schemaObj.targetNamespace); + if (schemaObj.syntacticalTargetNamespace != null) { + serializedSchema.setAttribute("targetNamespace", schemaObj.syntacticalTargetNamespace); Object targetNS = - schema_ns.get(schemaObj.targetNamespace); + schema_ns.get(schemaObj.syntacticalTargetNamespace); //if the namespace is not entered then add //the targetNamespace as its if (targetNS == null) { serializedSchema.setAttributeNS(XMLNS_NAMESPACE_URI, - "xmlns", schemaObj.targetNamespace); - schema_ns.put(schemaObj.targetNamespace, ""); + "xmlns", schemaObj.syntacticalTargetNamespace); + schema_ns.put(schemaObj.syntacticalTargetNamespace, ""); } } diff -ubrN XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java --- XmlSchema-orig/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java 2006-08-13 03:25:53.000000000 +0200 +++ XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaType.java 2006-09-04 01:34:08.000000000 +0200 @@ -89,6 +89,6 @@ if(name == null) { return null; } - return new QName(schema.targetNamespace, name); + return new QName(schema.logicalTargetNamespace, name); } } diff -ubrN XmlSchema-orig/src/test/java/tests/CircularSchemaTest.java XmlSchema/src/test/java/tests/CircularSchemaTest.java --- XmlSchema-orig/src/test/java/tests/CircularSchemaTest.java 2006-08-13 05:56:49.000000000 +0200 +++ XmlSchema/src/test/java/tests/CircularSchemaTest.java 2006-09-04 03:10:41.000000000 +0200 @@ -2,7 +2,6 @@ import java.io.File; import java.io.FileInputStream; -import java.util.Set; import junit.framework.TestCase; @@ -18,10 +17,10 @@ InputSource source = new InputSource(new FileInputStream(file)); source.setSystemId(file.toURL().toString()); - XmlSchema schema = schemas.read(source, null); + schemas.read(source, null); - Set xmlSchemas = schemas.getXmlSchemas(); + XmlSchema[] xmlSchemas = schemas.getXmlSchemas(); assertNotNull(xmlSchemas); - assertEquals(2, xmlSchemas.size()); + assertEquals(3, xmlSchemas.length); } } \ No newline at end of file diff -ubrN XmlSchema-orig/src/test/java/tests/IncludeTest.java XmlSchema/src/test/java/tests/IncludeTest.java --- XmlSchema-orig/src/test/java/tests/IncludeTest.java 2006-09-04 01:26:34.000000000 +0200 +++ XmlSchema/src/test/java/tests/IncludeTest.java 2006-09-04 01:48:22.000000000 +0200 @@ -3,7 +3,6 @@ import java.io.FileInputStream; import java.io.InputStream; -import java.util.Iterator; import java.util.Set; import java.util.HashSet; @@ -121,7 +120,6 @@ } - /** * Test importing a schema without namespace into a schema * with namespace. @@ -129,7 +127,9 @@ public void testImportSchemaWithoutNamespace() throws Exception { InputStream is = new FileInputStream(Resources.asURI("includingWithNamespace.xsd")); XmlSchemaCollection schemaCol = new XmlSchemaCollection(); - XmlSchema schema = schemaCol.read(new StreamSource(is), null); + schemaCol.read(new StreamSource(is), null); + + assertNotNull(schemaCol.getTypeByQName(new QName("http://tns.demo.org", "XdwsGroupId"))); } } \ No newline at end of file diff -ubrN XmlSchema-orig/src/test/test-resources/includedWithoutNamespace.xsd XmlSchema/src/test/test-resources/includedWithoutNamespace.xsd --- XmlSchema-orig/src/test/test-resources/includedWithoutNamespace.xsd 1970-01-01 01:00:00.000000000 +0100 +++ XmlSchema/src/test/test-resources/includedWithoutNamespace.xsd 2006-09-04 01:47:49.000000000 +0200 @@ -0,0 +1,13 @@ + + + + + + + + + + diff -ubrN XmlSchema-orig/src/test/test-resources/includingWithNamespace.xsd XmlSchema/src/test/test-resources/includingWithNamespace.xsd --- XmlSchema-orig/src/test/test-resources/includingWithNamespace.xsd 1970-01-01 01:00:00.000000000 +0100 +++ XmlSchema/src/test/test-resources/includingWithNamespace.xsd 2006-09-04 01:47:54.000000000 +0200 @@ -0,0 +1,11 @@ + + + + + + diff -ubrN XmlSchema-orig/src/test/test-resources/.svn/entries XmlSchema/src/test/test-resources/.svn/entries --- XmlSchema-orig/src/test/test-resources/.svn/entries 2006-09-01 12:33:25.000000000 +0200 +++ XmlSchema/src/test/test-resources/.svn/entries 2006-09-04 01:46:45.000000000 +0200 @@ -191,6 +191,16 @@ kind="file" committed-date="2006-08-13T02:46:26.499000Z"/> + + - + @@ -54,23 +54,23 @@ - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.AnnotationTest.xml XmlSchema/target/surefire-reports/TEST-tests.AnnotationTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.AnnotationTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.AnnotationTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,38 +54,38 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.AnyAttTest.xml XmlSchema/target/surefire-reports/TEST-tests.AnyAttTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.AnyAttTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.AnyAttTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,25 +54,25 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.AnyTest.xml XmlSchema/target/surefire-reports/TEST-tests.AnyTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.AnyTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.AnyTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,24 +54,24 @@ - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.AttributeGroupTest.xml XmlSchema/target/surefire-reports/TEST-tests.AttributeGroupTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.AttributeGroupTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.AttributeGroupTest.xml 2006-09-04 03:11:22.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,7 +54,7 @@ - - - + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.BlockTest.xml XmlSchema/target/surefire-reports/TEST-tests.BlockTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.BlockTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.BlockTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,43 +54,43 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.ChoiceTest.xml XmlSchema/target/surefire-reports/TEST-tests.ChoiceTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.ChoiceTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.ChoiceTest.xml 2006-09-04 03:11:22.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,6 +54,6 @@ - - + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.CircularSchemaTest.xml XmlSchema/target/surefire-reports/TEST-tests.CircularSchemaTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.CircularSchemaTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.CircularSchemaTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,29 +54,29 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.ComplexContentRestrictionTest.xml XmlSchema/target/surefire-reports/TEST-tests.ComplexContentRestrictionTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.ComplexContentRestrictionTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.ComplexContentRestrictionTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,21 +54,21 @@ - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.ConstraintsTest.xml XmlSchema/target/surefire-reports/TEST-tests.ConstraintsTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.ConstraintsTest.xml 2006-09-04 02:32:21.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.ConstraintsTest.xml 2006-09-04 03:11:22.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,5 +54,5 @@ - + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.ExternalAttTest.xml XmlSchema/target/surefire-reports/TEST-tests.ExternalAttTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.ExternalAttTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.ExternalAttTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,27 +54,27 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.FacetsTest.xml XmlSchema/target/surefire-reports/TEST-tests.FacetsTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.FacetsTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.FacetsTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,20 +54,20 @@ - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.GroupTest.xml XmlSchema/target/surefire-reports/TEST-tests.GroupTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.GroupTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.GroupTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,30 +54,30 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.ImportTest.xml XmlSchema/target/surefire-reports/TEST-tests.ImportTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.ImportTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.ImportTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,32 +54,32 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.IncludeTest.xml XmlSchema/target/surefire-reports/TEST-tests.IncludeTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.IncludeTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.IncludeTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,9 +54,9 @@ - - - - - + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.ListTest.xml XmlSchema/target/surefire-reports/TEST-tests.ListTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.ListTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.ListTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,22 +54,22 @@ - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.MixedContentTest.xml XmlSchema/target/surefire-reports/TEST-tests.MixedContentTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.MixedContentTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.MixedContentTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,10 +54,10 @@ - - - - - - + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.NotationTest.xml XmlSchema/target/surefire-reports/TEST-tests.NotationTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.NotationTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.NotationTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,45 +54,45 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.RedefineTest.xml XmlSchema/target/surefire-reports/TEST-tests.RedefineTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.RedefineTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.RedefineTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,42 +54,42 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.SimpleContentExtensionTest.xml XmlSchema/target/surefire-reports/TEST-tests.SimpleContentExtensionTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.SimpleContentExtensionTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.SimpleContentExtensionTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,33 +54,33 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.SimpleContentRestrictionTest.xml XmlSchema/target/surefire-reports/TEST-tests.SimpleContentRestrictionTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.SimpleContentRestrictionTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.SimpleContentRestrictionTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -54,44 +54,44 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.TwoSchemasRefTest.xml XmlSchema/target/surefire-reports/TEST-tests.TwoSchemasRefTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.TwoSchemasRefTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.TwoSchemasRefTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,11 +54,11 @@ - - - - - - + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.TwoSchemasTest.xml XmlSchema/target/surefire-reports/TEST-tests.TwoSchemasTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.TwoSchemasTest.xml 2006-09-04 02:32:22.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.TwoSchemasTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,26 +54,26 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff -ubrN XmlSchema-orig/target/surefire-reports/TEST-tests.UnionTest.xml XmlSchema/target/surefire-reports/TEST-tests.UnionTest.xml --- XmlSchema-orig/target/surefire-reports/TEST-tests.UnionTest.xml 2006-09-04 02:32:23.000000000 +0200 +++ XmlSchema/target/surefire-reports/TEST-tests.UnionTest.xml 2006-09-04 03:11:23.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -54,28 +54,28 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file Binary files XmlSchema-orig/target/test-classes/tests/CircularSchemaTest.class and XmlSchema/target/test-classes/tests/CircularSchemaTest.class differ Binary files XmlSchema-orig/target/test-classes/tests/IncludeTest.class and XmlSchema/target/test-classes/tests/IncludeTest.class differ Binary files XmlSchema-orig/target/XmlSchema-SNAPSHOT.jar and XmlSchema/target/XmlSchema-SNAPSHOT.jar differ Binary files XmlSchema-orig/target/XmlSchema-SNAPSHOT-sources.jar and XmlSchema/target/XmlSchema-SNAPSHOT-sources.jar differ