Skip to content

Commit 4f3ca4b

Browse files
poutsmapoutsma
committed
Added @SInCE tag
1 parent f19d827 commit 4f3ca4b

19 files changed

+64
-73
lines changed

‎security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* are on.
3636
*
3737
* @author Arjen Poutsma
38+
* @since 1.0.0
3839
*/
3940
public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInterceptor {
4041

‎security/src/main/java/org/springframework/ws/soap/security/WsSecurityException.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* and validation.
2424
*
2525
* @author Arjen Poutsma
26+
* @since 1.0.0
2627
*/
2728
public abstract class WsSecurityException extends WebServiceException {
2829

‎security/src/main/java/org/springframework/ws/soap/security/WsSecuritySecurementException.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* fail. Failure to secure a message is usually not a fatal problem.
2424
*
2525
* @author Arjen Poutsma
26+
* @since 1.0.0
2627
*/
2728
public abstract class WsSecuritySecurementException extends WsSecurityException {
2829

‎security/src/main/java/org/springframework/ws/soap/security/WsSecurityValidationException.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* fail. Failure to validate a message is usually not a fatal problem.
2424
*
2525
* @author Arjen Poutsma
26+
* @since 1.0.0
2627
*/
2728
public abstract class WsSecurityValidationException extends WsSecurityException {
2829

‎security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.apache.commons.logging.Log;
2525
import org.apache.commons.logging.LogFactory;
26-
2726
import org.springframework.beans.factory.FactoryBean;
2827
import org.springframework.beans.factory.InitializingBean;
2928
import org.springframework.core.io.Resource;
@@ -37,6 +36,7 @@
3736
*
3837
* @author Arjen Poutsma
3938
* @see #setLocation(org.springframework.core.io.Resource)
39+
* @since 1.0.0
4040
*/
4141
public class KeyStoreFactoryBean implements FactoryBean, InitializingBean {
4242

@@ -55,7 +55,7 @@ public class KeyStoreFactoryBean implements FactoryBean, InitializingBean {
5555
/**
5656
* Sets the location of the key store to use. If this is not set, a new, empty key store will be used.
5757
*
58-
* @see KeyStore#load(java.io.InputStream, char[])
58+
* @see KeyStore#load(java.io.InputStream,char[])
5959
*/
6060
public void setLocation(Resource location) {
6161
this.location = location;
@@ -71,9 +71,7 @@ public void setPassword(String password) {
7171
}
7272
}
7373

74-
/**
75-
* Sets the provider of the key store to use. If this is not set, the default is used.
76-
*/
74+
/** Sets the provider of the key store to use. If this is not set, the default is used. */
7775
public void setProvider(String provider) {
7876
this.provider = provider;
7977
}

‎security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
* @see com.sun.xml.wss.impl.callback.XWSSCallback
5555
* @see org.springframework.ws.soap.saaj.SaajSoapMessageFactory
5656
* @see <a href="https://xwss.dev.java.net/">XWSS</a>
57+
* @since 1.0.0
5758
*/
5859
public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implements InitializingBean {
5960

@@ -85,9 +86,7 @@ public void setCallbackHandlers(CallbackHandler[] callbackHandler) {
8586
this.callbackHandler = new CallbackHandlerChain(callbackHandler);
8687
}
8788

88-
/**
89-
* Sets the policy configuration to use for XWSS. Required.
90-
*/
89+
/** Sets the policy configuration to use for XWSS. Required. */
9190
public void setPolicyConfiguration(Resource policyConfiguration) {
9291
this.policyConfiguration = policyConfiguration;
9392
}
@@ -100,7 +99,7 @@ public void afterPropertiesSet() throws Exception {
10099
InputStream is = null;
101100
try {
102101
if (logger.isInfoEnabled()) {
103-
logger.info("Loading policy configuration from from '" + policyConfiguration.getFilename() + "'");
102+
logger.info("Loading policy configuration from from '" + policyConfiguration + "'");
104103
}
105104
is = policyConfiguration.getInputStream();
106105
processor = processorFactory.createProcessorForSecurityConfiguration(is, callbackHandler);

‎security/src/main/java/org/springframework/ws/soap/security/xwss/callback/AbstractCallbackHandler.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.ws.soap.security.xwss.callback;
1818

1919
import java.io.IOException;
20-
2120
import javax.security.auth.callback.Callback;
2221
import javax.security.auth.callback.CallbackHandler;
2322
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -29,12 +28,11 @@
2928
* Abstract implementation of a <code>CallbackHandler</code>.
3029
*
3130
* @author Arjen Poutsma
31+
* @since 1.0.0
3232
*/
3333
public abstract class AbstractCallbackHandler implements CallbackHandler {
3434

35-
/**
36-
* Logger available to subclasses.
37-
*/
35+
/** Logger available to subclasses. */
3836
protected final Log logger = LogFactory.getLog(getClass());
3937

4038
protected AbstractCallbackHandler() {
@@ -52,8 +50,6 @@ public final void handle(Callback[] callbacks) throws IOException, UnsupportedCa
5250
}
5351
}
5452

55-
/**
56-
* Template method that should be implemented by subclasses.
57-
*/
53+
/** Template method that should be implemented by subclasses. */
5854
protected abstract void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException;
5955
}

‎security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CallbackHandlerChain.java‎

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

1919
import java.io.IOException;
2020
import java.security.cert.X509Certificate;
21-
2221
import javax.security.auth.callback.Callback;
2322
import javax.security.auth.callback.CallbackHandler;
2423
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -32,6 +31,7 @@
3231
* handler throws a <code>UnsupportedCallbackException</code>, the next handler is tried.
3332
*
3433
* @author Arjen Poutsma
34+
* @since 1.0.0
3535
*/
3636
public class CallbackHandlerChain extends AbstractCallbackHandler {
3737

‎security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.ws.soap.security.xwss.callback;
1818

1919
import java.io.IOException;
20-
2120
import javax.security.auth.callback.Callback;
2221
import javax.security.auth.callback.UnsupportedCallbackException;
2322

@@ -33,6 +32,7 @@
3332
* so you only need to override those you need.
3433
*
3534
* @author Arjen Poutsma
35+
* @since 1.0.0
3636
*/
3737
public class CryptographyCallbackHandler extends AbstractCallbackHandler {
3838

@@ -80,9 +80,9 @@ protected void handleCertificateValidationCallback(CertificateValidationCallback
8080
* implementation delegates to specific handling methods.
8181
*
8282
* @see #handlePrivateKeyRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
83-
* com.sun.xml.wss.impl.callback.DecryptionKeyCallback.PrivateKeyRequest)
83+
*com.sun.xml.wss.impl.callback.DecryptionKeyCallback.PrivateKeyRequest)
8484
* @see #handleSymmetricKeyRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
85-
* com.sun.xml.wss.impl.callback.DecryptionKeyCallback.SymmetricKeyRequest)
85+
*com.sun.xml.wss.impl.callback.DecryptionKeyCallback.SymmetricKeyRequest)
8686
*/
8787
protected final void handleDecryptionKeyCallback(DecryptionKeyCallback callback)
8888
throws IOException, UnsupportedCallbackException {
@@ -102,13 +102,13 @@ else if (callback.getRequest() instanceof DecryptionKeyCallback.SymmetricKeyRequ
102102
* <code>handleDecryptionKeyCallback()</code>. Default implementation delegates to specific handling methods.
103103
*
104104
* @see #handlePublicKeyBasedPrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
105-
* com.sun.xml.wss.impl.callback.SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest)
105+
*com.sun.xml.wss.impl.callback.SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest)
106106
* @see #handleX509CertificateBasedRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
107-
* com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509CertificateBasedRequest)
107+
*com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509CertificateBasedRequest)
108108
* @see #handleX509IssuerSerialBasedRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
109-
* com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509IssuerSerialBasedRequest)
109+
*com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509IssuerSerialBasedRequest)
110110
* @see #handleX509SubjectKeyIdentifierBasedRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
111-
* com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509SubjectKeyIdentifierBasedRequest)
111+
*com.sun.xml.wss.impl.callback.DecryptionKeyCallback.X509SubjectKeyIdentifierBasedRequest)
112112
*/
113113
protected final void handlePrivateKeyRequest(DecryptionKeyCallback callback,
114114
DecryptionKeyCallback.PrivateKeyRequest request)
@@ -180,7 +180,7 @@ protected void handleX509SubjectKeyIdentifierBasedRequest(DecryptionKeyCallback
180180
* <code>handleDecryptionKeyCallback()</code>. Default implementation delegates to specific handling methods.
181181
*
182182
* @see #handleAliasSymmetricKeyRequest(com.sun.xml.wss.impl.callback.DecryptionKeyCallback,
183-
* com.sun.xml.wss.impl.callback.DecryptionKeyCallback.AliasSymmetricKeyRequest)
183+
*com.sun.xml.wss.impl.callback.DecryptionKeyCallback.AliasSymmetricKeyRequest)
184184
*/
185185
protected final void handleSymmetricKeyRequest(DecryptionKeyCallback callback,
186186
DecryptionKeyCallback.SymmetricKeyRequest request)
@@ -215,9 +215,9 @@ protected void handleAliasSymmetricKeyRequest(DecryptionKeyCallback callback,
215215
* implementation delegates to specific handling methods.
216216
*
217217
* @see #handleSymmetricKeyRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
218-
* com.sun.xml.wss.impl.callback.EncryptionKeyCallback.SymmetricKeyRequest)
218+
*com.sun.xml.wss.impl.callback.EncryptionKeyCallback.SymmetricKeyRequest)
219219
* @see #handleX509CertificateRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
220-
* com.sun.xml.wss.impl.callback.EncryptionKeyCallback.X509CertificateRequest)
220+
*com.sun.xml.wss.impl.callback.EncryptionKeyCallback.X509CertificateRequest)
221221
*/
222222
protected final void handleEncryptionKeyCallback(EncryptionKeyCallback callback)
223223
throws IOException, UnsupportedCallbackException {
@@ -239,7 +239,7 @@ else if (callback.getRequest() instanceof EncryptionKeyCallback.X509CertificateR
239239
* <code>handleEncryptionKeyCallback()</code>. Default implementation delegates to specific handling methods.
240240
*
241241
* @see #handleAliasSymmetricKeyRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
242-
* com.sun.xml.wss.impl.callback.EncryptionKeyCallback.AliasSymmetricKeyRequest)
242+
*com.sun.xml.wss.impl.callback.EncryptionKeyCallback.AliasSymmetricKeyRequest)
243243
*/
244244
protected final void handleSymmetricKeyRequest(EncryptionKeyCallback callback,
245245
EncryptionKeyCallback.SymmetricKeyRequest request)
@@ -265,11 +265,11 @@ protected void handleAliasSymmetricKeyRequest(EncryptionKeyCallback callback,
265265
* <code>handleEncryptionKeyCallback()</code>. Default implementation delegates to specific handling methods.
266266
*
267267
* @see #handleAliasX509CertificateRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
268-
* com.sun.xml.wss.impl.callback.EncryptionKeyCallback.AliasX509CertificateRequest)
268+
*com.sun.xml.wss.impl.callback.EncryptionKeyCallback.AliasX509CertificateRequest)
269269
* @see #handleDefaultX509CertificateRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
270-
* com.sun.xml.wss.impl.callback.EncryptionKeyCallback.DefaultX509CertificateRequest)
270+
*com.sun.xml.wss.impl.callback.EncryptionKeyCallback.DefaultX509CertificateRequest)
271271
* @see #handlePublicKeyBasedRequest(com.sun.xml.wss.impl.callback.EncryptionKeyCallback,
272-
* com.sun.xml.wss.impl.callback.EncryptionKeyCallback.PublicKeyBasedRequest)
272+
*com.sun.xml.wss.impl.callback.EncryptionKeyCallback.PublicKeyBasedRequest)
273273
*/
274274
protected final void handleX509CertificateRequest(EncryptionKeyCallback callback,
275275
EncryptionKeyCallback.X509CertificateRequest request)
@@ -331,7 +331,7 @@ protected void handlePublicKeyBasedRequest(EncryptionKeyCallback callback,
331331
* implementation delegates to specific handling methods.
332332
*
333333
* @see #handlePrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
334-
* com.sun.xml.wss.impl.callback.SignatureKeyCallback.PrivKeyCertRequest)
334+
*com.sun.xml.wss.impl.callback.SignatureKeyCallback.PrivKeyCertRequest)
335335
*/
336336
protected final void handleSignatureKeyCallback(SignatureKeyCallback callback)
337337
throws IOException, UnsupportedCallbackException {
@@ -348,11 +348,11 @@ protected final void handleSignatureKeyCallback(SignatureKeyCallback callback)
348348
* <code>handleSignatureKeyCallback()</code>. Default implementation delegates to specific handling methods.
349349
*
350350
* @see #handleDefaultPrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
351-
* com.sun.xml.wss.impl.callback.SignatureKeyCallback.DefaultPrivKeyCertRequest)
351+
*com.sun.xml.wss.impl.callback.SignatureKeyCallback.DefaultPrivKeyCertRequest)
352352
* @see #handleAliasPrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
353-
* com.sun.xml.wss.impl.callback.SignatureKeyCallback.AliasPrivKeyCertRequest)
353+
*com.sun.xml.wss.impl.callback.SignatureKeyCallback.AliasPrivKeyCertRequest)
354354
* @see #handlePublicKeyBasedPrivKeyCertRequest(com.sun.xml.wss.impl.callback.SignatureKeyCallback,
355-
* com.sun.xml.wss.impl.callback.SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest)
355+
*com.sun.xml.wss.impl.callback.SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest)
356356
*/
357357
protected final void handlePrivKeyCertRequest(SignatureKeyCallback cb,
358358
SignatureKeyCallback.PrivKeyCertRequest request)
@@ -413,7 +413,7 @@ protected void handlePublicKeyBasedPrivKeyCertRequest(SignatureKeyCallback callb
413413
* Default implementation delegates to specific handling methods.
414414
*
415415
* @see #handleX509CertificateRequest(com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback,
416-
* com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509CertificateRequest)
416+
*com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509CertificateRequest)
417417
*/
418418
protected final void handleSignatureVerificationKeyCallback(SignatureVerificationKeyCallback callback)
419419
throws UnsupportedCallbackException, IOException {
@@ -432,11 +432,11 @@ protected final void handleSignatureVerificationKeyCallback(SignatureVerificatio
432432
* handling methods.
433433
*
434434
* @see #handlePublicKeyBasedRequest(com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback,
435-
* com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.PublicKeyBasedRequest)
435+
*com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.PublicKeyBasedRequest)
436436
* @see #handleX509IssuerSerialBasedRequest(com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback,
437-
* com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509IssuerSerialBasedRequest)
437+
*com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509IssuerSerialBasedRequest)
438438
* @see #handleX509SubjectKeyIdentifierBasedRequest(com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback,
439-
* com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509SubjectKeyIdentifierBasedRequest)
439+
*com.sun.xml.wss.impl.callback.SignatureVerificationKeyCallback.X509SubjectKeyIdentifierBasedRequest)
440440
*/
441441
protected final void handleX509CertificateRequest(SignatureVerificationKeyCallback callback,
442442
SignatureVerificationKeyCallback.X509CertificateRequest request)

‎security/src/main/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidator.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* in the JWSDP samples.
3030
*
3131
* @author Arjen Poutsma
32+
* @since 1.0.0
3233
*/
3334
public class DefaultTimestampValidator implements TimestampValidationCallback.TimestampValidator {
3435

0 commit comments

Comments
 (0)