You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/05/15 13:38:29 UTC
svn commit: r1679546 - in /webservices/wss4j/branches/2_0_x-fixes:
ws-security-common/src/main/java/org/apache/wss4j/common/ext/
ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/
ws-security-common/src/main/java/org/apache/wss4j/common...
Author: coheigea
Date: Fri May 15 11:38:28 2015
New Revision: 1679546
URL: http://svn.apache.org/r1679546
Log:
Some javadoc fixes
Conflicts:
ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
Modified:
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentRequestCallback.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentResultCallback.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java
webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentRequestCallback.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentRequestCallback.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentRequestCallback.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentRequestCallback.java Fri May 15 11:38:28 2015
@@ -28,8 +28,6 @@ public class AttachmentRequestCallback i
/**
* The requested attachment which will be secured. If null all attachments are requested
- *
- * @return
*/
public String getAttachmentId() {
return attachmentId;
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentResultCallback.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentResultCallback.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentResultCallback.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentResultCallback.java Fri May 15 11:38:28 2015
@@ -27,8 +27,6 @@ public class AttachmentResultCallback im
/**
* The requested attachment which will be secured. If null all attachments are requested
- *
- * @return
*/
public String getAttachmentId() {
return attachmentId;
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java Fri May 15 11:38:28 2015
@@ -120,7 +120,6 @@ public class KerberosContext {
/**
* Checks if this context instance is already destroyed.
- * @return
*/
public boolean isDisposed() {
return disposed;
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java Fri May 15 11:38:28 2015
@@ -59,7 +59,7 @@ public class AudienceRestrictionBean {
/**
* Set the audienceURI instance
*
- * @param audienceURI the audienceURI instance to set
+ * @param audienceURIs the audienceURI instances to set
*/
public void setAudienceURIs(List<String> audienceURIs) {
this.audienceURIs.clear();
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java Fri May 15 11:38:28 2015
@@ -78,7 +78,7 @@ public class SpnegoTokenContext {
* @param jaasLoginModuleName the JAAS Login Module name to use
* @param callbackHandler a CallbackHandler instance to retrieve a password (optional)
* @param serviceName the desired Kerberized service
- * @param serviceNameForm
+ * @param isUsernameServiceNameForm
* @throws WSSecurityException
*/
public void retrieveServiceTicket(
@@ -97,7 +97,7 @@ public class SpnegoTokenContext {
* @param jaasLoginModuleName the JAAS Login Module name to use
* @param callbackHandler a CallbackHandler instance to retrieve a password (optional)
* @param serviceName the desired Kerberized service
- * @param serviceNameForm
+ * @param isUsernameServiceNameForm
* @param requestCredDeleg Whether to request credential delegation or not
* @param delegationCredential The delegation credential to use
* @throws WSSecurityException
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java Fri May 15 11:38:28 2015
@@ -133,7 +133,6 @@ public class Loader {
* algorithm used to find the resource is given in getResource()
*
* @param resourceName The name of the resource to load
- * @param callingClass The Class object of the calling object
*/
public static InputStream getResourceAsStream(String resourceName) {
URL url = getResource(resourceName);
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java Fri May 15 11:38:28 2015
@@ -74,7 +74,7 @@ public class WSSecSignatureBase extends
* @param wsDocInfo The WSDocInfo object to store protection elements in
* @param signatureFactory The XMLSignature object
* @param secHeader The Security Header
- * @param wssConfig The WSSConfig
+ * @param addInclusivePrefixes Whether to add inclusive prefixes or not
* @param digestAlgo The digest algorithm to use
* @throws WSSecurityException
*/
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java Fri May 15 11:38:28 2015
@@ -1225,7 +1225,6 @@ public class EncDecryptionTest extends A
*/
/* Not spec conform and therefore not supported!:
- @Test
public void testEncDecryptionKeyIdentifierBinarySecurityTokenEmbedded() throws Exception {
ByteArrayOutputStream baos;
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java Fri May 15 11:38:28 2015
@@ -118,7 +118,6 @@ public class VulnerabliltyVectorsTest ex
/*
Todo correct this test.
- @Test
public void testRecursiveKeyReferencesDOS2() throws Exception {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java?rev=1679546&r1=1679545&r2=1679546&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java (original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/StAX2DOM.java Fri May 15 11:38:28 2015
@@ -150,13 +150,6 @@ public class StAX2DOM {
return recordLoc;
}
- /**
- * @param parent
- * @param reader
- * @return
- * @throws javax.xml.stream.XMLStreamException
- *
- */
static Element startElement(Document doc,
Node parent,
XMLStreamReader reader,