Index: src/xs/org/apache/ws/jaxme/xs/impl/XSLogicalParser.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSLogicalParser.java,v retrieving revision 1.19 diff -u -r1.19 XSLogicalParser.java --- src/xs/org/apache/ws/jaxme/xs/impl/XSLogicalParser.java 19 Aug 2004 19:53:03 -0000 1.19 +++ src/xs/org/apache/ws/jaxme/xs/impl/XSLogicalParser.java 23 Aug 2004 06:12:19 -0000 @@ -63,7 +63,9 @@ import org.xml.sax.InputSource; import org.xml.sax.Locator; import org.xml.sax.SAXException; +import org.xml.sax.XMLFilter; import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLFilterImpl; /**

Implementation of a logical parser.

@@ -198,38 +200,9 @@ } } - protected XsESchema parseSyntax(InputSource pSource) - throws SAXException, IOException, ParserConfigurationException { - XSContext data = getData(); - try { - XsObjectFactory factory = data.getXsObjectFactory(); - XsESchema mySchema = factory.newXsESchema(); - XsSAXParser xsSAXParser = factory.newXsSAXParser(mySchema); - addSyntaxSchema(mySchema); - try { - data.setCurrentContentHandler(xsSAXParser); - XMLReader xr = factory.newXMLReader(isValidating()); - xr.setContentHandler(xsSAXParser); - EntityResolver entityResolver = xr.getEntityResolver(); - if (entityResolver != null) { - InputSource iSource = entityResolver.resolveEntity(pSource.getPublicId(), pSource.getSystemId()); - if (iSource != null) { - pSource = iSource; - } - } - xr.parse(pSource); - return (XsESchema) xsSAXParser.getBean(); - } finally { - removeSyntaxSchema(); - } - } finally { - data.setCurrentContentHandler(null); - } - } - /**

Converts the given URI into an instance of InputSource.

*/ - protected InputSource getInputSource(String pReferencingSystemId, String pURI) throws IOException { + protected InputSource getInputSource(String pReferencingSystemId, String pURI) throws SAXException { URL url = null; if (pReferencingSystemId != null) { // Try to create the new URI based on the old URI; may be its relative? @@ -253,7 +226,7 @@ try { url = new File(pURI).toURL(); } catch (MalformedURLException f) { - throw new MalformedURLException("Failed to parse the URI " + pURI); + throw new SAXException("Failed to parse the URI " + pURI); } } } @@ -263,7 +236,46 @@ isource.setSystemId(url.toString()); return isource; } catch (IOException e) { - throw new IOException("Failed to open the URL " + url); + throw new SAXException("Failed to open the URL " + url, e); + } + } + + + protected XsESchema parseSyntax(Locator pLocator, String pSchemaLocation) + throws SAXException, IOException, ParserConfigurationException { + XsESchema result = getData().getXsObjectFactory().newXsESchema(); + parseSyntax(pLocator, pSchemaLocation, result); + return result; + } + + protected void parseSyntax(Locator pLocator, String pSchemaLocation, + XsESchema pSchema) + throws SAXException, IOException, ParserConfigurationException { + XSContext data = getData(); + try { + XsObjectFactory factory = data.getXsObjectFactory(); + XMLReader xr = factory.newXMLReader(isValidating()); + EntityResolver entityResolver = xr.getEntityResolver(); + InputSource schemaSource = null; + if (entityResolver != null) { + schemaSource = entityResolver.resolveEntity(null, pSchemaLocation); + } + if (schemaSource == null) { + schemaSource = getInputSource(pLocator == null ? null : pLocator.getSystemId(), + pSchemaLocation); + } + + XsSAXParser xsSAXParser = factory.newXsSAXParser(pSchema); + addSyntaxSchema(pSchema); + try { + data.setCurrentContentHandler(xsSAXParser); + xr.setContentHandler(xsSAXParser); + xr.parse(schemaSource); + } finally { + removeSyntaxSchema(); + } + } finally { + data.setCurrentContentHandler(null); } } @@ -346,7 +358,7 @@ /**

Handles xs:include.

*/ protected void includeSchema(XsESchema pIncludingSchema, - XsEInclude pInclude) + XsEInclude pInclude) throws SAXException, IOException, ParserConfigurationException { XsAnyURI schemaLocation = pInclude.getSchemaLocation(); if (schemaLocation == null) { @@ -354,20 +366,20 @@ pInclude.getLocator()); } Locator locator = pInclude.getLocator(); - InputSource schemaSource = getInputSource(locator == null ? null : locator.getSystemId(), - schemaLocation.toString()); - XsESchema includedSchema = parseSyntax(schemaSource); + XsESchema includedSchema = parseSyntax(locator, schemaLocation.toString()); XsAnyURI incNamespace = includedSchema.getTargetNamespace(); if (incNamespace == null) { - includedSchema.setTargetNamespace(pIncludingSchema.getTargetNamespace()); + if (pIncludingSchema.getTargetNamespace() != null) { + includedSchema.setTargetNamespace(pIncludingSchema.getTargetNamespace()); + } } else { - XsAnyURI myNamespace = includedSchema.getTargetNamespace(); - if (!incNamespace.equals(myNamespace)) { - throw new LocSAXException("Invalid include: The included schemas target namespace " + - incNamespace + " and the including schemas target namespace " + - myNamespace + " do not match.", - pInclude.getLocator()); - } + XsAnyURI myNamespace = includedSchema.getTargetNamespace(); + if (!incNamespace.equals(myNamespace)) { + throw new LocSAXException("Invalid include: The included schemas target namespace " + + incNamespace + " and the including schemas target namespace " + + myNamespace + " do not match.", + pInclude.getLocator()); + } } parse(includedSchema); } @@ -441,8 +453,7 @@ importedSchemas = new HashSet(); } importedSchemas.add(pSchemaLocation); - InputSource schemaSource = getInputSource(pLocator == null ? null : pLocator.getSystemId(), pSchemaLocation); - XsESchema importedSchema = parseSyntax(schemaSource); + XsESchema importedSchema = parseSyntax(pLocator, pSchemaLocation); importSchema(pImportingSchema, pNamespace, importedSchema, pLocator); } Index: src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java,v retrieving revision 1.16 diff -u -r1.16 ParserTest.java --- src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java 20 Aug 2004 20:50:38 -0000 1.16 +++ src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java 23 Aug 2004 06:12:19 -0000 @@ -56,12 +56,14 @@ import org.apache.ws.jaxme.xs.types.XSNMToken; import org.apache.ws.jaxme.xs.types.XSPositiveInteger; import org.apache.ws.jaxme.xs.types.XSString; -import org.apache.ws.jaxme.xs.xml.XsComplexContentType; import org.apache.ws.jaxme.xs.xml.XsNamespaceList; import org.apache.ws.jaxme.xs.xml.XsQName; +import org.apache.ws.jaxme.xs.xml.impl.XsObjectFactoryImpl; import org.xml.sax.Attributes; +import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; /**

Implements some basic tests for the Schema generator.

@@ -1158,7 +1160,7 @@ " foo\n" + "\n"; InputSource isource = new InputSource(new StringReader(schemaSource)); - isource.setSystemId("testSimpleTypeRestriction2.xsd"); + isource.setSystemId("testAppInfoEmbeddedText.xsd"); XSSchema schema = pParser.parse(isource); XSAnnotation[] annotations = schema.getAnnotations(); assertEquals(1, annotations.length); @@ -1174,5 +1176,65 @@ public void testAppInfoEmbeddedText() throws Exception { testAppInfoEmbeddedText(newXSParser()); testAppInfoEmbeddedText(newJAXBParser()); + } + + private void testImportSchemaWithoutNamespace(XSParser pParser) throws Exception { + final String schemaSource = + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n"; + final String importedSchema = + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n"; + + pParser.getContext().setXsObjectFactory(new XsObjectFactoryImpl(){ + public XMLReader newXMLReader(boolean pValidating) throws ParserConfigurationException, SAXException { + XMLReader result = super.newXMLReader(pValidating); + result.setEntityResolver(new EntityResolver(){ + public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { + if ("abc.xsd".equals(systemId)) { + return new InputSource(new StringReader(importedSchema)); + } else { + throw new SAXException("Invalid systemId: " + systemId); + } + } + }); + return result; + } + }); + InputSource isource = new InputSource(new StringReader(schemaSource)); + isource.setSystemId("testImportSchemaWithoutNamespace.xsd"); + XSSchema schema = pParser.parse(isource); + XSElement[] elements = schema.getElements(); + assertEquals(4, elements.length); + assertEquals(new XsQName("xyz", "c"), elements[0].getName()); + assertEquals(new XsQName("xyz", "d"), elements[1].getName()); + assertEquals(new XsQName("xyz", "a"), elements[2].getName()); + assertEquals(new XsQName("xyz", "b"), elements[3].getName()); + } + + /**

Tests, whether importing a schema without namespace + * changes the imported schemas namespace to the local + * namespace.

+ */ + public void testImportSchemaWithoutNamespace() throws Exception { + testImportSchemaWithoutNamespace(newXSParser()); } } Index: src/xs/org/apache/ws/jaxme/xs/xml/XsQName.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/XsQName.java,v retrieving revision 1.3 diff -u -r1.3 XsQName.java --- src/xs/org/apache/ws/jaxme/xs/xml/XsQName.java 16 Feb 2004 23:39:46 -0000 1.3 +++ src/xs/org/apache/ws/jaxme/xs/xml/XsQName.java 23 Aug 2004 06:12:19 -0000 @@ -56,11 +56,12 @@ return false; } XsQName name = (XsQName) pObject; - return name.namespaceURI.equals(namespaceURI) && name.localName.equals(localName); + return name.getNamespaceURI().equals(getNamespaceURI()) + && name.getLocalName().equals(getLocalName()); } public int hashCode() { - return namespaceURI.hashCode() + localName.hashCode(); + return getNamespaceURI().hashCode() + getLocalName().hashCode(); } public String toString() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsAGDefRefImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsAGDefRefImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsAGDefRefImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsAGDefRefImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsAGDefRefImpl.java 23 Aug 2004 06:12:19 -0000 @@ -44,43 +44,45 @@ * @author Jochen Wiedmann */ public class XsAGDefRefImpl implements XsAGDefRef { - private final XsObject owner; - private XsNCName name; - private XsQName ref; - - public XsAGDefRefImpl(XsObject pOwner) { - owner = pOwner; - } - - public void setName(XsNCName pName) { - if (ref != null) { - throw new IllegalStateException("The 'name' and 'ref' attributes are mutually exclusive."); - } - name = pName; - } - - public XsNCName getName() { - return name; - } - - public void setRef(XsQName pRef) { - if (name != null) { - throw new IllegalStateException("The 'name' and 'ref' attributes are mutually exclusive."); - } - ref = pRef; - } - - public void setRef(String pRef) throws SAXException { - setRef(XsObjectImpl.asXsQName(owner.getLocator(), ((XsObjectImpl) owner).getNamespaceSupport(), pRef)); - } - - public XsQName getRef() { - return ref; - } - - public void validate() throws SAXException { - if (name == null && ref == null) { - throw new LocSAXException("You must set either of the attributes 'name' or 'ref'.", owner.getLocator()); - } - } + private final XsObject owner; + private XsNCName name; + private XsQName ref; + + /**

Creates a new instance with the given parent object.

+ */ + public XsAGDefRefImpl(XsObject pOwner) { + owner = pOwner; + } + + public void setName(XsNCName pName) { + if (ref != null) { + throw new IllegalStateException("The 'name' and 'ref' attributes are mutually exclusive."); + } + name = pName; + } + + public XsNCName getName() { + return name; + } + + public void setRef(XsQName pRef) { + if (name != null) { + throw new IllegalStateException("The 'name' and 'ref' attributes are mutually exclusive."); + } + ref = pRef; + } + + public void setRef(String pRef) throws SAXException { + setRef(XsObjectImpl.asXsQName(owner.getXsESchema(), owner.getLocator(), ((XsObjectImpl) owner).getNamespaceSupport(), pRef)); + } + + public XsQName getRef() { + return ref; + } + + public void validate() throws SAXException { + if (name == null && ref == null) { + throw new LocSAXException("You must set either of the attributes 'name' or 'ref'.", owner.getLocator()); + } + } } Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEKeyrefImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEKeyrefImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsEKeyrefImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEKeyrefImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEKeyrefImpl.java 23 Aug 2004 06:12:19 -0000 @@ -51,7 +51,7 @@ } public void setRefer(String pRefer) throws SAXException { - setRefer(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pRefer)); + setRefer(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pRefer)); } public XsQName getRefer() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEListImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEListImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsEListImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEListImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEListImpl.java 23 Aug 2004 06:12:19 -0000 @@ -64,7 +64,7 @@ } public void setItemType(String pItemType) throws SAXException { - setItemType(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pItemType)); + setItemType(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pItemType)); } public XsQName getItemType() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsERestrictionImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsERestrictionImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsERestrictionImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsERestrictionImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsERestrictionImpl.java 23 Aug 2004 06:12:19 -0000 @@ -92,7 +92,7 @@ } public void setBase(String pBase) throws SAXException { - setBase(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pBase)); + setBase(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pBase)); } public XsQName getBase() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java,v retrieving revision 1.5 diff -u -r1.5 XsESchemaImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java 16 Feb 2004 23:39:44 -0000 1.5 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsESchemaImpl.java 23 Aug 2004 06:12:19 -0000 @@ -251,4 +251,30 @@ public Object[] getChilds() { return childs.toArray(); } + + /**

Creates a new {@link XsQName}, which is mutable and + * has the schemas target namespace as a namespace URI: + * If the target namespace changes, then the names URI + * does as well.

+ */ + public XsQName newXsQName(String pLocalName, String pPrefix) { + return new XsQName(getTargetNamespace(), pLocalName, pPrefix){ + public String getNamespaceURI() { + XsAnyURI uri = getTargetNamespace(); + if (uri != null) { + return uri.toString(); + } else { + return ""; + } + } + public String toString() { + XsAnyURI uri = getTargetNamespace(); + if (uri == null) { + return super.toString(); + } else { + return "{" + uri + "}" + getLocalName() + " (<= " + super.toString() + ")"; + } + } + }; + } } Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEUnionImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEUnionImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsEUnionImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEUnionImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsEUnionImpl.java 23 Aug 2004 06:12:19 -0000 @@ -97,7 +97,7 @@ List myMemberTypes = new ArrayList(); for (StringTokenizer st = new StringTokenizer(pTypes); st.hasMoreTokens(); ) { String s = st.nextToken(); - XsQName qName = XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), s); + XsQName qName = XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), s); myMemberTypes.add(qName); } setMemberTypes((XsQName[]) myMemberTypes.toArray(new XsQName[myMemberTypes.size()])); Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsObjectImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsObjectImpl.java,v retrieving revision 1.3 diff -u -r1.3 XsObjectImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsObjectImpl.java 16 Feb 2004 23:39:44 -0000 1.3 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsObjectImpl.java 23 Aug 2004 06:12:19 -0000 @@ -25,6 +25,7 @@ import org.xml.sax.helpers.LocatorImpl; import org.xml.sax.helpers.NamespaceSupport; + /**

Base class for all the types, attributes, elements, ...

* * @author Jochen Wiedmann @@ -68,12 +69,19 @@ public XsObjectFactory getObjectFactory() { return getContext().getXsObjectFactory(); } public Locator getLocator() { return locator; } protected NamespaceSupport getNamespaceSupport() { return getContext().getNamespaceSupport(); } - protected static XsQName asXsQName(Locator pLocator, NamespaceSupport pNss, String pName) throws SAXException { + protected static XsQName asXsQName(XsESchema pSchema, Locator pLocator, NamespaceSupport pNss, String pName) throws SAXException { String[] parts = pNss.processName(pName, new String[3], false); if (parts == null) { throw new LocSAXException("Undeclared namespace prefix: " + pName, pLocator); } - return new XsQName(parts[0], parts[1], XsQName.prefixOf(pName)); + if (pSchema instanceof XsESchemaImpl + && pSchema.getTargetNamespace() == null + && (parts[0] == null || "".equals(parts[0]))) { + // xs:include may map the target namespace + return ((XsESchemaImpl) pSchema).newXsQName(parts[1], XsQName.prefixOf(pName)); + } else { + return new XsQName(parts[0], parts[1], XsQName.prefixOf(pName)); + } } public XSContext getContext() { return getXsESchema().getContext(); } Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeGroupImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeGroupImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsTAttributeGroupImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeGroupImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeGroupImpl.java 23 Aug 2004 06:12:19 -0000 @@ -58,7 +58,7 @@ } public void setRef(String pRef) throws SAXException { - setRef(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pRef)); + setRef(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pRef)); } public XsQName getRef() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeGroupRefImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeGroupRefImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsTAttributeGroupRefImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeGroupRefImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeGroupRefImpl.java 23 Aug 2004 06:12:19 -0000 @@ -49,7 +49,7 @@ public void setRef(XsQName pRef) { ref = pRef; } public void setRef(String pRef) throws SAXException { - setRef(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pRef)); + setRef(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pRef)); } public XsQName getRef() { return ref; } public void validate() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeImpl.java,v retrieving revision 1.3 diff -u -r1.3 XsTAttributeImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeImpl.java 16 Feb 2004 23:39:44 -0000 1.3 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTAttributeImpl.java 23 Aug 2004 06:12:19 -0000 @@ -87,7 +87,7 @@ } public void setType(String pType) throws SAXException { - setType(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pType)); + setType(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pType)); } public XsQName getType() { @@ -143,7 +143,7 @@ } public void setRef(String pRef) throws SAXException { - setRef(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pRef)); + setRef(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pRef)); } public XsQName getRef() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTElementImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTElementImpl.java,v retrieving revision 1.4 diff -u -r1.4 XsTElementImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTElementImpl.java 16 Feb 2004 23:39:44 -0000 1.4 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTElementImpl.java 23 Aug 2004 06:12:19 -0000 @@ -129,7 +129,7 @@ } public void setType(String pType) throws SAXException { - setType(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pType)); + setType(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pType)); } public XsQName getType() { @@ -141,7 +141,7 @@ } public void setSubstitutionGroup(String pSubstitutionGroup) throws SAXException { - setSubstitutionGroup(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pSubstitutionGroup)); + setSubstitutionGroup(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pSubstitutionGroup)); } public XsQName getSubstitutionGroup() { @@ -226,7 +226,7 @@ } public void setRef(String pRef) throws SAXException { - setRef(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pRef)); + setRef(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pRef)); } public XsQName getRef() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTExplicitGroupImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTExplicitGroupImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsTExplicitGroupImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTExplicitGroupImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTExplicitGroupImpl.java 23 Aug 2004 06:12:19 -0000 @@ -68,6 +68,6 @@ } public void setRef(String pRef) throws SAXException { - setRef(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pRef)); + setRef(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pRef)); } } Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTExtensionTypeImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTExtensionTypeImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsTExtensionTypeImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTExtensionTypeImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTExtensionTypeImpl.java 23 Aug 2004 06:12:19 -0000 @@ -54,7 +54,7 @@ } public void setBase(String pBase) throws SAXException { - setBase(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pBase)); + setBase(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pBase)); } public XsQName getBase() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTGroupImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTGroupImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsTGroupImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTGroupImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTGroupImpl.java 23 Aug 2004 06:12:20 -0000 @@ -67,7 +67,7 @@ } public void setRef(String pRef) throws SAXException { - setRef(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pRef)); + setRef(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pRef)); } public XsQName getRef() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTRestrictionTypeImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTRestrictionTypeImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsTRestrictionTypeImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTRestrictionTypeImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTRestrictionTypeImpl.java 23 Aug 2004 06:12:20 -0000 @@ -60,7 +60,7 @@ } public void setBase(String pBase) throws SAXException { - setBase(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pBase)); + setBase(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pBase)); } public XsQName getBase() { Index: src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTSimpleExtensionTypeImpl.java =================================================================== RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTSimpleExtensionTypeImpl.java,v retrieving revision 1.2 diff -u -r1.2 XsTSimpleExtensionTypeImpl.java --- src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTSimpleExtensionTypeImpl.java 16 Feb 2004 23:39:44 -0000 1.2 +++ src/xs/org/apache/ws/jaxme/xs/xml/impl/XsTSimpleExtensionTypeImpl.java 23 Aug 2004 06:12:20 -0000 @@ -57,7 +57,7 @@ } public void setBase(String pBase) throws SAXException { - setBase(XsObjectImpl.asXsQName(getLocator(), getNamespaceSupport(), pBase)); + setBase(XsObjectImpl.asXsQName(getXsESchema(), getLocator(), getNamespaceSupport(), pBase)); } public XsQName getBase() {