You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by di...@apache.org on 2006/09/05 19:07:49 UTC
svn commit: r440405 - in
/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema:
SchemaBuilder.java XmlSchemaCollection.java
Author: dims
Date: Tue Sep 5 10:07:48 2006
New Revision: 440405
URL: http://svn.apache.org/viewvc?view=rev&rev=440405
Log:
oops! XMLConstants again
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/XmlSchemaCollection.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=440405&r1=440404&r2=440405
==============================================================================
--- 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 Tue Sep 5 10:07:48 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;
@@ -1204,7 +1203,7 @@
private QName newLocalQName(String pLocalName) {
String uri = schema.logicalTargetNamespace;
if (uri == null) {
- uri = XMLConstants.NULL_NS_URI;
+ uri = Constants.NULL_NS_URI;
}
return new QName(uri, pLocalName);
}
@@ -1370,7 +1369,7 @@
if (element.name != null) {
final String name = element.name;
- element.qualifiedName = (isQualified || isGlobal) ? newLocalQName(name) : new QName(XMLConstants.NULL_NS_URI, name);
+ element.qualifiedName = (isQualified || isGlobal) ? newLocalQName(name) : new QName(Constants.NULL_NS_URI, name);
}
Element annotationEl =
@@ -1577,7 +1576,7 @@
TargetNamespaceValidator validator = new TargetNamespaceValidator(){
private boolean isEmpty(String pValue) {
- return pValue == null || XMLConstants.NULL_NS_URI.equals(pValue);
+ return pValue == null || Constants.NULL_NS_URI.equals(pValue);
}
public void validate(XmlSchema pSchema) {
final boolean valid;
@@ -1663,7 +1662,7 @@
private TargetNamespaceValidator newIncludeValidator(final XmlSchema schema) {
return new TargetNamespaceValidator(){
private boolean isEmpty(String pValue) {
- return pValue == null || XMLConstants.NULL_NS_URI.equals(pValue);
+ return pValue == null || Constants.NULL_NS_URI.equals(pValue);
}
public void validate(XmlSchema pSchema) {
if (isEmpty(pSchema.syntacticalTargetNamespace)) {
@@ -1895,7 +1894,7 @@
if (namespaceURI!= null &&
!"".equals(namespaceURI) && //ignore unqualified attributes
- !name.startsWith(XMLConstants.XMLNS_ATTRIBUTE) && //ignore namespaces
+ !name.startsWith(Constants.XMLNS_ATTRIBUTE) && //ignore namespaces
!Constants.URI_2001_SCHEMA_XSD.equals(namespaceURI)){
attribMap.put(new QName(namespaceURI,name),
attribute.getValue());
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?view=diff&rev=440405&r1=440404&r2=440405
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java Tue Sep 5 10:07:48 2006
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -53,7 +52,7 @@
private final String namespace;
private final String systemId;
SchemaKey(String pNamespace, String pSystemId) {
- namespace = pNamespace == null ? XMLConstants.NULL_NS_URI : pNamespace;
+ namespace = pNamespace == null ? Constants.NULL_NS_URI : pNamespace;
systemId = pSystemId == null ? "" : pSystemId;
}
String getNamespace() { return namespace; }
@@ -73,7 +72,7 @@
return namespace.equals(other.namespace) && systemId.equals(other.systemId);
}
public String toString() {
- return XMLConstants.NULL_NS_URI.equals(namespace) ?
+ return Constants.NULL_NS_URI.equals(namespace) ?
systemId : ("{" + namespace + "}" + systemId);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org