cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1502271 - in /cxf/trunk: api/src/main/java/org/apache/cxf/common/util/ api/src/main/java/org/apache/cxf/common/xmlschema/ api/src/main/java/org/apache/cxf/service/model/ rt/core/src/main/java/org/apache/cxf/databinding/source/ rt/core/src/...
Date Thu, 11 Jul 2013 16:20:45 GMT
Author: dkulp
Date: Thu Jul 11 16:20:45 2013
New Revision: 1502271

URL: http://svn.apache.org/r1502271
Log:
Use the constants from XmlSchema directly instead of our copies (faster startup and less memory as constants only initialized once)

Removed:
    cxf/trunk/api/src/main/java/org/apache/cxf/common/util/XMLSchemaQNames.java
    cxf/trunk/api/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java
Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
    cxf/trunk/api/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
    cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java
    cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java
    cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
    cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
    cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
    cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
    cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
    cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java Thu Jul 11 16:20:45 2013
@@ -31,8 +31,8 @@ import org.apache.cxf.common.logging.Log
  */
 public final class SystemPropertyAction implements PrivilegedAction<String> {
     private static final Logger LOG = LogUtils.getL7dLogger(SystemPropertyAction.class);
-    final String property;
-    final String def;
+    private final String property;
+    private final String def;
     private SystemPropertyAction(String name) {
         property = name;
         def = null;

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java Thu Jul 11 16:20:45 2013
@@ -54,6 +54,7 @@ import org.apache.ws.commons.schema.XmlS
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeContent;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
 import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * Some functions that avoid problems with Commons XML Schema.
@@ -175,7 +176,7 @@ public final class XmlSchemaUtils {
     public static void addImportIfNeeded(XmlSchema schema, String namespaceUri) {
         // no need to import nothing or the XSD schema, or the schema we are fixing.
         if ("".equals(namespaceUri)
-            || XmlSchemaConstants.XSD_NAMESPACE_URI.equals(namespaceUri)
+            || Constants.URI_2001_SCHEMA_XSD.equals(namespaceUri)
             || schema.getTargetNamespace().equals(namespaceUri)) {
             return;
         }

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java Thu Jul 11 16:20:45 2013
@@ -28,11 +28,11 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import org.apache.cxf.common.WSDLConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaForm;
 import org.apache.ws.commons.schema.XmlSchemaSerializer.XmlSchemaSerializerException;
+import org.apache.ws.commons.schema.constants.Constants;
 import org.apache.ws.commons.schema.utils.NamespaceMap;
 
 public final class SchemaInfo extends AbstractPropertiesHolder {
@@ -100,7 +100,7 @@ public final class SchemaInfo extends Ab
             // Some unit tests really want to see 'tns:'.
             if (schAgain.getNamespaceContext() == null) {
                 NamespaceMap nsMap = new NamespaceMap();
-                nsMap.add("xsd", XmlSchemaConstants.XSD_NAMESPACE_URI);
+                nsMap.add("xsd", Constants.URI_2001_SCHEMA_XSD);
                 nsMap.add("tns", schAgain.getTargetNamespace());
                 schAgain.setNamespaceContext(nsMap);
             }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java Thu Jul 11 16:20:45 2013
@@ -26,13 +26,13 @@ import javax.xml.stream.XMLStreamWriter;
 import org.w3c.dom.Node;
 
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.databinding.DataReader;
 import org.apache.cxf.databinding.DataWriter;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.ServiceModelVisitor;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * A simple databinding implementation which reads and writes Source objects.
@@ -64,7 +64,7 @@ public class SourceDataBinding extends o
                     if (part.getTypeQName() != null || part.getElementQName() != null) {
                         return;
                     }
-                    part.setTypeQName(XmlSchemaConstants.ANY_TYPE_QNAME);
+                    part.setTypeQName(Constants.XSD_ANYTYPE);
                 }
             } .walk();
         }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java Thu Jul 11 16:20:45 2013
@@ -33,7 +33,6 @@ import org.w3c.dom.Node;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.databinding.AbstractDataBinding;
 import org.apache.cxf.databinding.DataReader;
 import org.apache.cxf.databinding.DataWriter;
@@ -44,6 +43,7 @@ import org.apache.cxf.service.ServiceMod
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * A simple databinding implementation which reads and writes Source objects.
@@ -72,7 +72,7 @@ public class StaxDataBinding extends Abs
                     if (part.getTypeQName() != null || part.getElementQName() != null) {
                         return;
                     }
-                    part.setTypeQName(XmlSchemaConstants.ANY_TYPE_QNAME);
+                    part.setTypeQName(Constants.XSD_ANYTYPE);
                 }
             } .walk();
         }

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Thu Jul 11 16:20:45 2013
@@ -48,7 +48,6 @@ import org.apache.cxf.common.classloader
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.databinding.AbstractDataBinding;
 import org.apache.cxf.databinding.DataReader;
@@ -66,6 +65,7 @@ import org.apache.ws.commons.schema.XmlS
 import org.apache.ws.commons.schema.XmlSchemaAnnotated;
 import org.apache.ws.commons.schema.XmlSchemaException;
 import org.apache.ws.commons.schema.XmlSchemaForm;
+import org.apache.ws.commons.schema.constants.Constants;
 import org.apache.ws.commons.schema.utils.NamespaceMap;
 
 /**
@@ -434,7 +434,7 @@ public class AegisDatabinding extends Ab
 
                 String schemaNamespaceUri = entry.getKey();
 
-                if (XmlSchemaConstants.XSD_NAMESPACE_URI.equals(schemaNamespaceUri)) {
+                if (Constants.URI_2001_SCHEMA_XSD.equals(schemaNamespaceUri)) {
                     continue;
                 }
 
@@ -466,8 +466,8 @@ public class AegisDatabinding extends Ab
 
                 // ditto for xsd: instead of just namespace= for the schema schema.
                 if (!xmlsNamespaceMap.containsKey("xsd")
-                    && !xmlsNamespaceMap.containsValue(XmlSchemaConstants.XSD_NAMESPACE_URI)) {
-                    xmlsNamespaceMap.add("xsd", XmlSchemaConstants.XSD_NAMESPACE_URI);
+                    && !xmlsNamespaceMap.containsValue(Constants.URI_2001_SCHEMA_XSD)) {
+                    xmlsNamespaceMap.add("xsd", Constants.URI_2001_SCHEMA_XSD);
                 }
 
                 schema.setNamespaceContext(xmlsNamespaceMap);

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java Thu Jul 11 16:20:45 2013
@@ -36,7 +36,7 @@ import org.apache.cxf.aegis.type.collect
 import org.apache.cxf.aegis.util.NamespaceHelper;
 import org.apache.cxf.aegis.util.ServiceUtils;
 import org.apache.cxf.common.WSDLConstants;
-import org.apache.cxf.common.util.XMLSchemaQNames;
+import org.apache.ws.commons.schema.constants.Constants;
 
 public abstract class AbstractTypeCreator implements TypeCreator {
     public static final String HTTP_CXF_APACHE_ORG_ARRAYS = "http://cxf.apache.org/arrays";
@@ -282,7 +282,7 @@ public abstract class AbstractTypeCreato
 
     protected AegisType createObjectType() {
         ObjectType type = new ObjectType();
-        type.setSchemaType(XMLSchemaQNames.XSD_ANY);
+        type.setSchemaType(Constants.XSD_ANY);
         type.setTypeClass(Object.class);
         type.setTypeMapping(getTypeMapping());
         return type;

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java Thu Jul 11 16:20:45 2013
@@ -71,7 +71,7 @@ import org.apache.cxf.binding.soap.Soap1
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.common.util.XMLSchemaQNames;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * The implementation of the Aegis type map. It maintains a map from
@@ -217,49 +217,49 @@ public class DefaultTypeMapping implemen
 
     private static void fillStandardMappings(TypeMapping tm, boolean defaultNillable, 
                                              boolean enableMtomXmime, boolean enableJDOM) {
-        defaultRegister(tm, defaultNillable, BigDecimal.class, XMLSchemaQNames.XSD_DECIMAL,
+        defaultRegister(tm, defaultNillable, BigDecimal.class, Constants.XSD_DECIMAL,
                         new BigDecimalType());
-        defaultRegister(tm, defaultNillable, BigInteger.class, XMLSchemaQNames.XSD_INTEGER,
+        defaultRegister(tm, defaultNillable, BigInteger.class, Constants.XSD_INTEGER,
                         new BigIntegerType());
-        defaultRegister(tm, defaultNillable, Boolean.class, XMLSchemaQNames.XSD_BOOLEAN,
+        defaultRegister(tm, defaultNillable, Boolean.class, Constants.XSD_BOOLEAN,
                         new BooleanType());
-        defaultRegister(tm, defaultNillable, Calendar.class, XMLSchemaQNames.XSD_DATETIME,
+        defaultRegister(tm, defaultNillable, Calendar.class, Constants.XSD_DATETIME,
                         new CalendarType());
-        defaultRegister(tm, defaultNillable, Date.class, XMLSchemaQNames.XSD_DATETIME, new DateTimeType());
-        defaultRegister(tm, defaultNillable, Float.class, XMLSchemaQNames.XSD_FLOAT, new FloatType());
-        defaultRegister(tm, defaultNillable, Double.class, XMLSchemaQNames.XSD_DOUBLE, new DoubleType());
-        defaultRegister(tm, defaultNillable, Integer.class, XMLSchemaQNames.XSD_INT, new IntType());
-        defaultRegister(tm, defaultNillable, Long.class, XMLSchemaQNames.XSD_LONG, new LongType());
-        defaultRegister(tm, defaultNillable, Object.class, XMLSchemaQNames.XSD_ANY, new ObjectType());
-        defaultRegister(tm, defaultNillable, Byte.class, XMLSchemaQNames.XSD_BYTE, new ByteType());
-        defaultRegister(tm, defaultNillable, Short.class, XMLSchemaQNames.XSD_SHORT, new ShortType());
-        defaultRegister(tm, defaultNillable, Source.class, XMLSchemaQNames.XSD_ANY, new SourceType());
-        defaultRegister(tm, defaultNillable, String.class, XMLSchemaQNames.XSD_STRING, new StringType());
-        defaultRegister(tm, defaultNillable, Time.class, XMLSchemaQNames.XSD_TIME, new TimeType());
-        defaultRegister(tm, defaultNillable, Timestamp.class, XMLSchemaQNames.XSD_DATETIME,
+        defaultRegister(tm, defaultNillable, Date.class, Constants.XSD_DATETIME, new DateTimeType());
+        defaultRegister(tm, defaultNillable, Float.class, Constants.XSD_FLOAT, new FloatType());
+        defaultRegister(tm, defaultNillable, Double.class, Constants.XSD_DOUBLE, new DoubleType());
+        defaultRegister(tm, defaultNillable, Integer.class, Constants.XSD_INT, new IntType());
+        defaultRegister(tm, defaultNillable, Long.class, Constants.XSD_LONG, new LongType());
+        defaultRegister(tm, defaultNillable, Object.class, Constants.XSD_ANY, new ObjectType());
+        defaultRegister(tm, defaultNillable, Byte.class, Constants.XSD_BYTE, new ByteType());
+        defaultRegister(tm, defaultNillable, Short.class, Constants.XSD_SHORT, new ShortType());
+        defaultRegister(tm, defaultNillable, Source.class, Constants.XSD_ANY, new SourceType());
+        defaultRegister(tm, defaultNillable, String.class, Constants.XSD_STRING, new StringType());
+        defaultRegister(tm, defaultNillable, Time.class, Constants.XSD_TIME, new TimeType());
+        defaultRegister(tm, defaultNillable, Timestamp.class, Constants.XSD_DATETIME,
                         new TimestampType());
-        defaultRegister(tm, defaultNillable, URI.class, XMLSchemaQNames.XSD_URI, new URIType());
-        defaultRegister(tm, defaultNillable, XMLStreamReader.class, XMLSchemaQNames.XSD_ANY,
+        defaultRegister(tm, defaultNillable, URI.class, Constants.XSD_ANYURI, new URIType());
+        defaultRegister(tm, defaultNillable, XMLStreamReader.class, Constants.XSD_ANY,
                         new XMLStreamReaderType());
         
-        defaultRegister(tm, defaultNillable, boolean.class, XMLSchemaQNames.XSD_BOOLEAN,
+        defaultRegister(tm, defaultNillable, boolean.class, Constants.XSD_BOOLEAN,
                         new BooleanType());
-        defaultRegister(tm, defaultNillable, byte[].class, XMLSchemaQNames.XSD_BASE64, new Base64Type());
-        defaultRegister(tm, defaultNillable, double.class, XMLSchemaQNames.XSD_DOUBLE, new DoubleType());
-        defaultRegister(tm, defaultNillable, float.class, XMLSchemaQNames.XSD_FLOAT, new FloatType());
-        defaultRegister(tm, defaultNillable, int.class, XMLSchemaQNames.XSD_INT, new IntType());
-        defaultRegister(tm, defaultNillable, short.class, XMLSchemaQNames.XSD_SHORT, new ShortType());
-        defaultRegister(tm, defaultNillable, byte.class, XMLSchemaQNames.XSD_BYTE, new ByteType());
-        defaultRegister(tm, defaultNillable, long.class, XMLSchemaQNames.XSD_LONG, new LongType());
+        defaultRegister(tm, defaultNillable, byte[].class, Constants.XSD_BASE64, new Base64Type());
+        defaultRegister(tm, defaultNillable, double.class, Constants.XSD_DOUBLE, new DoubleType());
+        defaultRegister(tm, defaultNillable, float.class, Constants.XSD_FLOAT, new FloatType());
+        defaultRegister(tm, defaultNillable, int.class, Constants.XSD_INT, new IntType());
+        defaultRegister(tm, defaultNillable, short.class, Constants.XSD_SHORT, new ShortType());
+        defaultRegister(tm, defaultNillable, byte.class, Constants.XSD_BYTE, new ByteType());
+        defaultRegister(tm, defaultNillable, long.class, Constants.XSD_LONG, new LongType());
 
-        defaultRegister(tm, defaultNillable, java.sql.Date.class, XMLSchemaQNames.XSD_DATETIME,
+        defaultRegister(tm, defaultNillable, java.sql.Date.class, Constants.XSD_DATETIME,
                         new SqlDateType());
-        defaultRegister(tm, defaultNillable, java.sql.Date.class, XMLSchemaQNames.XSD_DATE,
+        defaultRegister(tm, defaultNillable, java.sql.Date.class, Constants.XSD_DATE,
                         new SqlDateType());
-        defaultRegister(tm, defaultNillable, Number.class, XMLSchemaQNames.XSD_DECIMAL,
+        defaultRegister(tm, defaultNillable, Number.class, Constants.XSD_DECIMAL,
                         new BigDecimalType());
         
-        QName mtomBase64 = XMLSchemaQNames.XSD_BASE64;
+        QName mtomBase64 = Constants.XSD_BASE64;
         if (enableMtomXmime) {
             mtomBase64 = AbstractXOPType.XML_MIME_BASE64;
         }
@@ -270,7 +270,7 @@ public class DefaultTypeMapping implemen
                         new DataHandlerType(enableMtomXmime, null));
         
 
-        defaultRegister(tm, defaultNillable, Document.class, XMLSchemaQNames.XSD_ANY, new DocumentType());
+        defaultRegister(tm, defaultNillable, Document.class, Constants.XSD_ANY, new DocumentType());
         if (enableJDOM) {
             registerJDOMTypes(tm, defaultNillable);
         }
@@ -280,7 +280,7 @@ public class DefaultTypeMapping implemen
     private static void registerJDOMTypes(TypeMapping tm, boolean defaultNillable) {
         try {
             Class<?> jdomDocClass = ClassLoaderUtils.loadClass("org.jdom.Document", DefaultTypeMapping.class);
-            defaultRegister(tm, defaultNillable, jdomDocClass, XMLSchemaQNames.XSD_ANY,
+            defaultRegister(tm, defaultNillable, jdomDocClass, Constants.XSD_ANY,
                             new JDOMDocumentType());
 
         } catch (ClassNotFoundException e) {
@@ -290,21 +290,13 @@ public class DefaultTypeMapping implemen
         try {
             Class<?> jdomElementClass = 
                 ClassLoaderUtils.loadClass("org.jdom.Element", DefaultTypeMapping.class);
-            defaultRegister(tm, defaultNillable, jdomElementClass, XMLSchemaQNames.XSD_ANY,
+            defaultRegister(tm, defaultNillable, jdomElementClass, Constants.XSD_ANY,
                                 new JDOMElementType());
         } catch (ClassNotFoundException e) {
             // not available.
         }
     }
 
-    public static DefaultTypeMapping createSoap11TypeMapping(boolean defaultNillable, 
-     boolean enableMtomXmime) {
-        return createSoap11TypeMapping(
-                                       defaultNillable,
-                                       enableMtomXmime,
-                                       false);
-    }
-
     /**
      * Create a type mapping object with a stock set of mappings, including the SOAP 1.1 'encoded'
      * types.
@@ -376,31 +368,31 @@ public class DefaultTypeMapping implemen
                         CharacterAsStringType.CHARACTER_AS_STRING_TYPE_QNAME,
                         new CharacterAsStringType());
 
-        defaultRegister(tm, defaultNillable, javax.xml.datatype.Duration.class, XMLSchemaQNames.XSD_DURATION,
+        defaultRegister(tm, defaultNillable, javax.xml.datatype.Duration.class, Constants.XSD_DURATION,
                             new org.apache.cxf.aegis.type.java5.DurationType());
         defaultRegister(tm, defaultNillable, javax.xml.datatype.XMLGregorianCalendar.class,
-                            XMLSchemaQNames.XSD_DATE,
+                        Constants.XSD_DATE,
                             new org.apache.cxf.aegis.type.java5.XMLGregorianCalendarType());
         defaultRegister(tm, defaultNillable, javax.xml.datatype.XMLGregorianCalendar.class,
-                            XMLSchemaQNames.XSD_TIME,
+                        Constants.XSD_TIME,
                             new org.apache.cxf.aegis.type.java5.XMLGregorianCalendarType());
         defaultRegister(tm, defaultNillable, javax.xml.datatype.XMLGregorianCalendar.class,
-                            XMLSchemaQNames.XSD_G_DAY,
+                        Constants.XSD_DAY,
                             new org.apache.cxf.aegis.type.java5.XMLGregorianCalendarType());
         defaultRegister(tm, defaultNillable, javax.xml.datatype.XMLGregorianCalendar.class,
-                            XMLSchemaQNames.XSD_G_MONTH,
+                        Constants.XSD_MONTH,
                             new org.apache.cxf.aegis.type.java5.XMLGregorianCalendarType());
         defaultRegister(tm, defaultNillable, javax.xml.datatype.XMLGregorianCalendar.class,
-                            XMLSchemaQNames.XSD_G_MONTH_DAY,
+                        Constants.XSD_MONTHDAY,
                             new org.apache.cxf.aegis.type.java5.XMLGregorianCalendarType());
         defaultRegister(tm, defaultNillable, javax.xml.datatype.XMLGregorianCalendar.class,
-                            XMLSchemaQNames.XSD_G_YEAR,
+                        Constants.XSD_YEAR,
                             new org.apache.cxf.aegis.type.java5.XMLGregorianCalendarType());
         defaultRegister(tm, defaultNillable, javax.xml.datatype.XMLGregorianCalendar.class,
-                            XMLSchemaQNames.XSD_G_YEAR_MONTH,
+                        Constants.XSD_YEARMONTH,
                             new org.apache.cxf.aegis.type.java5.XMLGregorianCalendarType());
         defaultRegister(tm, defaultNillable, javax.xml.datatype.XMLGregorianCalendar.class,
-                            XMLSchemaQNames.XSD_DATETIME,
+                        Constants.XSD_DATETIME,
                             new org.apache.cxf.aegis.type.java5.XMLGregorianCalendarType());
         return tm;
     }

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java Thu Jul 11 16:20:45 2013
@@ -36,11 +36,11 @@ import org.apache.cxf.aegis.xml.MessageR
 import org.apache.cxf.aegis.xml.MessageWriter;
 import org.apache.cxf.aegis.xml.stax.ElementReader;
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * An ArrayType.
@@ -232,7 +232,7 @@ public class ArrayType extends AegisType
         if (type == null) {
             throw new DatabindingException("Couldn't find type for array.");
         }
-        if (XmlSchemaConstants.ANY_TYPE_QNAME.equals(type.getSchemaType())) {
+        if (Constants.XSD_ANYTYPE.equals(type.getSchemaType())) {
             forceXsiWrite = true;
         }
 

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java Thu Jul 11 16:20:45 2013
@@ -35,10 +35,10 @@ import org.apache.cxf.aegis.xml.MessageR
 import org.apache.cxf.aegis.xml.MessageWriter;
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * AegisType for runtime inspection of types. Looks as the class to be written, and
@@ -271,7 +271,7 @@ public class ObjectType extends AegisTyp
             simple.setName("serializedJavaObject");
             XmlSchemaSimpleTypeRestriction restriction = new XmlSchemaSimpleTypeRestriction();
             simple.setContent(restriction);
-            restriction.setBaseTypeName(XmlSchemaConstants.BASE64BINARY_QNAME);
+            restriction.setBaseTypeName(Constants.XSD_BASE64);
         }
     }
 }

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java Thu Jul 11 16:20:45 2013
@@ -26,12 +26,12 @@ import org.apache.cxf.aegis.DatabindingE
 import org.apache.cxf.aegis.type.AegisType;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
 import org.apache.ws.commons.schema.XmlSchemaFacet;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+import org.apache.ws.commons.schema.constants.Constants;
 
 public class EnumType extends AegisType {
     @SuppressWarnings("unchecked")
@@ -69,7 +69,7 @@ public class EnumType extends AegisType 
         XmlSchemaSimpleType simple = new XmlSchemaSimpleType(root, true);
         simple.setName(getSchemaType().getLocalPart());
         XmlSchemaSimpleTypeRestriction restriction = new XmlSchemaSimpleTypeRestriction();
-        restriction.setBaseTypeName(XmlSchemaConstants.STRING_QNAME);
+        restriction.setBaseTypeName(Constants.XSD_STRING);
         simple.setContent(restriction);
 
         Object[] constants = getTypeClass().getEnumConstants();

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java Thu Jul 11 16:20:45 2013
@@ -36,7 +36,6 @@ import org.apache.cxf.aegis.type.AegisTy
 import org.apache.cxf.aegis.type.basic.Base64Type;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.message.Attachment;
 import org.apache.ws.commons.schema.XmlSchemaElement;
@@ -75,7 +74,7 @@ public abstract class AbstractXOPType ex
         //      we use the XMIME type instead of the XSD type to allow for our content type attribute.
             setSchemaType(XML_MIME_BASE64);
         } else {
-            setSchemaType(XmlSchemaConstants.BASE64BINARY_QNAME);
+            setSchemaType(Constants.XSD_BASE64);
         }
     }
     

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java Thu Jul 11 16:20:45 2013
@@ -49,7 +49,6 @@ import org.apache.cxf.binding.soap.SoapT
 import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.endpoint.ServerRegistry;
 import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
@@ -70,7 +69,9 @@ import org.apache.cxf.wsdl11.ServiceWSDL
 import org.apache.cxf.wsdl11.WSDLDefinitionBuilder;
 import org.apache.cxf.wsdl11.WSDLManagerImpl;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.constants.Constants;
 import org.apache.ws.commons.schema.utils.NamespaceMap;
+
 import org.junit.Before;
 
 public abstract class AbstractAegisTest extends AbstractCXFTest {
@@ -282,7 +283,7 @@ public abstract class AbstractAegisTest 
         xmlsNamespaceMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX, targetNamespace);
         
         // ditto for xsd: instead of just namespace= for the schema schema.
-        xmlsNamespaceMap.add("xsd", XmlSchemaConstants.XSD_NAMESPACE_URI);
+        xmlsNamespaceMap.add("xsd", Constants.URI_2001_SCHEMA_XSD);
         return s;
     }
     

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java Thu Jul 11 16:20:45 2013
@@ -42,7 +42,6 @@ import org.apache.cxf.aegis.type.TypeMap
 import org.apache.cxf.aegis.xml.stax.ElementReader;
 import org.apache.cxf.aegis.xml.stax.ElementWriter;
 import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.ws.commons.schema.XmlSchema;
@@ -52,6 +51,7 @@ import org.apache.ws.commons.schema.XmlS
 import org.apache.ws.commons.schema.XmlSchemaObject;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
 import org.apache.ws.commons.schema.XmlSchemaSequenceMember;
+import org.apache.ws.commons.schema.constants.Constants;
 
 import org.junit.Test;
 
@@ -478,11 +478,11 @@ public class BeanTest extends AbstractAe
                 if ("littleByte".equals(oe.getName())) {
                     littleByteOk = true;
                     assertNotNull(oe.getSchemaTypeName());
-                    assertEquals(XmlSchemaConstants.BYTE_QNAME, oe.getSchemaTypeName());
+                    assertEquals(Constants.XSD_BYTE, oe.getSchemaTypeName());
                 } else if ("bigByte".equals(oe.getName())) {
                     bigByteOk = true;
                     assertNotNull(oe.getSchemaTypeName());
-                    assertEquals(XmlSchemaConstants.BYTE_QNAME, oe.getSchemaTypeName());
+                    assertEquals(Constants.XSD_BYTE, oe.getSchemaTypeName());
                 }
             }
         }

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java Thu Jul 11 16:20:45 2013
@@ -28,7 +28,8 @@ import org.w3c.dom.Element;
 import org.apache.cxf.aegis.AbstractAegisTest;
 import org.apache.cxf.aegis.AegisContext;
 import org.apache.cxf.aegis.type.TypeMapping;
-import org.apache.cxf.common.util.XMLSchemaQNames;
+import org.apache.ws.commons.schema.constants.Constants;
+
 import org.junit.Test;
 
 
@@ -50,8 +51,8 @@ public class DateTimezoneTest extends Ab
     @Test
     public void testTimezoneLessCalendar() throws Exception {
         BeanTypeInfo info = new BeanTypeInfo(CalendarBean.class, "urn:Bean");
-        mapping.register(Calendar.class, XMLSchemaQNames.XSD_DATETIME, new TimezoneLessDateType());
-        mapping.register(Calendar.class, XMLSchemaQNames.XSD_DATE, new TimezoneLessDateType());        
+        mapping.register(Calendar.class, Constants.XSD_DATETIME, new TimezoneLessDateType());
+        mapping.register(Calendar.class, Constants.XSD_DATE, new TimezoneLessDateType());        
         info.setTypeMapping(mapping);
   
         BeanType type = new BeanType(info);
@@ -70,8 +71,8 @@ public class DateTimezoneTest extends Ab
     @Test
     public void testTimezoneLessDate() throws Exception {
         BeanTypeInfo info = new BeanTypeInfo(DateBean.class, "urn:Bean");
-        mapping.register(Date.class, XMLSchemaQNames.XSD_DATETIME, new TimezoneLessDateType());
-        mapping.register(Date.class, XMLSchemaQNames.XSD_DATE, new TimezoneLessDateType());        
+        mapping.register(Date.class, Constants.XSD_DATETIME, new TimezoneLessDateType());
+        mapping.register(Date.class, Constants.XSD_DATE, new TimezoneLessDateType());        
         info.setTypeMapping(mapping);
   
         BeanType type = new BeanType(info);

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java Thu Jul 11 16:20:45 2013
@@ -33,12 +33,12 @@ import org.apache.cxf.aegis.type.AegisTy
 import org.apache.cxf.aegis.type.basic.StringType;
 import org.apache.cxf.aegis.xml.MessageReader;
 import org.apache.cxf.aegis.xml.MessageWriter;
-import org.apache.cxf.common.util.XMLSchemaQNames;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+import org.apache.ws.commons.schema.constants.Constants;
 
 import org.junit.After;
 import org.junit.Before;
@@ -122,7 +122,7 @@ public class ClassTest extends AbstractA
             xst.setName("class");
             
             XmlSchemaSimpleTypeRestriction content = new XmlSchemaSimpleTypeRestriction();
-            content.setBaseTypeName(XMLSchemaQNames.XSD_STRING);
+            content.setBaseTypeName(Constants.XSD_STRING);
             xst.setContent(content);
         }
                  

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CustomStringType.java Thu Jul 11 16:20:45 2013
@@ -21,11 +21,11 @@ package org.apache.cxf.aegis.type.java5;
 import javax.xml.XMLConstants;
 
 import org.apache.cxf.aegis.type.basic.StringType;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaSimpleContentExtension;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+import org.apache.ws.commons.schema.constants.Constants;
 
 public class CustomStringType extends StringType {
 
@@ -38,9 +38,9 @@ public class CustomStringType extends St
         XmlSchemaSimpleType type = new XmlSchemaSimpleType(root, true);
         type.setName(getSchemaType().getLocalPart());
         XmlSchemaSimpleContentExtension ext = new XmlSchemaSimpleContentExtension();
-        ext.setBaseTypeName(XmlSchemaConstants.STRING_QNAME);
+        ext.setBaseTypeName(Constants.XSD_STRING);
         XmlSchemaSimpleTypeRestriction content = new XmlSchemaSimpleTypeRestriction();
-        content.setBaseTypeName(XmlSchemaConstants.STRING_QNAME);
+        content.setBaseTypeName(Constants.XSD_STRING);
         type.setContent(content);
     }
 

Modified: cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/SDODataBinding.java Thu Jul 11 16:20:45 2013
@@ -34,7 +34,6 @@ import javax.xml.stream.XMLStreamWriter;
 
 import org.w3c.dom.Node;
 
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.databinding.AbstractDataBinding;
 import org.apache.cxf.databinding.DataReader;
 import org.apache.cxf.databinding.DataWriter;
@@ -45,6 +44,7 @@ import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.tuscany.sdo.api.SDOUtil;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.constants.Constants;
 
 import commonj.sdo.DataObject;
 import commonj.sdo.Type;
@@ -151,7 +151,7 @@ public class SDODataBinding extends Abst
         }
         for (ServiceInfo serviceInfo : service.getServiceInfos()) {
             for (XmlSchema schema : serviceInfo.getXmlSchemaCollection().getXmlSchemas()) {
-                if (schema.getTargetNamespace().equals(XmlSchemaConstants.XSD_NAMESPACE_URI)) {
+                if (schema.getTargetNamespace().equals(Constants.URI_2001_SCHEMA_XSD)) {
                     continue;
                 }
                 StringWriter writer = new StringWriter();

Modified: cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java Thu Jul 11 16:20:45 2013
@@ -34,7 +34,6 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
@@ -46,6 +45,7 @@ import org.apache.tuscany.sdo.generate.X
 import org.apache.tuscany.sdo.helper.HelperContextImpl;
 import org.apache.tuscany.sdo.helper.XSDHelperImpl;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.constants.Constants;
 import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
@@ -126,7 +126,7 @@ public class SDODatabinding extends XSD2
 
         ((XSDHelperImpl)xsdHelper).setRedefineBuiltIn(generateBuiltIn);
         for (XmlSchema schema : schemaCollection.getXmlSchemas()) {
-            if (schema.getTargetNamespace().equals(XmlSchemaConstants.XSD_NAMESPACE_URI)) {
+            if (schema.getTargetNamespace().equals(Constants.URI_2001_SCHEMA_XSD)) {
                 continue;
             }
             StringWriter writer = new StringWriter();

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Thu Jul 11 16:20:45 2013
@@ -82,7 +82,6 @@ import org.apache.cxf.common.util.Reflec
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.XmlSchemaPrimitiveUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
@@ -110,6 +109,7 @@ import org.apache.cxf.service.model.Endp
 import org.apache.cxf.staxutils.DelegatingXMLStreamWriter;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.constants.Constants;
 
 public class WadlGenerator implements ContainerRequestFilter {
 
@@ -212,7 +212,7 @@ public class WadlGenerator implements Co
         sbMain.append("<application");
         if (!isJson) {
             sbMain.append(" xmlns=\"").append(getNamespace()).append("\" xmlns:xs=\"")
-                .append(XmlSchemaConstants.XSD_NAMESPACE_URI).append("\"");
+                .append(Constants.URI_2001_SCHEMA_XSD).append("\"");
         }
         StringBuilder sbGrammars = new StringBuilder();
         sbGrammars.append("<grammars>");
@@ -947,11 +947,11 @@ public class WadlGenerator implements Co
                         }
                     } else {
                         handleExistingDocRefs(DOMUtils.getChildrenWithName(docEl,
-                                                                           XmlSchemaConstants.XSD_NAMESPACE_URI,
+                                                                           Constants.URI_2001_SCHEMA_XSD,
                                                                            "import"), "schemaLocation", loc,
                                               href, m, ui);
                         handleExistingDocRefs(DOMUtils.getChildrenWithName(docEl,
-                                                                           XmlSchemaConstants.XSD_NAMESPACE_URI,
+                                                                           Constants.URI_2001_SCHEMA_XSD,
                                                                            "include"), "schemaLocation", loc,
                                               href, m, ui);
                     }
@@ -1051,15 +1051,15 @@ public class WadlGenerator implements Co
                                                                  Collections.<Class<?>, QName> emptyMap());
                             if (typeName != null) {
                                 Element newElement = doc
-                                    .createElementNS(XmlSchemaConstants.XSD_NAMESPACE_URI, "xs:element");
+                                    .createElementNS(Constants.URI_2001_SCHEMA_XSD, "xs:element");
                                 newElement.setAttribute("name", entry.getValue().getLocalPart());
-                                Element ctElement = doc.createElementNS(XmlSchemaConstants.XSD_NAMESPACE_URI,
+                                Element ctElement = doc.createElementNS(Constants.URI_2001_SCHEMA_XSD,
                                                                         "xs:complexType");
                                 newElement.appendChild(ctElement);
                                 Element seqElement = doc
-                                    .createElementNS(XmlSchemaConstants.XSD_NAMESPACE_URI, "xs:sequence");
+                                    .createElementNS(Constants.URI_2001_SCHEMA_XSD, "xs:sequence");
                                 ctElement.appendChild(seqElement);
-                                Element xsElement = doc.createElementNS(XmlSchemaConstants.XSD_NAMESPACE_URI,
+                                Element xsElement = doc.createElementNS(Constants.URI_2001_SCHEMA_XSD,
                                                                         "xs:element");
                                 seqElement.appendChild(xsElement);
                                 xsElement.setAttribute("ref", "tns:" + typeName.getLocalPart());
@@ -1367,7 +1367,7 @@ public class WadlGenerator implements Co
         source.setBuffering();
         String targetNs = source.getValue("/*/@targetNamespace");
 
-        Map<String, String> nsMap = Collections.singletonMap("xs", XmlSchemaConstants.XSD_NAMESPACE_URI);
+        Map<String, String> nsMap = Collections.singletonMap("xs", Constants.URI_2001_SCHEMA_XSD);
         String[] elementNames = source.getValues("/*/xs:element/@name", nsMap);
         externalQnamesMap.put(targetNs, Arrays.asList(elementNames));
         String schemaValue = source.getNode("/xs:schema", nsMap, String.class);
@@ -1456,7 +1456,7 @@ public class WadlGenerator implements Co
 
         private Map<String, String> getLocationsMap(XMLSource source, String elementName, List<URI> links,
                                                     UriInfo ui) {
-            Map<String, String> nsMap = Collections.singletonMap("xs", XmlSchemaConstants.XSD_NAMESPACE_URI);
+            Map<String, String> nsMap = Collections.singletonMap("xs", Constants.URI_2001_SCHEMA_XSD);
             String[] locations = source.getValues("/*/xs:" + elementName + "/@schemaLocation", nsMap);
             if (locations == null) {
                 return Collections.emptyMap();

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java Thu Jul 11 16:20:45 2013
@@ -34,7 +34,7 @@ import javax.xml.transform.Source;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
+import org.apache.ws.commons.schema.constants.Constants;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -48,7 +48,7 @@ public class XMLSourceTest extends Asser
         XMLSource xp = new XMLSource(is);
         xp.setBuffering();
         Map<String, String> nsMap = 
-            Collections.singletonMap("xs", XmlSchemaConstants.XSD_NAMESPACE_URI);
+            Collections.singletonMap("xs", Constants.URI_2001_SCHEMA_XSD);
         String value = xp.getNode("/xs:schema", nsMap, String.class);
         assertFalse(value.contains("<?xml"));
         assertTrue(value, value.startsWith("<xs:schema"));

Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java Thu Jul 11 16:20:45 2013
@@ -39,7 +39,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.helpers.DOMUtils;
@@ -55,6 +54,7 @@ import org.apache.cxf.service.Service;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.servlet.ServletDestination;
+import org.apache.ws.commons.schema.constants.Constants;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 
@@ -111,21 +111,21 @@ public class WadlGeneratorTest extends A
             WadlGenerator.WADL_NS, "grammars");
         assertEquals(1, grammarEls.size());
         List<Element> schemasEls = DOMUtils.getChildrenWithName(grammarEls.get(0), 
-            XmlSchemaConstants.XSD_NAMESPACE_URI, "schema");
+                                                                Constants.URI_2001_SCHEMA_XSD, "schema");
         assertEquals(1, schemasEls.size());
         assertEquals("http://books", schemasEls.get(0).getAttribute("targetNamespace"));
         List<Element> elementEls = DOMUtils.getChildrenWithName(schemasEls.get(0), 
-            XmlSchemaConstants.XSD_NAMESPACE_URI, "element");
+                                                                Constants.URI_2001_SCHEMA_XSD, "element");
         assertEquals(1, elementEls.size());
         assertTrue(checkElement(elementEls, "books", "books"));
 
         List<Element> complexTypesEls = DOMUtils.getChildrenWithName(schemasEls.get(0), 
-            XmlSchemaConstants.XSD_NAMESPACE_URI, "complexType");
+                                                                     Constants.URI_2001_SCHEMA_XSD, "complexType");
         assertEquals(1, complexTypesEls.size());
         assertTrue(checkComplexType(complexTypesEls, "books"));
         
         List<Element> importEls = DOMUtils.getChildrenWithName(schemasEls.get(0), 
-            XmlSchemaConstants.XSD_NAMESPACE_URI, "import");
+                                                               Constants.URI_2001_SCHEMA_XSD, "import");
         assertEquals(1, importEls.size());
         assertEquals("http://localhost:8080/baz/book1.xsd",
                      importEls.get(0).getAttribute("schemaLocation"));
@@ -237,7 +237,8 @@ public class WadlGeneratorTest extends A
                                                                 "grammars");
         assertEquals(1, grammarEls.size());
         List<Element> schemasEls = DOMUtils.getChildrenWithName(grammarEls.get(0), 
-              XmlSchemaConstants.XSD_NAMESPACE_URI, "schema");
+                                                                Constants.URI_2001_SCHEMA_XSD,
+                                                                "schema");
         assertEquals(2, schemasEls.size());
         assertEquals("http://example.com/test", schemasEls.get(0).getAttribute("targetNamespace"));
         assertEquals("http://example.com/test", schemasEls.get(1).getAttribute("targetNamespace"));
@@ -330,11 +331,13 @@ public class WadlGeneratorTest extends A
                                                                 "grammars");
         assertEquals(1, grammarEls.size());
         List<Element> schemasEls = DOMUtils.getChildrenWithName(grammarEls.get(0), 
-                                                          XmlSchemaConstants.XSD_NAMESPACE_URI, "schema");
+                                                                Constants.URI_2001_SCHEMA_XSD,
+                                                                "schema");
         assertEquals(1, schemasEls.size());
         assertEquals("http://superbooks", schemasEls.get(0).getAttribute("targetNamespace"));
         List<Element> elementEls = DOMUtils.getChildrenWithName(schemasEls.get(0), 
-                            XmlSchemaConstants.XSD_NAMESPACE_URI, "element");
+                                                                Constants.URI_2001_SCHEMA_XSD,
+                                                                "element");
         
         int size = book2El == null ? 2 : 3;
         int elementSize = size;
@@ -354,7 +357,8 @@ public class WadlGeneratorTest extends A
         }
         
         List<Element> complexTypesEls = DOMUtils.getChildrenWithName(schemasEls.get(0), 
-                                        XmlSchemaConstants.XSD_NAMESPACE_URI, "complexType");
+                                                                     Constants.URI_2001_SCHEMA_XSD,
+                                                                     "complexType");
         assertEquals(size, complexTypesEls.size());
         
         assertTrue(checkComplexType(complexTypesEls, "book"));
@@ -370,7 +374,8 @@ public class WadlGeneratorTest extends A
                                                                 "grammars");
         assertEquals(1, grammarEls.size());
         List<Element> schemasEls = DOMUtils.getChildrenWithName(grammarEls.get(0), 
-                                                          XmlSchemaConstants.XSD_NAMESPACE_URI, "schema");
+                                                                Constants.URI_2001_SCHEMA_XSD,
+                                                                "schema");
         assertEquals(0, schemasEls.size());
         
         List<Element> includeEls = DOMUtils.getChildrenWithName(grammarEls.get(0), WadlGenerator.WADL_NS,
@@ -402,13 +407,13 @@ public class WadlGeneratorTest extends A
                     }
                 } else if ("books".equals(name)) {
                     Element ctElement = 
-                        (Element)e.getElementsByTagNameNS(XmlSchemaConstants.XSD_NAMESPACE_URI, 
+                        (Element)e.getElementsByTagNameNS(Constants.URI_2001_SCHEMA_XSD, 
                                                           "complexType").item(0);
                     Element seqElement = 
-                        (Element)ctElement.getElementsByTagNameNS(XmlSchemaConstants.XSD_NAMESPACE_URI, 
+                        (Element)ctElement.getElementsByTagNameNS(Constants.URI_2001_SCHEMA_XSD, 
                                                           "sequence").item(0);
                     Element xsElement = 
-                        (Element)seqElement.getElementsByTagNameNS(XmlSchemaConstants.XSD_NAMESPACE_URI, 
+                        (Element)seqElement.getElementsByTagNameNS(Constants.URI_2001_SCHEMA_XSD, 
                                                           "element").item(0);
                     String ref = xsElement.getAttribute("ref");
                     String expectedRef = "tns:thebook";

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Thu Jul 11 16:20:45 2013
@@ -57,7 +57,6 @@ import org.apache.cxf.common.injection.N
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.PackageUtils;
 import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.common.util.XMLSchemaQNames;
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.databinding.source.SourceDataBinding;
 import org.apache.cxf.endpoint.Endpoint;
@@ -87,6 +86,7 @@ import org.apache.cxf.ws.addressing.JAXW
 import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
 import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * Constructs a service model from JAX-WS service endpoint classes. Works
@@ -370,7 +370,7 @@ public class JaxWsServiceFactoryBean ext
                             MessagePartInfo mpi = mInfo.addMessagePart("parameters");
                             mpi.setElement(true);
                             mpi.setTypeClass(c);
-                            mpi.setTypeQName(XMLSchemaQNames.XSD_ANY);
+                            mpi.setTypeQName(Constants.XSD_ANY);
 
                             mInfo = op.createMessage(new QName(catchAll.getNamespaceURI(),
                                                                name + "Response"),
@@ -379,7 +379,7 @@ public class JaxWsServiceFactoryBean ext
                             mpi = mInfo.addMessagePart("parameters");
                             mpi.setElement(true);
                             mpi.setTypeClass(c);
-                            mpi.setTypeQName(XMLSchemaQNames.XSD_ANY);
+                            mpi.setTypeQName(Constants.XSD_ANY);
 
                             BindingOperationInfo bo = new BindingOperationInfo(bind, op);
                             op.setProperty("operation.is.synthetic", Boolean.TRUE);
@@ -693,7 +693,7 @@ public class JaxWsServiceFactoryBean ext
 
     protected void initializeParameter(MessagePartInfo part, Class<?> rawClass, Type type) {
         if (implInfo.isWebServiceProvider()) {
-            part.setTypeQName(XMLSchemaQNames.XSD_ANY);
+            part.setTypeQName(Constants.XSD_ANY);
             part.setTypeClass(rawClass);
             return;
         }

Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java (original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java Thu Jul 11 16:20:45 2013
@@ -25,7 +25,6 @@ import javax.xml.namespace.QName;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotated;
@@ -34,6 +33,7 @@ import org.apache.ws.commons.schema.XmlS
 import org.apache.ws.commons.schema.XmlSchemaObject;
 import org.apache.ws.commons.schema.XmlSchemaType;
 import org.apache.ws.commons.schema.XmlSchemaUse;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * All the information needed to create the JavaScript for an Xml Schema attribute
@@ -162,19 +162,19 @@ public final class AttributeInfo impleme
                                          AttributeInfo attributeInfo) {
         attributeInfo.type = element.getSchemaType();
         if (attributeInfo.type == null) {
-            if (element.getSchemaTypeName().equals(XmlSchemaConstants.ANY_TYPE_QNAME)) {
+            if (element.getSchemaTypeName().equals(Constants.XSD_ANYTYPE)) {
                 attributeInfo.anyType = true;
             } else {
                 attributeInfo.type = schemaCollection.getTypeByQName(element.getSchemaTypeName());
                 if (attributeInfo.type == null
                     && !element.getSchemaTypeName()
-                            .getNamespaceURI().equals(XmlSchemaConstants.XSD_NAMESPACE_URI)) {
+                            .getNamespaceURI().equals(Constants.URI_2001_SCHEMA_XSD)) {
                     XmlSchemaUtils.unsupportedConstruct("MISSING_TYPE", element.getSchemaTypeName()
                             .toString(), element.getQName(), element);
                 }
             }
         } else if (attributeInfo.type.getQName() != null
-            && XmlSchemaConstants.ANY_TYPE_QNAME.equals(attributeInfo.type.getQName())) {
+            && Constants.XSD_ANYTYPE.equals(attributeInfo.type.getQName())) {
             attributeInfo.anyType = true;
         }
     }

Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java (original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java Thu Jul 11 16:20:45 2013
@@ -31,7 +31,6 @@ import org.w3c.dom.Attr;
 
 import org.apache.cxf.common.WSDLConstants;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.databinding.source.mime.MimeAttribute;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
@@ -282,7 +281,7 @@ public class JavascriptUtils {
         if (type == null) {
             return false;
         }
-        if (XmlSchemaConstants.BASE64BINARY_QNAME.equals(type.getQName())) {
+        if (Constants.XSD_BASE64.equals(type.getQName())) {
             return true;
         }
         // there could be some disagreement whether the following is a good enough test.
@@ -295,7 +294,7 @@ public class JavascriptUtils {
                 if (content.getContent() instanceof XmlSchemaSimpleContentExtension) {
                     XmlSchemaSimpleContentExtension extension = 
                         (XmlSchemaSimpleContentExtension)content.getContent();
-                    if (XmlSchemaConstants.BASE64BINARY_QNAME.equals(extension.getBaseTypeName())) {
+                    if (Constants.XSD_BASE64.equals(extension.getBaseTypeName())) {
                         return true;
                     }
                 }

Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java (original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java Thu Jul 11 16:20:45 2013
@@ -26,13 +26,13 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaObject;
 import org.apache.ws.commons.schema.XmlSchemaParticle;
 import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * All the information needed to create the JavaScript for an Xml Schema element
@@ -248,19 +248,19 @@ public final class ParticleInfo implemen
         elementInfo.type = element.getSchemaType();
         if (elementInfo.type == null) {
             if (element.getSchemaTypeName() == null // no type at all -> anyType
-                || element.getSchemaTypeName().equals(XmlSchemaConstants.ANY_TYPE_QNAME)) {
+                || element.getSchemaTypeName().equals(Constants.XSD_ANYTYPE)) {
                 elementInfo.anyType = true;
             } else {
                 elementInfo.type = schemaCollection.getTypeByQName(element.getSchemaTypeName());
                 if (elementInfo.type == null
                     && !element.getSchemaTypeName()
-                            .getNamespaceURI().equals(XmlSchemaConstants.XSD_NAMESPACE_URI)) {
+                            .getNamespaceURI().equals(Constants.URI_2001_SCHEMA_XSD)) {
                     XmlSchemaUtils.unsupportedConstruct("MISSING_TYPE", element.getSchemaTypeName()
                             .toString(), element.getQName(), element);
                 }
             }
         } else if (elementInfo.type.getQName() != null
-            && XmlSchemaConstants.ANY_TYPE_QNAME.equals(elementInfo.type.getQName())) {
+            && Constants.XSD_ANYTYPE.equals(elementInfo.type.getQName())) {
             elementInfo.anyType = true;
         }
     }

Modified: cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java (original)
+++ cxf/trunk/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java Thu Jul 11 16:20:45 2013
@@ -29,7 +29,6 @@ import org.apache.cxf.common.i18n.Messag
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
 import org.apache.cxf.javascript.AttributeInfo;
 import org.apache.cxf.javascript.ItemInfo;
@@ -48,6 +47,7 @@ import org.apache.ws.commons.schema.XmlS
 import org.apache.ws.commons.schema.XmlSchemaObject;
 import org.apache.ws.commons.schema.XmlSchemaSimpleType;
 import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.ws.commons.schema.constants.Constants;
 
 /**
  * Generate Javascript for a schema, and provide information needed for the service builder. As of this pass,
@@ -80,7 +80,7 @@ public class SchemaJavascriptBuilder {
     public String generateCodeForSchemaCollection(XmlSchemaCollection collection) {
         StringBuilder accumulatedCode = new StringBuilder();
         for (XmlSchema schema : collection.getXmlSchemas()) {
-            if (!XmlSchemaConstants.XSD_NAMESPACE_URI.equals(schema.getTargetNamespace())) {
+            if (!Constants.URI_2001_SCHEMA_XSD.equals(schema.getTargetNamespace())) {
                 accumulatedCode.append(generateCodeForSchema(schema));
             }
         }

Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptor.java Thu Jul 11 16:20:45 2013
@@ -30,7 +30,6 @@ import javax.xml.stream.XMLStreamConstan
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.util.XMLSchemaQNames;
 import org.apache.cxf.databinding.DataReader;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
@@ -51,6 +50,7 @@ import org.apache.cxf.service.model.Serv
 import org.apache.cxf.staxutils.DepthXMLStreamReader;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.constants.Constants;
 
 public class DocLiteralInInterceptor extends AbstractInDatabindingInterceptor {
     public static final String KEEP_PARAMETERS_WRAPPER = DocLiteralInInterceptor.class.getName() 
@@ -220,7 +220,7 @@ public class DocLiteralInInterceptor ext
             List<MessagePartInfo> bparts = bmsg.getMessageParts();
             if (bparts.size() == 0
                 || (bparts.size() == 1 
-                    && XMLSchemaQNames.XSD_ANY.equals(bparts.get(0).getTypeQName()))) {
+                    && Constants.XSD_ANY.equals(bparts.get(0).getTypeQName()))) {
                 BindingOperationInfo boi = ep.getEndpointInfo().getBinding().getOperation(op);
                 exchange.put(BindingOperationInfo.class, boi);
                 exchange.put(OperationInfo.class, op);

Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/URIMappingInterceptor.java Thu Jul 11 16:20:45 2013
@@ -40,7 +40,6 @@ import org.apache.cxf.common.logging.Log
 import org.apache.cxf.common.util.CollectionUtils;
 import org.apache.cxf.common.util.PrimitiveUtils;
 import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.common.util.XMLSchemaQNames;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
 import org.apache.cxf.interceptor.Fault;
@@ -56,6 +55,7 @@ import org.apache.cxf.service.model.Bind
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceModelUtil;
+import org.apache.ws.commons.schema.constants.Constants;
 
 public class URIMappingInterceptor extends AbstractInDatabindingInterceptor {
     public static final String URIMAPPING_SKIP = URIMappingInterceptor.class.getName() + ".skip";
@@ -119,7 +119,7 @@ public class URIMappingInterceptor exten
         for (BindingOperationInfo b : service.getOperations()) {
             if (b.getInput() != null && !b.getInput().getMessageInfo().getMessageParts().isEmpty()) {
                 MessagePartInfo inf = b.getInput().getMessageInfo().getMessagePart(0);
-                if (XMLSchemaQNames.XSD_ANY.equals(inf.getTypeQName())) {
+                if (Constants.XSD_ANY.equals(inf.getTypeQName())) {
                     return b;
                 }
             }

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Thu Jul 11 16:20:45 2013
@@ -44,7 +44,6 @@ import org.apache.commons.httpclient.Htt
 import org.apache.commons.httpclient.methods.FileRequestEntity;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.io.CachedOutputStream;
@@ -56,6 +55,7 @@ import org.apache.cxf.jaxrs.model.wadl.W
 import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
 import org.apache.cxf.jaxrs.provider.aegis.AegisElementProvider;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.ws.commons.schema.constants.Constants;
 
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -165,11 +165,12 @@ public class JAXRSClientServerSpringBook
         WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(10000000L);
         Document doc = DOMUtils.readXml(new InputStreamReader(client.get(InputStream.class), "UTF-8"));
         Element root = doc.getDocumentElement();
-        assertEquals(XmlSchemaConstants.XSD_NAMESPACE_URI, root.getNamespaceURI());
+        assertEquals(Constants.URI_2001_SCHEMA_XSD, root.getNamespaceURI());
         assertEquals("schema", root.getLocalName());
         if (includedSchema != null) {
             List<Element> includeEls = DOMUtils.getChildrenWithName(root, 
-                         XmlSchemaConstants.XSD_NAMESPACE_URI, refAttrName);
+                                                                    Constants.URI_2001_SCHEMA_XSD,
+                                                                    refAttrName);
             assertEquals(1, includeEls.size());
             String href = includeEls.get(0).getAttribute("schemaLocation");
             assertEquals(address + includedSchema, href);

Modified: cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java?rev=1502271&r1=1502270&r2=1502271&view=diff
==============================================================================
--- cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java (original)
+++ cxf/trunk/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java Thu Jul 11 16:20:45 2013
@@ -87,7 +87,6 @@ import org.apache.cxf.common.util.Reflec
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.SystemPropertyAction;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.JavaUtils;
@@ -98,6 +97,7 @@ import org.apache.cxf.service.model.Sche
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.tools.common.ToolException;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.constants.Constants;
 
 public class SourceGenerator {
     public static final String CODE_TYPE_GRAMMAR = "grammar";
@@ -396,7 +396,7 @@ public class SourceGenerator {
     private void populateElementTypeMap(Application app, Element schemaEl, 
             String systemId, Map<String, String> elementTypeMap) {
         List<Element> elementEls = DOMUtils.getChildrenWithName(schemaEl, 
-                XmlSchemaConstants.XSD_NAMESPACE_URI, "element");
+                                                                Constants.URI_2001_SCHEMA_XSD, "element");
         for (Element el : elementEls) {
             String type = el.getAttribute("type");
             if (type.length() > 0) {
@@ -404,7 +404,7 @@ public class SourceGenerator {
             }
         }
         Element includeEl = DOMUtils.getFirstChildWithName(schemaEl, 
-                XmlSchemaConstants.XSD_NAMESPACE_URI, "include");
+                                                           Constants.URI_2001_SCHEMA_XSD, "include");
         if (includeEl != null) {
             int ind = systemId.lastIndexOf("/");
             if (ind != -1) {
@@ -1131,7 +1131,7 @@ public class SourceGenerator {
         String[] pair = type.split(":");
         if (pair.length == 2) {
             if (XSD_SPECIFIC_TYPE_MAP.containsKey(pair[1])) {
-                String expandedName = "{" + XmlSchemaConstants.XSD_NAMESPACE_URI + "}" + pair[1];
+                String expandedName = "{" + Constants.URI_2001_SCHEMA_XSD + "}" + pair[1];
                 if (schemaTypeMap.containsKey(expandedName)) {
                     return schemaTypeMap.get(expandedName);
                 }
@@ -1350,7 +1350,7 @@ public class SourceGenerator {
         
         List<SchemaInfo> schemas = new ArrayList<SchemaInfo>();
         List<Element> schemasEls = DOMUtils.getChildrenWithName(grammarEls.get(0), 
-             XmlSchemaConstants.XSD_NAMESPACE_URI, "schema");
+                                                                Constants.URI_2001_SCHEMA_XSD, "schema");
         for (int i = 0; i < schemasEls.size(); i++) {
             String systemId = app.getWadlPath();
             if (schemasEls.size() > 1) {



Mime
View raw message