changeset 55109:31f43d8e7afb

8224767: Add String constants for Canonical XML 1.1 URIs Reviewed-by: xuelei
author mullan
date Thu, 30 May 2019 09:24:13 -0400
parents 430da9dcfcb2
children 17f85a8780d5
files src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java
diffstat 2 files changed, 53 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java	Thu May 30 07:07:15 2019 -0400
+++ b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java	Thu May 30 09:24:13 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,6 +90,24 @@
         "http://www.w3.org/2001/10/xml-exc-c14n#WithComments";
 
     /**
+     * The <a href="https://www.w3.org/TR/xml-c14n11/">Canonical XML 1.1
+     * (without comments)</a> canonicalization method algorithm URI.
+     *
+     * @since 13
+     */
+    final static String INCLUSIVE_11 = "http://www.w3.org/2006/12/xml-c14n11";
+
+    /**
+     * The <a href="https://www.w3.org/TR/xml-c14n11/#WithComments">
+     * Canonical XML 1.1 with comments</a> canonicalization method algorithm
+     * URI.
+     *
+     * @since 13
+     */
+    final static String INCLUSIVE_11_WITH_COMMENTS =
+        "http://www.w3.org/2006/12/xml-c14n11#WithComments";
+
+    /**
      * Returns the algorithm-specific input parameters associated with this
      * <code>CanonicalizationMethod</code>.
      *
--- a/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java	Thu May 30 07:07:15 2019 -0400
+++ b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/TransformService.java	Thu May 30 09:24:13 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -141,9 +141,18 @@
      * may be different than the order of providers returned by
      * {@link Security#getProviders() Security.getProviders()}.
      *
-     * @param algorithm the URI of the algorithm
+     * @param algorithm the URI of the algorithm. See the
+     *    {@code TransformService} section in the
+     *    <a href=
+     *    "{@docRoot}/../specs/security/standard-names.html#xml-signature-transform-transformservice-algorithms">
+     *    Java Security Standard Algorithm Names Specification</a> for a list of
+     *    standard transform algorithms.
      * @param mechanismType the type of the XML processing mechanism and
-     *   representation
+     *    representation. See the {@code TransformService} section in the
+     *    <a href=
+     *    "{@docRoot}/../specs/security/standard-names.html#xml-signature-xmlsignaturefactorykeyinfofactorytransformservice-mechanisms">
+     *    Java Security Standard Algorithm Names Specification</a> for a list of
+     *    standard mechanism types.
      * @return a new <code>TransformService</code>
      * @throws NullPointerException if <code>algorithm</code> or
      *   <code>mechanismType</code> is  <code>null</code>
@@ -193,9 +202,18 @@
      * <code>Provider</code> object does not have to be registered in the
      * provider list.
      *
-     * @param algorithm the URI of the algorithm
+     * @param algorithm the URI of the algorithm. See the
+     *    {@code TransformService} section in the
+     *    <a href=
+     *    "{@docRoot}/../specs/security/standard-names.html#xml-signature-transform-transformservice-algorithms">
+     *    Java Security Standard Algorithm Names Specification</a> for a list of
+     *    standard transform algorithms.
      * @param mechanismType the type of the XML processing mechanism and
-     *   representation
+     *    representation. See the {@code TransformService} section in the
+     *    <a href=
+     *    "{@docRoot}/../specs/security/standard-names.html#xml-signature-xmlsignaturefactorykeyinfofactorytransformservice-mechanisms">
+     *    Java Security Standard Algorithm Names Specification</a> for a list of
+     *    standard mechanism types.
      * @param provider the <code>Provider</code> object
      * @return a new <code>TransformService</code>
      * @throws NullPointerException if <code>provider</code>,
@@ -246,9 +264,18 @@
      * <p>Note that the list of registered providers may be retrieved via
      * the {@link Security#getProviders() Security.getProviders()} method.
      *
-     * @param algorithm the URI of the algorithm
+     * @param algorithm the URI of the algorithm. See the
+     *    {@code TransformService} section in the
+     *    <a href=
+     *    "{@docRoot}/../specs/security/standard-names.html#xml-signature-transform-transformservice-algorithms">
+     *    Java Security Standard Algorithm Names Specification</a> for a list of
+     *    standard transform algorithms.
      * @param mechanismType the type of the XML processing mechanism and
-     *   representation
+     *    representation. See the {@code TransformService} section in the
+     *    <a href=
+     *    "{@docRoot}/../specs/security/standard-names.html#xml-signature-xmlsignaturefactorykeyinfofactorytransformservice-mechanisms">
+     *    Java Security Standard Algorithm Names Specification</a> for a list of
+     *    standard mechanism types.
      * @param provider the string name of the provider
      * @return a new <code>TransformService</code>
      * @throws NoSuchProviderException if the specified provider is not