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 2022/05/23 12:43:48 UTC
[santuario-xml-security-java] branch master updated: Fix typos.
This is an automated email from the ASF dual-hosted git repository.
mullan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/santuario-xml-security-java.git
The following commit(s) were added to refs/heads/master by this push:
new d2840a3e Fix typos.
d2840a3e is described below
commit d2840a3e2263a1ffebe2bb981575a0362c307752
Author: Sean Mullan <se...@oracle.com>
AuthorDate: Mon May 23 08:43:24 2022 -0400
Fix typos.
---
.../org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java | 2 +-
.../org/apache/jcp/xml/dsig/internal/dom/DOMReference.java | 2 +-
.../apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java | 2 +-
.../org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java | 4 ++--
.../security/c14n/implementations/NameSpaceSymbTable.java | 8 ++++----
.../xml/security/c14n/implementations/XmlAttrStack.java | 2 +-
.../java/org/apache/xml/security/keys/content/MgmtData.java | 2 +-
.../keyresolver/implementations/RetrievalMethodResolver.java | 2 +-
.../org/apache/xml/security/signature/ObjectContainer.java | 2 +-
.../org/apache/xml/security/signature/SignatureProperty.java | 2 +-
.../org/apache/xml/security/signature/VerifiedReference.java | 2 +-
.../xml/security/signature/XMLSignatureInputDebugger.java | 2 +-
.../java/org/apache/xml/security/transforms/Transform.java | 2 +-
src/main/java/org/apache/xml/security/utils/I18n.java | 2 +-
.../java/org/apache/xml/security/utils/RFC2253Parser.java | 12 ++++++------
15 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
index 690c31b0..f0a683c9 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
@@ -100,7 +100,7 @@ public final class DOMManifest extends DOMStructure implements Manifest {
}
refs.add(new DOMReference(refElem, context, provider));
if (secVal && refs.size() > DOMSignedInfo.MAXIMUM_REFERENCE_COUNT) {
- String error = "A maxiumum of " + DOMSignedInfo.MAXIMUM_REFERENCE_COUNT + " "
+ String error = "A maximum of " + DOMSignedInfo.MAXIMUM_REFERENCE_COUNT + " "
+ "references per Manifest are allowed with secure validation";
throw new MarshalException(error);
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
index 8e463b59..8086b58e 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
@@ -208,7 +208,7 @@ public final class DOMReference extends DOMStructure
newTransforms.add
(new DOMTransform(transformElem, context, provider));
if (secVal && newTransforms.size() > MAXIMUM_TRANSFORM_COUNT) {
- String error = "A maxiumum of " + MAXIMUM_TRANSFORM_COUNT + " "
+ String error = "A maximum of " + MAXIMUM_TRANSFORM_COUNT + " "
+ "transforms per Reference are allowed with secure validation";
throw new MarshalException(error);
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
index ccae982e..169524a1 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
@@ -157,7 +157,7 @@ public final class DOMRetrievalMethod extends DOMStructure
newTransforms.add
(new DOMTransform(transformElem, context, provider));
if (secVal && newTransforms.size() > DOMReference.MAXIMUM_TRANSFORM_COUNT) {
- String error = "A maxiumum of " + DOMReference.MAXIMUM_TRANSFORM_COUNT + " "
+ String error = "A maximum of " + DOMReference.MAXIMUM_TRANSFORM_COUNT + " "
+ "transforms per Reference are allowed with secure validation";
throw new MarshalException(error);
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
index 4b8ce3dc..df7c5762 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
@@ -112,7 +112,7 @@ public final class DOMSignedInfo extends DOMStructure implements SignedInfo {
* @param cm the canonicalization method
* @param sm the signature method
* @param references the list of references. The list is copied.
- * @param id an optional identifer that will allow this
+ * @param id an optional identifier that will allow this
* <code>SignedInfo</code> to be referenced by other signatures and
* objects
* @throws NullPointerException if <code>cm</code>, <code>sm</code>,
@@ -178,7 +178,7 @@ public final class DOMSignedInfo extends DOMStructure implements SignedInfo {
}
refList.add(new DOMReference(refElem, context, provider));
if (secVal && refList.size() > MAXIMUM_REFERENCE_COUNT) {
- String error = "A maxiumum of " + MAXIMUM_REFERENCE_COUNT + " "
+ String error = "A maximum of " + MAXIMUM_REFERENCE_COUNT + " "
+ "references per Manifest are allowed with secure validation";
throw new MarshalException(error);
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java b/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
index 8a730ff4..62a0eb8d 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
@@ -46,7 +46,7 @@ public class NameSpaceSymbTable {
initialMap.put(XMLNS, ne);
}
- /**The map betwen prefix-> entry table. */
+ /**The map between prefix-> entry table. */
private SymbMap symb;
/**The stacks for removing the definitions when doing pop.*/
@@ -54,7 +54,7 @@ public class NameSpaceSymbTable {
private boolean cloned = true;
/**
- * Default constractor
+ * Default constructor
**/
public NameSpaceSymbTable() {
//Insert the default binding for xmlns.
@@ -166,14 +166,14 @@ public class NameSpaceSymbTable {
symb.put(prefix, entry);
entry.rendered = true;
entry.lastrendered = entry.uri;
- // Return the node for outputing.
+ // Return the node for outputting.
return entry.n;
}
/**
* Gets a definition without mark it as render.
* For render in exclusive c14n the namespaces in the include prefixes.
- * @param prefix The prefix whose definition is neaded.
+ * @param prefix The prefix whose definition is needed.
* @return the attr to render, null if there is no need to render
**/
public Attr getMappingWithoutRendered(String prefix) {
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java b/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java
index e030a6e6..7c2338a7 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/XmlAttrStack.java
@@ -348,7 +348,7 @@ class XmlAttrStack {
// that from the input buffer else if the input buffer consists
// only of ".." and if the output buffer does not contain only
// the root slash "/", then move the ".." to the output buffer
- // else delte it.; otherwise,
+ // else delete it.; otherwise,
} else if (".".equals(input)) {
input = "";
printStep("2D", output.toString(), input);
diff --git a/src/main/java/org/apache/xml/security/keys/content/MgmtData.java b/src/main/java/org/apache/xml/security/keys/content/MgmtData.java
index cd8627c1..bb72d668 100644
--- a/src/main/java/org/apache/xml/security/keys/content/MgmtData.java
+++ b/src/main/java/org/apache/xml/security/keys/content/MgmtData.java
@@ -55,7 +55,7 @@ public class MgmtData extends SignatureElementProxy implements KeyInfoContent {
/**
* Method getMgmtData
*
- * @return the managment data
+ * @return the management data
*/
public String getMgmtData() {
return this.getTextFromTextChild();
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
index 4e8439b8..9ab4cc0b 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
@@ -297,7 +297,7 @@ public class RetrievalMethodResolver extends KeyResolverSpi {
}
List<Node> parents = new ArrayList<>();
- // Obtain all the parents of the elemnt
+ // Obtain all the parents of the element
while (e != null) {
parents.add(e);
Node n = e.getParentNode();
diff --git a/src/main/java/org/apache/xml/security/signature/ObjectContainer.java b/src/main/java/org/apache/xml/security/signature/ObjectContainer.java
index 5c1ed8a7..2d56f808 100644
--- a/src/main/java/org/apache/xml/security/signature/ObjectContainer.java
+++ b/src/main/java/org/apache/xml/security/signature/ObjectContainer.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Node;
* Handles <code><ds:Object></code> elements
* <code>Object</code> {@link Element} supply facility which can contain any kind data
*
- * $todo$ if we remove childen, the boolean values are not updated
+ * $todo$ if we remove children, the boolean values are not updated
*/
public class ObjectContainer extends SignatureElementProxy {
diff --git a/src/main/java/org/apache/xml/security/signature/SignatureProperty.java b/src/main/java/org/apache/xml/security/signature/SignatureProperty.java
index 8f13122b..42bdac35 100644
--- a/src/main/java/org/apache/xml/security/signature/SignatureProperty.java
+++ b/src/main/java/org/apache/xml/security/signature/SignatureProperty.java
@@ -45,7 +45,7 @@ public class SignatureProperty extends SignatureElementProxy {
}
/**
- * Constructs {@link SignatureProperty} using sepcified <code>target</code> attribute and
+ * Constructs {@link SignatureProperty} using specified <code>target</code> attribute and
* <code>id</code> attribute
*
* @param doc the {@link Document} in which <code>XMLsignature</code> is placed
diff --git a/src/main/java/org/apache/xml/security/signature/VerifiedReference.java b/src/main/java/org/apache/xml/security/signature/VerifiedReference.java
index e925d5fa..07d43060 100644
--- a/src/main/java/org/apache/xml/security/signature/VerifiedReference.java
+++ b/src/main/java/org/apache/xml/security/signature/VerifiedReference.java
@@ -34,7 +34,7 @@ public class VerifiedReference {
* @param valid Whether this Reference was successfully validated or not
* @param uri The URI of this Reference
* @param manifestReferences If this reference is a reference to a Manifest, this holds the list
- * of verified referenes associated with this Manifest
+ * of verified references associated with this Manifest
*/
public VerifiedReference(boolean valid, String uri, List<VerifiedReference> manifestReferences) {
this.valid = valid;
diff --git a/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java b/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
index d2041cbe..8860bf2d 100644
--- a/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
+++ b/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
@@ -123,7 +123,7 @@ public class XMLSignatureInputDebugger {
/**
* Constructor XMLSignatureInputDebugger
*
- * @param xmlSignatureInput the signatur to pretty print
+ * @param xmlSignatureInput the signature to pretty print
* @param inclusiveNamespace
*/
public XMLSignatureInputDebugger(
diff --git a/src/main/java/org/apache/xml/security/transforms/Transform.java b/src/main/java/org/apache/xml/security/transforms/Transform.java
index ffb01a70..8c9aebd5 100644
--- a/src/main/java/org/apache/xml/security/transforms/Transform.java
+++ b/src/main/java/org/apache/xml/security/transforms/Transform.java
@@ -305,7 +305,7 @@ public final class Transform extends SignatureElementProxy {
/**
* Transforms the input, and generates {@link XMLSignatureInput} as output.
*
- * @param input input {@link XMLSignatureInput} which can supplied Octect
+ * @param input input {@link XMLSignatureInput} which can supplied Octet
* Stream and NodeSet as Input of Transformation
* @param os where to output the result of the last transformation
* @param secureValidation Whether secure validation is enabled
diff --git a/src/main/java/org/apache/xml/security/utils/I18n.java b/src/main/java/org/apache/xml/security/utils/I18n.java
index c9bb1b6f..d303b13f 100644
--- a/src/main/java/org/apache/xml/security/utils/I18n.java
+++ b/src/main/java/org/apache/xml/security/utils/I18n.java
@@ -51,7 +51,7 @@ public final class I18n {
/**
* Method translate
*
- * translates a message ID into an internationalized String, see alse
+ * translates a message ID into an internationalized String, see also
* <CODE>XMLSecurityException.getExceptionMEssage()</CODE>. The strings are
* stored in the <CODE>ResourceBundle</CODE>, which is identified in
* <CODE>exceptionMessagesResourceBundleBase</CODE>
diff --git a/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java b/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java
index 72ab461a..911778ff 100644
--- a/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java
+++ b/src/main/java/org/apache/xml/security/utils/RFC2253Parser.java
@@ -464,15 +464,15 @@ public class RFC2253Parser {
*/
static String trim(String str) {
- String trimed = str.trim();
- int i = str.indexOf(trimed) + trimed.length();
+ String trimmed = str.trim();
+ int i = str.indexOf(trimmed) + trimmed.length();
- if (str.length() > i && trimed.endsWith("\\")
- && !trimed.endsWith("\\\\") && str.charAt(i) == ' ') {
- trimed = trimed + " ";
+ if (str.length() > i && trimmed.endsWith("\\")
+ && !trimmed.endsWith("\\\\") && str.charAt(i) == ' ') {
+ trimmed = trimmed + " ";
}
- return trimed;
+ return trimmed;
}
}