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 2016/01/04 12:29:59 UTC
svn commit: r1722850 [1/4] - in /webservices/wss4j/branches/2_1_x-fixes:
build-tools/src/main/resources/
integration/src/test/java/org/apache/wss4j/integration/test/kerberos/
performance/src/test/java/org/apache/wss4j/performance/
ws-security-common/sr...
Author: coheigea
Date: Mon Jan 4 11:29:57 2016
New Revision: 1722850
URL: http://svn.apache.org/viewvc?rev=1722850&view=rev
Log:
More checkstyle work
Conflicts:
ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientExceptionAction.java
ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceExceptionAction.java
ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
Modified:
webservices/wss4j/branches/2_1_x-fixes/build-tools/src/main/resources/wss4j-checkstyle.xml
webservices/wss4j/branches/2_1_x-fixes/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
webservices/wss4j/branches/2_1_x-fixes/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/ConversationConstants.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContextAndServiceNameCallback.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/token/BinarySecurity.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
Modified: webservices/wss4j/branches/2_1_x-fixes/build-tools/src/main/resources/wss4j-checkstyle.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/build-tools/src/main/resources/wss4j-checkstyle.xml?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/build-tools/src/main/resources/wss4j-checkstyle.xml (original)
+++ webservices/wss4j/branches/2_1_x-fixes/build-tools/src/main/resources/wss4j-checkstyle.xml Mon Jan 4 11:29:57 2016
@@ -61,7 +61,6 @@
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
- <module name="TypeName"/>
<!-- Checks for imports -->
@@ -91,7 +90,6 @@
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
- <module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
@@ -104,7 +102,6 @@
<!-- Checks for blocks. You know, those {}'s -->
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
Modified: webservices/wss4j/branches/2_1_x-fixes/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java Mon Jan 4 11:29:57 2016
@@ -240,7 +240,7 @@ public class KerberosTest extends Abstra
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -393,7 +393,7 @@ public class KerberosTest extends Abstra
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -471,7 +471,7 @@ public class KerberosTest extends Abstra
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -544,7 +544,7 @@ public class KerberosTest extends Abstra
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -617,7 +617,7 @@ public class KerberosTest extends Abstra
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -692,7 +692,7 @@ public class KerberosTest extends Abstra
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java Mon Jan 4 11:29:57 2016
@@ -436,7 +436,7 @@ public abstract class AbstractTestBase e
}
if (doDebug) {
log.debug("WSS4JHandler: orginal SOAP request: ");
- log.debug(XMLUtils.PrettyDocumentToString(doc));
+ log.debug(XMLUtils.prettyDocumentToString(doc));
}
doSenderAction(doc, reqData, actions, isRequest);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java Mon Jan 4 11:29:57 2016
@@ -63,7 +63,8 @@ public class NamePasswordCallbackHandler
pwCallback.setPassword(password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
LOG.error("Unsupported callback type " + callbacks[i].getClass().getName());
- throw new UnsupportedCallbackException(callbacks[i], "Unsupported callback type " + callbacks[i].getClass().getName());
+ throw new UnsupportedCallbackException(callbacks[i], "Unsupported callback type "
+ + callbacks[i].getClass().getName());
}
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/WSS4JConstants.java Mon Jan 4 11:29:57 2016
@@ -170,7 +170,7 @@ public class WSS4JConstants {
// Localnames
//
public static final String WSSE_LN = "Security";
- public static final String THUMBPRINT ="ThumbprintSHA1";
+ public static final String THUMBPRINT = "ThumbprintSHA1";
public static final String SAML_ASSERTION_ID = "SAMLAssertionID";
public static final String SAML2_ASSERTION_ID = "SAMLID";
public static final String ENC_KEY_VALUE_TYPE = "EncryptedKey";
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java Mon Jan 4 11:29:57 2016
@@ -273,7 +273,7 @@ public abstract class CryptoBase impleme
List<?> l = path.getCertificates();
X509Certificate[] certs = new X509Certificate[l.size()];
int i = 0;
- for (Iterator<?> iterator = l.iterator(); iterator.hasNext(); ) {
+ for (Iterator<?> iterator = l.iterator(); iterator.hasNext();) {
certs[i++] = (X509Certificate) iterator.next();
}
return certs;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/ConversationConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/ConversationConstants.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/ConversationConstants.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/ConversationConstants.java Mon Jan 4 11:29:57 2016
@@ -21,6 +21,8 @@ package org.apache.wss4j.common.derivedK
import javax.xml.namespace.QName;
+import org.apache.wss4j.common.ext.WSSecurityException;
+
/**
* Class ConversationConstants
*/
@@ -178,6 +180,9 @@ public final class ConversationConstants
String P_SHA_1_2005_12 =
"http://docs.oasis-open.org/ws-sx/ws-secureconversation/200512/dk/p_sha1";
+
+ byte[] createKey(byte[] secret, byte[] seed, int offset, long length)
+ throws WSSecurityException;
}
public static String getWSCNs(int version) {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java Mon Jan 4 11:29:57 2016
@@ -35,7 +35,8 @@ public class WSSecurityException extends
* Fault codes defined in the WSS 1.1 spec under section 12, Error handling
*/
- public static final String NS_WSSE10 = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
+ public static final String NS_WSSE10 =
+ "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
/**
* An unsupported token was provided
@@ -112,8 +113,7 @@ public class WSSecurityException extends
MESSAGE_EXPIRED(WSSecurityException.MESSAGE_EXPIRED),
FAILED_ENCRYPTION(null), //Non standard error message
FAILED_SIGNATURE(null), //Non standard error message
- SECURITY_ERROR(WSSecurityException.SECURITY_ERROR)
- ;
+ SECURITY_ERROR(WSSecurityException.SECURITY_ERROR);
private QName qName;
Modified: webservices/wss4j/branches/2_1_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_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContext.java Mon Jan 4 11:29:57 2016
@@ -108,8 +108,7 @@ public class KerberosContext {
if (gssContext != null) {
try {
gssContext.dispose();
- }
- catch (GSSException e) {
+ } catch (GSSException e) {
LOG.error("Error disposing of the GSSContext", e);
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContextAndServiceNameCallback.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContextAndServiceNameCallback.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContextAndServiceNameCallback.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosContextAndServiceNameCallback.java Mon Jan 4 11:29:57 2016
@@ -43,11 +43,11 @@ public class KerberosContextAndServiceNa
this.serviceName = serviceName;
}
- public void setIsUsernameServiceNameForm(boolean isUsernameServiceNameForm){
+ public void setIsUsernameServiceNameForm(boolean isUsernameServiceNameForm) {
this.isUsernameServiceNameForm = isUsernameServiceNameForm;
}
- public boolean isUsernameServiceNameForm(){
+ public boolean isUsernameServiceNameForm() {
return this.isUsernameServiceNameForm;
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java Mon Jan 4 11:29:57 2016
@@ -21,8 +21,6 @@ package org.apache.wss4j.common.saml;
import java.io.InputStream;
-import javax.naming.ConfigurationException;
-
import org.opensaml.core.config.Configuration;
import org.opensaml.core.xml.config.XMLConfigurationException;
import org.opensaml.core.xml.config.XMLConfigurator;
@@ -34,7 +32,7 @@ import org.opensaml.core.xml.config.XMLO
public final class OpenSAMLBootstrap {
/** List of default configuration files. */
- private static final String[] xmlConfigs = {
+ private static final String[] XML_CONFIGS = {
"/default-config.xml",
"/schema-config.xml",
"/saml1-assertion-config.xml",
@@ -83,7 +81,7 @@ public final class OpenSAMLBootstrap {
Thread.currentThread().setContextClassLoader(XMLObjectProviderRegistrySupport.class.getClassLoader());
- for (String config : xmlConfigs) {
+ for (String config : XML_CONFIGS) {
//most are found in the Configuration.class classloader
InputStream ins = Configuration.class.getResourceAsStream(config);
if (ins == null) {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java Mon Jan 4 11:29:57 2016
@@ -79,14 +79,16 @@ public final class OpenSAMLUtil {
ConfigurationService.setConfiguration(configuration);
XMLObjectProviderRegistry providerRegistry = new XMLObjectProviderRegistry();
- configuration.register(XMLObjectProviderRegistry.class, providerRegistry, ConfigurationService.DEFAULT_PARTITION_NAME);
+ configuration.register(XMLObjectProviderRegistry.class, providerRegistry,
+ ConfigurationService.DEFAULT_PARTITION_NAME);
try {
OpenSAMLBootstrap.bootstrap();
SAMLConfiguration samlConfiguration = new SAMLConfiguration();
- configuration.register(SAMLConfiguration.class, samlConfiguration, ConfigurationService.DEFAULT_PARTITION_NAME);
+ configuration.register(SAMLConfiguration.class, samlConfiguration,
+ ConfigurationService.DEFAULT_PARTITION_NAME);
builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
marshallerFactory = XMLObjectProviderRegistrySupport.getMarshallerFactory();
@@ -95,7 +97,8 @@ public final class OpenSAMLUtil {
try {
configureParserPool(providerRegistry);
} catch (Throwable t) {
- LOG.warn("Unable to bootstrap the parser pool part of the opensaml library - some SAML operations may fail", t);
+ LOG.warn("Unable to bootstrap the parser pool part of the opensaml library "
+ + "- some SAML operations may fail", t);
}
samlEngineInitialized = true;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java Mon Jan 4 11:29:57 2016
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.security.auth.callback.CallbackHandler;
-import javax.xml.bind.ValidationException;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
@@ -643,7 +642,7 @@ public class SamlAssertionWrapper {
validator.validate(sig);
} catch (SignatureException ex) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex,
- "empty", new Object[] { "SAML signature validation failed"});
+ "empty", new Object[] {"SAML signature validation failed"});
}
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java Mon Jan 4 11:29:57 2016
@@ -37,7 +37,7 @@ public class AuthDecisionStatementBean {
/**
* enum representing the possible decision types as specified in the SAML spec
*/
- public enum Decision {PERMIT, INDETERMINATE, DENY}
+ public enum Decision { PERMIT, INDETERMINATE, DENY }
/**
* The decision rendered by the SAML authority with respect to the specified resource
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java Mon Jan 4 11:29:57 2016
@@ -206,8 +206,8 @@ public class SubjectBean {
if (subjectConfirmationMethod == null && that.subjectConfirmationMethod != null) {
return false;
- } else if (subjectConfirmationMethod != null &&
- !subjectConfirmationMethod.equals(that.subjectConfirmationMethod)) {
+ } else if (subjectConfirmationMethod != null
+ && !subjectConfirmationMethod.equals(that.subjectConfirmationMethod)) {
return false;
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java Mon Jan 4 11:29:57 2016
@@ -223,17 +223,14 @@ public final class SAML1ComponentBuilder
X509KeyInfoGeneratorFactory kiFactory = new X509KeyInfoGeneratorFactory();
KeyInfoBean.CERT_IDENTIFIER certIdentifier = keyInfo.getCertIdentifer();
switch (certIdentifier) {
- case X509_CERT: {
+ case X509_CERT:
kiFactory.setEmitEntityCertificate(true);
break;
- }
- case KEY_VALUE: {
+ case KEY_VALUE:
kiFactory.setEmitPublicKeyValue(true);
break;
- }
- case X509_ISSUER_SERIAL: {
+ case X509_ISSUER_SERIAL:
kiFactory.setEmitX509IssuerSerial(true);
- }
}
return kiFactory.newInstance().generate(keyInfoCredential);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java Mon Jan 4 11:29:57 2016
@@ -60,7 +60,9 @@ public class DefaultSpnegoServiceAction
GSSManager gssManager = GSSManager.getInstance();
Oid oid = new Oid("1.3.6.1.5.5.2");
- GSSName gssService = gssManager.createName(serviceName, isUsernameServiceNameForm ? GSSName.NT_USER_NAME : GSSName.NT_HOSTBASED_SERVICE);
+ GSSName gssService =
+ gssManager.createName(serviceName, isUsernameServiceNameForm ? GSSName.NT_USER_NAME
+ : GSSName.NT_HOSTBASED_SERVICE);
secContext = gssManager.createContext(gssService, oid, null, GSSContext.DEFAULT_LIFETIME);
return secContext.acceptSecContext(ticket, 0, ticket.length);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/token/BinarySecurity.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/token/BinarySecurity.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/token/BinarySecurity.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/token/BinarySecurity.java Mon Jan 4 11:29:57 2016
@@ -114,7 +114,7 @@ public class BinarySecurity {
LOG.debug("Trying to create a BinarySecurityToken via a null CallbackHandler");
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE);
}
- TokenElementCallback[] callback = new TokenElementCallback[] { new TokenElementCallback() };
+ TokenElementCallback[] callback = new TokenElementCallback[] {new TokenElementCallback()};
try {
callbackHandler.handle(callback);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java Mon Jan 4 11:29:57 2016
@@ -185,8 +185,7 @@ public final class AttachmentUtils {
int count = 0;
char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++) {
- if (SPACE != chars[i] &&
- HTAB != chars[i]) {
+ if (SPACE != chars[i] && HTAB != chars[i]) {
break;
}
count++;
@@ -208,10 +207,7 @@ public final class AttachmentUtils {
final char ch2 = text.charAt(i + 1);
final char ch3 = text.charAt(i + 2);
- if (CARRIAGE_RETURN == ch1 &&
- LINEFEED == ch2 &&
- (SPACE == ch3 ||
- HTAB == ch3)) {
+ if (CARRIAGE_RETURN == ch1 && LINEFEED == ch2 && (SPACE == ch3 || HTAB == ch3)) {
i += 2;
if (i >= text.length() - 3) {
@@ -344,11 +340,9 @@ public final class AttachmentUtils {
public static String quote(String text) {
char startChar = text.charAt(0);
char endChar = text.charAt(text.length() - 1);
- if (DOUBLE_QUOTE == startChar &&
- DOUBLE_QUOTE == endChar) {
+ if (DOUBLE_QUOTE == startChar && DOUBLE_QUOTE == endChar) {
return text;
- } else if (DOUBLE_QUOTE != startChar &&
- DOUBLE_QUOTE != endChar) {
+ } else if (DOUBLE_QUOTE != startChar && DOUBLE_QUOTE != endChar) {
return DOUBLE_QUOTE + text + DOUBLE_QUOTE;
} else if (DOUBLE_QUOTE != startChar) {
return DOUBLE_QUOTE + text;
@@ -488,13 +482,16 @@ public final class AttachmentUtils {
// For now, we only work with Block ciphers, so this will work.
// This should probably be put into the JCE mapper.
int ivLen = cipher.getBlockSize();
- if (XMLCipher.AES_128_GCM.equals(encAlgo) || XMLCipher.AES_192_GCM.equals(encAlgo) || XMLCipher.AES_256_GCM.equals(encAlgo)) {
+ if (XMLCipher.AES_128_GCM.equals(encAlgo) || XMLCipher.AES_192_GCM.equals(encAlgo)
+ || XMLCipher.AES_256_GCM.equals(encAlgo)) {
ivLen = 12;
}
byte[] ivBytes = new byte[ivLen];
- int read = 0;
- while ((read += super.in.read(ivBytes, read, ivLen - read)) != ivLen) ; //NOPMD
+ int read = super.in.read(ivBytes, 0, ivLen);
+ while (read != ivLen) {
+ read += super.in.read(ivBytes, read, ivLen - read);
+ }
IvParameterSpec iv = new IvParameterSpec(ivBytes);
try {
@@ -574,12 +571,11 @@ public final class AttachmentUtils {
//the encryption. If a header listed in the profile is present it MUST be included in
//the encryption. If a header is not listed in this profile, then it MUST NOT be
//included in the encryption.
- if (AttachmentUtils.MIME_HEADER_CONTENT_DESCRIPTION.equals(key) ||
- AttachmentUtils.MIME_HEADER_CONTENT_DISPOSITION.equals(key) ||
- AttachmentUtils.MIME_HEADER_CONTENT_ID.equals(key) ||
- AttachmentUtils.MIME_HEADER_CONTENT_LOCATION.equals(key) ||
- AttachmentUtils.MIME_HEADER_CONTENT_TYPE.equals(key)
- ) {
+ if (AttachmentUtils.MIME_HEADER_CONTENT_DESCRIPTION.equals(key)
+ || AttachmentUtils.MIME_HEADER_CONTENT_DISPOSITION.equals(key)
+ || AttachmentUtils.MIME_HEADER_CONTENT_ID.equals(key)
+ || AttachmentUtils.MIME_HEADER_CONTENT_LOCATION.equals(key)
+ || AttachmentUtils.MIME_HEADER_CONTENT_TYPE.equals(key)) {
iterator.remove();
outputStreamWriter.write(key);
outputStreamWriter.write(':');
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java Mon Jan 4 11:29:57 2016
@@ -94,130 +94,114 @@ public final class DOM2Writer {
int type = node.getNodeType();
switch (type) {
case Node.DOCUMENT_NODE:
- {
- Node child = node.getFirstChild();
- while (child != null) {
- print(child, namespaceStack, out, pretty, indent);
- child = child.getNextSibling();
- }
- break;
+ Node child = node.getFirstChild();
+ while (child != null) {
+ print(child, namespaceStack, out, pretty, indent);
+ child = child.getNextSibling();
}
+ break;
case Node.ELEMENT_NODE:
- {
- namespaceStack.push();
- if (pretty) {
- for (int i = 0; i < indent; i++) {
- out.print(' ');
- }
+ namespaceStack.push();
+ if (pretty) {
+ for (int i = 0; i < indent; i++) {
+ out.print(' ');
}
- out.print('<' + node.getNodeName());
- String elPrefix = node.getPrefix();
- String elNamespaceURI = node.getNamespaceURI();
- if (elPrefix != null &&
- elNamespaceURI != null &&
- elPrefix.length() > 0) {
+ }
+ out.print('<' + node.getNodeName());
+ String elPrefix = node.getPrefix();
+ String elNamespaceURI = node.getNamespaceURI();
+ if (elPrefix != null && elNamespaceURI != null && elPrefix.length() > 0) {
+ boolean prefixIsDeclared = false;
+ try {
+ String namespaceURI = namespaceStack.getNamespaceURI(elPrefix);
+ if (elNamespaceURI.equals(namespaceURI)) {
+ prefixIsDeclared = true;
+ }
+ } catch (IllegalArgumentException e) { //NOPMD
+ //
+ }
+ if (!prefixIsDeclared) {
+ printNamespaceDecl(node, namespaceStack, out);
+ }
+ }
+ NamedNodeMap attrs = node.getAttributes();
+ int len = (attrs != null) ? attrs.getLength() : 0;
+ for (int i = 0; i < len; i++) {
+ Attr attr = (Attr) attrs.item(i);
+ out.print(' ' + attr.getNodeName() + "=\"");
+ normalize(attr.getValue(), out);
+ out.print('\"');
+ String attrPrefix = attr.getPrefix();
+ String attrNamespaceURI = attr.getNamespaceURI();
+ if (attrPrefix != null && attrNamespaceURI != null) {
boolean prefixIsDeclared = false;
try {
- String namespaceURI = namespaceStack.getNamespaceURI(elPrefix);
- if (elNamespaceURI.equals(namespaceURI)) {
+ String namespaceURI = namespaceStack.getNamespaceURI(attrPrefix);
+ if (attrNamespaceURI.equals(namespaceURI)) {
prefixIsDeclared = true;
}
} catch (IllegalArgumentException e) { //NOPMD
//
}
if (!prefixIsDeclared) {
- printNamespaceDecl(node, namespaceStack, out);
+ printNamespaceDecl(attr, namespaceStack, out);
}
}
- NamedNodeMap attrs = node.getAttributes();
- int len = (attrs != null) ? attrs.getLength() : 0;
- for (int i = 0; i < len; i++) {
- Attr attr = (Attr) attrs.item(i);
- out.print(' ' + attr.getNodeName() + "=\"");
- normalize(attr.getValue(), out);
- out.print('\"');
- String attrPrefix = attr.getPrefix();
- String attrNamespaceURI = attr.getNamespaceURI();
- if (attrPrefix != null && attrNamespaceURI != null) {
- boolean prefixIsDeclared = false;
- try {
- String namespaceURI = namespaceStack.getNamespaceURI(attrPrefix);
- if (attrNamespaceURI.equals(namespaceURI)) {
- prefixIsDeclared = true;
- }
- } catch (IllegalArgumentException e) { //NOPMD
- //
- }
- if (!prefixIsDeclared) {
- printNamespaceDecl(attr, namespaceStack, out);
- }
- }
+ }
+ child = node.getFirstChild();
+ if (child != null) {
+ hasChildren = true;
+ out.print('>');
+ if (pretty) {
+ out.print(LS);
}
- Node child = node.getFirstChild();
- if (child != null) {
- hasChildren = true;
- out.print('>');
- if (pretty) {
- out.print(LS);
- }
- while (child != null) {
- print(child, namespaceStack, out, pretty, indent + 1);
- child = child.getNextSibling();
- }
- } else {
- hasChildren = false;
- out.print("/>");
- if (pretty) {
- out.print(LS);
- }
+ while (child != null) {
+ print(child, namespaceStack, out, pretty, indent + 1);
+ child = child.getNextSibling();
+ }
+ } else {
+ hasChildren = false;
+ out.print("/>");
+ if (pretty) {
+ out.print(LS);
}
- namespaceStack.pop();
- break;
}
+ namespaceStack.pop();
+ break;
case Node.ENTITY_REFERENCE_NODE:
- {
- out.print('&');
- out.print(node.getNodeName());
- out.print(';');
- break;
- }
+ out.print('&');
+ out.print(node.getNodeName());
+ out.print(';');
+ break;
case Node.CDATA_SECTION_NODE:
- {
- out.print("<![CDATA[");
- out.print(node.getNodeValue());
- out.print("]]>");
- break;
- }
+ out.print("<![CDATA[");
+ out.print(node.getNodeValue());
+ out.print("]]>");
+ break;
case Node.TEXT_NODE:
- {
- normalize(node.getNodeValue(), out);
- break;
- }
+ normalize(node.getNodeValue(), out);
+ break;
case Node.COMMENT_NODE:
- {
- out.print("<!--");
- out.print(node.getNodeValue());
- out.print("-->");
- if (pretty) {
- out.print(LS);
- }
- break;
+ out.print("<!--");
+ out.print(node.getNodeValue());
+ out.print("-->");
+ if (pretty) {
+ out.print(LS);
}
+ break;
case Node.PROCESSING_INSTRUCTION_NODE:
- {
- out.print("<?");
- out.print(node.getNodeName());
- String data = node.getNodeValue();
- if (data != null && data.length() > 0) {
- out.print(' ');
- out.print(data);
- }
- out.println("?>");
- if (pretty) {
- out.print(LS);
- }
- break;
+ out.print("<?");
+ out.print(node.getNodeName());
+ String data = node.getNodeValue();
+ if (data != null && data.length() > 0) {
+ out.print(' ');
+ out.print(data);
+ }
+ out.println("?>");
+ if (pretty) {
+ out.print(LS);
}
+ break;
}
if (type == Node.ELEMENT_NODE && hasChildren) {
if (pretty) {
@@ -240,16 +224,12 @@ public final class DOM2Writer {
PrintWriter out) {
switch (node.getNodeType()) {
case Node.ATTRIBUTE_NODE:
- {
- printNamespaceDecl(((Attr) node).getOwnerElement(), node,
- namespaceStack, out);
- break;
- }
+ printNamespaceDecl(((Attr) node).getOwnerElement(), node,
+ namespaceStack, out);
+ break;
case Node.ELEMENT_NODE:
- {
- printNamespaceDecl((Element) node, node, namespaceStack, out);
- break;
- }
+ printNamespaceDecl((Element) node, node, namespaceStack, out);
+ break;
}
}
@@ -258,8 +238,8 @@ public final class DOM2Writer {
PrintWriter out) {
String namespaceURI = node.getNamespaceURI();
String prefix = node.getPrefix();
- if (!(namespaceURI.equals(XMLUtils.XMLNS_NS) && prefix.equals("xmlns")) &&
- !(namespaceURI.equals(XMLUtils.XML_NS) && prefix.equals("xml"))) {
+ if (!(namespaceURI.equals(XMLUtils.XMLNS_NS) && prefix.equals("xmlns"))
+ && !(namespaceURI.equals(XMLUtils.XML_NS) && prefix.equals("xml"))) {
if (XMLUtils.getNamespace(prefix, owner) == null) {
out.print(" xmlns:" + prefix + "=\"" + namespaceURI + '\"');
}
@@ -279,31 +259,21 @@ public final class DOM2Writer {
char c = s.charAt(i);
switch (c) {
case '<':
- {
- fOut.print("<");
- break;
- }
+ fOut.print("<");
+ break;
case '>':
- {
- fOut.print(">");
- break;
- }
+ fOut.print(">");
+ break;
case '&':
- {
- fOut.print("&");
- break;
- }
+ fOut.print("&");
+ break;
case '"':
- {
- fOut.print(""");
- break;
- }
+ fOut.print(""");
+ break;
case '\r':
case '\n':
default:
- {
- fOut.print(c);
- }
+ fOut.print(c);
}
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java Mon Jan 4 11:29:57 2016
@@ -64,7 +64,7 @@ public class NSStack {
public void push() {
top++;
if (top >= stack.length) {
- Mapping newstack[] = new Mapping[stack.length * 2];
+ Mapping[] newstack = new Mapping[stack.length * 2];
System.arraycopy(stack, 0, newstack, 0, stack.length);
stack = newstack;
}
@@ -87,8 +87,8 @@ public class NSStack {
// Reset the currentDefaultNS to ignore the frame just removed.
currentDefaultNS = top;
while (currentDefaultNS > 0) {
- if (stack[currentDefaultNS] != null &&
- stack[currentDefaultNS].getPrefix().length() == 0) {
+ if (stack[currentDefaultNS] != null
+ && stack[currentDefaultNS].getPrefix().length() == 0) {
break;
}
currentDefaultNS--;
@@ -205,8 +205,8 @@ public class NSStack {
// If defaults are OK, and the given NS is the current default,
// return "" as the prefix to favor defaults where possible.
- if (!noDefault && currentDefaultNS > 0 && stack[currentDefaultNS] != null &&
- namespaceURI.equals(stack[currentDefaultNS].getNamespaceURI())) {
+ if (!noDefault && currentDefaultNS > 0 && stack[currentDefaultNS] != null
+ && namespaceURI.equals(stack[currentDefaultNS].getNamespaceURI())) {
return "";
}
for (int cursor = top; cursor > 0; cursor--) {
@@ -214,8 +214,7 @@ public class NSStack {
if (map == null) {
continue;
}
- if (map.getNamespaceHash() == hash &&
- map.getNamespaceURI().equals(namespaceURI)) {
+ if (map.getNamespaceHash() == hash && map.getNamespaceURI().equals(namespaceURI)) {
String possiblePrefix = map.getPrefix();
if (noDefault && possiblePrefix.length() == 0) {
continue;
@@ -232,8 +231,7 @@ public class NSStack {
if (map == null) {
continue;
}
- if (ppHash == map.getPrefixHash() &&
- possiblePrefix.equals(map.getPrefix())) {
+ if (ppHash == map.getPrefixHash() && possiblePrefix.equals(map.getPrefix())) {
break;
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/util/XMLUtils.java Mon Jan 4 11:29:57 2016
@@ -125,14 +125,14 @@ public final class XMLUtils {
return null;
}
- public static String PrettyDocumentToString(Document doc) throws IOException, TransformerException {
+ public static String prettyDocumentToString(Document doc) throws IOException, TransformerException {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- ElementToStream(doc.getDocumentElement(), baos);
+ elementToStream(doc.getDocumentElement(), baos);
return new String(baos.toByteArray());
}
}
- public static void ElementToStream(Element element, OutputStream out)
+ public static void elementToStream(Element element, OutputStream out)
throws TransformerException {
DOMSource source = new DOMSource(element);
StreamResult result = new StreamResult(out);
@@ -156,7 +156,7 @@ public final class XMLUtils {
}
Element domElement = (Element) node;
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- ElementToStream(domElement, baos);
+ elementToStream(domElement, baos);
InputSource isource = new InputSource(source.getSystemId());
isource.setByteStream(new ByteArrayInputStream(baos.toByteArray()));
return isource;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java Mon Jan 4 11:29:57 2016
@@ -88,7 +88,7 @@ public class CertificateStoreTest extend
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
//
@@ -120,7 +120,7 @@ public class CertificateStoreTest extend
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
//
@@ -158,7 +158,7 @@ public class CertificateStoreTest extend
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -192,7 +192,7 @@ public class CertificateStoreTest extend
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -226,7 +226,7 @@ public class CertificateStoreTest extend
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -261,7 +261,7 @@ public class CertificateStoreTest extend
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
//
@@ -289,7 +289,7 @@ public class CertificateStoreTest extend
if (LOG.isDebugEnabled()) {
LOG.debug("Verfied and decrypted message:");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
return results;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java Mon Jan 4 11:29:57 2016
@@ -89,7 +89,7 @@ public class CryptoProviderTest extends
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
verify(signedDoc);
@@ -110,7 +110,7 @@ public class CryptoProviderTest extends
secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, crypto, secHeader);
- String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(signedDoc);
outputString =
outputString.replace("1.2.840.113549.1.9.1=#16125765726e6572406578616d706c652e636f6d",
"EMAILADDRESS=Werner@example.com");
@@ -137,7 +137,7 @@ public class CryptoProviderTest extends
secHeader.insertSecurityHeader();
Document signedDoc = sign.build(doc, crypto, secHeader);
- String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(signedDoc);
outputString =
outputString.replace("1.2.840.113549.1.9.1=#16125765726e6572406578616d706c652e636f6d",
"E=Werner@example.com");
@@ -196,7 +196,7 @@ public class CryptoProviderTest extends
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
verify(encryptedDoc);
@@ -245,7 +245,7 @@ public class CryptoProviderTest extends
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(encryptedDoc);
+ XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
try {
@@ -269,7 +269,7 @@ public class CryptoProviderTest extends
if (LOG.isDebugEnabled()) {
LOG.debug("Verfied and decrypted message:");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java Mon Jan 4 11:29:57 2016
@@ -81,7 +81,7 @@ public class CallbackRefTest extends org
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
@@ -118,7 +118,7 @@ public class CallbackRefTest extends org
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java Mon Jan 4 11:29:57 2016
@@ -79,7 +79,7 @@ public class CustomActionProcessorTest e
if (LOG.isDebugEnabled()) {
LOG.debug("Signed message with IssuerSerial key identifier:");
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After Signing IS....");
@@ -124,7 +124,7 @@ public class CustomActionProcessorTest e
if (LOG.isDebugEnabled()) {
LOG.debug("Signed message with IssuerSerial key identifier:");
String outputString =
- XMLUtils.PrettyDocumentToString(signedDoc);
+ XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
LOG.info("After Signing IS....");
@@ -261,7 +261,7 @@ public class CustomActionProcessorTest e
if (LOG.isDebugEnabled()) {
LOG.debug("Message:");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java Mon Jan 4 11:29:57 2016
@@ -91,7 +91,7 @@ public class CustomTokenTest extends org
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java Mon Jan 4 11:29:57 2016
@@ -108,7 +108,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -144,7 +144,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -195,7 +195,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -241,7 +241,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -281,7 +281,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -317,7 +317,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -354,7 +354,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -403,7 +403,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -449,7 +449,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -499,7 +499,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -546,7 +546,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -589,7 +589,7 @@ public class SecurityActionTokenTest ext
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java Mon Jan 4 11:29:57 2016
@@ -91,7 +91,7 @@ public class SignatureConfirmationTest e
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -132,7 +132,7 @@ public class SignatureConfirmationTest e
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -171,7 +171,7 @@ public class SignatureConfirmationTest e
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -199,7 +199,7 @@ public class SignatureConfirmationTest e
false
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signature Confirmation response....");
LOG.debug(outputString);
@@ -235,7 +235,7 @@ public class SignatureConfirmationTest e
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -255,7 +255,7 @@ public class SignatureConfirmationTest e
false
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signature Confirmation response....");
LOG.debug(outputString);
@@ -290,7 +290,7 @@ public class SignatureConfirmationTest e
if (LOG.isDebugEnabled()) {
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -324,7 +324,7 @@ public class SignatureConfirmationTest e
if (LOG.isDebugEnabled()) {
LOG.debug("Verfied and decrypted message:");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
return results;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java Mon Jan 4 11:29:57 2016
@@ -96,7 +96,7 @@ public class SignatureUTAliasTest extend
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -120,7 +120,7 @@ public class SignatureUTAliasTest extend
if (LOG.isDebugEnabled()) {
LOG.debug("Verfied and decrypted message:");
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
return results;
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java Mon Jan 4 11:29:57 2016
@@ -83,7 +83,7 @@ public class UseReqSigCertTest extends o
true
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed message:");
LOG.debug(outputString);
@@ -128,7 +128,7 @@ public class UseReqSigCertTest extends o
true
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed message:");
LOG.debug(outputString);
@@ -173,7 +173,7 @@ public class UseReqSigCertTest extends o
true
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug("Signed message:");
LOG.debug(outputString);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java Mon Jan 4 11:29:57 2016
@@ -103,7 +103,7 @@ public class WSHandlerGetPasswordTest ex
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
@@ -144,7 +144,7 @@ public class WSHandlerGetPasswordTest ex
);
String outputString =
- XMLUtils.PrettyDocumentToString(doc);
+ XMLUtils.prettyDocumentToString(doc);
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java?rev=1722850&r1=1722849&r2=1722850&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java Mon Jan 4 11:29:57 2016
@@ -120,7 +120,7 @@ public class AttachmentTest extends Asse
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
- String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -165,7 +165,7 @@ public class AttachmentTest extends Asse
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
- String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -221,7 +221,7 @@ public class AttachmentTest extends Asse
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
- String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -266,7 +266,7 @@ public class AttachmentTest extends Asse
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
- String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -329,7 +329,7 @@ public class AttachmentTest extends Asse
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
- String outputString = XMLUtils.PrettyDocumentToString(signedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(signedDoc);
LOG.debug(outputString);
}
@@ -379,7 +379,7 @@ public class AttachmentTest extends Asse
Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(encryptedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -438,7 +438,7 @@ public class AttachmentTest extends Asse
Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(encryptedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -497,7 +497,7 @@ public class AttachmentTest extends Asse
encrypt.prependToHeader(secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(doc);
+ String outputString = XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -562,7 +562,7 @@ public class AttachmentTest extends Asse
encrypt.prependToHeader(secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(doc);
+ String outputString = XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -624,7 +624,7 @@ public class AttachmentTest extends Asse
Assert.assertEquals(1, encryptedAttachments.get(0).getHeaders().size());
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(encryptedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -670,7 +670,7 @@ public class AttachmentTest extends Asse
Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(encryptedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -730,7 +730,7 @@ public class AttachmentTest extends Asse
Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(encryptedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -794,7 +794,7 @@ public class AttachmentTest extends Asse
Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(encryptedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -883,7 +883,7 @@ public class AttachmentTest extends Asse
Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(encryptedDoc);
+ String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
LOG.debug(outputString);
}
@@ -958,7 +958,7 @@ public class AttachmentTest extends Asse
doc = signature.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(doc);
+ String outputString = XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}
@@ -1047,7 +1047,7 @@ public class AttachmentTest extends Asse
doc = signature.build(doc, crypto, secHeader);
if (LOG.isDebugEnabled()) {
- String outputString = XMLUtils.PrettyDocumentToString(doc);
+ String outputString = XMLUtils.prettyDocumentToString(doc);
LOG.debug(outputString);
}