You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2009/01/05 21:10:45 UTC
svn commit: r731681 [1/2] - in /cxf/trunk: api/src/main/java/org/apache/cxf/
api/src/main/java/org/apache/cxf/service/model/
api/src/main/java/org/apache/cxf/wsdl/ api/src/test/java/org/apache/cxf/
common/common/src/main/java/org/apache/cxf/common/ com...
Author: bimargulies
Date: Mon Jan 5 12:10:42 2009
New Revision: 731681
URL: http://svn.apache.org/viewvc?rev=731681&view=rev
Log:
Herd a bunch of XmlSchema utilities into one place.
Added:
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java
- copied, changed from r731389, cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties (with props)
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java (with props)
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
- copied, changed from r731402, cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java
cxf/trunk/common/common/src/resources/
- copied from r731389, cxf/trunk/common/common/src/main/resources/
cxf/trunk/common/common/src/resources/META-INF/
- copied from r731672, cxf/trunk/common/common/src/main/resources/META-INF/
cxf/trunk/common/common/src/resources/schemas/
- copied from r731672, cxf/trunk/common/common/src/main/resources/schemas/
Removed:
cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java
cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java
cxf/trunk/common/common/src/main/resources/
cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/XmlSchemaUtils.java
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/SchemaInfo.java
cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.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/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.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/TypeUtil.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.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/XMLBeansServiceTest.java
cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.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/interceptors/DispatchOutDatabindingInterceptor.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.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/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/Stax2DOM.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/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/NSManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/NSManager.java Mon Jan 5 12:10:42 2009
@@ -25,8 +25,8 @@
import java.util.Map;
import java.util.Set;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
/***
* Only public/static/final fields can be resolved
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -25,10 +25,10 @@
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.cxf.helpers.XMLUtils;
import org.apache.cxf.io.CachedOutputStream;
-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.XmlSchemaForm;
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Mon Jan 5 12:10:42 2009
@@ -65,6 +65,7 @@
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
Modified: cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/NSManagerTest.java Mon Jan 5 12:10:42 2009
@@ -19,8 +19,8 @@
package org.apache.cxf;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.junit.Assert;
import org.junit.Test;
Copied: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java (from r731389, cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java?p2=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java&r1=731389&r2=731681&rev=731681&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLConstants.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java Mon Jan 5 12:10:42 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.wsdl;
+package org.apache.cxf.common;
import javax.xml.namespace.QName;
Added: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties?rev=731681&view=auto
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties (added)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties Mon Jan 5 12:10:42 2009
@@ -0,0 +1,30 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+MULTIPLE_ANY= Multiple xs:any constructs in {0}.
+ELEMENT_MISSING_TYPE= Root element {0} refers to undefined type {1} in {2}.
+UNSUPPORTED_TYPE_CONSTRUCT= Unsupported schema construct {0}.
+ELEMENT_DANGLING_REFERENCE= Element {0} refers to undefined element {1}.
+NON_SEQUENCE_PARTICLE=Limitation: Type {0} is not defined as a sequence. {1}
+NON_ELEMENT_CHILD=Limitation: Non-Element sequence member {0} of {1}. {2}
+ABSTRACT_ELEMENT=Limitation: Abstract element {0} of {1}. {2}
+ELEMENT_HAS_NO_TYPE=Element {0} has no type in the schema. {1}
+ELEMENT_TYPE_MISSING=Element {0} references type {1} which is not defined.
+ELEMENT_SCHEMA_MISSING=Element {0} contained in missing schema.
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/Messages.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java?rev=731681&view=auto
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java (added)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java Mon Jan 5 12:10:42 2009
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.common.xmlschema;
+
+import java.util.logging.Logger;
+
+import org.apache.cxf.common.i18n.Message;
+
+/**
+ * This exception is thrown when the Javascript client generator hits a schema
+ * construct that it cannot handle.
+ */
+public class UnsupportedConstruct extends RuntimeException {
+
+ public UnsupportedConstruct() {
+ }
+
+ public UnsupportedConstruct(String explanation) {
+ super(explanation);
+ }
+
+ public UnsupportedConstruct(Logger logger, String messageKey, Object...args) {
+ super(new Message(messageKey, logger, args).toString());
+
+ }
+
+ public UnsupportedConstruct(Throwable cause) {
+ super(cause);
+ }
+
+ public UnsupportedConstruct(Throwable cause, Logger logger, String messageKey, Object...args) {
+ super(new Message(messageKey, logger, args).toString(), cause);
+ }
+
+ public UnsupportedConstruct(String explanation, Throwable cause) {
+ super(explanation, cause);
+ }
+
+ public UnsupportedConstruct(Message message) {
+ super(message.toString());
+ }
+
+}
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/UnsupportedConstruct.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java (from r731402, cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java?p2=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java&p1=cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java&r1=731402&r2=731681&rev=731681&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaTools.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java Mon Jan 5 12:10:42 2009
@@ -25,25 +25,47 @@
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;
+import org.apache.ws.commons.schema.XmlSchemaAnnotated;
+import org.apache.ws.commons.schema.XmlSchemaAny;
+import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;
+import org.apache.ws.commons.schema.XmlSchemaAttribute;
+import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
+import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaContent;
+import org.apache.ws.commons.schema.XmlSchemaContentModel;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaEnumerationFacet;
import org.apache.ws.commons.schema.XmlSchemaFacet;
+import org.apache.ws.commons.schema.XmlSchemaForm;
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaObject;
import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.apache.ws.commons.schema.XmlSchemaParticle;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.XmlSchemaSimpleType;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeContent;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+import org.apache.ws.commons.schema.XmlSchemaType;
/**
* Some functions that avoid problems with Commons XML Schema.
*/
-public final class XmlSchemaTools {
- private static final Logger LOG = LogUtils.getL7dLogger(XmlSchemaTools.class);
+public final class XmlSchemaUtils {
+ public static final XmlSchemaForm QUALIFIED = new XmlSchemaForm(XmlSchemaForm.QUALIFIED);
+ public static final XmlSchemaForm UNQUALIFIED = new XmlSchemaForm(XmlSchemaForm.UNQUALIFIED);
+ 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 + "'";
+ public static final String XSI_NIL_WITH_PREFIX = XSI_NS_ATTR + " xsi:nil='true'";
+
+ private static final Logger LOG = LogUtils.getL7dLogger(XmlSchemaUtils.class);
+ private static final XmlSchemaSequence EMPTY_SEQUENCE = new XmlSchemaSequence();
- private XmlSchemaTools() {
+ private XmlSchemaUtils() {
}
private static void setNameFromQName(XmlSchemaElement element, QName name) {
@@ -200,4 +222,431 @@
inc.add(imp);
schema.getItems().add(imp);
}
+
+ /**
+ * This copes with an observed phenomenon in the schema built by the
+ * ReflectionServiceFactoryBean. It is creating element such that: (a) the
+ * type is not set. (b) the refName is set. (c) the namespaceURI in the
+ * refName is set empty. This apparently indicates 'same Schema' to everyone
+ * else, so thus function implements that convention here. It is unclear if
+ * that is a correct structure, and it if changes, we can simplify or
+ * eliminate this function.
+ *
+ * @param name
+ * @param referencingURI
+ * @return
+ */
+ public static XmlSchemaElement findElementByRefName(SchemaCollection xmlSchemaCollection,
+ QName name,
+ String referencingURI) {
+ String uri = name.getNamespaceURI();
+ if ("".equals(uri)) {
+ uri = referencingURI;
+ }
+ QName copyName = new QName(uri, name.getLocalPart());
+ XmlSchemaElement target = xmlSchemaCollection.getElementByQName(copyName);
+ assert target != null;
+ return target;
+ }
+
+ public static QName getBaseType(XmlSchemaComplexType type) {
+ XmlSchemaContentModel model = type.getContentModel();
+ if (model == null) {
+ return null;
+ }
+ XmlSchemaContent content = model.getContent();
+ if (content == null) {
+ return null;
+ }
+
+ if (!(content instanceof XmlSchemaComplexContentExtension)) {
+ return null;
+ }
+
+ XmlSchemaComplexContentExtension ext = (XmlSchemaComplexContentExtension)content;
+ return ext.getBaseTypeName();
+ }
+
+ public static XmlSchemaObjectCollection getContentAttributes(XmlSchemaComplexType type) {
+ XmlSchemaContentModel model = type.getContentModel();
+ if (model == null) {
+ return null;
+ }
+ XmlSchemaContent content = model.getContent();
+ if (content == null) {
+ return null;
+ }
+ if (!(content instanceof XmlSchemaComplexContentExtension)) {
+ return null;
+ }
+
+ //TODO: the anyAttribute case.
+ XmlSchemaComplexContentExtension ext = (XmlSchemaComplexContentExtension)content;
+ return ext.getAttributes();
+ }
+
+ public static List<XmlSchemaAnnotated>
+ getContentAttributes(XmlSchemaComplexType type, SchemaCollection collection) {
+ List<XmlSchemaAnnotated> results = new ArrayList<XmlSchemaAnnotated>();
+ QName baseTypeName = getBaseType(type);
+ if (baseTypeName != null) {
+ XmlSchemaComplexType baseType = (XmlSchemaComplexType)collection.getTypeByQName(baseTypeName);
+ // recurse onto the base type ...
+ results.addAll(getContentAttributes(baseType, collection));
+ // and now process our sequence.
+ XmlSchemaObjectCollection extAttrs = getContentAttributes(type);
+ for (int i = 0; i < extAttrs.getCount(); i++) {
+ results.add((XmlSchemaAnnotated)extAttrs.getItem(i));
+ }
+ return results;
+ } else {
+ // no base type, the simple case.
+ XmlSchemaObjectCollection attrs = type.getAttributes();
+ for (int i = 0; i < attrs.getCount(); i++) {
+ results.add((XmlSchemaAnnotated)attrs.getItem(i));
+ }
+ return results;
+ }
+ }
+
+ public static List<XmlSchemaObject> getContentElements(XmlSchemaComplexType type,
+ SchemaCollection collection) {
+ List<XmlSchemaObject> results = new ArrayList<XmlSchemaObject>();
+ QName baseTypeName = getBaseType(type);
+ if (baseTypeName != null) {
+ XmlSchemaComplexType baseType = (XmlSchemaComplexType)collection.getTypeByQName(baseTypeName);
+ // recurse onto the base type ...
+ results.addAll(getContentElements(baseType, collection));
+ // and now process our sequence.
+ XmlSchemaSequence extSequence = getContentSequence(type);
+ for (int i = 0; i < extSequence.getItems().getCount(); i++) {
+ results.add(extSequence.getItems().getItem(i));
+ }
+ return results;
+ } else {
+ // no base type, the simple case.
+ XmlSchemaSequence sequence = getSequence(type);
+ for (int i = 0; i < sequence.getItems().getCount(); i++) {
+ results.add(sequence.getItems().getItem(i));
+ }
+ return results;
+ }
+ }
+
+ public static XmlSchemaSequence getContentSequence(XmlSchemaComplexType type) {
+ XmlSchemaContentModel model = type.getContentModel();
+ if (model == null) {
+ return null;
+ }
+ XmlSchemaContent content = model.getContent();
+ if (content == null) {
+ return null;
+ }
+ if (!(content instanceof XmlSchemaComplexContentExtension)) {
+ return null;
+ }
+
+ XmlSchemaComplexContentExtension ext = (XmlSchemaComplexContentExtension)content;
+ XmlSchemaParticle particle = ext.getParticle();
+ if (particle == null) {
+ return null;
+ }
+ XmlSchemaSequence sequence = null;
+ try {
+ sequence = (XmlSchemaSequence) particle;
+ } catch (ClassCastException cce) {
+ unsupportedConstruct("NON_SEQUENCE_PARTICLE", type);
+ }
+ return sequence;
+ }
+
+ /**
+ * By convention, an element that is named in its schema's TNS can have a 'name' but
+ * no QName. This can get inconvenient for consumers who want to think about qualified names.
+ * Unfortunately, XmlSchema elements, unlike types, don't store a reference to their containing
+ * schema.
+ * @param element
+ * @param schema
+ * @return
+ */
+ public static QName getElementQualifiedName(XmlSchemaElement element, XmlSchema schema) {
+ if (element.getQName() != null) {
+ return element.getQName();
+ } else if (element.getName() != null) {
+ return new QName(schema.getTargetNamespace(), element.getName());
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Follow a chain of references from element to element until we can obtain
+ * a type.
+ *
+ * @param element
+ * @return
+ */
+ public static XmlSchemaType getElementType(SchemaCollection xmlSchemaCollection,
+ String referencingURI,
+ XmlSchemaElement element,
+ XmlSchemaType containingType) {
+ if (element.getSchemaTypeName() != null) {
+ XmlSchemaType type = xmlSchemaCollection.getTypeByQName(element.getSchemaTypeName());
+ if (type == null) {
+ Message message = new Message("ELEMENT_TYPE_MISSING", LOG, element.getQName(),
+ element.getSchemaTypeName().toString());
+ throw new UnsupportedConstruct(message);
+ }
+ return type;
+ }
+ assert element != null;
+ // The referencing URI only helps if there is a schema that points to
+ // it.
+ // It might be the URI for the wsdl TNS, which might have no schema.
+ if (xmlSchemaCollection.getSchemaByTargetNamespace(referencingURI) == null) {
+ referencingURI = null;
+ }
+
+ if (referencingURI == null && containingType != null) {
+ referencingURI = containingType.getQName().getNamespaceURI();
+ }
+
+ XmlSchemaElement originalElement = element;
+ while (element.getSchemaType() == null && element.getRefName() != null) {
+ XmlSchemaElement nextElement = findElementByRefName(xmlSchemaCollection,
+ element.getRefName(),
+ referencingURI);
+ assert nextElement != null;
+ element = nextElement;
+ }
+ if (element.getSchemaType() == null) {
+ unsupportedConstruct("ELEMENT_HAS_NO_TYPE",
+ originalElement.getName(),
+ containingType.getQName(),
+ containingType);
+ }
+ return element.getSchemaType();
+ }
+
+ /**
+ * If the object is an attribute or an anyAttribute,
+ * return the 'Annotated'. If it's not one of those, or it's a group,
+ * throw. We're not ready for groups yet.
+ * @param object
+ * @return
+ */
+ public static XmlSchemaAnnotated getObjectAnnotated(XmlSchemaObject object, QName contextName) {
+
+ if (!(object instanceof XmlSchemaAnnotated)) {
+ unsupportedConstruct("NON_ANNOTATED_ATTRIBUTE",
+ object.getClass().getSimpleName(),
+ contextName, object);
+ }
+ if (!(object instanceof XmlSchemaAttribute)
+ && !(object instanceof XmlSchemaAnyAttribute)) {
+ unsupportedConstruct("EXOTIC_ATTRIBUTE",
+ object.getClass().getSimpleName(), contextName,
+ object);
+ }
+
+ return (XmlSchemaAnnotated) object;
+ }
+
+ /**
+ * If the object is an element or an any, return the particle. If it's not a particle, or it's a group,
+ * throw. We're not ready for groups yet.
+ * @param object
+ * @return
+ */
+ public static XmlSchemaParticle getObjectParticle(XmlSchemaObject object, QName contextName) {
+
+ if (!(object instanceof XmlSchemaParticle)) {
+ unsupportedConstruct("NON_PARTICLE_CHILD",
+ object.getClass().getSimpleName(),
+ contextName, object);
+ }
+ if (!(object instanceof XmlSchemaElement)
+ && !(object instanceof XmlSchemaAny)) {
+ unsupportedConstruct("GROUP_CHILD",
+ object.getClass().getSimpleName(), contextName,
+ object);
+ }
+
+ return (XmlSchemaParticle) object;
+ }
+
+ public static XmlSchemaElement getReferredElement(XmlSchemaElement element,
+ SchemaCollection xmlSchemaCollection) {
+ if (element.getRefName() != null) {
+ XmlSchemaElement refElement = xmlSchemaCollection.getElementByQName(element.getRefName());
+ if (refElement == null) {
+ throw new RuntimeException("Dangling reference");
+ }
+ return refElement;
+ }
+ return null;
+ }
+
+ public static XmlSchemaSequence getSequence(XmlSchemaComplexType type) {
+ XmlSchemaParticle particle = type.getParticle();
+ XmlSchemaSequence sequence = null;
+
+ if (particle == null) {
+ // the code that uses this wants to iterate. An empty one is more useful than
+ // a null pointer, and certainly an exception.
+ return EMPTY_SEQUENCE;
+ }
+
+ try {
+ sequence = (XmlSchemaSequence) particle;
+ } catch (ClassCastException cce) {
+ unsupportedConstruct("NON_SEQUENCE_PARTICLE", type);
+ }
+
+ return sequence;
+ }
+
+ public static boolean isAttributeNameQualified(XmlSchemaAttribute attribute, XmlSchema schema) {
+ if (attribute.getRefName() != null) {
+ throw new RuntimeException("isElementNameQualified on element with ref=");
+ }
+ if (attribute.getForm().equals(QUALIFIED)) {
+ return true;
+ }
+ if (attribute.getForm().equals(UNQUALIFIED)) {
+ return false;
+ }
+ return schema.getAttributeFormDefault().equals(QUALIFIED);
+ }
+
+ /**
+ * due to a bug, feature, or just plain oddity of JAXB, it isn't good enough
+ * to just check the form of an element and of its schema. If schema 'a'
+ * (default unqualified) has a complex type with an element with a ref= to
+ * schema (b) (default unqualified), JAXB seems to expect to see a
+ * qualifier, anyway. <br/> So, if the element is local to a complex type,
+ * all we care about is the default element form of the schema and the local
+ * form of the element. <br/> If, on the other hand, the element is global,
+ * we might need to compare namespaces. <br/>
+ *
+ * @param attribute the attribute
+ * @param global if this element is a global element (complex type ref= to
+ * it, or in a part)
+ * @param localSchema the schema of the complex type containing the
+ * reference, only used for the 'odd case'.
+ * @param elementSchema the schema for the element.
+ * @return if the element needs to be qualified.
+ */
+ public static boolean isAttributeQualified(XmlSchemaAttribute attribute,
+ boolean global,
+ XmlSchema localSchema,
+ XmlSchema attributeSchema) {
+ if (attribute.getQName() == null) {
+ throw new RuntimeException("getSchemaQualifier on anonymous element.");
+ }
+ if (attribute.getRefName() != null) {
+ throw new RuntimeException("getSchemaQualified on the 'from' side of ref=.");
+ }
+
+
+ if (global) {
+ return isAttributeNameQualified(attribute, attributeSchema)
+ || (localSchema != null
+ && !(attribute.getQName().getNamespaceURI().equals(localSchema.getTargetNamespace())));
+ } else {
+ return isAttributeNameQualified(attribute, attributeSchema);
+ }
+ }
+
+ public static boolean isComplexType(XmlSchemaType type) {
+ return type instanceof XmlSchemaComplexType;
+ }
+
+ public static boolean isElementNameQualified(XmlSchemaElement element, XmlSchema schema) {
+ if (element.getRefName() != null) {
+ throw new RuntimeException("isElementNameQualified on element with ref=");
+ }
+ if (element.getForm().equals(QUALIFIED)) {
+ return true;
+ }
+ if (element.getForm().equals(UNQUALIFIED)) {
+ return false;
+ }
+ return schema.getElementFormDefault().equals(QUALIFIED);
+ }
+
+ /**
+ * due to a bug, feature, or just plain oddity of JAXB, it isn't good enough
+ * to just check the form of an element and of its schema. If schema 'a'
+ * (default unqualified) has a complex type with an element with a ref= to
+ * schema (b) (default unqualified), JAXB seems to expect to see a
+ * qualifier, anyway. <br/> So, if the element is local to a complex type,
+ * all we care about is the default element form of the schema and the local
+ * form of the element. <br/> If, on the other hand, the element is global,
+ * we might need to compare namespaces. <br/>
+ *
+ * @param element the element.
+ * @param global if this element is a global element (complex type ref= to
+ * it, or in a part)
+ * @param localSchema the schema of the complex type containing the
+ * reference, only used for the 'odd case'.
+ * @param elementSchema the schema for the element.
+ * @return if the element needs to be qualified.
+ */
+ public static boolean isElementQualified(XmlSchemaElement element,
+ boolean global,
+ XmlSchema localSchema,
+ XmlSchema elementSchema) {
+ QName qn = getElementQualifiedName(element, localSchema);
+ if (qn == null) {
+ throw new RuntimeException("isElementQualified on anonymous element.");
+ }
+ if (element.getRefName() != null) {
+ throw new RuntimeException("isElementQualified on the 'from' side of ref=.");
+ }
+
+
+ if (global) {
+ return isElementNameQualified(element, elementSchema)
+ || (localSchema != null
+ && !(qn.getNamespaceURI().equals(localSchema.getTargetNamespace())));
+ } else {
+ return isElementNameQualified(element, elementSchema);
+ }
+ }
+
+ public static boolean isParticleArray(XmlSchemaParticle particle) {
+ return particle.getMaxOccurs() > 1;
+ }
+
+ public static boolean isParticleOptional(XmlSchemaParticle particle) {
+ return particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1;
+ }
+
+ public static void unsupportedConstruct(String messageKey,
+ String what,
+ QName subjectName,
+ XmlSchemaObject subject) {
+ Message message = new Message(messageKey, LOG, what,
+ subjectName == null ? "anonymous" : subjectName,
+ cleanedUpSchemaSource(subject));
+ LOG.severe(message.toString());
+ throw new UnsupportedConstruct(message);
+
+ }
+
+ public static void unsupportedConstruct(String messageKey, XmlSchemaType subject) {
+ Message message = new Message(messageKey, LOG, subject.getQName(),
+ cleanedUpSchemaSource(subject));
+ LOG.severe(message.toString());
+ throw new UnsupportedConstruct(message);
+ }
+
+ public static String cleanedUpSchemaSource(XmlSchemaObject subject) {
+ if (subject.getSourceURI() == null) {
+ return "";
+ } else {
+ return subject.getSourceURI() + ":" + subject.getLineNumber();
+ }
+ }
}
Modified: cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java (original)
+++ cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java Mon Jan 5 12:10:42 2009
@@ -27,6 +27,7 @@
import org.apache.cxf.binding.http.HttpConstants;
import org.apache.cxf.binding.http.URIMapper;
import org.apache.cxf.binding.xml.interceptor.XMLMessageOutInterceptor;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.MapNamespaceContext;
@@ -39,7 +40,6 @@
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
-import org.apache.cxf.wsdl.WSDLConstants;
public class DatabindingOutSetupInterceptor extends AbstractPhaseInterceptor<Message> {
private static final WrappedOutInterceptor WRAPPED_OUT = new WrappedOutInterceptor();
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -57,6 +57,7 @@
import org.apache.cxf.binding.soap.model.SoapBodyInfo;
import org.apache.cxf.binding.soap.model.SoapHeaderInfo;
import org.apache.cxf.binding.soap.model.SoapOperationInfo;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.endpoint.Endpoint;
@@ -87,7 +88,6 @@
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.MultipleEndpointObserver;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -22,12 +22,12 @@
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 {
private SoapVersion soapVersion;
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -36,6 +36,7 @@
import org.apache.cxf.binding.soap.model.SoapBindingInfo;
import org.apache.cxf.binding.soap.model.SoapBodyInfo;
import org.apache.cxf.binding.soap.model.SoapOperationInfo;
+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;
@@ -43,7 +44,6 @@
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;
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -27,13 +27,13 @@
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -25,9 +25,9 @@
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/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java Mon Jan 5 12:10:42 2009
@@ -59,6 +59,7 @@
import com.ibm.wsdl.extensions.schema.SchemaImpl;
import org.apache.cxf.Bus;
import org.apache.cxf.NSManager;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.helpers.XPathUtils;
@@ -76,7 +77,6 @@
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.cxf.wsdl.WSDLManager;
import org.apache.ws.commons.schema.utils.NamespacePrefixList;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Mon Jan 5 12:10:42 2009
@@ -51,12 +51,12 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.catalog.CatalogWSDLLocator;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.CacheMap;
import org.apache.cxf.common.util.PropertiesLoaderUtils;
import org.apache.cxf.service.model.ServiceSchemaInfo;
import org.apache.cxf.wsdl.JAXBExtensionHelper;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl.WSDLManager;
/**
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java Mon Jan 5 12:10:42 2009
@@ -46,7 +46,7 @@
import org.apache.cxf.aegis.type.java5.Java5TypeCreator;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
@@ -239,7 +239,7 @@
}
public static boolean schemaImportsUtilityTypes(XmlSchema schema) {
- return XmlSchemaTools.schemaImportsNamespace(schema, UTILITY_TYPES_SCHEMA_NS);
+ return XmlSchemaUtils.schemaImportsNamespace(schema, UTILITY_TYPES_SCHEMA_NS);
}
private Document getSchemaDocument(String resourcePath) {
@@ -278,7 +278,7 @@
}
public static void addUtilityTypesToSchema(XmlSchema root) {
- XmlSchemaTools.addImportIfNeeded(root, UTILITY_TYPES_SCHEMA_NS);
+ XmlSchemaUtils.addImportIfNeeded(root, UTILITY_TYPES_SCHEMA_NS);
}
/**
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -41,12 +41,13 @@
import org.apache.cxf.aegis.type.TypeCreator;
import org.apache.cxf.aegis.type.TypeMapping;
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;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.common.xmlschema.XmlSchemaConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.cxf.databinding.AbstractDataBinding;
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.databinding.DataWriter;
@@ -60,7 +61,6 @@
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.XmlSchemaForm;
@@ -505,7 +505,7 @@
}
private boolean schemaImportsXmime(XmlSchema schema) {
- return XmlSchemaTools.schemaImportsNamespace(schema, AbstractXOPType.XML_MIME_NS);
+ return XmlSchemaUtils.schemaImportsNamespace(schema, AbstractXOPType.XML_MIME_NS);
}
public QName getSuggestedName(Service s, TypeMapping tm, OperationInfo op, int param) {
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -34,8 +34,8 @@
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.common.util.XMLSchemaQNames;
-import org.apache.cxf.wsdl.WSDLConstants;
/**
* @author Hani Suleiman Date: Jun 14, 2005 Time: 11:59:57 PM
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -25,7 +25,7 @@
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.ws.commons.schema.XmlSchema;
@@ -159,6 +159,6 @@
public static void setAttributeAttributes(QName name, Type type, XmlSchema root) {
String ns = type.getSchemaType().getNamespaceURI();
- XmlSchemaTools.addImportIfNeeded(root, ns);
+ XmlSchemaUtils.addImportIfNeeded(root, ns);
}
}
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java Mon Jan 5 12:10:42 2009
@@ -40,7 +40,7 @@
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaAny;
@@ -584,7 +584,7 @@
}
private void addXmimeToSchema(XmlSchema root) {
- XmlSchemaTools.addImportIfNeeded(root, AbstractXOPType.XML_MIME_NS);
+ XmlSchemaUtils.addImportIfNeeded(root, AbstractXOPType.XML_MIME_NS);
}
@Override
@@ -697,7 +697,7 @@
attribute.setSchemaTypeName(type.getSchemaType());
String ns = name.getNamespaceURI();
if (!ns.equals(root.getTargetNamespace())) {
- XmlSchemaTools.addImportIfNeeded(root, ns);
+ XmlSchemaUtils.addImportIfNeeded(root, ns);
}
}
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -41,6 +41,7 @@
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.common.xmlschema.XmlSchemaConstants;
import org.apache.cxf.endpoint.Server;
@@ -54,7 +55,6 @@
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.WSDLDefinitionBuilder;
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -36,18 +36,18 @@
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.logging.LogUtils;
import org.apache.cxf.common.util.ReflectionInvokationHandler;
import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.common.xmlschema.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.service.ServiceModelVisitor;
import org.apache.cxf.service.model.FaultInfo;
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;
@@ -326,7 +326,7 @@
private XmlSchemaElement createXsElement(MessagePartInfo part, QName typeName, SchemaInfo schemaInfo) {
XmlSchemaElement el = new XmlSchemaElement();
- XmlSchemaTools.setElementQName(el, part.getElementQName());
+ XmlSchemaUtils.setElementQName(el, part.getElementQName());
el.setNillable(true);
el.setSchemaTypeName(typeName);
part.setXmlSchema(el);
@@ -349,7 +349,7 @@
&& !isExistSchemaElement(schemaInfo.getSchema(), part.getElementQName())) {
XmlSchemaElement el = new XmlSchemaElement();
- XmlSchemaTools.setElementQName(el, part.getElementQName());
+ XmlSchemaUtils.setElementQName(el, part.getElementQName());
el.setNillable(true);
schemaInfo.getSchema().getItems().add(el);
@@ -382,7 +382,7 @@
}
XmlSchemaElement el = new XmlSchemaElement();
- XmlSchemaTools.setElementQName(el, part.getElementQName());
+ XmlSchemaUtils.setElementQName(el, part.getElementQName());
schemaInfo.getSchema().getItems().add(el);
schemaInfo.getSchema().getElements().add(el.getQName(), el);
@@ -411,7 +411,7 @@
String ns = schemaInfo.getSchema().getElementFormDefault()
.getValue().equals(XmlSchemaForm.UNQUALIFIED)
? "" : part.getElementQName().getLocalPart();
- XmlSchemaTools.setElementQName(el,
+ XmlSchemaUtils.setElementQName(el,
new QName(ns, m.getName().substring(beginIdx)));
Iterator<QName> itr = beanInfo.getTypeNames().iterator();
if (!itr.hasNext()) {
@@ -470,7 +470,7 @@
}
XmlSchemaElement el = new XmlSchemaElement();
- XmlSchemaTools.setElementQName(el, part.getElementQName());
+ XmlSchemaUtils.setElementQName(el, part.getElementQName());
schema.getItems().add(el);
schema.getElements().add(el.getQName(), el);
part.setXmlSchema(el);
@@ -531,7 +531,7 @@
QName name, boolean isArray) {
XmlSchemaElement el = new XmlSchemaElement();
el.setName(name.getLocalPart());
- XmlSchemaTools.setElementQName(el, name);
+ XmlSchemaUtils.setElementQName(el, name);
if (isArray) {
el.setMinOccurs(0);
@@ -546,8 +546,8 @@
QName ename = new QName(beanInfo.getElementNamespaceURI(null),
beanInfo.getElementLocalName(null));
XmlSchemaElement el2 = schemas.getElementByQName(ename);
- XmlSchemaTools.setElementQName(el, null);
- XmlSchemaTools.setElementRefName(el, el2.getRefName());
+ XmlSchemaUtils.setElementQName(el, null);
+ XmlSchemaUtils.setElementRefName(el, el2.getRefName());
} else {
Iterator<QName> itr = beanInfo.getTypeNames().iterator();
if (!itr.hasNext()) {
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -21,8 +21,8 @@
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.junit.Before;
import org.junit.Test;
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -22,8 +22,8 @@
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.junit.Before;
import org.junit.Test;
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -28,8 +28,8 @@
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.junit.Before;
import org.junit.Test;
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -47,6 +47,7 @@
import org.w3c.dom.Node;
import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.interceptor.Fault;
@@ -55,7 +56,6 @@
import org.apache.cxf.message.XMLMessage;
import org.apache.cxf.staxutils.StaxUtils;
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/interceptors/DispatchOutDatabindingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutDatabindingInterceptor.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutDatabindingInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/DispatchOutDatabindingInterceptor.java Mon Jan 5 12:10:42 2009
@@ -55,6 +55,7 @@
import org.apache.cxf.binding.soap.Soap12;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.databinding.DataWriter;
import org.apache.cxf.databinding.source.NodeDataWriter;
@@ -72,7 +73,6 @@
import org.apache.cxf.message.XMLMessage;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
-import org.apache.cxf.wsdl.WSDLConstants;
public class DispatchOutDatabindingInterceptor extends AbstractOutDatabindingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(DispatchOutDatabindingInterceptor.class);
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=731681&r1=731680&r2=731681&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 Mon Jan 5 12:10:42 2009
@@ -43,6 +43,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.io.CachedOutputStream;
@@ -51,7 +52,6 @@
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.staxutils.StaxUtils;
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/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Mon Jan 5 12:10:42 2009
@@ -54,11 +54,12 @@
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.catalog.CatalogXmlSchemaURIResolver;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
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.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.databinding.source.mime.MimeAttribute;
import org.apache.cxf.databinding.source.mime.MimeSerializer;
@@ -94,7 +95,6 @@
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.service.model.UnwrappedOperationInfo;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.ws.commons.schema.XmlSchema;
@@ -885,7 +885,7 @@
XmlSchema schema = si.getSchema();
XmlSchemaElement el = new XmlSchemaElement();
- XmlSchemaTools.setElementQName(el, mpi.getElementQName());
+ XmlSchemaUtils.setElementQName(el, mpi.getElementQName());
if (!isExistSchemaElement(schema, mpi.getElementQName())) {
SchemaCollection.addGlobalElementToSchema(schema, el);
}
@@ -992,7 +992,7 @@
}
XmlSchemaElement el = new XmlSchemaElement();
- XmlSchemaTools.setElementQName(el, qname);
+ XmlSchemaUtils.setElementQName(el, qname);
el.setNillable(true);
if (!isExistSchemaElement(schema, qname)) {
@@ -1086,7 +1086,7 @@
QName wrapperName) {
XmlSchemaElement el = new XmlSchemaElement();
- XmlSchemaTools.setElementQName(el, wrapperName);
+ XmlSchemaUtils.setElementQName(el, wrapperName);
SchemaCollection.addGlobalElementToSchema(schema, el);
wrappedMessage.getMessageParts().get(0).setXmlSchema(el);
@@ -1105,12 +1105,12 @@
for (MessagePartInfo mpi : unwrappedMessage.getMessageParts()) {
el = new XmlSchemaElement();
- XmlSchemaTools.setElementQName(el, mpi.getName());
+ XmlSchemaUtils.setElementQName(el, mpi.getName());
Map<Class, Boolean> jaxbAnnoMap = getJaxbAnnoMap(mpi);
if (mpi.isElement()) {
addImport(schema, mpi.getElementQName().getNamespaceURI());
- XmlSchemaTools.setElementQName(el, null);
- XmlSchemaTools.setElementRefName(el, mpi.getElementQName());
+ XmlSchemaUtils.setElementQName(el, null);
+ XmlSchemaUtils.setElementRefName(el, mpi.getElementQName());
} else {
if (mpi.getTypeQName() != null && !jaxbAnnoMap.containsKey(XmlList.class)) {
el.setSchemaTypeName(mpi.getTypeQName());
@@ -1154,7 +1154,7 @@
mpi.setElement(true);
mpi.setElementQName(newName);
mpi.setConcreteName(newName);
- XmlSchemaTools.setElementQName(el, newName);
+ XmlSchemaUtils.setElementQName(el, newName);
}
if (Collection.class.isAssignableFrom(mpi.getTypeClass())
@@ -1178,7 +1178,7 @@
if (Boolean.TRUE.equals(mpi.getProperty(HEADER))) {
QName qn = (QName)mpi.getProperty(ELEMENT_NAME);
- XmlSchemaTools.setElementQName(el, qn);
+ XmlSchemaUtils.setElementQName(el, qn);
SchemaInfo headerSchemaInfo = getOrCreateSchema(serviceInfo, qn.getNamespaceURI(),
getQualifyWrapperSchema());
Modified: cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java (original)
+++ cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/AttributeInfo.java Mon Jan 5 12:10:42 2009
@@ -26,6 +26,7 @@
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;
import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;
Modified: cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java (original)
+++ cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java Mon Jan 5 12:10:42 2009
@@ -30,10 +30,11 @@
import org.w3c.dom.Attr;
import org.apache.cxf.aegis.type.mtom.AbstractXOPType;
+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.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaObject;
Modified: cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java (original)
+++ cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/ParticleInfo.java Mon Jan 5 12:10:42 2009
@@ -27,6 +27,7 @@
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;
Modified: cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java (original)
+++ cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Mon Jan 5 12:10:42 2009
@@ -34,16 +34,17 @@
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.binding.soap.model.SoapBindingInfo;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
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.XmlSchemaUtils;
import org.apache.cxf.javascript.JavascriptUtils;
import org.apache.cxf.javascript.NameManager;
import org.apache.cxf.javascript.NamespacePrefixAccumulator;
import org.apache.cxf.javascript.ParticleInfo;
import org.apache.cxf.javascript.UnsupportedConstruct;
-import org.apache.cxf.javascript.XmlSchemaUtils;
import org.apache.cxf.service.ServiceModelVisitor;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
@@ -54,7 +55,6 @@
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.local.LocalTransportFactory;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaAny;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
Modified: cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java (original)
+++ cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java Mon Jan 5 12:10:42 2009
@@ -29,7 +29,7 @@
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.XmlSchemaTools;
+import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
import org.apache.cxf.javascript.AttributeInfo;
import org.apache.cxf.javascript.ItemInfo;
import org.apache.cxf.javascript.JavascriptUtils;
@@ -37,7 +37,6 @@
import org.apache.cxf.javascript.NamespacePrefixAccumulator;
import org.apache.cxf.javascript.ParticleInfo;
import org.apache.cxf.javascript.UnsupportedConstruct;
-import org.apache.cxf.javascript.XmlSchemaUtils;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaAnnotated;
@@ -111,8 +110,8 @@
}
} else if (xmlSchemaObject instanceof XmlSchemaSimpleType) {
XmlSchemaSimpleType simpleType = (XmlSchemaSimpleType)xmlSchemaObject;
- if (XmlSchemaTools.isEumeration(simpleType)) {
- List<String> values = XmlSchemaTools.enumeratorValues(simpleType);
+ if (XmlSchemaUtils.isEumeration(simpleType)) {
+ List<String> values = XmlSchemaUtils.enumeratorValues(simpleType);
code.append("//\n");
code.append("// Simple type (enumeration) " + simpleType.getQName() + "\n");
code.append("//\n");
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Mon Jan 5 12:10:42 2009
@@ -53,6 +53,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapMessage;
+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;
@@ -88,7 +89,6 @@
import org.apache.cxf.ws.security.tokenstore.MemoryTokenStore;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
import org.apache.cxf.ws.security.tokenstore.TokenStore;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.velocity.util.ClassUtils;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Mon Jan 5 12:10:42 2009
@@ -50,6 +50,7 @@
import javax.wsdl.extensions.soap12.SOAP12Operation;
import javax.xml.namespace.QName;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.tools.common.ExtensionInvocationHandler;
import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
@@ -58,7 +59,6 @@
import org.apache.cxf.tools.common.extensions.soap.SoapFault;
import org.apache.cxf.tools.common.extensions.soap.SoapHeader;
import org.apache.cxf.tools.common.extensions.soap.SoapOperation;
-import org.apache.cxf.wsdl.WSDLConstants;
public final class SOAPBindingUtil {
private static Map<String, String> bindingMap = new HashMap<String, String>();
Modified: cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java (original)
+++ cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/WSDLVersionTest.java Mon Jan 5 12:10:42 2009
@@ -19,7 +19,8 @@
package org.apache.cxf.tools.common;
-import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.common.WSDLConstants;
+
import org.junit.Assert;
import org.junit.Test;
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java Mon Jan 5 12:10:42 2009
@@ -45,9 +45,9 @@
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
import org.apache.cxf.binding.corba.wsdl.OperationType;
import org.apache.cxf.binding.corba.wsdl.TypeMappingType;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.wsdl.JAXBExtensionHelper;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaImport;
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java Mon Jan 5 12:10:42 2009
@@ -38,6 +38,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.BusApplicationContext;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
@@ -55,7 +56,6 @@
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.java2wsdl.processor.internal.ServiceBuilderFactory;
import org.apache.cxf.tools.util.AnnotationUtil;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactory.java Mon Jan 5 12:10:42 2009
@@ -19,9 +19,9 @@
package org.apache.cxf.tools.java2wsdl.generator;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.wsdl.WSDLConstants;
public final class WSDLGeneratorFactory {
private WSDLConstants.WSDLVersion wsdlVersion;
Modified: cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=731681&r1=731680&r2=731681&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java (original)
+++ cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java Mon Jan 5 12:10:42 2009
@@ -32,6 +32,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.BusApplicationContext;
+import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
@@ -48,7 +49,6 @@
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WrapperBeanGenerator;
import org.apache.cxf.tools.java2wsdl.processor.internal.ServiceBuilderFactory;
import org.apache.cxf.tools.util.AnnotationUtil;
-import org.apache.cxf.wsdl.WSDLConstants;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;