You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2015/03/18 13:54:21 UTC
svn commit: r1667527 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal:
./ dom/
Author: mullan
Date: Wed Mar 18 12:54:20 2015
New Revision: 1667527
URL: http://svn.apache.org/r1667527
Log:
Remove superfluous whitespace.
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/SignerOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java Wed Mar 18 12:54:20 2015
@@ -34,7 +34,7 @@ import org.apache.xml.security.utils.Uns
/**
* This class has been modified slightly to use java.security.MessageDigest
- * objects as input, rather than
+ * objects as input, rather than
* org.apache.xml.security.algorithms.MessageDigestAlgorithm objects.
* It also optionally caches the input bytes.
*
@@ -78,7 +78,7 @@ public class DigesterOutputStream extend
}
md.update((byte)input);
}
-
+
@Override
public void write(byte[] input, int offset, int len) {
if (buffer) {
@@ -94,12 +94,12 @@ public class DigesterOutputStream extend
}
md.update(input, offset, len);
}
-
+
/**
- * @return the digest value
+ * @return the digest value
*/
public byte[] getDigestValue() {
- return md.digest();
+ return md.digest();
}
/**
@@ -113,7 +113,7 @@ public class DigesterOutputStream extend
return null;
}
}
-
+
@Override
public void close() throws IOException {
if (buffer) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java Wed Mar 18 12:54:20 2015
@@ -22,7 +22,7 @@ import java.io.ByteArrayOutputStream;
import javax.crypto.Mac;
/**
- * Derived from Apache sources and changed to use Mac objects instead of
+ * Derived from Apache sources and changed to use Mac objects instead of
* org.apache.xml.security.algorithms.SignatureAlgorithm objects.
*
* @author raul
@@ -41,7 +41,7 @@ public class MacOutputStream extends Byt
super.write(arg0);
mac.update((byte) arg0);
}
-
+
@Override
public void write(byte[] arg0, int arg1, int arg2) {
super.write(arg0, arg1, arg2);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/SignerOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/SignerOutputStream.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/SignerOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/SignerOutputStream.java Wed Mar 18 12:54:20 2015
@@ -29,8 +29,8 @@ import java.security.Signature;
import java.security.SignatureException;
/**
- * Derived from Apache sources and changed to use java.security.Signature
- * objects as input instead of
+ * Derived from Apache sources and changed to use java.security.Signature
+ * objects as input instead of
* org.apache.xml.security.algorithms.SignatureAlgorithm objects.
*
* @author raul
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java Wed Mar 18 12:54:20 2015
@@ -83,7 +83,7 @@ abstract class AbstractDOMSignatureMetho
throws InvalidKeyException, XMLSignatureException;
/**
- * Returns the java.security.Signature or javax.crypto.Mac standard
+ * Returns the java.security.Signature or javax.crypto.Mac standard
* algorithm name.
*/
abstract String getJCAAlgorithm();
@@ -180,7 +180,7 @@ abstract class AbstractDOMSignatureMetho
return getAlgorithm().equals(osm.getAlgorithm()) &&
paramsEqual(osm.getParameterSpec());
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -189,7 +189,7 @@ abstract class AbstractDOMSignatureMetho
if (spec != null) {
result = 31 * result + spec.hashCode();
}
-
+
return result;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Wed Mar 18 12:54:20 2015
@@ -59,7 +59,7 @@ public abstract class ApacheCanonicalize
protected C14NMethodParameterSpec params;
protected Document ownerDoc;
protected Element transformElem;
-
+
public final AlgorithmParameterSpec getParameterSpec()
{
return params;
@@ -102,14 +102,14 @@ public abstract class ApacheCanonicalize
((javax.xml.crypto.dom.DOMStructure)parent).getNode();
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
-
- public Data canonicalize(Data data, XMLCryptoContext xc)
+
+ public Data canonicalize(Data data, XMLCryptoContext xc)
throws TransformException
{
return canonicalize(data, xc, null);
}
- public Data canonicalize(Data data, XMLCryptoContext xc, OutputStream os)
+ public Data canonicalize(Data data, XMLCryptoContext xc, OutputStream os)
throws TransformException
{
if (apacheCanonicalizer == null) {
@@ -136,7 +136,7 @@ public abstract class ApacheCanonicalize
try {
Set<Node> nodeSet = null;
if (data instanceof ApacheData) {
- XMLSignatureInput in =
+ XMLSignatureInput in =
((ApacheData)data).getXMLSignatureInput();
if (in.isElement()) {
if (inclusiveNamespaces != null) {
@@ -210,7 +210,7 @@ public abstract class ApacheCanonicalize
if (apacheTransform == null) {
try {
- apacheTransform =
+ apacheTransform =
new Transform(ownerDoc, getAlgorithm(), transformElem.getChildNodes());
apacheTransform.setElement(transformElem, xc.getBaseURI());
boolean secVal = Utils.secureValidation(xc);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java Wed Mar 18 12:54:20 2015
@@ -28,7 +28,7 @@ import javax.xml.crypto.Data;
import org.apache.xml.security.signature.XMLSignatureInput;
/**
- * XMLSignatureInput Data wrapper.
+ * XMLSignatureInput Data wrapper.
*
* @author Sean Mullan
*/
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java Wed Mar 18 12:54:20 2015
@@ -29,7 +29,7 @@ import javax.xml.crypto.OctetStreamData;
import org.apache.xml.security.c14n.CanonicalizationException;
import org.apache.xml.security.signature.XMLSignatureInput;
-public class ApacheOctetStreamData extends OctetStreamData
+public class ApacheOctetStreamData extends OctetStreamData
implements ApacheData {
private XMLSignatureInput xi;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java Wed Mar 18 12:54:20 2015
@@ -80,7 +80,7 @@ public abstract class ApacheTransform ex
if (!(parent instanceof javax.xml.crypto.dom.DOMStructure)) {
throw new ClassCastException("parent must be of type DOMStructure");
}
- transformElem = (Element)
+ transformElem = (Element)
((javax.xml.crypto.dom.DOMStructure) parent).getNode();
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
@@ -99,7 +99,7 @@ public abstract class ApacheTransform ex
if (!(parent instanceof javax.xml.crypto.dom.DOMStructure)) {
throw new ClassCastException("parent must be of type DOMStructure");
}
- transformElem = (Element)
+ transformElem = (Element)
((javax.xml.crypto.dom.DOMStructure) parent).getNode();
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
@@ -136,7 +136,7 @@ public abstract class ApacheTransform ex
if (apacheTransform == null) {
try {
- apacheTransform =
+ apacheTransform =
new Transform(ownerDoc, getAlgorithm(), transformElem.getChildNodes());
apacheTransform.setElement(transformElem, xc.getBaseURI());
boolean secVal = Utils.secureValidation(xc);
@@ -148,9 +148,9 @@ public abstract class ApacheTransform ex
} catch (Exception ex) {
throw new TransformException("Couldn't find Transform for: " +
getAlgorithm(), ex);
- }
+ }
}
-
+
if (Utils.secureValidation(xc)) {
String algorithm = getAlgorithm();
if (Transforms.TRANSFORM_XSLT.equals(algorithm)) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java Wed Mar 18 12:54:20 2015
@@ -42,7 +42,7 @@ import org.apache.xml.security.c14n.Inva
public final class DOMCanonicalXMLC14N11Method extends ApacheCanonicalizer {
public static final String C14N_11 = "http://www.w3.org/2006/12/xml-c14n11";
- public static final String C14N_11_WITH_COMMENTS
+ public static final String C14N_11_WITH_COMMENTS
= "http://www.w3.org/2006/12/xml-c14n11#WithComments";
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java Wed Mar 18 12:54:20 2015
@@ -39,7 +39,7 @@ import javax.xml.crypto.dsig.*;
*
* @author Sean Mullan
*/
-public class DOMCanonicalizationMethod extends DOMTransform
+public class DOMCanonicalizationMethod extends DOMTransform
implements CanonicalizationMethod {
/**
@@ -69,7 +69,7 @@ public class DOMCanonicalizationMethod e
super(cmElem, context, provider);
if (!(spi instanceof ApacheCanonicalizer) && !isC14Nalg(spi.getAlgorithm())) {
throw new MarshalException("Illegal CanonicalizationMethod");
- }
+ }
}
/**
@@ -111,7 +111,7 @@ public class DOMCanonicalizationMethod e
return getAlgorithm().equals(ocm.getAlgorithm()) &&
DOMUtils.paramsEqual(getParameterSpec(), ocm.getParameterSpec());
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -123,7 +123,7 @@ public class DOMCanonicalizationMethod e
return result;
}
-
+
private static boolean isC14Nalg(String alg) {
return alg.equals(CanonicalizationMethod.INCLUSIVE)
|| alg.equals(CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS)
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java Wed Mar 18 12:54:20 2015
@@ -150,9 +150,9 @@ public abstract class DOMDigestMethod ex
}
/**
- * Unmarshals <code>DigestMethodParameterSpec</code> from the specified
+ * Unmarshals <code>DigestMethodParameterSpec</code> from the specified
* <code>Element</code>. By default, this method throws an exception since
- * most DigestMethod algorithms do not have parameters. Subclasses should
+ * most DigestMethod algorithms do not have parameters. Subclasses should
* override it if they have parameters.
*
* @param paramsElem the <code>Element</code> holding the input params
@@ -169,7 +169,7 @@ public abstract class DOMDigestMethod ex
}
/**
- * This method invokes the abstract {@link #marshalParams marshalParams}
+ * This method invokes the abstract {@link #marshalParams marshalParams}
* method to marshal any algorithm-specific parameters.
*/
public static void marshal(XmlWriter xwriter, DigestMethod digest, String prefix)
@@ -201,7 +201,7 @@ public abstract class DOMDigestMethod ex
return getAlgorithm().equals(odm.getAlgorithm()) && paramsEqual;
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -209,7 +209,7 @@ public abstract class DOMDigestMethod ex
result = 31 * result + params.hashCode();
}
result = 31 * result + getAlgorithm().hashCode();
-
+
return result;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Wed Mar 18 12:54:20 2015
@@ -70,7 +70,7 @@ public abstract class DOMHMACSignatureMe
private SignatureMethodParameterSpec params;
/**
- * Creates a <code>DOMHMACSignatureMethod</code> with the specified params
+ * Creates a <code>DOMHMACSignatureMethod</code> with the specified params
*
* @param params algorithm-specific parameters (may be <code>null</code>)
* @throws InvalidAlgorithmParameterException if params are inappropriate
@@ -100,7 +100,7 @@ public abstract class DOMHMACSignatureMe
}
@Override
- void checkParams(SignatureMethodParameterSpec params)
+ void checkParams(SignatureMethodParameterSpec params)
throws InvalidAlgorithmParameterException
{
if (params != null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Wed Mar 18 12:54:20 2015
@@ -198,7 +198,7 @@ public final class DOMKeyInfo extends Ba
return keyInfoTypes.equals(oki.getContent()) && idsEqual;
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -206,7 +206,7 @@ public final class DOMKeyInfo extends Ba
result = 31 * result + id.hashCode();
}
result = 31 * result + keyInfoTypes.hashCode();
-
+
return result;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Wed Mar 18 12:54:20 2015
@@ -148,7 +148,7 @@ public final class DOMKeyInfoFactory ext
if (!(xmlStructure instanceof javax.xml.crypto.dom.DOMStructure)) {
throw new ClassCastException("xmlStructure must be of type DOMStructure");
}
- Node node =
+ Node node =
((javax.xml.crypto.dom.DOMStructure) xmlStructure).getNode();
node.normalize();
@@ -175,7 +175,7 @@ public final class DOMKeyInfoFactory ext
throw new MarshalException("invalid KeyInfo tag: " + namespace + ":" + tag);
}
}
-
+
private static class UnmarshalContext extends DOMCryptoContext {
UnmarshalContext() {}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java Wed Mar 18 12:54:20 2015
@@ -38,7 +38,7 @@ public final class DOMKeyName extends Ba
private final String name;
/**
- * Creates a <code>DOMKeyName</code>.
+ * Creates a <code>DOMKeyName</code>.
*
* @param name the name of the key identifier
* @throws NullPointerException if <code>name</code> is null
@@ -75,12 +75,12 @@ public final class DOMKeyName extends Ba
KeyName okn = (KeyName)obj;
return name.equals(okn.getName());
}
-
+
@Override
public int hashCode() {
int result = 17;
result = 31 * result + name.hashCode();
-
+
return result;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java Wed Mar 18 12:54:20 2015
@@ -66,7 +66,7 @@ import org.apache.xml.security.utils.Cla
*/
public abstract class DOMKeyValue<K extends PublicKey> extends BaseStructure implements KeyValue {
- private static final String XMLDSIG_11_XMLNS
+ private static final String XMLDSIG_11_XMLNS
= "http://www.w3.org/2009/xmldsig11#";
private final K publicKey;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java Wed Mar 18 12:54:20 2015
@@ -155,7 +155,7 @@ public final class DOMManifest extends B
return idsEqual && references.equals(oman.getReferences());
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -163,7 +163,7 @@ public final class DOMManifest extends B
result = 31 * result + id.hashCode();
}
result = 31 * result + references.hashCode();
-
+
return result;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java Wed Mar 18 12:54:20 2015
@@ -47,18 +47,18 @@ public final class DOMPGPData extends Ba
private final List<XMLStructure> externalElements;
/**
- * Creates a <code>DOMPGPData</code> containing the specified key packet.
+ * Creates a <code>DOMPGPData</code> containing the specified key packet.
* and optional list of external elements.
*
- * @param keyPacket a PGP Key Material Packet as defined in section 5.5 of
- * <a href="http://www.ietf.org/rfc/rfc2440.txt"/>RFC 2440</a>. The
+ * @param keyPacket a PGP Key Material Packet as defined in section 5.5 of
+ * <a href="http://www.ietf.org/rfc/rfc2440.txt"/>RFC 2440</a>. The
* array is cloned to prevent subsequent modification.
* @param other a list of {@link XMLStructure}s representing elements from
* an external namespace. The list is defensively copied to prevent
* subsequent modification. May be <code>null</code> or empty.
- * @throws NullPointerException if <code>keyPacket</code> is
+ * @throws NullPointerException if <code>keyPacket</code> is
* <code>null</code>
- * @throws IllegalArgumentException if the key packet is not in the
+ * @throws IllegalArgumentException if the key packet is not in the
* correct format
* @throws ClassCastException if <code>other</code> contains any
* entries that are not of type {@link XMLStructure}
@@ -88,24 +88,24 @@ public final class DOMPGPData extends Ba
* Creates a <code>DOMPGPData</code> containing the specified key id and
* optional key packet and list of external elements.
*
- * @param keyId a PGP public key id as defined in section 11.2 of
- * <a href="http://www.ietf.org/rfc/rfc2440.txt"/>RFC 2440</a>. The
+ * @param keyId a PGP public key id as defined in section 11.2 of
+ * <a href="http://www.ietf.org/rfc/rfc2440.txt"/>RFC 2440</a>. The
* array is cloned to prevent subsequent modification.
- * @param keyPacket a PGP Key Material Packet as defined in section 5.5 of
+ * @param keyPacket a PGP Key Material Packet as defined in section 5.5 of
* <a href="http://www.ietf.org/rfc/rfc2440.txt"/>RFC 2440</a> (may
- * be <code>null</code>). The array is cloned to prevent subsequent
+ * be <code>null</code>). The array is cloned to prevent subsequent
* modification.
* @param other a list of {@link XMLStructure}s representing elements from
* an external namespace. The list is defensively copied to prevent
* subsequent modification. May be <code>null</code> or empty.
* @throws NullPointerException if <code>keyId</code> is <code>null</code>
- * @throws IllegalArgumentException if the key id or packet is not in the
+ * @throws IllegalArgumentException if the key id or packet is not in the
* correct format
* @throws ClassCastException if <code>other</code> contains any
* entries that are not of type {@link XMLStructure}
*/
public DOMPGPData(byte[] keyId, byte[] keyPacket,
- List<? extends XMLStructure> other)
+ List<? extends XMLStructure> other)
{
if (keyId == null) {
throw new NullPointerException("keyId cannot be null");
@@ -191,7 +191,7 @@ public final class DOMPGPData extends Ba
* section 4 of RFC 2440.
*
* This method only checks if the packet contains a valid tag. The
- * contents of the packet should be checked by the application.
+ * contents of the packet should be checked by the application.
*/
private void checkKeyPacket(byte[] keyPacket) {
// length must be at least 3 (one byte for tag, one byte for length,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Wed Mar 18 12:54:20 2015
@@ -57,9 +57,9 @@ import org.apache.xml.security.utils.Uns
* @author Sean Mullan
* @author Joyce Leung
*/
-public final class DOMReference extends DOMStructure
+public final class DOMReference extends DOMStructure
implements Reference, DOMURIReference {
-
+
/**
* The maximum number of transforms per reference, if secure validation is enabled.
*/
@@ -182,18 +182,18 @@ public final class DOMReference extends
this.appliedTransformData = result;
this.provider = provider;
}
-
+
/**
* Creates a <code>DOMReference</code> from an element.
*
* @param refElem a Reference element
*/
- public DOMReference(Element refElem, XMLCryptoContext context,
+ public DOMReference(Element refElem, XMLCryptoContext context,
Provider provider)
throws MarshalException
{
boolean secVal = Utils.secureValidation(context);
-
+
// unmarshal Transforms, if specified
Element nextSibling = DOMUtils.getFirstChildElement(refElem);
List<Transform> transforms = new ArrayList<Transform>(5);
@@ -234,7 +234,7 @@ public final class DOMReference extends
Element dmElem = nextSibling;
this.digestMethod = DOMDigestMethod.unmarshal(dmElem);
String digestMethodAlgorithm = this.digestMethod.getAlgorithm();
- if (secVal
+ if (secVal
&& MessageDigestAlgorithm.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5.equals(digestMethodAlgorithm)) {
throw new MarshalException(
"It is forbidden to use algorithm " + digestMethod + " when secure validation is enabled"
@@ -344,7 +344,7 @@ public final class DOMReference extends
xwriter.writeEndElement(); // "Reference"
}
- public void digest(XMLSignContext signContext)
+ public void digest(XMLSignContext signContext)
throws XMLSignatureException
{
Data data = null;
@@ -407,7 +407,7 @@ public final class DOMReference extends
return dis;
}
- private Data dereference(XMLCryptoContext context)
+ private Data dereference(XMLCryptoContext context)
throws XMLSignatureException
{
Data data = null;
@@ -430,7 +430,7 @@ public final class DOMReference extends
return data;
}
- private byte[] transform(Data dereferencedData,
+ private byte[] transform(Data dereferencedData,
XMLCryptoContext context)
throws XMLSignatureException
{
@@ -464,7 +464,7 @@ public final class DOMReference extends
data = transform.transform(data, context, os);
}
}
-
+
if (data != null) {
XMLSignatureInput xi;
// explicitly use C14N 1.1 when generating signature
@@ -520,15 +520,15 @@ public final class DOMReference extends
spi = TransformService.getInstance(c14nalg, "DOM");
}
}
-
+
DOMTransform t = new DOMTransform(spi);
Element transformsElem = null;
String dsPrefix = DOMUtils.getSignaturePrefix(context);
if (allTransforms.isEmpty()) {
transformsElem = DOMUtils.createElement(
- refElem.getOwnerDocument(),
+ refElem.getOwnerDocument(),
"Transforms", XMLSignature.XMLNS, dsPrefix);
- refElem.insertBefore(transformsElem,
+ refElem.insertBefore(transformsElem,
DOMUtils.getFirstChildElement(refElem));
} else {
transformsElem = DOMUtils.getFirstChildElement(refElem);
@@ -562,14 +562,14 @@ public final class DOMReference extends
os.close();
} catch (IOException e) {
throw new XMLSignatureException(e);
- }
+ }
}
if (dos != null) {
try {
dos.close();
} catch (IOException e) {
throw new XMLSignatureException(e);
- }
+ }
}
}
}
@@ -600,10 +600,10 @@ public final class DOMReference extends
Arrays.equals(digestValue, oref.getDigestValue());
return digestMethod.equals(oref.getDigestMethod()) && idsEqual &&
- urisEqual && typesEqual &&
+ urisEqual && typesEqual &&
allTransforms.equals(oref.getTransforms()) && digestValuesEqual;
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -621,7 +621,7 @@ public final class DOMReference extends
}
result = 31 * result + digestMethod.hashCode();
result = 31 * result + allTransforms.hashCode();
-
+
return result;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Wed Mar 18 12:54:20 2015
@@ -74,7 +74,7 @@ public final class DOMRetrievalMethod ex
private Attr here;
/**
- * Creates a <code>DOMRetrievalMethod</code> containing the specified
+ * Creates a <code>DOMRetrievalMethod</code> containing the specified
* URIReference and List of Transforms.
*
* @param uri the URI
@@ -82,11 +82,11 @@ public final class DOMRetrievalMethod ex
* @param transforms a list of {@link Transform}s. The list is defensively
* copied to prevent subsequent modification. May be <code>null</code>
* or empty.
- * @throws IllegalArgumentException if the format of <code>uri</code> is
+ * @throws IllegalArgumentException if the format of <code>uri</code> is
* invalid, as specified by Reference's URI attribute in the W3C
* specification for XML-Signature Syntax and Processing
* @throws NullPointerException if <code>uriReference</code>
- * is <code>null</code>
+ * is <code>null</code>
* @throws ClassCastException if <code>transforms</code> contains any
* entries that are not of type {@link Transform}
*/
@@ -119,7 +119,7 @@ public final class DOMRetrievalMethod ex
this.type = type;
}
-
+
/**
* Creates a <code>DOMRetrievalMethod</code> from an element.
*
@@ -135,13 +135,13 @@ public final class DOMRetrievalMethod ex
// get here node
here = rmElem.getAttributeNodeNS(null, "URI");
-
+
boolean secVal = Utils.secureValidation(context);
// get Transforms, if specified
List<Transform> transforms = new ArrayList<Transform>();
Element transformsElem = DOMUtils.getFirstChildElement(rmElem);
-
+
if (transformsElem != null) {
String localName = transformsElem.getLocalName();
String namespace = transformsElem.getNamespaceURI();
@@ -227,7 +227,7 @@ public final class DOMRetrievalMethod ex
}
/*
- * If URIDereferencer is specified in context; use it, otherwise use
+ * If URIDereferencer is specified in context; use it, otherwise use
* built-in.
*/
URIDereferencer deref = context.getURIDereferencer();
@@ -305,7 +305,7 @@ public final class DOMRetrievalMethod ex
return uri.equals(orm.getURI()) &&
transforms.equals(orm.getTransforms()) && typesEqual;
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -314,7 +314,7 @@ public final class DOMRetrievalMethod ex
}
result = 31 * result + uri.hashCode();
result = 31 * result + transforms.hashCode();
-
+
return result;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Wed Mar 18 12:54:20 2015
@@ -50,7 +50,7 @@ public abstract class DOMSignatureMethod
private SignatureMethodParameterSpec params;
private Signature signature;
-
+
// see RFC 4051 for these algorithm definitions
static final String RSA_SHA224 =
"http://www.w3.org/2001/04/xmldsig-more#rsa-sha224";
@@ -98,10 +98,10 @@ public abstract class DOMSignatureMethod
* @throws InvalidAlgorithmParameterException if the parameters are not
* appropriate for this signature method
*/
- DOMSignatureMethod(AlgorithmParameterSpec params)
+ DOMSignatureMethod(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException
{
- if (params != null &&
+ if (params != null &&
!(params instanceof SignatureMethodParameterSpec)) {
throw new InvalidAlgorithmParameterException
("params must be of type SignatureMethodParameterSpec");
@@ -727,5 +727,5 @@ public abstract class DOMSignatureMethod
return Type.ECDSA;
}
}
-
+
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Wed Mar 18 12:54:20 2015
@@ -39,15 +39,15 @@ import org.w3c.dom.Node;
*/
public final class DOMSignatureProperties extends BaseStructure
implements SignatureProperties {
-
+
private final String id;
private final List<SignatureProperty> properties;
/**
- * Creates a <code>DOMSignatureProperties</code> from the specified
+ * Creates a <code>DOMSignatureProperties</code> from the specified
* parameters.
*
- * @param properties a list of one or more {@link SignatureProperty}s. The
+ * @param properties a list of one or more {@link SignatureProperty}s. The
* list is defensively copied to protect against subsequent modification.
* @param id the Id (may be <code>null</code>)
* @throws ClassCastException if <code>properties</code> contains any
@@ -152,7 +152,7 @@ public final class DOMSignaturePropertie
return properties.equals(osp.getProperties()) && idsEqual;
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -160,7 +160,7 @@ public final class DOMSignaturePropertie
result = 31 * result + id.hashCode();
}
result = 31 * result + properties.hashCode();
-
+
return result;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Wed Mar 18 12:54:20 2015
@@ -39,7 +39,7 @@ import org.w3c.dom.Node;
*/
public final class DOMSignatureProperty extends BaseStructure
implements SignatureProperty {
-
+
private final String id;
private final String target;
private final List<XMLStructure> content;
@@ -54,7 +54,7 @@ public final class DOMSignatureProperty
* @throws ClassCastException if <code>content</code> contains any
* entries that are not of type {@link XMLStructure}
* @throws IllegalArgumentException if <code>content</code> is empty
- * @throws NullPointerException if <code>content</code> or
+ * @throws NullPointerException if <code>content</code> or
* <code>target</code> is <code>null</code>
*/
public DOMSignatureProperty(List<? extends XMLStructure> content,
@@ -160,7 +160,7 @@ public final class DOMSignatureProperty
return equalsContent(ospContent) &&
target.equals(osp.getTarget()) && idsEqual;
}
-
+
@Override
public int hashCode() {
int result = 17;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Wed Mar 18 12:54:20 2015
@@ -46,7 +46,7 @@ import org.apache.xml.security.utils.Uns
* @author Sean Mullan
*/
public final class DOMSignedInfo extends DOMStructure implements SignedInfo {
-
+
/**
* The maximum number of references per Manifest, if secure validation is enabled.
*/
@@ -56,13 +56,13 @@ public final class DOMSignedInfo extends
org.slf4j.LoggerFactory.getLogger(DOMSignedInfo.class);
/** Signature - NOT Recommended RSAwithMD5 */
- private static final String ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5 =
+ private static final String ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5 =
Constants.MoreAlgorithmsSpecNS + "rsa-md5";
-
+
/** HMAC - NOT Recommended HMAC-MD5 */
- private static final String ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5 =
+ private static final String ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5 =
Constants.MoreAlgorithmsSpecNS + "hmac-md5";
-
+
private List<Reference> references;
private CanonicalizationMethod canonicalizationMethod;
private SignatureMethod signatureMethod;
@@ -78,7 +78,7 @@ public final class DOMSignedInfo extends
* @param sm the signature method
* @param references the list of references. The list is copied.
* @throws NullPointerException if
- * <code>cm</code>, <code>sm</code>, or <code>references</code> is
+ * <code>cm</code>, <code>sm</code>, or <code>references</code> is
* <code>null</code>
* @throws IllegalArgumentException if <code>references</code> is empty
* @throws ClassCastException if any of the references are not of
@@ -121,7 +121,7 @@ public final class DOMSignedInfo extends
* @throws ClassCastException if any of the references are not of
* type <code>Reference</code>
*/
- public DOMSignedInfo(CanonicalizationMethod cm, SignatureMethod sm,
+ public DOMSignedInfo(CanonicalizationMethod cm, SignatureMethod sm,
List<? extends Reference> references, String id) {
this(cm, sm, references);
this.id = id;
@@ -151,7 +151,7 @@ public final class DOMSignedInfo extends
"SignatureMethod",
XMLSignature.XMLNS);
signatureMethod = DOMSignatureMethod.unmarshal(smElem);
-
+
boolean secVal = Utils.secureValidation(context);
String signatureMethodAlgorithm = signatureMethod.getAlgorithm();
@@ -161,12 +161,12 @@ public final class DOMSignedInfo extends
"It is forbidden to use algorithm " + signatureMethod + " when secure validation is enabled"
);
}
-
+
// unmarshal References
ArrayList<Reference> refList = new ArrayList<Reference>(5);
Element refElem = DOMUtils.getNextSiblingElement(smElem, "Reference", XMLSignature.XMLNS);
refList.add(new DOMReference(refElem, context, provider));
-
+
refElem = DOMUtils.getNextSiblingElement(refElem);
while (refElem != null) {
String name = refElem.getLocalName();
@@ -218,15 +218,15 @@ public final class DOMSignedInfo extends
}
OutputStream os = new UnsyncBufferedOutputStream(bos);
-
+
DOMSubTreeData subTree = new DOMSubTreeData(localSiElem, true);
try {
- ((DOMCanonicalizationMethod)
+ ((DOMCanonicalizationMethod)
canonicalizationMethod).canonicalize(subTree, context, os);
} catch (TransformException te) {
throw new XMLSignatureException(te);
}
-
+
try {
os.flush();
} catch (IOException e) {
@@ -250,7 +250,7 @@ public final class DOMSignedInfo extends
}
this.canonData = new ByteArrayInputStream(signedInfoBytes);
-
+
try {
os.close();
} catch (IOException e) {
@@ -323,7 +323,7 @@ public final class DOMSignedInfo extends
result = 31 * result + canonicalizationMethod.hashCode();
result = 31 * result + signatureMethod.hashCode();
result = 31 * result + references.hashCode();
-
+
return result;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Wed Mar 18 12:54:20 2015
@@ -172,7 +172,7 @@ public class DOMSubTreeData implements N
nodeSet.add(node);
break;
case Node.COMMENT_NODE:
- if (withComments) {
+ if (withComments) {
nodeSet.add(node);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java Wed Mar 18 12:54:20 2015
@@ -187,7 +187,7 @@ public class DOMTransform extends BaseSt
return result;
}
-
+
/**
* Transforms the specified data using the underlying transform algorithm.
* This method invokes the {@link #marshal marshal} method and passes it
@@ -199,7 +199,7 @@ public class DOMTransform extends BaseSt
* @param context the marshalling context
* @return the transformed data
* @throws MarshalException if an exception occurs while marshalling
- * @throws NullPointerException if <code>data</code> or <code>context</code>
+ * @throws NullPointerException if <code>data</code> or <code>context</code>
* is <code>null</code>
* @throws XMLSignatureException if an unexpected error occurs while
* executing the transform
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Wed Mar 18 12:54:20 2015
@@ -42,7 +42,7 @@ import javax.xml.crypto.dom.*;
* @author Sean Mullan
*/
public class DOMURIDereferencer implements URIDereferencer {
-
+
static final URIDereferencer INSTANCE = new DOMURIDereferencer();
private DOMURIDereferencer() {
@@ -67,9 +67,9 @@ public class DOMURIDereferencer implemen
String uri = uriRef.getURI();
DOMCryptoContext dcc = (DOMCryptoContext) context;
String baseURI = context.getBaseURI();
-
+
boolean secVal = Utils.secureValidation(context);
-
+
// Check if same-document URI and already registered on the context
if (uri != null && uri.length() != 0 && uri.charAt(0) == '#') {
String id = uri.substring(1);
@@ -89,7 +89,7 @@ public class DOMURIDereferencer implemen
throw new URIReferenceException(error);
}
}
-
+
XMLSignatureInput result = new XMLSignatureInput(referencedElem);
result.setSecureValidation(secVal);
if (!uri.substring(1).startsWith("xpointer(id(")) {
@@ -98,16 +98,16 @@ public class DOMURIDereferencer implemen
result.setMIMEType("text/xml");
if (baseURI != null && baseURI.length() > 0) {
- result.setSourceURI(baseURI.concat(uriAttr.getNodeValue()));
+ result.setSourceURI(baseURI.concat(uriAttr.getNodeValue()));
} else {
- result.setSourceURI(uriAttr.getNodeValue());
+ result.setSourceURI(uriAttr.getNodeValue());
}
return new ApacheNodeSetData(result);
}
- }
+ }
try {
- ResourceResolver apacheResolver =
+ ResourceResolver apacheResolver =
ResourceResolver.getInstance(uriAttr, baseURI, secVal);
XMLSignatureInput in = apacheResolver.resolve(uriAttr, baseURI, secVal);
if (in.isOctetStream()) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java Wed Mar 18 12:54:20 2015
@@ -45,7 +45,7 @@ import javax.xml.crypto.dsig.spec.*;
public final class DOMUtils {
// class cannot be instantiated
- private DOMUtils() {}
+ private DOMUtils() {}
/**
* Returns the owner document of the specified node.
@@ -93,12 +93,12 @@ public final class DOMUtils {
}
/**
- * Sets an element's attribute (using DOM level 2) with the
+ * Sets an element's attribute (using DOM level 2) with the
* specified value and namespace prefix.
*
* @param elem the element to set the attribute on
* @param name the name of the attribute
- * @param value the attribute value. If null, no attribute is set.
+ * @param value the attribute value. If null, no attribute is set.
*/
public static void setAttribute(Element elem, String name, String value) {
if (value == null) {
@@ -108,14 +108,14 @@ public final class DOMUtils {
}
/**
- * Sets an element's attribute (using DOM level 2) with the
+ * Sets an element's attribute (using DOM level 2) with the
* specified value and namespace prefix AND registers the ID value with
* the specified element. This is for resolving same-document
* ID references.
*
* @param elem the element to set the attribute on
* @param name the name of the attribute
- * @param value the attribute value. If null, no attribute is set.
+ * @param value the attribute value. If null, no attribute is set.
*/
public static void setAttributeID(Element elem, String name, String value) {
if (value == null) {
@@ -126,11 +126,11 @@ public final class DOMUtils {
}
/**
- * Returns the first child element of the specified node, or null if there
+ * Returns the first child element of the specified node, or null if there
* is no such element.
*
* @param node the node
- * @return the first child element of the specified node, or null if there
+ * @return the first child element of the specified node, or null if there
* is no such element
* @throws NullPointerException if <code>node == null</code>
*/
@@ -207,11 +207,11 @@ public final class DOMUtils {
}
/**
- * Returns the last child element of the specified node, or null if there
+ * Returns the last child element of the specified node, or null if there
* is no such element.
*
* @param node the node
- * @return the last child element of the specified node, or null if there
+ * @return the last child element of the specified node, or null if there
* is no such element
* @throws NullPointerException if <code>node == null</code>
*/
@@ -224,11 +224,11 @@ public final class DOMUtils {
}
/**
- * Returns the next sibling element of the specified node, or null if there
+ * Returns the next sibling element of the specified node, or null if there
* is no such element.
*
* @param node the node
- * @return the next sibling element of the specified node, or null if there
+ * @return the next sibling element of the specified node, or null if there
* is no such element
* @throws NullPointerException if <code>node == null</code>
*/
@@ -239,7 +239,7 @@ public final class DOMUtils {
}
return (Element)sibling;
}
-
+
/**
* Returns the next sibling element of the specified node and checks that
* the local name is equal to {@code localName}.
@@ -276,7 +276,7 @@ public final class DOMUtils {
/**
* Returns the attribute value for the attribute with the specified name.
- * Returns null if there is no such attribute, or
+ * Returns null if there is no such attribute, or
* the empty string if the attribute value is empty.
*
* <p>This works around a limitation of the DOM
@@ -357,7 +357,7 @@ public final class DOMUtils {
};
}
}
-
+
/**
* Returns the prefix associated with the specified namespace URI
*
@@ -385,7 +385,7 @@ public final class DOMUtils {
public static String getSignaturePrefix(XMLCryptoContext context) {
return getNSPrefix(context, XMLSignature.XMLNS);
}
-
+
/**
* Removes all children nodes from the specified node.
*
@@ -415,7 +415,7 @@ public final class DOMUtils {
}
/**
- * Checks if child element has same owner document before
+ * Checks if child element has same owner document before
* appending to the parent, and imports it to the parent's document
* if necessary.
*/
@@ -502,7 +502,7 @@ public final class DOMUtils {
}
Node ostylesheetElem =
((javax.xml.crypto.dom.DOMStructure) ostylesheet).getNode();
- XMLStructure stylesheet = spec1.getStylesheet();
+ XMLStructure stylesheet = spec1.getStylesheet();
Node stylesheetElem =
((javax.xml.crypto.dom.DOMStructure) stylesheet).getNode();
return nodesEqual(stylesheetElem, ostylesheetElem);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java Wed Mar 18 12:54:20 2015
@@ -56,7 +56,7 @@ public final class DOMX509Data extends B
* {@link String} (subject names), <code>byte[]</code> (subject key ids),
* {@link java.security.cert.X509Certificate}, {@link X509CRL},
* or {@link javax.xml.dsig.XMLStructure}
- * objects or elements from an external namespace). The list is
+ * objects or elements from an external namespace). The list is
* defensively copied to protect against subsequent modification.
* @throws NullPointerException if <code>content</code> is <code>null</code>
* @throws IllegalArgumentException if <code>content</code> is empty
@@ -186,7 +186,7 @@ public final class DOMX509Data extends B
}
}
- private X509Certificate unmarshalX509Certificate(Element elem)
+ private X509Certificate unmarshalX509Certificate(Element elem)
throws MarshalException
{
try {
@@ -206,7 +206,7 @@ public final class DOMX509Data extends B
}
}
- private ByteArrayInputStream unmarshalBase64Binary(Element elem)
+ private ByteArrayInputStream unmarshalBase64Binary(Element elem)
throws MarshalException {
try {
if (cf == null) {
@@ -241,10 +241,10 @@ public final class DOMX509Data extends B
Object x = content.get(i);
Object ox = ocontent.get(i);
if (x instanceof byte[]) {
- if (!(ox instanceof byte[]) ||
+ if (!(ox instanceof byte[]) ||
!Arrays.equals((byte[])x, (byte[])ox)) {
return false;
- }
+ }
} else {
if (!(x.equals(ox))) {
return false;
@@ -254,7 +254,7 @@ public final class DOMX509Data extends B
return true;
}
-
+
@Override
public int hashCode() {
int result = 17;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java Wed Mar 18 12:54:20 2015
@@ -46,16 +46,16 @@ public final class DOMX509IssuerSerial e
private final BigInteger serialNumber;
/**
- * Creates a <code>DOMX509IssuerSerial</code> containing the specified
+ * Creates a <code>DOMX509IssuerSerial</code> containing the specified
* issuer distinguished name/serial number pair.
*
- * @param issuerName the X.509 issuer distinguished name in RFC 2253
+ * @param issuerName the X.509 issuer distinguished name in RFC 2253
* String format
* @param serialNumber the serial number
* @throws IllegalArgumentException if the format of <code>issuerName</code>
* is not RFC 2253 compliant
- * @throws NullPointerException if <code>issuerName</code> or
- * <code>serialNumber</code> is <code>null</code>
+ * @throws NullPointerException if <code>issuerName</code> or
+ * <code>serialNumber</code> is <code>null</code>
*/
public DOMX509IssuerSerial(String issuerName, BigInteger serialNumber) {
if (issuerName == null) {
@@ -108,7 +108,7 @@ public final class DOMX509IssuerSerial e
return issuerName.equals(ois.getIssuerName()) &&
serialNumber.equals(ois.getSerialNumber());
}
-
+
@Override
public int hashCode() {
int result = 17;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java Wed Mar 18 12:54:20 2015
@@ -91,7 +91,7 @@ public final class DOMXMLObject extends
{
// unmarshal attributes
this.encoding = DOMUtils.getAttributeValue(objElem, "Encoding");
-
+
Attr attr = objElem.getAttributeNodeNS(null, "Id");
if (attr != null) {
this.id = attr.getValue();
@@ -207,7 +207,7 @@ public final class DOMXMLObject extends
return idsEqual && encodingsEqual && mimeTypesEqual &&
equalsContent(getXmlObjectContent(oxo));
}
-
+
@Override
public int hashCode() {
int result = 17;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Wed Mar 18 12:54:20 2015
@@ -75,7 +75,7 @@ public final class DOMXMLSignature exten
static {
org.apache.xml.security.Init.init();
}
-
+
/**
* Creates a <code>DOMXMLSignature</code> from the specified components.
*
@@ -134,7 +134,7 @@ public final class DOMXMLSignature exten
XMLSignature.XMLNS);
si = new DOMSignedInfo(siElem, context, provider);
- // unmarshal SignatureValue
+ // unmarshal SignatureValue
Element sigValElem = DOMUtils.getNextSiblingElement(siElem,
"SignatureValue",
XMLSignature.XMLNS);
@@ -164,7 +164,7 @@ public final class DOMXMLSignature exten
context, provider));
nextSibling = DOMUtils.getNextSiblingElement(nextSibling);
}
- objects = Collections.unmodifiableList(tempObjects);
+ objects = Collections.unmodifiableList(tempObjects);
}
}
@@ -233,7 +233,7 @@ public final class DOMXMLSignature exten
}
@Override
- public boolean validate(XMLValidateContext vc)
+ public boolean validate(XMLValidateContext vc)
throws XMLSignatureException
{
if (vc == null) {
@@ -316,7 +316,7 @@ public final class DOMXMLSignature exten
}
@Override
- public void sign(XMLSignContext signContext)
+ public void sign(XMLSignContext signContext)
throws MarshalException, XMLSignatureException
{
if (signContext == null) {
@@ -427,7 +427,7 @@ public final class DOMXMLSignature exten
si.equals(osig.getSignedInfo()) &&
objects.equals(osig.getObjects());
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -484,7 +484,7 @@ public final class DOMXMLSignature exten
ref.digest(signContext);
}
- public class DOMSignatureValue extends DOMStructure
+ public class DOMSignatureValue extends DOMStructure
implements SignatureValue
{
private String id;
@@ -588,7 +588,7 @@ public final class DOMXMLSignature exten
//XXX compare signature values?
return idEqual;
}
-
+
@Override
public int hashCode() {
int result = 17;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Wed Mar 18 12:54:20 2015
@@ -172,7 +172,7 @@ public final class DOMXMLSignatureFactor
throw new ClassCastException("xmlStructure must be of type DOMStructure");
}
return unmarshal
- (((javax.xml.crypto.dom.DOMStructure) xmlStructure).getNode(),
+ (((javax.xml.crypto.dom.DOMStructure) xmlStructure).getNode(),
new UnmarshalContext());
}
@@ -180,11 +180,11 @@ public final class DOMXMLSignatureFactor
UnmarshalContext() {}
}
- private XMLSignature unmarshal(Node node, XMLCryptoContext context)
+ private XMLSignature unmarshal(Node node, XMLCryptoContext context)
throws MarshalException {
node.normalize();
-
+
Element element = null;
if (node.getNodeType() == Node.DOCUMENT_NODE) {
element = ((Document) node).getDocumentElement();
@@ -322,7 +322,7 @@ public final class DOMXMLSignatureFactor
public Transform newTransform(String algorithm,
TransformParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
-
+
TransformService spi;
if (getProvider() == null) {
spi = TransformService.getInstance(algorithm, "DOM");
@@ -333,7 +333,7 @@ public final class DOMXMLSignatureFactor
spi = TransformService.getInstance(algorithm, "DOM");
}
}
-
+
spi.init(params);
return new DOMTransform(spi);
}
@@ -352,7 +352,7 @@ public final class DOMXMLSignatureFactor
spi = TransformService.getInstance(algorithm, "DOM");
}
}
-
+
if (params == null) {
spi.init(null);
} else {
@@ -375,7 +375,7 @@ public final class DOMXMLSignatureFactor
spi = TransformService.getInstance(algorithm, "DOM");
}
}
-
+
spi.init(params);
return new DOMCanonicalizationMethod(spi);
}
@@ -384,7 +384,7 @@ public final class DOMXMLSignatureFactor
public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
XMLStructure params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
- TransformService spi;
+ TransformService spi;
if (getProvider() == null) {
spi = TransformService.getInstance(algorithm, "DOM");
} else {
@@ -399,7 +399,7 @@ public final class DOMXMLSignatureFactor
} else {
spi.init(params, null);
}
-
+
return new DOMCanonicalizationMethod(spi);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Wed Mar 18 12:54:20 2015
@@ -92,7 +92,7 @@ public final class DOMXPathFilter2Transf
XPathType.Filter filter = null;
if (filterVal.equals("intersect")) {
filter = XPathType.Filter.INTERSECT;
- } else if (filterVal.equals("subtract")) {
+ } else if (filterVal.equals("subtract")) {
filter = XPathType.Filter.SUBTRACT;
} else if (filterVal.equals("union")) {
filter = XPathType.Filter.UNION;
@@ -127,7 +127,7 @@ public final class DOMXPathFilter2Transf
throws MarshalException
{
super.marshalParams(parent, context);
- XPathFilter2ParameterSpec xp =
+ XPathFilter2ParameterSpec xp =
(XPathFilter2ParameterSpec)getParameterSpec();
String prefix = DOMUtils.getNSPrefix(context, Transform.XPATH2);
String qname = prefix == null || prefix.length() == 0
@@ -150,7 +150,7 @@ public final class DOMXPathFilter2Transf
xpathType.getNamespaceMap().entrySet();
for (Map.Entry<String, String> entry : entries) {
elem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" +
- entry.getKey(),
+ entry.getKey(),
entry.getValue());
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Wed Mar 18 12:54:20 2015
@@ -91,7 +91,7 @@ public final class DOMXPathTransform ext
throws MarshalException
{
super.marshalParams(parent, context);
- XPathFilterParameterSpec xp =
+ XPathFilterParameterSpec xp =
(XPathFilterParameterSpec)getParameterSpec();
Element xpathElem = DOMUtils.createElement(ownerDoc, "XPath",
XMLSignature.XMLNS, DOMUtils.getSignaturePrefix(context));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java Wed Mar 18 12:54:20 2015
@@ -69,9 +69,9 @@ public final class DOMXSLTTransform exte
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException {
super.marshalParams(parent, context);
- XSLTTransformParameterSpec xp =
+ XSLTTransformParameterSpec xp =
(XSLTTransformParameterSpec) getParameterSpec();
- Node xsltElem =
+ Node xsltElem =
((javax.xml.crypto.dom.DOMStructure) xp.getStylesheet()).getNode();
DOMUtils.appendChild(transformElem, xsltElem);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java?rev=1667527&r1=1667526&r2=1667527&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java Wed Mar 18 12:54:20 2015
@@ -90,7 +90,7 @@ public final class XMLDSigRI extends Pro
map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11" +
" MechanismType", "DOM");
- // InclusiveWithComments C14N 1.1
+ // InclusiveWithComments C14N 1.1
map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11#WithComments",
"org.apache.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method");
map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11#WithComments" +