From 218c72253b52f9925f764ba56f1c17540c014f0b Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Thu, 16 Dec 2010 16:45:02 +0000 Subject: [PATCH] Minor fixes --- .../PayloadRootQNameEndpointMapping.java | 4 +++- .../mapping/SoapActionEndpointMapping.java | 4 +++- .../wsdl/wsdl11/DefaultWsdl11Definition.java | 24 ++++++++++++++----- .../ws/wsdl/wsdl11/provider/SoapProvider.java | 6 ++--- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java index 7f85429c..f8934fcd 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -43,7 +43,9 @@ import org.springframework.ws.server.endpoint.support.PayloadRootUtils; * @author Arjen Poutsma * @see org.springframework.xml.namespace.QNameEditor * @since 1.0.0 + * @deprecated as of Spring Web Services 2.0, in favor of {@link PayloadRootAnnotationMethodEndpointMapping}. */ +@Deprecated public class PayloadRootQNameEndpointMapping extends AbstractQNameEndpointMapping { private static TransformerFactory transformerFactory; diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java index 064ef6cc..4813459d 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -49,7 +49,9 @@ import org.springframework.ws.soap.server.SoapEndpointMapping; * * @author Arjen Poutsma * @since 1.0.0 + * @deprecated as of Spring Web Services 2.0, in favor of {@link SoapActionAnnotationMethodEndpointMapping}. */ +@Deprecated public class SoapActionEndpointMapping extends AbstractMapBasedEndpointMapping implements SoapEndpointMapping { private String[] actorsOrRoles; diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java index ed1cf001..b057e84b 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java @@ -1,11 +1,11 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 the original author or authors. * * Licensed 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 + * 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, @@ -87,7 +87,7 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe * Sets the single XSD schema to inline. Either this property, or {@link #setSchemaCollection(XsdSchemaCollection) * schemaCollection} must be set. */ - public void setSchema(final XsdSchema schema) { + public void setSchema(XsdSchema schema) { typesProvider.setSchema(schema); } @@ -122,12 +122,20 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe messagesProvider.setFaultSuffix(faultSuffix); } - /** Indicates whether a SOAP 1.1 binding should be created. */ + /** + * Indicates whether a SOAP 1.1 binding should be created. + *

+ * Defaults to true. + */ public void setCreateSoap11Binding(boolean createSoap11Binding) { soapProvider.setCreateSoap11Binding(createSoap11Binding); } - /** Indicates whether a SOAP 1.2 binding should be created. */ + /** + * Indicates whether a SOAP 1.2 binding should be created. + *

+ * Defaults to false. + */ public void setCreateSoap12Binding(boolean createSoap12Binding) { soapProvider.setCreateSoap12Binding(createSoap12Binding); } @@ -152,7 +160,11 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe soapProvider.setLocationUri(locationUri); } - /** Sets the service name. */ + /** + * Sets the service name. + *

+ * Defaults to the port type name, with the suffix {@code Service} appended to it. + */ public void setServiceName(String serviceName) { soapProvider.setServiceName(serviceName); this.serviceName = serviceName; diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java index 2b76f463..23802332 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java @@ -1,11 +1,11 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 the original author or authors. * * Licensed 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 + * 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, @@ -25,7 +25,7 @@ import javax.wsdl.WSDLException; * SOAP 1.2. Delegates to {@link Soap11Provider} and {@link Soap12Provider}. *

* By setting the {@link #setSoapActions(java.util.Properties) soapActions} property, the SOAP Actions defined in the - * resulting WSDL can be set. Additionaly, the transport uri can be changed from the default HTTP transport by using the + * resulting WSDL can be set. Additionally, the transport uri can be changed from the default HTTP transport by using the * {@link #setTransportUri(String) transportUri} property. *

* The {@link #setCreateSoap11Binding(boolean) createSoap11} and {@link #setCreateSoap12Binding(boolean) createSoap12}