You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/11 22:47:48 UTC
svn commit: r1502354 [1/2] - in /cxf/trunk:
api/src/main/java/org/apache/cxf/common/
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/ api/src/main/java/org/...
Author: dkulp
Date: Thu Jul 11 20:47:46 2013
New Revision: 1502354
URL: http://svn.apache.org/r1502354
Log:
Move the WSDLConstants into rt-wsdl, remove SOAPConstants.
Added:
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
- copied, changed from r1502294, cxf/trunk/api/src/main/java/org/apache/cxf/common/WSDLConstants.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java
- copied, changed from r1502294, cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java
cxf/trunk/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/NSManagerTest.java
- copied, changed from r1502294, cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java
Removed:
cxf/trunk/api/src/main/java/org/apache/cxf/common/WSDLConstants.java
cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SOAPConstants.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/NSManager.java
cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java
Modified:
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/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.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/TypeUtil.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/encoded/ArrayTypeInfo.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.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/inheritance/InheritancePOJOTest.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/ByteDataTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java
cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java
cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/DocumentStyleTest.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/MultipleSchemaInNSTest.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.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/service/ServiceJavascriptBuilder.java
cxf/trunk/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/utils/JSONUtils.java
cxf/trunk/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XBinding.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XDef.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XFault.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XInput.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XMessage.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOperation.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XOutput.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPort.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XPortType.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XService.java
cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/model/XNodeTest.java
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
cxf/trunk/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/address/SoapAddress.java
cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -25,7 +25,6 @@ import java.util.logging.Logger;
import javax.xml.namespace.QName;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.ws.commons.schema.XmlSchema;
@@ -61,8 +60,6 @@ import org.apache.ws.commons.schema.cons
*/
public final class XmlSchemaUtils {
public static final String XSI_NIL = "xsi:nil='true'";
- public static final String XSI_NS_ATTR = WSDLConstants.NP_XMLNS + ":"
- + WSDLConstants.NP_SCHEMA_XSI + "='" + WSDLConstants.NS_SCHEMA_XSI + "'";
private static final Logger LOG = LogUtils.getL7dLogger(XmlSchemaUtils.class);
private static final XmlSchemaSequence EMPTY_SEQUENCE = new XmlSchemaSequence();
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -27,7 +27,6 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaForm;
@@ -118,12 +117,12 @@ public final class SchemaInfo extends Ab
// set to the same value as the targetNamespace attribute.
// The aegis databinding tests demonstrate this particularly.
if (element.getPrefix() == null
- && !WSDLConstants.NS_SCHEMA_XSD.equals(element.getAttributeNS(WSDLConstants.NS_XMLNS,
- WSDLConstants.NP_XMLNS))) {
+ && !Constants.URI_2001_SCHEMA_XSD.equals(element.getAttributeNS(Constants.XMLNS_ATTRIBUTE_NS_URI,
+ Constants.XMLNS_ATTRIBUTE))) {
Attr attr = element.getOwnerDocument()
- .createAttributeNS(WSDLConstants.NS_XMLNS, WSDLConstants.NP_XMLNS);
- attr.setValue(WSDLConstants.NS_SCHEMA_XSD);
+ .createAttributeNS(Constants.XMLNS_ATTRIBUTE_NS_URI, Constants.XMLNS_ATTRIBUTE);
+ attr.setValue(Constants.URI_2001_SCHEMA_XSD);
element.setAttributeNodeNS(attr);
}
return element;
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java Thu Jul 11 20:47:46 2013
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import javax.wsdl.Binding;
import javax.wsdl.BindingFault;
import javax.wsdl.BindingInput;
@@ -55,9 +56,9 @@ import org.apache.cxf.binding.soap.wsdl.
import org.apache.cxf.binding.soap.wsdl.extensions.SoapFault;
import org.apache.cxf.binding.soap.wsdl.extensions.SoapHeader;
import org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.util.ExtensionInvocationHandler;
import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.wsdl.WSDLConstants;
public final class SOAPBindingUtil {
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Thu Jul 11 20:47:46 2013
@@ -71,7 +71,6 @@ import org.apache.cxf.binding.soap.wsdl.
import org.apache.cxf.binding.soap.wsdl.extensions.SoapFault;
import org.apache.cxf.binding.soap.wsdl.extensions.SoapHeader;
import org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
@@ -102,6 +101,7 @@ import org.apache.cxf.transport.Multiple
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.WSAddressingFeature;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl.binding.AbstractWSDLBindingFactory;
import org.apache.cxf.wsdl.interceptors.BareOutInterceptor;
Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java Thu Jul 11 20:47:46 2013
@@ -22,11 +22,11 @@ package org.apache.cxf.binding.soap.mode
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapVersion;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.WSDLConstants;
public class SoapBindingInfo extends BindingInfo {
Modified: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java (original)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java Thu Jul 11 20:47:46 2013
@@ -36,7 +36,6 @@ import org.apache.cxf.binding.soap.model
import org.apache.cxf.binding.soap.model.SoapBodyInfo;
import org.apache.cxf.binding.soap.model.SoapOperationInfo;
import org.apache.cxf.bus.managers.BindingFactoryManagerImpl;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingMessageInfo;
@@ -44,8 +43,10 @@ import org.apache.cxf.service.model.Bind
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.easymock.IMocksControl;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java Thu Jul 11 20:47:46 2013
@@ -26,13 +26,12 @@ import java.util.List;
import javax.xml.namespace.QName;
import org.apache.cxf.bindings.xformat.XMLBindingMessageFormat;
-import org.apache.cxf.common.WSDLConstants;
-
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.validator.ServiceValidator;
+import org.apache.cxf.wsdl.WSDLConstants;
public class XMLFormatValidator extends ServiceValidator {
Modified: cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java (original)
+++ cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java Thu Jul 11 20:47:46 2013
@@ -20,14 +20,15 @@
package org.apache.cxf.binding.xml.wsdl11;
import java.util.Map;
+
import javax.wsdl.Port;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.http.HTTPAddress;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.wsdl.AbstractWSDLPlugin;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.http.AddressType;
public final class HttpAddressPlugin extends AbstractWSDLPlugin {
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -43,7 +43,6 @@ import org.apache.cxf.aegis.type.TypeMap
import org.apache.cxf.aegis.type.basic.ArrayType;
import org.apache.cxf.aegis.type.java5.AnnotationReader;
import org.apache.cxf.aegis.type.mtom.AbstractXOPType;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
@@ -61,6 +60,7 @@ import org.apache.cxf.service.model.Mess
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaAnnotated;
import org.apache.ws.commons.schema.XmlSchemaException;
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -35,7 +35,7 @@ import org.apache.cxf.aegis.type.collect
import org.apache.cxf.aegis.type.collection.MapType;
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.aegis.util.ServiceUtils;
-import org.apache.cxf.common.WSDLConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.constants.Constants;
public abstract class AbstractTypeCreator implements TypeCreator {
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -70,7 +70,6 @@ import org.apache.cxf.aegis.type.xml.XML
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.ws.commons.schema.constants.Constants;
/**
@@ -359,7 +358,7 @@ public class DefaultTypeMapping implemen
boolean enableMtomXmime,
boolean enableJDOM) {
// by convention, the default mapping is against the XML schema URI.
- DefaultTypeMapping tm = new DefaultTypeMapping(SOAPConstants.XSD);
+ DefaultTypeMapping tm = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD);
fillStandardMappings(tm, defaultNillable, enableMtomXmime, enableJDOM);
defaultRegister(tm, defaultNillable, Character.class,
CharacterAsStringType.CHARACTER_AS_STRING_TYPE_QNAME,
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java Thu Jul 11 20:47:46 2013
@@ -26,12 +26,13 @@ import java.util.logging.Logger;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
+
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.constants.Constants;
/**
@@ -54,7 +55,7 @@ public final class TypeUtil {
return baseType;
}
- String overrideType = xsr.getAttributeValue(SOAPConstants.XSI_NS, "type");
+ String overrideType = xsr.getAttributeValue(Constants.URI_2001_SCHEMA_XSI, "type");
if (overrideType != null) {
QName overrideName = NamespaceHelper.createQName(xsr.getNamespaceContext(), overrideType);
@@ -113,7 +114,7 @@ public final class TypeUtil {
return null;
}
- String typeNameString = xsr.getAttributeValue(SOAPConstants.XSI_NS, "type");
+ String typeNameString = xsr.getAttributeValue(Constants.URI_2001_SCHEMA_XSI, "type");
if (typeNameString != null) {
QName schemaTypeName = NamespaceHelper.createQName(xsr.getNamespaceContext(),
typeNameString);
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -34,7 +34,6 @@ import org.apache.cxf.aegis.type.TypeMap
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.common.util.Base64Utility;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaSimpleType;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
@@ -51,8 +50,8 @@ import org.apache.ws.commons.schema.cons
*
*/
public class ObjectType extends AegisType {
- private static final QName XSI_TYPE = new QName(SOAPConstants.XSI_NS, "type");
- private static final QName XSI_NIL = new QName(SOAPConstants.XSI_NS, "nil");
+ private static final QName XSI_TYPE = new QName(Constants.URI_2001_SCHEMA_XSI, "type");
+ private static final QName XSI_NIL = new QName(Constants.URI_2001_SCHEMA_XSI, "nil");
private Set<AegisType> dependencies;
private boolean serializedWhenUnknown;
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java Thu Jul 11 20:47:46 2013
@@ -34,9 +34,9 @@ import org.apache.cxf.aegis.type.TypeMap
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.binding.soap.Soap11;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.ws.commons.schema.constants.Constants;
import static org.apache.cxf.aegis.type.encoded.SoapEncodingUtil.readAttributeValue;
@@ -64,7 +64,7 @@ public class ArrayTypeInfo {
// if type is xsd:ur-type replace it with xsd:anyType
String namespace = reader.getNamespaceForPrefix(typeName.getPrefix());
if (!StringUtils.isEmpty(namespace)) {
- if (SOAPConstants.XSD.equals(namespace) && "ur-type".equals(typeName.getLocalPart())) {
+ if (Constants.URI_2001_SCHEMA_XSD.equals(namespace) && "ur-type".equals(typeName.getLocalPart())) {
typeName = new QName(namespace, "anyType", typeName.getPrefix());
} else {
typeName = new QName(namespace, typeName.getLocalPart(), typeName.getPrefix());
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageReader.java Thu Jul 11 20:47:46 2013
@@ -22,13 +22,13 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.aegis.DatabindingException;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.ws.commons.schema.constants.Constants;
/**
* Basic type conversions for reading messages.
*/
public abstract class AbstractMessageReader implements MessageReader {
- private static final QName XSI_NIL = new QName(SOAPConstants.XSI_NS, "nil", SOAPConstants.XSI_PREFIX);
+ private static final QName XSI_NIL = new QName(Constants.URI_2001_SCHEMA_XSI, "nil", "xsi");
public AbstractMessageReader() {
}
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java Thu Jul 11 20:47:46 2013
@@ -20,7 +20,7 @@ package org.apache.cxf.aegis.xml;
import javax.xml.namespace.QName;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.ws.commons.schema.constants.Constants;
/**
* Basic type conversion functionality for writing messages.
@@ -53,11 +53,11 @@ public abstract class AbstractMessageWri
} else {
value = type.getLocalPart();
}
- getAttributeWriter("type", SOAPConstants.XSI_NS).writeValue(value);
+ getAttributeWriter("type", Constants.URI_2001_SCHEMA_XSI).writeValue(value);
}
public void writeXsiNil() {
- MessageWriter attWriter = getAttributeWriter("nil", SOAPConstants.XSI_NS);
+ MessageWriter attWriter = getAttributeWriter("nil", Constants.URI_2001_SCHEMA_XSI);
attWriter.writeValue("true");
attWriter.close();
}
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java Thu Jul 11 20:47:46 2013
@@ -30,9 +30,9 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.aegis.DatabindingException;
import org.apache.cxf.aegis.xml.AbstractMessageReader;
import org.apache.cxf.aegis.xml.MessageReader;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.staxutils.DepthXMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.ws.commons.schema.constants.Constants;
/**
* Reads literal encoded messages.
@@ -95,7 +95,7 @@ public class ElementReader extends Abstr
/*
* We're making a conscious choice here -- garbage in == garbage out.
*/
- String xsiTypeQname = root.getAttributeValue(SOAPConstants.XSI_NS, "type");
+ String xsiTypeQname = root.getAttributeValue(Constants.URI_2001_SCHEMA_XSI, "type");
if (xsiTypeQname != null) {
Matcher m = QNAME_PATTERN.matcher(xsiTypeQname);
if (m.matches()) {
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -50,8 +50,6 @@ import org.apache.cxf.binding.soap.SoapB
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
-import org.apache.cxf.common.WSDLConstants;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
@@ -68,6 +66,7 @@ import org.apache.cxf.test.AbstractCXFTe
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
@@ -115,9 +114,9 @@ public abstract class AbstractAegisTest
- addNamespace("wsdl", SOAPConstants.WSDL11_NS);
- addNamespace("wsdlsoap", SOAPConstants.WSDL11_SOAP_NS);
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("wsdl", WSDLConstants.NS_WSDL11);
+ addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
+ addNamespace("xsd", WSDLConstants.NS_SCHEMA_XSD);
}
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java Thu Jul 11 20:47:46 2013
@@ -29,8 +29,9 @@ import org.w3c.dom.Node;
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.frontend.ServerFactoryBean;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -90,7 +91,7 @@ public class InheritancePOJOTest extends
@Test
public void testLocalGetEmployee() throws Exception {
Node response = invoke("InheritanceService", "GetEmployee.xml");
- addNamespace("xsi", SOAPConstants.XSI_NS);
+ addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
addNamespace("w", "urn:xfire:inheritance");
addNamespace("p", "http://inheritance.aegis.cxf.apache.org");
assertValid("//s:Body/w:getEmployeeResponse/w:return/p:division", response);
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -41,7 +41,6 @@ import org.apache.cxf.aegis.type.TypeCre
import org.apache.cxf.aegis.type.TypeMapping;
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.helpers.DOMUtils;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.ws.commons.schema.XmlSchema;
@@ -65,7 +64,7 @@ public class BeanTest extends AbstractAe
addNamespace("b", "urn:Bean");
addNamespace("bz", "urn:beanz");
addNamespace("a", "urn:anotherns");
- addNamespace("xsi", SOAPConstants.XSI_NS);
+ addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
}
@@ -577,7 +576,7 @@ public class BeanTest extends AbstractAe
// just
// shouldn't be there.
- addNamespace("xsi", SOAPConstants.XSI_NS);
+ addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
assertValid("/b:root/b:data[@xsi:nil='true']", element);
XMLStreamReader sreader = StaxUtils.createXMLStreamReader(element);
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java Thu Jul 11 20:47:46 2013
@@ -23,7 +23,8 @@ import org.w3c.dom.Node;
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.services.DataService;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
+
import org.junit.Test;
public class ByteDataTest extends AbstractAegisTest {
@@ -47,10 +48,10 @@ public class ByteDataTest extends Abstra
public void testBeanServiceWSDL() throws Exception {
Document doc = getWSDLDocument("DataService");
- addNamespace("wsdl", SOAPConstants.WSDL11_NS);
- addNamespace("wsdlsoap", SOAPConstants.WSDL11_SOAP_NS);
- addNamespace("xsd", SOAPConstants.XSD);
-
+ addNamespace("wsdl", WSDLConstants.NS_WSDL11);
+ addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
+ addNamespace("xsd", WSDLConstants.NS_SCHEMA_XSD);
+
assertValid("//xsd:element[@name='data'][@type='xsd:base64Binary']", doc);
}
}
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java Thu Jul 11 20:47:46 2013
@@ -30,7 +30,7 @@ import org.apache.cxf.aegis.services.Xml
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.aegis.type.TypeCreationOptions;
import org.apache.cxf.aegis.type.TypeMapping;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Test;
@@ -42,7 +42,7 @@ public class QualificationTest extends A
addNamespace("b", "urn:Bean");
addNamespace("xyzzy", "urn:xyzzy");
addNamespace("pkg", "http://services.aegis.cxf.apache.org");
- addNamespace("xsi", SOAPConstants.XSI_NS);
+ addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
}
@Test
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java Thu Jul 11 20:47:46 2013
@@ -38,9 +38,9 @@ import org.apache.cxf.aegis.xml.MessageW
import org.apache.cxf.aegis.xml.stax.ElementReader;
import org.apache.cxf.aegis.xml.stax.ElementWriter;
import org.apache.cxf.binding.soap.Soap11;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.helpers.MapNamespaceContext;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
@@ -54,13 +54,13 @@ public abstract class AbstractEncodedTes
addNamespace("b", "urn:Bean");
addNamespace("a", "urn:anotherns");
- addNamespace("xsi", SOAPConstants.XSI_NS);
+ addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
addNamespace("soapenc", Soap11.getInstance().getSoapEncodingStyle());
AegisContext context = new AegisContext();
// create a different mapping than the context creates.
TypeMapping baseMapping = DefaultTypeMapping.createSoap11TypeMapping(true, false, false);
- mapping = new DefaultTypeMapping(SOAPConstants.XSD, baseMapping);
+ mapping = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD, baseMapping);
mapping.setTypeCreator(context.createTypeCreator());
context.setTypeMapping(mapping);
context.initialize();
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfoTest.java Thu Jul 11 20:47:46 2013
@@ -19,6 +19,7 @@
package org.apache.cxf.aegis.type.encoded;
import java.io.ByteArrayInputStream;
+
import javax.xml.namespace.QName;
import org.apache.cxf.aegis.AbstractAegisTest;
@@ -26,7 +27,8 @@ import org.apache.cxf.aegis.AegisContext
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.aegis.type.basic.BeanTypeInfo;
import org.apache.cxf.aegis.xml.stax.ElementReader;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Test;
public class ArrayTypeInfoTest extends AbstractAegisTest {
@@ -38,7 +40,7 @@ public class ArrayTypeInfoTest extends A
addNamespace("b", "urn:Bean");
addNamespace("a", "urn:anotherns");
- addNamespace("xsi", SOAPConstants.XSI_NS);
+ addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
AegisContext context = new AegisContext();
context.initialize();
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java Thu Jul 11 20:47:46 2013
@@ -32,9 +32,10 @@ import org.apache.cxf.aegis.type.TypeMap
import org.apache.cxf.aegis.type.XMLTypeCreator;
import org.apache.cxf.aegis.type.basic.BeanType;
import org.apache.cxf.aegis.type.basic.StringType;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.Service;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -152,7 +153,7 @@ public class AnnotatedTypeTest extends A
public void testWSDL() throws Exception {
Document wsdl = getWSDLDocument("AnnotatedService");
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid(
"//xsd:complexType[@name='AnnotatedBean1']/xsd:sequence/xsd:"
+ "element[@name='elementProperty']",
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java Thu Jul 11 20:47:46 2013
@@ -37,7 +37,7 @@ import org.apache.cxf.aegis.type.collect
import org.apache.cxf.aegis.type.java5.dto.CollectionDTO;
import org.apache.cxf.aegis.type.java5.dto.DTOService;
import org.apache.cxf.aegis.type.java5.dto.ObjectDTO;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
import org.junit.Test;
@@ -52,7 +52,7 @@ public class CollectionTest extends Abst
public void setUp() throws Exception {
super.setUp();
- tm = new DefaultTypeMapping(SOAPConstants.XSD);
+ tm = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD);
creator = new Java5TypeCreator();
creator.setConfiguration(new TypeCreationOptions());
tm.setTypeCreator(creator);
@@ -120,7 +120,7 @@ public class CollectionTest extends Abst
@Test
public void testCollectionDTO() {
- tm = new DefaultTypeMapping(SOAPConstants.XSD);
+ tm = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD);
creator = new Java5TypeCreator();
creator.setConfiguration(new TypeCreationOptions());
tm.setTypeCreator(creator);
@@ -143,7 +143,7 @@ public class CollectionTest extends Abst
@Test
public void testObjectDTO() {
- tm = new DefaultTypeMapping(SOAPConstants.XSD);
+ tm = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD);
creator = new Java5TypeCreator();
creator.setConfiguration(new TypeCreationOptions());
tm.setTypeCreator(creator);
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java Thu Jul 11 20:47:46 2013
@@ -23,8 +23,9 @@ package org.apache.cxf.aegis.type.java5;
import org.w3c.dom.Document;
import org.apache.cxf.aegis.AbstractAegisTest;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Test;
public class DualOutServiceTest extends AbstractAegisTest {
@@ -40,7 +41,7 @@ public class DualOutServiceTest extends
Document wsdl = getWSDLDocument("DualOutService");
assertNotNull(wsdl);
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid(
"//xsd:complexType[@name='getValuesResponse']//xsd:element"
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java Thu Jul 11 20:47:46 2013
@@ -30,10 +30,10 @@ import org.apache.cxf.aegis.type.Default
import org.apache.cxf.aegis.type.TypeCreationOptions;
import org.apache.cxf.aegis.type.java5.CurrencyService.Currency;
import org.apache.cxf.aegis.xml.stax.ElementReader;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaSerializer;
+import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
import org.junit.Test;
@@ -124,7 +124,7 @@ public class EnumTypeTest extends Abstra
XmlSchemaSerializer ser = new XmlSchemaSerializer();
Document doc = ser.serializeSchema(schema, false)[0];
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid("//xsd:simpleType[@name='test']/xsd:restriction[@base='xsd:string']", doc);
assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='VALUE1']", doc);
assertValid("//xsd:restriction[@base='xsd:string']/xsd:enumeration[@value='VALUE2']", doc);
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java Thu Jul 11 20:47:46 2013
@@ -32,9 +32,10 @@ import org.apache.cxf.aegis.type.TypeMap
import org.apache.cxf.aegis.type.XMLTypeCreator;
import org.apache.cxf.aegis.type.basic.BeanType;
import org.apache.cxf.aegis.type.basic.StringType;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.Service;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -152,7 +153,7 @@ public class JaxbTypeTest extends Abstra
public void testWSDL() throws Exception {
Document wsdl = getWSDLDocument("JaxbService");
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid(
"//xsd:complexType[@name='JaxbBean1']/xsd:sequence/xsd:"
+ "element[@name='elementProperty']",
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/OperationNSTest.java Thu Jul 11 20:47:46 2013
@@ -21,6 +21,7 @@ package org.apache.cxf.aegis.type.java5;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+
import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -32,9 +33,10 @@ import org.w3c.dom.Document;
import org.apache.cxf.aegis.AbstractAegisTest;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -57,7 +59,7 @@ public class OperationNSTest extends Abs
public void testWSDL() throws Exception {
Collection<Document> wsdls = getWSDLDocuments("NotificationService");
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
//assertValid("//xsd:element[@name='Notify']", wsdl);
assertTrue(isExist(wsdls, "//xsd:element[@name='Notify']", getNamespaces()));
}
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XFireTypeTest.java Thu Jul 11 20:47:46 2013
@@ -32,9 +32,10 @@ import org.apache.cxf.aegis.type.TypeMap
import org.apache.cxf.aegis.type.XMLTypeCreator;
import org.apache.cxf.aegis.type.basic.BeanType;
import org.apache.cxf.aegis.type.basic.StringType;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.Service;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -152,7 +153,7 @@ public class XFireTypeTest extends Abstr
public void testWSDL() throws Exception {
Document wsdl = getWSDLDocument("XFireService");
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid(
"//xsd:complexType[@name='XFireBean1']/xsd:sequence/xsd:"
+ "element[@name='elementProperty']",
Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java Thu Jul 11 20:47:46 2013
@@ -31,7 +31,8 @@ import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.type.DefaultTypeMapping;
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.aegis.type.xml.XMLStreamReaderType;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -44,12 +45,12 @@ public class XMLStreamReaderMappingTest
super.setUp();
addNamespace("b", "urn:beanz");
- addNamespace("xsi", SOAPConstants.XSI_NS);
+ addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
context = new AegisContext();
// create a different mapping than the context creates.
TypeMapping baseMapping = DefaultTypeMapping.createSoap11TypeMapping(true, false, false);
- mapping = new DefaultTypeMapping(SOAPConstants.XSD, baseMapping);
+ mapping = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD, baseMapping);
mapping.register(XMLStreamReader.class,
new QName("urn:Bean", "SimpleBean"), new XMLStreamReaderType());
mapping.setTypeCreator(context.createTypeCreator());
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Thu Jul 11 20:47:46 2013
@@ -70,11 +70,11 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.ReflectionUtil;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
@@ -87,6 +87,7 @@ import org.apache.cxf.staxutils.W3CNames
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaSimpleType;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeList;
+import org.apache.ws.commons.schema.constants.Constants;
/**
* Utility functions for JAXB.
@@ -114,14 +115,14 @@ public final class JAXBEncoderDecoder {
public QName getAttributeName(int index) {
if (first && index == 0) {
- return new QName(SOAPConstants.XSI_NS, "type");
+ return new QName(Constants.URI_2001_SCHEMA_XSI, "type");
}
return super.getAttributeName(index - 1);
}
public String getAttributeNamespace(int index) {
if (first && index == 0) {
- return SOAPConstants.XSI_NS;
+ return Constants.URI_2001_SCHEMA_XSI;
}
return super.getAttributeNamespace(index - 1);
}
@@ -159,7 +160,7 @@ public final class JAXBEncoderDecoder {
public String getAttributeValue(String namespaceUri,
String localName) {
if (first
- && SOAPConstants.XSI_NS.equals(namespaceUri)
+ && Constants.URI_2001_SCHEMA_XSI.equals(namespaceUri)
&& "type".equals(localName)) {
String pfx = this.getNamespaceContext().getPrefix(typeQName.getNamespaceURI());
if (StringUtils.isEmpty(pfx)) {
@@ -639,7 +640,7 @@ public final class JAXBEncoderDecoder {
if (source instanceof XMLStreamReader
&& typeQName != null) {
XMLStreamReader reader = (XMLStreamReader)source;
- String type = reader.getAttributeValue(SOAPConstants.XSI_NS, "type");
+ String type = reader.getAttributeValue(Constants.URI_2001_SCHEMA_XSI, "type");
if (StringUtils.isEmpty(type)) {
source = new AddXSITypeStreamReader(reader, typeQName);
}
Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java Thu Jul 11 20:47:46 2013
@@ -45,7 +45,6 @@ import javax.xml.bind.annotation.adapter
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.jaxb.JAXBBeanInfo;
import org.apache.cxf.common.jaxb.JAXBContextProxy;
@@ -60,6 +59,7 @@ import org.apache.cxf.service.model.Faul
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
Modified: cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java (original)
+++ cxf/trunk/rt/databinding/jibx/src/test/java/org/apache/cxf/jibx/AbstractJibxTest.java Thu Jul 11 20:47:46 2013
@@ -25,7 +25,6 @@ import org.w3c.dom.Node;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.binding.soap.SoapTransportFactory;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
import org.apache.cxf.frontend.ServerFactoryBean;
@@ -34,8 +33,10 @@ import org.apache.cxf.test.AbstractCXFTe
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
+
import org.junit.Before;
public abstract class AbstractJibxTest extends AbstractCXFTest {
@@ -73,9 +74,9 @@ public abstract class AbstractJibxTest e
bus.setExtension(new WSDLManagerImpl(), WSDLManager.class);
- addNamespace("wsdl", SOAPConstants.WSDL11_NS);
- addNamespace("wsdlsoap", SOAPConstants.WSDL11_SOAP_NS);
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("wsdl", WSDLConstants.NS_WSDL11);
+ addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
+ addNamespace("xsd", WSDLConstants.NS_SCHEMA_XSD);
}
public Server createService(Class<?> serviceClass, Object serviceBean, String address, QName name) {
Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractSDOTest.java Thu Jul 11 20:47:46 2013
@@ -39,7 +39,6 @@ import org.apache.cxf.binding.BindingFac
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
@@ -51,6 +50,7 @@ import org.apache.cxf.tools.wsdlto.core.
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
@@ -93,9 +93,9 @@ public abstract class AbstractSDOTest ex
bus.setExtension(new WSDLManagerImpl(), WSDLManager.class);
- addNamespace("wsdl", SOAPConstants.WSDL11_NS);
- addNamespace("wsdlsoap", SOAPConstants.WSDL11_SOAP_NS);
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("wsdl", WSDLConstants.NS_WSDL11);
+ addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
+ addNamespace("xsd", WSDLConstants.NS_SCHEMA_XSD);
}
@Override
Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java Thu Jul 11 20:47:46 2013
@@ -41,7 +41,6 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
@@ -51,6 +50,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.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaException;
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/AbstractXmlBeansTest.java Thu Jul 11 20:47:46 2013
@@ -39,7 +39,6 @@ import org.apache.cxf.binding.BindingFac
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
@@ -51,9 +50,11 @@ import org.apache.cxf.tools.wsdlto.core.
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
+import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
@@ -93,9 +94,10 @@ public abstract class AbstractXmlBeansTe
bus.setExtension(new WSDLManagerImpl(), WSDLManager.class);
- addNamespace("wsdl", SOAPConstants.WSDL11_NS);
- addNamespace("wsdlsoap", SOAPConstants.WSDL11_SOAP_NS);
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("wsdl", WSDLConstants.NS_WSDL11);
+ addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
+ addNamespace("xsd", WSDLConstants.NS_SCHEMA_XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
}
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/DocumentStyleTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/DocumentStyleTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/DocumentStyleTest.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/DocumentStyleTest.java Thu Jul 11 20:47:46 2013
@@ -23,8 +23,8 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
+import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
import org.junit.Test;
@@ -69,7 +69,7 @@ public class DocumentStyleTest extends A
public void testWSDL() throws Exception {
Document wsdl = getWSDLDocument("TestService");
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid("//xsd:schema[@targetNamespace='urn:TestService']"
+ "/xsd:complexType[@name='mixedRequest']"
+ "/xsd:sequence/xsd:element[@name='string'][@type='xsd:string']",
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/MultipleSchemaInNSTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/MultipleSchemaInNSTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/MultipleSchemaInNSTest.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/MultipleSchemaInNSTest.java Thu Jul 11 20:47:46 2013
@@ -23,8 +23,8 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.ws.commons.schema.constants.Constants;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +49,7 @@ public class MultipleSchemaInNSTest exte
public void testWSDL() throws Exception {
Document wsdl = getWSDLDocument("MultipleSchemaService");
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
NodeList list = assertValid("//xsd:schema[@targetNamespace='" + ns + "']", wsdl);
assertEquals(StaxUtils.toString(wsdl), 3, list.getLength());
assertValid("//xsd:import[@namespace='" + ns + "']",
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WeatherService2Test.java Thu Jul 11 20:47:46 2013
@@ -21,8 +21,9 @@ package org.apache.cxf.xmlbeans;
import org.w3c.dom.Node;
-import org.apache.cxf.common.WSDLConstants;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -56,7 +57,7 @@ public class WeatherService2Test extends
public void testWSDL() throws Exception {
Node wsdl = getWSDLDocument("WeatherService");
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
addNamespace("w", WSDLConstants.NS_WSDL11);
assertValid("//w:message[@name='GetForecastsResponse']/w:part[@element='tns:GetForecastsResponse']",
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/WrappedStyleTest.java Thu Jul 11 20:47:46 2013
@@ -24,10 +24,11 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -82,7 +83,7 @@ public class WrappedStyleTest extends Ab
public void testWSDL() throws Exception {
Node wsdl = getWSDLDocument("TestService");
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
addNamespace("ns0", "http://cxf.apache.org/xmlbeans");
assertValid("//xsd:schema[@targetNamespace='urn:TestService']"
+ "/xsd:complexType[@name='mixedRequest']"
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XMLBeansServiceTest.java Thu Jul 11 20:47:46 2013
@@ -22,8 +22,9 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Node;
-import org.apache.cxf.common.WSDLConstants;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -63,7 +64,7 @@ public class XMLBeansServiceTest extends
// printNode(wsdl);
addNamespace("wsdl", WSDLConstants.NS_WSDL11);
addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid("//wsdl:types/xsd:schema[@targetNamespace='http://www.webservicex.net']", wsdl);
assertValid("//xsd:schema[@targetNamespace='http://www.webservicex.net']"
@@ -81,7 +82,7 @@ public class XMLBeansServiceTest extends
addNamespace("wsdl", WSDLConstants.NS_WSDL11);
addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid("//wsdl:types/xsd:schema[@targetNamespace='http://cxf.apache.org/xmlbeans']"
+ "/xsd:element[@name='request']", wsdl);
@@ -95,8 +96,8 @@ public class XMLBeansServiceTest extends
addNamespace("wsdl", WSDLConstants.NS_WSDL11);
addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
- addNamespace("xsd", SOAPConstants.XSD);
- addNamespace("s", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
+ addNamespace("s", Constants.URI_2001_SCHEMA_XSD);
assertEquals(1, assertValid(xpathString, wsdl).getLength());
}
Modified: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java (original)
+++ cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java Thu Jul 11 20:47:46 2013
@@ -28,9 +28,10 @@ import org.w3c.dom.Node;
import net.webservicex.WeatherData;
-import org.apache.cxf.common.WSDLConstants;
-import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.xmlbeans.AbstractXmlBeansTest;
+import org.apache.ws.commons.schema.constants.Constants;
+
import org.junit.Before;
import org.junit.Test;
@@ -64,7 +65,7 @@ public class WeatherServiceRPCLitTest ex
Node wsdl = getWSDLDocument("WeatherService");
addNamespace("w", WSDLConstants.NS_WSDL11);
- addNamespace("xsd", SOAPConstants.XSD);
+ addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
assertValid("//w:message[@name='getWeatherDataResponse']/w:part[@type='tns:WeatherData']", wsdl);
}
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -72,7 +72,6 @@ import org.w3c.dom.Node;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.jaxb.JAXBBeanInfo;
import org.apache.cxf.common.jaxb.JAXBContextProxy;
import org.apache.cxf.common.jaxb.JAXBUtils;
@@ -108,6 +107,7 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.staxutils.DelegatingXMLStreamWriter;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.constants.Constants;
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java Thu Jul 11 20:47:46 2013
@@ -40,10 +40,10 @@ import org.w3c.dom.ls.LSResourceResolver
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.catalog.OASISCatalogManager;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.xmlschema.LSInputImpl;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
+import org.apache.cxf.wsdl.WSDLConstants;
public class SchemaHandler {
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageImpl.java Thu Jul 11 20:47:46 2013
@@ -49,7 +49,6 @@ import com.ibm.wsdl.util.xml.DOMUtils;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.saaj.SAAJFactoryResolver;
import org.apache.cxf.binding.soap.saaj.SAAJUtils;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.io.CachedOutputStream;
@@ -59,6 +58,7 @@ import org.apache.cxf.message.XMLMessage
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.staxutils.W3CDOMStreamReader;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
+import org.apache.cxf.wsdl.WSDLConstants;
public class LogicalMessageImpl implements LogicalMessage {
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java Thu Jul 11 20:47:46 2013
@@ -45,7 +45,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
@@ -60,6 +59,7 @@ import org.apache.cxf.staxutils.W3CDOMSt
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
public class ProviderImpl extends javax.xml.ws.spi.Provider {
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java Thu Jul 11 20:47:46 2013
@@ -35,13 +35,13 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.annotations.Policies;
import org.apache.cxf.annotations.Policy;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.helpers.XPathUtils;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.ws.policy.EndpointPolicy;
import org.apache.cxf.ws.policy.PolicyEngine;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.neethi.Constants;
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1502354&r1=1502353&r2=1502354&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Thu Jul 11 20:47:46 2013
@@ -71,11 +71,11 @@ import com.sun.tools.xjc.reader.internal
import com.sun.tools.xjc.reader.internalizer.InternalizationLogic;
//import com.sun.tools.xjc.reader.xmlschema.parser.XMLSchemaInternalizationLogic;
+
import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.catalog.OASISCatalogManagerHelper;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.jaxb.JAXBUtils;
@@ -104,6 +104,7 @@ import org.apache.cxf.service.factory.Se
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaSerializer;
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=1502354&r1=1502353&r2=1502354&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 20:47:46 2013
@@ -29,10 +29,10 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Attr;
-import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.cxf.databinding.source.mime.MimeAttribute;
+import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaObject;