Author: dims Date: Mon Sep 4 20:53:36 2006 New Revision: 440241 URL: http://svn.apache.org/viewvc?view=rev&rev=440241 Log: get rid of javax.xml.XMLConstants
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/constants/Constants.java webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?view=diff&rev=440241&r1=440240&r2=440241 ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java Mon Sep 4 20:53:36 2006 @@ -22,7 +22,6 @@ import java.util.StringTokenizer; import java.util.Vector; -import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; @@ -503,16 +502,16 @@ final String localName; final String prefix; if (offset == -1) { - uri = pContext.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX); - if (XMLConstants.NULL_NS_URI.equals(uri)) { + uri = pContext.getNamespaceURI(Constants.DEFAULT_NS_PREFIX); + if (Constants.NULL_NS_URI.equals(uri)) { return new QName(schema.targetNamespace, pName); } localName = pName; - prefix = XMLConstants.DEFAULT_NS_PREFIX; + prefix = Constants.DEFAULT_NS_PREFIX; } else { prefix = pName.substring(0, offset); uri = pContext.getNamespaceURI(prefix); - if (uri == null || XMLConstants.NULL_NS_URI.equals(uri)) { + if (uri == null || Constants.NULL_NS_URI.equals(uri)) { throw new IllegalStateException("The prefix " + prefix + " is not bound."); } localName = pName.substring(offset+1); @@ -1294,7 +1293,7 @@ ctx = new NodeNamespaceContext(attrEl); } String namespace = ctx.getNamespaceURI(prefix); - if (!XMLConstants.NULL_NS_URI.equals(namespace)) { + if (!Constants.NULL_NS_URI.equals(namespace)) { Attr nsAttr = attrEl.getOwnerDocument().createAttribute("xmlns:" + prefix); nsAttr.setValue(namespace); attrs.add(nsAttr); Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?view=diff&rev=440241&r1=440240&r2=440241 ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java Mon Sep 4 20:53:36 2006 @@ -16,6 +16,8 @@ package org.apache.ws.commons.schema; +import org.apache.ws.commons.schema.constants.Constants; +import org.apache.ws.commons.schema.utils.NamespacePrefixList; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -23,20 +25,14 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; -import org.xml.sax.helpers.NamespaceSupport; -import org.apache.ws.commons.schema.constants.Constants; -import org.apache.ws.commons.schema.utils.NamespacePrefixList; -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.namespace.NamespaceContext; -import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; -import java.util.Iterator; public class XmlSchemaSerializer { @@ -163,12 +159,9 @@ for (int i = 0; i < prefixes.length; i++) { String prefix = prefixes[i]; String uri = ctx.getNamespaceURI(prefix); - if (XMLConstants.DEFAULT_NS_PREFIX.equals(prefix)) { -// serializedSchema.setAttributeNS(XMLConstants.NULL_NS_URI, -// XMLConstants.XMLNS_ATTRIBUTE, uri); - } else { - serializedSchema.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, - XMLConstants.XMLNS_ATTRIBUTE + ":" + prefix, uri); + if (!Constants.DEFAULT_NS_PREFIX.equals(prefix)) { + serializedSchema.setAttributeNS(Constants.XMLNS_ATTRIBUTE_NS_URI, + Constants.XMLNS_ATTRIBUTE + ":" + prefix, uri); } } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/constants/Constants.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/constants/Constants.java?view=diff&rev=440241&r1=440240&r2=440241 ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/constants/Constants.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/constants/Constants.java Mon Sep 4 20:53:36 2006 @@ -123,4 +123,18 @@ public static class MetaDataConstants{ public static final String EXTERNAL_ATTRIBUTES = "EXTERNAL_ATTRIBUTES"; } + + public static final String XMLNS_ATTRIBUTE_NS_URI = + "http://www.w3.org/2000/xmlns/"; + + public static final String XMLNS_ATTRIBUTE = "xmlns"; + + public static final String DEFAULT_NS_PREFIX = ""; + + public static final String XML_NS_URI = + "http://www.w3.org/XML/1998/namespace"; + + public static final String XML_NS_PREFIX = "xml"; + + public static final String NULL_NS_URI = ""; } Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java?view=diff&rev=440241&r1=440240&r2=440241 ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java Mon Sep 4 20:53:36 2006 @@ -24,125 +24,10 @@ return (String[]) keys.toArray(new String[keys.size()]); } - /** - * <p>Get Namespace URI bound to a prefix in the current scope.</p> - * <p/> - * <p>When requesting a Namespace URI by prefix, the following - * table describes the returned Namespace URI value for all - * possible prefix values:</p> - * <p/> - * <table border="2" rules="all" cellpadding="4"> - * <thead> - * <tr> - * <td align="center" colspan="2"> - * <code>getNamespaceURI(prefix)</code> - * return value for specified prefixes - * </td> - * </tr> - * <tr> - * <td>prefix parameter</td> - * <td>Namespace URI return value</td> - * </tr> - * </thead> - * <tbody> - * <tr> - * <td><code>DEFAULT_NS_PREFIX</code> ("")</td> - * <td>default Namespace URI in the current scope or - * <code>[EMAIL PROTECTED] javax.xml.XMLConstants#NULL_NS_URI XMLConstants.NULL_NS_URI("")}</code> - * when there is no default Namespace URI in the current scope</td> - * </tr> - * <tr> - * <td>bound prefix</td> - * <td>Namespace URI bound to prefix in current scope</td> - * </tr> - * <tr> - * <td>unbound prefix</td> - * <td><code>[EMAIL PROTECTED] javax.xml.XMLConstants#NULL_NS_URI XMLConstants.NULL_NS_URI("")}</code> </td> - * </tr> - * <tr> - * <td><code>XMLConstants.XML_NS_PREFIX</code> ("xml")</td> - * <td><code>XMLConstants.XML_NS_URI</code> - * ("http://www.w3.org/XML/1998/namespace")</td> - * </tr> - * <tr> - * <td><code>XMLConstants.XMLNS_ATTRIBUTE</code> ("xmlns")</td> - * <td><code>XMLConstants.XMLNS_ATTRIBUTE_NS_URI</code> - * ("http://www.w3.org/2000/xmlns/")</td> - * </tr> - * <tr> - * <td><code>null</code></td> - * <td><code>IllegalArgumentException</code> is thrown</td> - * </tr> - * </tbody> - * </table> - * - * @param prefix prefix to look up - * @return Namespace URI bound to prefix in the current scope - */ public String getNamespaceURI(String prefix) { return (String) get(prefix); } - /** - * <p>Get prefix bound to Namespace URI in the current scope.</p> - * <p/> - * <p>To get all prefixes bound to a Namespace URI in the current - * scope, use [EMAIL PROTECTED] #getPrefixes(String namespaceURI)}.</p> - * <p/> - * <p>When requesting a prefix by Namespace URI, the following - * table describes the returned prefix value for all Namespace URI - * values:</p> - * <p/> - * <table border="2" rules="all" cellpadding="4"> - * <thead> - * <tr> - * <td align="center" colspan="2"> - * <code>getPrefix(namespaceURI)</code> return value for - * specified Namespace URIs - * </td> - * </tr> - * <tr> - * <td>Namespace URI parameter</td> - * <td>prefix value returned</td> - * </tr> - * </thead> - * <tbody> - * <tr> - * <td><default Namespace URI></td> - * <td><code>XMLConstants.DEFAULT_NS_PREFIX</code> ("") - * </td> - * </tr> - * <tr> - * <td>bound Namespace URI</td> - * <td>prefix bound to Namespace URI in the current scope, - * if multiple prefixes are bound to the Namespace URI in - * the current scope, a single arbitrary prefix, whose - * choice is implementation dependent, is returned</td> - * </tr> - * <tr> - * <td>unbound Namespace URI</td> - * <td><code>null</code></td> - * </tr> - * <tr> - * <td><code>XMLConstants.XML_NS_URI</code> - * ("http://www.w3.org/XML/1998/namespace")</td> - * <td><code>XMLConstants.XML_NS_PREFIX</code> ("xml")</td> - * </tr> - * <tr> - * <td><code>XMLConstants.XMLNS_ATTRIBUTE_NS_URI</code> - * ("http://www.w3.org/2000/xmlns/")</td> - * <td><code>XMLConstants.XMLNS_ATTRIBUTE</code> ("xmlns")</td> - * </tr> - * <tr> - * <td><code>null</code></td> - * <td><code>IllegalArgumentException</code> is thrown</td> - * </tr> - * </tbody> - * </table> - * - * @param namespaceURI URI of Namespace to lookup - * @return prefix bound to Namespace URI in current context - */ public String getPrefix(String namespaceURI) { Iterator iterator = entrySet().iterator(); while (iterator.hasNext()) { @@ -154,68 +39,6 @@ return null; } - /** - * <p>Get all prefixes bound to a Namespace URI in the current - * scope.</p> - * <p/> - * <p>An Iterator over String elements is returned in an arbitrary, <strong>implementation dependent</strong>, order.</p> - * <p/> - * <p><strong>The <code>Iterator</code> is - * <em>not</em> modifiable. e.g. the - * <code>remove()</code> method will throw - * <code>UnsupportedOperationException</code>.</strong></p> - * <p/> - * <p>When requesting prefixes by Namespace URI, the following - * table describes the returned prefixes value for all Namespace - * URI values:</p> - * <p/> - * <table border="2" rules="all" cellpadding="4"> - * <thead> - * <tr> - * <td align="center" colspan="2"><code> - * getPrefixes(namespaceURI)</code> return value for - * specified Namespace URIs</td> - * </tr> - * <tr> - * <td>Namespace URI parameter</td> - * <td>prefixes value returned</td> - * </tr> - * </thead> - * <tbody> - * <tr> - * <td>bound Namespace URI, - * including the <default Namespace URI></td> - * <td><code>Iterator</code> over prefixes bound to Namespace URI in - * the current scope in an arbitrary, <strong>implementation dependent</strong>, - * order</td> - * </tr> - * <tr> - * <td>unbound Namespace URI</td> - * <td>empty <code>Iterator</code></td> - * </tr> - * <tr> - * <td><code>XMLConstants.XML_NS_URI</code> - * ("http://www.w3.org/XML/1998/namespace")</td> - * <td><code>Iterator</code> with one element set to - * <code>XMLConstants.XML_NS_PREFIX</code> ("xml")</td> - * </tr> - * <tr> - * <td><code>XMLConstants.XMLNS_ATTRIBUTE_NS_URI</code> - * ("http://www.w3.org/2000/xmlns/")</td> - * <td><code>Iterator</code> with one element set to - * <code>XMLConstants.XMLNS_ATTRIBUTE</code> ("xmlns")</td> - * </tr> - * <tr> - * <td><code>null</code></td> - * <td><code>IllegalArgumentException</code> is thrown</td> - * </tr> - * </tbody> - * </table> - * - * @param namespaceURI URI of Namespace to lookup - * @return <code>Iterator</code> for all prefixes bound to the - * Namespace URI in the current scope - */ public Iterator getPrefixes(String namespaceURI) { ArrayList list = new ArrayList(); Iterator iterator = entrySet().iterator(); Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java?view=diff&rev=440241&r1=440240&r2=440241 ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java Mon Sep 4 20:53:36 2006 @@ -24,33 +24,32 @@ import java.util.List; import java.util.Map; -import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; import org.w3c.dom.Node; - +import org.apache.ws.commons.schema.constants.Constants; /** * Implementation of [EMAIL PROTECTED] NamespaceContext}, which is based on a DOM node. */ public class NodeNamespaceContext implements NamespacePrefixList { - private static final Collection XML_NS_PREFIX_COLLECTION = Collections.singletonList(XMLConstants.XML_NS_PREFIX); - private static final Collection XMLNS_ATTRIBUTE_COLLECTION = Collections.singletonList(XMLConstants.XMLNS_ATTRIBUTE); - private Node node; - private Map declarations; + private static final Collection XML_NS_PREFIX_COLLECTION = Collections.singletonList(Constants.XML_NS_PREFIX); + private static final Collection XMLNS_ATTRIBUTE_COLLECTION = Collections.singletonList(Constants.XMLNS_ATTRIBUTE); + private Node node; + private Map declarations; private String[] prefixes; - /** - * Creates a new instance with the given nodes context. - */ - public NodeNamespaceContext(Node pNode) { - node = pNode; - } - - private Map getDeclarations() { - if (declarations == null) { - declarations = new HashMap(); - declarations.put(XMLConstants.DEFAULT_NS_PREFIX, XMLConstants.NULL_NS_URI); + /** + * Creates a new instance with the given nodes context. + */ + public NodeNamespaceContext(Node pNode) { + node = pNode; + } + + private Map getDeclarations() { + if (declarations == null) { + declarations = new HashMap(); + declarations.put(Constants.DEFAULT_NS_PREFIX, Constants.NULL_NS_URI); new PrefixCollector(){ protected void declare(String pPrefix, String pNamespaceURI) { declarations.put(pPrefix, pNamespaceURI); @@ -58,63 +57,63 @@ }.searchAllPrefixDeclarations(node); Collection keys = declarations.keySet(); prefixes = (String[]) keys.toArray(new String[keys.size()]); - } - return declarations; - } - - public String getNamespaceURI(String pPrefix) { - if (pPrefix == null) { - throw new IllegalArgumentException("The prefix must not be null."); - } - if (XMLConstants.XML_NS_PREFIX.equals(pPrefix)) { - return XMLConstants.XML_NS_URI; - } - if (XMLConstants.XMLNS_ATTRIBUTE.equals(pPrefix)) { - return XMLConstants.XMLNS_ATTRIBUTE_NS_URI; - } - final String uri = (String) getDeclarations().get(pPrefix); - return uri == null ? XMLConstants.NULL_NS_URI : uri; - } - - public String getPrefix(String pNamespaceURI) { - if (pNamespaceURI == null) { - throw new IllegalArgumentException("The namespace URI must not be null."); - } - if (XMLConstants.XML_NS_URI.equals(pNamespaceURI)) { - return XMLConstants.XML_NS_PREFIX; - } - if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(pNamespaceURI)) { - return XMLConstants.XMLNS_ATTRIBUTE; - } - Map decl = getDeclarations(); - for (Iterator iter = decl.entrySet().iterator(); iter.hasNext(); ) { - Map.Entry entry = (Map.Entry) iter.next(); - if (pNamespaceURI.equals(entry.getValue())) { - return (String) entry.getKey(); - } - } - return null; - } - - public Iterator getPrefixes(String pNamespaceURI) { - if (pNamespaceURI == null) { - throw new IllegalArgumentException("The namespace URI must not be null."); - } - if (XMLConstants.XML_NS_URI.equals(pNamespaceURI)) { - return XML_NS_PREFIX_COLLECTION.iterator(); - } - if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(pNamespaceURI)) { - return XMLNS_ATTRIBUTE_COLLECTION.iterator(); - } - final List list = new ArrayList(); - for (Iterator iter = getDeclarations().entrySet().iterator(); iter.hasNext(); ) { - Map.Entry entry = (Map.Entry) iter.next(); - if (pNamespaceURI.equals(entry.getValue())) { - list.add(entry.getKey()); - } - } - return list.iterator(); - } + } + return declarations; + } + + public String getNamespaceURI(String pPrefix) { + if (pPrefix == null) { + throw new IllegalArgumentException("The prefix must not be null."); + } + if (Constants.XML_NS_PREFIX.equals(pPrefix)) { + return Constants.XML_NS_URI; + } + if (Constants.XMLNS_ATTRIBUTE.equals(pPrefix)) { + return Constants.XMLNS_ATTRIBUTE_NS_URI; + } + final String uri = (String) getDeclarations().get(pPrefix); + return uri == null ? Constants.NULL_NS_URI : uri; + } + + public String getPrefix(String pNamespaceURI) { + if (pNamespaceURI == null) { + throw new IllegalArgumentException("The namespace URI must not be null."); + } + if (Constants.XML_NS_URI.equals(pNamespaceURI)) { + return Constants.XML_NS_PREFIX; + } + if (Constants.XMLNS_ATTRIBUTE_NS_URI.equals(pNamespaceURI)) { + return Constants.XMLNS_ATTRIBUTE; + } + Map decl = getDeclarations(); + for (Iterator iter = decl.entrySet().iterator(); iter.hasNext(); ) { + Map.Entry entry = (Map.Entry) iter.next(); + if (pNamespaceURI.equals(entry.getValue())) { + return (String) entry.getKey(); + } + } + return null; + } + + public Iterator getPrefixes(String pNamespaceURI) { + if (pNamespaceURI == null) { + throw new IllegalArgumentException("The namespace URI must not be null."); + } + if (Constants.XML_NS_URI.equals(pNamespaceURI)) { + return XML_NS_PREFIX_COLLECTION.iterator(); + } + if (Constants.XMLNS_ATTRIBUTE_NS_URI.equals(pNamespaceURI)) { + return XMLNS_ATTRIBUTE_COLLECTION.iterator(); + } + final List list = new ArrayList(); + for (Iterator iter = getDeclarations().entrySet().iterator(); iter.hasNext(); ) { + Map.Entry entry = (Map.Entry) iter.next(); + if (pNamespaceURI.equals(entry.getValue())) { + list.add(entry.getKey()); + } + } + return list.iterator(); + } public String[] getDeclaredPrefixes() { getDeclarations(); // Make sure, that the prefixes array is valid Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java?view=diff&rev=440241&r1=440240&r2=440241 ============================================================================== --- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java (original) +++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/PrefixCollector.java Mon Sep 4 20:53:36 2006 @@ -16,11 +16,9 @@ package org.apache.ws.commons.schema.utils; -import javax.xml.XMLConstants; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; - +import org.apache.ws.commons.schema.constants.Constants; /** * Searches for namespace prefix declarations. @@ -43,9 +41,9 @@ for (int i = 0; i < map.getLength(); i++) { Node attr = map.item(i); final String uri = attr.getNamespaceURI(); - if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(uri)) { + if (Constants.XMLNS_ATTRIBUTE_NS_URI.equals(uri)) { String localName = attr.getLocalName(); - String prefix = XMLConstants.XMLNS_ATTRIBUTE.equals(localName) ? XMLConstants.DEFAULT_NS_PREFIX : localName; + String prefix = Constants.XMLNS_ATTRIBUTE.equals(localName) ? Constants.DEFAULT_NS_PREFIX : localName; declare(prefix, attr.getNodeValue()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]