Skip to content

Commit b040abb

Browse files
gregturngregturn
committed
Merge branch 'SWS-920' of https://github.com/marschall/spring-ws into marschall-SWS-920
2 parents de1e640 + 80bd845 commit b040abb

File tree

11 files changed

+41
-29
lines changed

11 files changed

+41
-29
lines changed

‎build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ configure(allprojects) {
6565
ext.javadocLinks = [
6666
"http://docs.oracle.com/javase/7/docs/api/",
6767
"http://docs.oracle.com/javaee/6/api/",
68-
"http://jackson.codehaus.org/1.9.12/javadoc/",
69-
"http://fasterxml.github.com/jackson-core/javadoc/2.2.2/",
68+
"http://docs.spring.io/spring/docs/current/javadoc-api/",
69+
"https://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/",
70+
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
71+
"http://fasterxml.github.com/jackson-core/javadoc/2.2.0/",
7072
] as String[]
7173

7274
}

‎spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ public final Source invoke(Source request) throws Exception {
7373
* Returns the payload element of the given source.
7474
*
7575
* <p>Default implementation checks whether the source is a {@link javax.xml.transform.dom.DOMSource}, and uses a
76-
* {@link org.jdom.input.DOMBuilder} to create a JDOM {@link org.jdom.Element}. In all other cases, or when
76+
* {@link org.dom4j.io.DOMReader} to create a JDOM {@link org.dom4j.Element}. In all other cases, or when
7777
* {@linkplain #setAlwaysTransform(boolean) alwaysTransform} is {@code true}, the source is transformed into a
78-
* {@link org.jdom.transform.JDOMResult}, which is more expensive. If the passed source is {@code null}, {@code
78+
* {@link org.dom4j.io.DocumentResult}, which is more expensive. If the passed source is {@code null}, {@code
7979
* null} is returned.
8080
*
8181
* @param source the source to return the root element of; can be {@code null}

‎spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public ActionCallback(URI action, AddressingVersion version) {
114114
*
115115
* @param action the value of the action property
116116
* @param version the WS-Addressing version to use
117-
* @param action the value of the destination property
117+
* @param to the value of the destination property
118118
*/
119119
public ActionCallback(URI action, AddressingVersion version, URI to) {
120120
Assert.notNull(action, "'action' must not be null");
@@ -127,7 +127,6 @@ public ActionCallback(URI action, AddressingVersion version, URI to) {
127127

128128
/**
129129
* Returns the WS-Addressing version
130-
* @return
131130
*/
132131
public AddressingVersion getVersion() {
133132
return version;

‎spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static void removeContents(OMContainer container) {
115115
* @param envelope the SOAP envelope to be converted
116116
* @return the converted document
117117
* @throws IllegalArgumentException in case of errors
118-
* @see org.apache.rampart.util.Axis2Util.getDocumentFromSOAPEnvelope(SOAPEnvelope, boolean)
118+
* @see org.apache.rampart.util.Axis2Util#getDocumentFromSOAPEnvelope(SOAPEnvelope, boolean)
119119
*/
120120
public static Document toDocument(SOAPEnvelope envelope) {
121121
try {
@@ -144,7 +144,7 @@ public static Document toDocument(SOAPEnvelope envelope) {
144144
* @param document the document to be converted
145145
* @return the converted envelope
146146
* @throws IllegalArgumentException in case of errors
147-
* @see org.apache.rampart.util.Axis2Util.getSOAPEnvelopeFromDOMDocument(Document, boolean)
147+
* @see org.apache.rampart.util.Axis2Util#getSOAPEnvelopeFromDOMDocument(Document, boolean)
148148
*/
149149
public static SOAPEnvelope toEnvelope(Document document) {
150150
try {

‎spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@
3737
* method parameters must be annotated with {@link SoapHeader} to indicate the SOAP header to resolve. This resolver
3838
* supports simple {@link SoapHeaderElement} parameters and {@link List} parameters for elements that appear multiple
3939
* times in the same SOAP header. </p> The following snippet shows an example of supported declarations.
40-
* <pre>
41-
* {@code
40+
* <pre><code>
4241
* public void soapHeaderElement(@SoapHeader("{http://springframework.org/ws}header") SoapHeaderElement element)
4342
*
44-
* <p>public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List<SoapHeaderElement>
45-
* elements)
46-
* </pre>
43+
* public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List&lt;SoapHeaderElement&gt; elements)
44+
* </code></pre>
4745
*
4846
* @author Tareq Abedrabbo
4947
* @author Arjen Poutsma

‎spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.http.client.ClientHttpResponse;
3030
import org.springframework.util.Assert;
3131
import org.springframework.ws.WebServiceMessage;
32+
import org.springframework.ws.transport.WebServiceConnection;
3233

3334
/**
3435
* Implementation of the {@link WebServiceConnection} interface that is based on the

‎spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractAnnotationConfigMessageDispatcherServletInitializer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.springframework.context.annotation.Configuration;
2020
import org.springframework.util.ObjectUtils;
21+
import org.springframework.web.WebApplicationInitializer;
2122
import org.springframework.web.context.WebApplicationContext;
2223
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
2324
import org.springframework.web.servlet.support.AbstractDispatcherServletInitializer;

‎spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/AbstractMessageDispatcherServletInitializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ protected String getServletName() {
122122

123123
/**
124124
* Specify the servlet mapping(s) for the {@code MessageDispatcherServlet}.
125-
* Defaults to {@link #DEFAULT_SERVLET_MAPPING}.
125+
* Defaults to {@link #DEFAULT_SERVLET_MAPPINGS}.
126126
* @see #registerMessageDispatcherServlet(ServletContext)
127127
*/
128128
protected String[] getServletMappings() {

‎spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* <p>Just a marker interface at the moment.
2525
*
2626
* @author Arjen Poutsma
27-
* @see Wsdl11DefinitionBuilder
27+
* @see DefaultWsdl11Definition
2828
* @since 1.0.0
2929
*/
3030
public interface Wsdl11Definition extends WsdlDefinition {

‎spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,28 @@
6565
*
6666
* <p>Valid <strong>validation</strong> actions are:
6767
*
68-
* <blockquote><table> <tr><th>Validation action</th><th>Description</th></tr> <tr><td>{@code UsernameToken}</td><td>Validates
69-
* username token</td></tr> <tr><td>{@code Timestamp}</td><td>Validates the timestamp</td></tr>
70-
* <tr><td>{@code Encrypt}</td><td>Decrypts the message</td></tr> <tr><td>{@code Signature}</td><td>Validates
71-
* the signature</td></tr> <tr><td>{@code NoSecurity}</td><td>No action performed</td></tr> </table></blockquote>
68+
* <blockquote>
69+
* <table>
70+
* <tr><th>Validation action</th><th>Description</th></tr>
71+
* <tr><td>{@code UsernameToken}</td><td>Validates username token</td></tr>
72+
* <tr><td>{@code Timestamp}</td><td>Validates the timestamp</td></tr>
73+
* <tr><td>{@code Encrypt}</td><td>Decrypts the message</td></tr>
74+
* <tr><td>{@code Signature}</td><td>Validates the signature</td></tr>
75+
* <tr><td>{@code NoSecurity}</td><td>No action performed</td></tr>
76+
* </table></blockquote>
7277
* <p>
73-
* <strong>Securement</strong> actions are: <blockquote><table> <tr><th>Securement action</th><th>Description</th></tr>
74-
* <tr><td>{@code UsernameToken</td>}<td>Adds a username token</td></tr> <tr><td>{@code UsernameTokenSignature</td>}<td>Adds
75-
* a username token and a signature username token secret key</td></tr> <tr><td>{@code Timestamp</td>}<td>Adds a
76-
* timestamp</td></tr> <tr><td>{@code Encrypt</td>}<td>Encrypts the response</td></tr>
77-
* <tr><td>{@code Signature</td>}<td>Signs the response</td></tr> <tr><td>{@code NoSecurity</td>}<td>No action
78-
* performed</td></tr> </table></blockquote>
78+
* <strong>Securement</strong> actions are:
79+
*
80+
* <blockquote>
81+
* <table>
82+
* <tr><th>Securement action</th><th>Description</th></tr>
83+
* <tr><td>{@code UsernameToken}</td><td>Adds a username token</td></tr>
84+
* <tr><td>{@code UsernameTokenSignature}</td><td>Adds a username token and a signature username token secret key</td></tr>
85+
* <tr><td>{@code Timestamp}</td><td>Adds a timestamp</td></tr>
86+
* <tr><td>{@code Encrypt}</td><td>Encrypts the response</td></tr>
87+
* <tr><td>{@code Signature}</td><td>Signs the response</td></tr>
88+
* <tr><td>{@code NoSecurity}</td><td>No action performed</td></tr>
89+
* </table></blockquote>
7990
*
8091
* <p>The order of the actions that the client performed to secure the messages is significant and is enforced by the
8192
* interceptor.
@@ -194,11 +205,11 @@ public void setSecurementEncryptionKeyTransportAlgorithm(String securementEncryp
194205
/**
195206
* Property to define which parts of the request shall be encrypted.
196207
*
197-
* <p>The value of this property is a list of semi-colon separated element names that identify the elements to encrypt.
208+
* <p>The value of this property is a list of semicolon separated element names that identify the elements to encrypt.
198209
* An encryption mode specifier and a namespace identification, each inside a pair of curly brackets, may precede
199210
* each element name.
200211
*
201-
* <p>The encryption mode specifier is either {@code{Content}} or {@code{Element}}. Please refer to the W3C
212+
* <p>The encryption mode specifier is either {@code {Content}} or {@code {Element}}. Please refer to the W3C
202213
* XML Encryption specification about the differences between Element and Content encryption. The encryption mode
203214
* defaults to {@code Content} if it is omitted. Example of a list:
204215
* <pre>
@@ -323,7 +334,7 @@ public void setSecurementSignatureKeyIdentifier(String securementSignatureKeyIde
323334
* sensitive string)
324335
*
325336
* <p>If there is no other element in the request with a local name of {@code Body} then the SOAP namespace
326-
* identifier can be empty ({@code{}}).
337+
* identifier can be empty ({@code {}}).
327338
*/
328339
public void setSecurementSignatureParts(String securementSignatureParts) {
329340
handler.setOption(WSHandlerConstants.SIGNATURE_PARTS, securementSignatureParts);

0 commit comments

Comments
 (0)