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 2008/01/23 22:53:21 UTC
svn commit: r614696 - in /incubator/cxf/trunk:
api/src/main/java/org/apache/cxf/service/model/
api/src/main/java/org/apache/cxf/tools/common/
api/src/main/java/org/apache/cxf/wsdl/
common/common/src/main/java/org/apache/cxf/common/util/ common/common/s...
Author: dkulp
Date: Wed Jan 23 13:53:17 2008
New Revision: 614696
URL: http://svn.apache.org/viewvc?rev=614696&view=rev
Log:
Fix a bunch of warnings in eclipse that now show up with the latest eclipse checkstyle plugin. :-(
Fix some wsdl that were invalid
Fix some aegis cases that were generating invalid wsdls
Fix some issues with validation where schemas were not found (more work to do here)
Fix issue of stack traces on every request (instead of just once) if it fails to process the schema
Removed:
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/Base64Binary.java
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpConstants.java
incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIConstants.java
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLConstants.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanWithDataHandler.java
incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MetadataConstants.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/HeaderTesterUtil.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/test_import.xsd
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/I18NStrings.java
incubator/cxf/trunk/testutils/src/main/resources/wsdl/inherit.wsdl
incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb_element_test.wsdl
incubator/cxf/trunk/testutils/src/main/resources/wsdl/string_array_test.wsdl
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java Wed Jan 23 13:53:17 2008
@@ -43,6 +43,13 @@
public <T> T getProperty(String name, Class<T> cls) {
return cls.cast(getProperty(name));
}
+ public boolean hasProperty(String name) {
+ Map<String, Object> map = propertyMap.get();
+ if (map != null) {
+ return map.containsKey(name);
+ }
+ return false;
+ }
public void setProperty(String name, Object v) {
if (null == propertyMap.get()) {
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java Wed Jan 23 13:53:17 2008
@@ -241,4 +241,8 @@
public static final String CLIENT_CLASS = "clientClass";
public static final String SERVER_CLASS = "serverClass";
public static final String CFG_JSPREFIXMAP = "javascriptPrefixMap";
+
+ private ToolConstants() {
+ //utility class
+ }
}
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Wed Jan 23 13:53:17 2008
@@ -58,6 +58,7 @@
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.apache.cxf.Bus;
@@ -68,6 +69,8 @@
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
+import org.apache.cxf.helpers.XMLUtils;
+import org.apache.cxf.resource.ExtendedURIResolver;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.Destination;
@@ -97,7 +100,7 @@
*/
private static final class SchemaLSResourceResolver implements LSResourceResolver {
private final ServiceInfo si;
-
+ private final ExtendedURIResolver resolver = new ExtendedURIResolver();
private SchemaLSResourceResolver(ServiceInfo serviceInfo) {
this.si = serviceInfo;
}
@@ -145,6 +148,21 @@
return impl;
}
}
+ //REVIST - we need to get catalogs in here somehow :-(
+ if (systemId == null) {
+ systemId = publicId;
+ }
+ if (systemId != null) {
+ InputSource source = resolver.resolve(systemId, baseURI);
+ if (source != null) {
+ LSInputImpl impl = new LSInputImpl();
+ impl.setByteStream(source.getByteStream());
+ impl.setSystemId(source.getSystemId());
+ impl.setPublicId(source.getPublicId());
+ return impl;
+ }
+ }
+ LOG.warning("Could not resolve Schema for " + systemId);
return null;
}
}
@@ -515,7 +533,7 @@
return null;
}
Schema schema = serviceInfo.getProperty(Schema.class.getName(), Schema.class);
- if (schema == null) {
+ if (schema == null && !serviceInfo.hasProperty(Schema.class.getName())) {
SchemaFactory factory = SchemaFactory.newInstance(
XMLConstants.W3C_XML_SCHEMA_NS_URI);
List<Source> schemaSources = new ArrayList<Source>();
@@ -532,15 +550,15 @@
try {
factory.setResourceResolver(new SchemaLSResourceResolver(serviceInfo));
schema = factory.newSchema(schemaSources.toArray(new Source[schemaSources.size()]));
- if (schema != null) {
- serviceInfo.setProperty(Schema.class.getName(), schema);
- LOG.log(Level.FINE, "Obtained schema from ServiceInfo");
- }
} catch (SAXException ex) {
// Something not right with the schema from the wsdl.
LOG.log(Level.WARNING, "SAXException for newSchema() on ", ex);
+ for (SchemaInfo schemaInfo : serviceInfo.getSchemas()) {
+ String s = XMLUtils.toString(schemaInfo.getElement(), 4);
+ LOG.log(Level.WARNING, "Schema for: " + schemaInfo.getNamespaceURI() + "\n" + s);
+ }
}
-
+ serviceInfo.setProperty(Schema.class.getName(), schema);
}
return schema;
}
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SOAPConstants.java Wed Jan 23 13:53:17 2008
@@ -24,7 +24,8 @@
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
* @since Feb 18, 2004
*/
-public class SOAPConstants {
+public final class SOAPConstants {
+
/** Document styles. */
public static final String WSDL11_NS = "http://schemas.xmlsoap.org/wsdl/";
@@ -80,4 +81,9 @@
*/
public static final String MTOM_ENABLED = "mtom-enabled";
+
+ private SOAPConstants() {
+ //utility class
+ }
+
}
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaConstants.java Wed Jan 23 13:53:17 2008
@@ -74,4 +74,8 @@
public static final QName UNSIGNEDLONG_QNAME = new QName(XSD_NAMESPACE_URI, "unsignedLong");
public static final QName UNSIGNEDSHORT_QNAME = new QName(XSD_NAMESPACE_URI, "unsignedShort");
+ private XmlSchemaConstants() {
+ //utility class
+ }
+
}
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java Wed Jan 23 13:53:17 2008
@@ -28,7 +28,7 @@
/*
* Override default styles to recognise JAXBElement as needing introspection
*/
-public class JAXBToStringStyle {
+public final class JAXBToStringStyle {
public static final ToStringStyle MULTI_LINE_STYLE =
new JAXBToStringStyleImpl(true);
@@ -39,6 +39,9 @@
public static final ToStringStyle DEFAULT_STYLE =
new JAXBToStringStyleImpl();
+ private JAXBToStringStyle() {
+ //utility class
+ }
}
class JAXBToStringStyleImpl extends ToStringStyle {
Modified: incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpConstants.java (original)
+++ incubator/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/HttpConstants.java Wed Jan 23 13:53:17 2008
@@ -18,11 +18,15 @@
*/
package org.apache.cxf.binding.http;
-public class HttpConstants {
+public final class HttpConstants {
public static final String CONTENT_TYPE = "Content-Type";
public static final String POST = "POST";
public static final String PUT = "PUT";
public static final String DELETE = "DELETE";
public static final String GET = "GET";
+
+ private HttpConstants() {
+ //utility class
+ }
}
Modified: incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIConstants.java (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIConstants.java Wed Jan 23 13:53:17 2008
@@ -31,4 +31,7 @@
public static final QName JBI_WRAPPER_PART = new QName(NS_JBI_WRAPPER, "part");
+ private JBIConstants() {
+ //utility class
+ }
}
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java Wed Jan 23 13:53:17 2008
@@ -19,7 +19,7 @@
package org.apache.cxf.binding.soap;
-public class SoapBindingConstants {
+public final class SoapBindingConstants {
public static final String BINDING_STYLE_RPC = "rpc";
public static final String BINDING_STYLE_DOC = "document";
@@ -29,4 +29,8 @@
public static final String SOAP_ACTION = "SOAPAction";
public static final String SOAP11_BINDING_ID = "http://schemas.xmlsoap.org/soap/";
public static final String SOAP12_BINDING_ID = "http://schemas.xmlsoap.org/wsdl/soap12/";
+
+ private SoapBindingConstants() {
+ //utility class
+ }
}
Modified: incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLConstants.java (original)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLConstants.java Wed Jan 23 13:53:17 2008
@@ -23,4 +23,7 @@
public final class XMLConstants {
public static final String NS_XML_FORMAT = "http://cxf.apache.org/bindings/xformat";
+ private XMLConstants() {
+ //utility class
+ }
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Wed Jan 23 13:53:17 2008
@@ -50,9 +50,9 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.SOAPConstants;
import org.apache.cxf.common.xmlschema.SchemaCollection;
-import org.apache.cxf.databinding.AbstractDataBinding;
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.databinding.DataWriter;
+import org.apache.cxf.databinding.source.AbstractDataBinding;
import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.frontend.SimpleMethodDispatcher;
import org.apache.cxf.helpers.CastUtils;
@@ -299,6 +299,7 @@
if (!deps.contains(t)) {
deps.add(t);
}
+ addDependencies(deps, t);
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java Wed Jan 23 13:53:17 2008
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.aegis.type;
+import java.util.List;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import org.apache.commons.logging.Log;
@@ -25,6 +27,10 @@
import org.apache.cxf.aegis.AegisContext;
import org.apache.cxf.aegis.util.NamespaceHelper;
import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.cxf.helpers.CastUtils;
+import org.jdom.Attribute;
+import org.jdom.Element;
+import org.jdom.Namespace;
/**
* Static methods/constants for Aegis.
@@ -151,6 +157,28 @@
type = tm.getType(value.getClass());
return type;
+ }
+
+ public static Attribute createTypeAttribute(String prefix, Type type, Element root) {
+ String ns = type.getSchemaType().getNamespaceURI();
+ if (!ns.equals(root.getAttributeValue("targetNamespace"))
+ && !ns.equals(SOAPConstants.XSD)) {
+ //find import statement
+ List<Element> l = CastUtils.cast(root.getChildren("import",
+ Namespace.getNamespace(SOAPConstants.XSD)));
+ boolean found = false;
+ for (Element e : l) {
+ if (ns.equals(e.getAttributeValue("namespace"))) {
+ found = true;
+ }
+ }
+ if (!found) {
+ Element element = new Element("import", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
+ root.addContent(0, element);
+ element.setAttribute("namespace", ns);
+ }
+ }
+ return new Attribute("type", prefix + ':' + type.getSchemaType().getLocalPart());
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java Wed Jan 23 13:53:17 2008
@@ -292,7 +292,7 @@
.getNamespaceURI());
element.setAttribute(new Attribute("name", componentType.getSchemaType().getLocalPart()));
- element.setAttribute(BeanType.createTypeAttribute(prefix, componentType, root));
+ element.setAttribute(TypeUtil.createTypeAttribute(prefix, componentType, root));
if (componentType.isNillable()) {
element.setAttribute(new Attribute("nillable", "true"));
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java Wed Jan 23 13:53:17 2008
@@ -27,7 +27,6 @@
import java.lang.reflect.Proxy;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import javax.xml.namespace.QName;
@@ -42,7 +41,6 @@
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.SOAPConstants;
-import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
import org.jaxen.JaxenException;
import org.jdom.Attribute;
@@ -519,7 +517,7 @@
String prefix = NamespaceHelper.getUniquePrefix(root, type.getSchemaType().getNamespaceURI());
element.setAttribute(new Attribute("name", nameWithPrefix));
- element.setAttribute(createTypeAttribute(prefix, type, root));
+ element.setAttribute(TypeUtil.createTypeAttribute(prefix, type, root));
}
/**
@@ -530,27 +528,6 @@
}
}
- static Attribute createTypeAttribute(String prefix, Type type, Element root) {
- String ns = type.getSchemaType().getNamespaceURI();
- if (!ns.equals(root.getAttributeValue("targetNamespace"))
- && !ns.equals(SOAPConstants.XSD)) {
- //find import statement
- List<Element> l = CastUtils.cast(root.getChildren("import",
- Namespace.getNamespace(SOAPConstants.XSD)));
- boolean found = false;
- for (Element e : l) {
- if (ns.equals(e.getAttributeValue("namespace"))) {
- found = true;
- }
- }
- if (!found) {
- Element element = new Element("import", SOAPConstants.XSD_PREFIX, SOAPConstants.XSD);
- root.addContent(0, element);
- element.setAttribute("namespace", ns);
- }
- }
- return new Attribute("type", prefix + ':' + type.getSchemaType().getLocalPart());
- }
private String getNameWithPrefix(Element root, String nameNS, String localName) {
if (!nameNS.equals(getSchemaType().getNamespaceURI())) {
String prefix = NamespaceHelper.getUniquePrefix((Element)root.getParent(), nameNS);
@@ -590,10 +567,10 @@
Element root) {
if (type.isAbstract()) {
element.setAttribute(new Attribute("name", nameWithPrefix));
- element.setAttribute(createTypeAttribute(prefix, type, root));
+ element.setAttribute(TypeUtil.createTypeAttribute(prefix, type, root));
int minOccurs = getTypeInfo().getMinOccurs(name);
- if (minOccurs != 1) {
+ if (minOccurs == 0) {
element.setAttribute(new Attribute("minOccurs", Integer.valueOf(minOccurs).toString()));
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java Wed Jan 23 13:53:17 2008
@@ -212,10 +212,9 @@
String prefix = NamespaceHelper.getUniquePrefix((Element)root, type.getSchemaType()
.getNamespaceURI());
- String typeName = prefix + ":" + type.getSchemaType().getLocalPart();
element.setAttribute(new Attribute("name", name.getLocalPart()));
- element.setAttribute(new Attribute("type", typeName));
+ element.setAttribute(TypeUtil.createTypeAttribute(prefix, type, root));
element.setAttribute(new Attribute("minOccurs", "0"));
element.setAttribute(new Attribute("maxOccurs", "1"));
Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Wed Jan 23 13:53:17 2008
@@ -321,14 +321,27 @@
final List<DOMResult> results = new ArrayList<DOMResult>();
context.generateSchema(new SchemaOutputResolver() {
+ private Map<String, String> builtIns = new HashMap<String, String>();
+ {
+ builtIns.put("http://www.w3.org/2005/02/addressing/wsdl",
+ "classpath:/schemas/wsdl/ws-addr-wsdl.xsd");
+ builtIns.put("http://www.w3.org/2005/08/addressing",
+ "classpath:/schemas/wsdl/ws-addr.xsd");
+ builtIns.put("http://schemas.xmlsoap.org/ws/2005/02/rm",
+ "classpath:/schemas/wsdl/wsrm.xsd");
+ builtIns.put("http://www.w3.org/2005/05/xmlmime",
+ "classpath:/schemas/wsdl/ws-addr.xsd");
+ }
+
@Override
public Result createOutput(String ns, String file) throws IOException {
DOMResult result = new DOMResult();
- result.setSystemId(file);
- // Don't include WS-Addressing bits
- if ("http://www.w3.org/2005/02/addressing/wsdl".equals(ns)) {
+
+ if (builtIns.containsKey(ns)) {
+ result.setSystemId(builtIns.get(ns));
return result;
}
+ result.setSystemId(file);
results.add(result);
return result;
}
Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/MtoMTest.java Wed Jan 23 13:53:17 2008
@@ -56,7 +56,7 @@
public void before() throws Exception {
setupRhino("mtom-service-endpoint",
"/org/apache/cxf/javascript/MtoMTests.js",
- true);
+ false);
implementor = (MtoMImpl)rawImplementor;
implementor.reset();
}
Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanNoDataHandler.java Wed Jan 23 13:53:17 2008
@@ -22,14 +22,11 @@
import java.io.UnsupportedEncodingException;
import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
/**
*
*/
-@XmlSeeAlso(Base64Binary.class)
@XmlType(namespace = "uri:org.apache.cxf.javascript.testns")
public class MtoMParameterBeanNoDataHandler {
private String ordinary;
@@ -43,11 +40,17 @@
}
@XmlMimeType("text/plain;charset=utf-8")
- @XmlSchemaType(namespace = "http://www.w3.org/2005/05/xmlmime", name = "base64Binary")
public byte[] getNotXml10() throws UnsupportedEncodingException {
return notXml10.getBytes("utf-8");
}
-
+ public void setNotXml10(byte[] notXml10) {
+ try {
+ this.notXml10 = new String(notXml10, "utf-8");
+ } catch (UnsupportedEncodingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
public void setNotXml10(String notXml10) {
this.notXml10 = notXml10;
}
Modified: incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanWithDataHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanWithDataHandler.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanWithDataHandler.java (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/MtoMParameterBeanWithDataHandler.java Wed Jan 23 13:53:17 2008
@@ -21,14 +21,12 @@
import javax.activation.DataHandler;
import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
+
/**
*
*/
-@XmlSeeAlso(Base64Binary.class)
@XmlType(namespace = "uri:org.apache.cxf.javascript.testns")
public class MtoMParameterBeanWithDataHandler {
private String ordinary;
@@ -42,7 +40,6 @@
}
@XmlMimeType("text/plain;charset=utf-8")
- @XmlSchemaType(namespace = "http://www.w3.org/2005/05/xmlmime", name = "base64Binary")
public DataHandler getNotXml10() {
return notXml10;
}
Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConstants.java Wed Jan 23 13:53:17 2008
@@ -55,4 +55,9 @@
public static final String JMS_REBASED_REPLY_TO = "org.apache.cxf.jms.server.replyto";
+
+ private JMSConstants() {
+ //utility class
+ }
+
}
Modified: incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MetadataConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MetadataConstants.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MetadataConstants.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MetadataConstants.java Wed Jan 23 13:53:17 2008
@@ -21,8 +21,13 @@
import javax.xml.namespace.QName;
-public class MetadataConstants {
+public final class MetadataConstants {
public static final QName MTOM_ASSERTION_QNAME =
new QName("http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmimeserialization",
"OptimizedMimeSerialization");
+
+
+ private MetadataConstants() {
+ //utility class
+ }
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/HeaderTesterUtil.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/HeaderTesterUtil.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/HeaderTesterUtil.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/HeaderTesterUtil.java Wed Jan 23 13:53:17 2008
@@ -38,4 +38,9 @@
public static final String INOUT_REQUEST_TYPE_IN = "inout request type in";
public static final String INOUT_REQUEST_TYPE_OUT = "inout request type out";
static final String EX_STRING = "CXF RUNTIME EXCEPTION";
+
+
+ private HeaderTesterUtil() {
+ //utility class
+ }
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/test_import.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/test_import.xsd?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/test_import.xsd (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/test_import.xsd Wed Jan 23 13:53:17 2008
@@ -18,11 +18,11 @@
under the License.
-->
<schema targetNamespace="http://apache.org/hello_world_soap_http_import"
-xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://schemas.iona.com/tests/schema_parser_import"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://apache.org/hello_world_soap_http_import"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<complexType name="SimpleStruct">
<sequence>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/I18NStrings.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/I18NStrings.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/I18NStrings.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/I18NStrings.java Wed Jan 23 13:53:17 2008
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.systest.type_test;
-public class I18NStrings {
+public final class I18NStrings {
public static final String JAP_SIMPLE_STRING;
public static final String CHINESE_COMPLEX_STRING;
@@ -174,5 +174,8 @@
CHINESE_COMPLEX_STRING = tmp;
}
+ private I18NStrings() {
+ //utility class
+ }
}
Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/inherit.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/inherit.wsdl?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/inherit.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/inherit.wsdl Wed Jan 23 13:53:17 2008
@@ -58,6 +58,7 @@
xmlns:x1="http://apache.org/cxf/tests/inherit/types"
xmlns:x2="http://apache.org/cxf/tests/inherit/objects"
elementFormDefault="qualified">
+ <import namespace="http://apache.org/cxf/tests/inherit/objects"/>
<complexType name="ObjectInfo">
<sequence>
<element name="baseObject" type="x2:BaseType"/>
Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb_element_test.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb_element_test.wsdl?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb_element_test.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/jaxb_element_test.wsdl Wed Jan 23 13:53:17 2008
@@ -23,14 +23,14 @@
targetNamespace="http://cxf.apache.org/jaxb_element_test/">
<wsdl:types>
<xsd:schema targetNamespace="http://cxf.apache.org/jaxb_element_test/">
- <xsd:element name="NewOperationResponse" type="xsd:string">
+ <xsd:element name="NewOperationResponse">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="out" minOccurs="0" nillable="true" type="xsd:string" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
- <xsd:element name="NewOperation" type="xsd:string">
+ <xsd:element name="NewOperation">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="in" minOccurs="0" nillable="true" type="xsd:string" />
Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/string_array_test.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/string_array_test.wsdl?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/string_array_test.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/string_array_test.wsdl Wed Jan 23 13:53:17 2008
@@ -1,83 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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.
+ 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.
-->
<wsdl:definitions name="HelloWorld"
- targetNamespace="http://apache.org/stringarray"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/stringarray"
- xmlns:x1="http://apache.org/stringarray/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <wsdl:types>
- <schema targetNamespace="http://apache.org/stringarray/types"
- xmlns="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified">
- <simpleType name="StringListType">
- <list itemType="string" />
- </simpleType>>
- </schema>
- </wsdl:types>
-
- <wsdl:message name="StringListRequest">
- <wsdl:part type="x1:StringListType" name="in"/>
- </wsdl:message>
-
- <wsdl:message name="IntegerRangeResponse">
- <wsdl:part type="x1:StringListType" name="out"/>
- </wsdl:message>
-
- <wsdl:portType name="StringListTest">
- <wsdl:operation name="StringListTest">
- <wsdl:input message="tns:StringListRequest"
- name="stringListRequest" />
- <wsdl:output message="tns:IntegerRangeResponse"
- name="integerRangeResponse" />
- </wsdl:operation>
-
- </wsdl:portType>
-
- <wsdl:binding name="Test_SOAPBinding_RPCLit"
- type="tns:StringListTest">
-
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http" />
-
- <wsdl:operation name="StringListTest">
- <soap:operation soapAction="" style="rpc" />
- <wsdl:input>
- <soap:body namespace="http://apache.org/stringarray"
- use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body namespace="http://apache.org/stringarray"
- use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="SOAPServiceRPCLit">
- <wsdl:port binding="tns:Test_SOAPBinding_RPCLit"
- name="SoapPortRPCLit">
- <soap:address
- location="http://localhost:9992/SOAPServiceRPCLit/SoapPort" />
- </wsdl:port>
- </wsdl:service>
+ targetNamespace="http://apache.org/stringarray"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://apache.org/stringarray"
+ xmlns:x1="http://apache.org/stringarray/types"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <wsdl:types>
+ <schema targetNamespace="http://apache.org/stringarray/types"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+ <simpleType name="StringListType">
+ <list itemType="string" />
+ </simpleType>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="StringListRequest">
+ <wsdl:part type="x1:StringListType" name="in"/>
+ </wsdl:message>
+
+ <wsdl:message name="IntegerRangeResponse">
+ <wsdl:part type="x1:StringListType" name="out"/>
+ </wsdl:message>
+
+ <wsdl:portType name="StringListTest">
+ <wsdl:operation name="StringListTest">
+ <wsdl:input message="tns:StringListRequest"
+ name="stringListRequest" />
+ <wsdl:output message="tns:IntegerRangeResponse"
+ name="integerRangeResponse" />
+ </wsdl:operation>
+
+ </wsdl:portType>
+
+ <wsdl:binding name="Test_SOAPBinding_RPCLit"
+ type="tns:StringListTest">
+
+ <soap:binding style="rpc"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+
+ <wsdl:operation name="StringListTest">
+ <soap:operation soapAction="" style="rpc" />
+ <wsdl:input>
+ <soap:body namespace="http://apache.org/stringarray"
+ use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://apache.org/stringarray"
+ use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="SOAPServiceRPCLit">
+ <wsdl:port binding="tns:Test_SOAPBinding_RPCLit"
+ name="SoapPortRPCLit">
+ <soap:address
+ location="http://localhost:9992/SOAPServiceRPCLit/SoapPort" />
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java?rev=614696&r1=614695&r2=614696&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java (original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java Wed Jan 23 13:53:17 2008
@@ -52,7 +52,7 @@
}
}
- private boolean isVerbose() {
+ public boolean isVerbose() {
return isSet(new String[] {"-V", "-verbose"});
}