--- old/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java 2013-06-28 11:35:08.063487300 -0400 +++ new/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java 2013-06-28 11:35:07.891492653 -0400 @@ -2,21 +2,23 @@ * reserved comment block * DO NOT REMOVE OR ALTER! */ -/* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ /* * =========================================================================== @@ -29,7 +31,7 @@ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. */ /* - * $Id: XMLDSigRI.java,v 1.2 2008/07/24 15:20:32 mullan Exp $ + * $Id: XMLDSigRI.java 1400021 2012-10-19 10:16:04Z coheigea $ */ package org.jcp.xml.dsig.internal.dom; @@ -53,13 +55,15 @@ static final long serialVersionUID = -5049765099299494554L; private static final String INFO = "XMLDSig " + - "(DOM XMLSignatureFactory; DOM KeyInfoFactory)"; + "(DOM XMLSignatureFactory; DOM KeyInfoFactory; " + + "C14N 1.0, C14N 1.1, Exclusive C14N, Base64, Enveloped, XPath, " + + "XPath2, XSLT TransformServices)"; public XMLDSigRI() { /* We are the XMLDSig provider */ - super("XMLDSig", 1.0, INFO); - - final Map map = new HashMap(); + super("XMLDSig", 1.8, INFO); + + final Map map = new HashMap(); map.put("XMLSignatureFactory.DOM", "org.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory"); map.put("KeyInfoFactory.DOM", @@ -67,94 +71,89 @@ // Inclusive C14N - map.put((String)"TransformService." + CanonicalizationMethod.INCLUSIVE, + map.put("TransformService." + CanonicalizationMethod.INCLUSIVE, "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14NMethod"); map.put("Alg.Alias.TransformService.INCLUSIVE", CanonicalizationMethod.INCLUSIVE); - map.put((String)"TransformService." + CanonicalizationMethod.INCLUSIVE + + map.put("TransformService." + CanonicalizationMethod.INCLUSIVE + " MechanismType", "DOM"); // InclusiveWithComments C14N - map.put((String) "TransformService." + + map.put("TransformService." + CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS, "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14NMethod"); map.put("Alg.Alias.TransformService.INCLUSIVE_WITH_COMMENTS", CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS); - map.put((String) "TransformService." + + map.put("TransformService." + CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS + " MechanismType", "DOM"); // Inclusive C14N 1.1 - map.put((String)"TransformService." + - "http://www.w3.org/2006/12/xml-c14n11", + map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11", "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method"); - map.put((String)"TransformService." + - "http://www.w3.org/2006/12/xml-c14n11" + + map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11" + " MechanismType", "DOM"); - // InclusiveWithComments C14N 1.1 - map.put((String)"TransformService." + - "http://www.w3.org/2006/12/xml-c14n11#WithComments", + // InclusiveWithComments C14N 1.1 + map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11#WithComments", "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method"); - map.put((String)"TransformService." + - "http://www.w3.org/2006/12/xml-c14n11#WithComments" + + map.put("TransformService.http://www.w3.org/2006/12/xml-c14n11#WithComments" + " MechanismType", "DOM"); // Exclusive C14N - map.put((String) "TransformService." + CanonicalizationMethod.EXCLUSIVE, + map.put("TransformService." + CanonicalizationMethod.EXCLUSIVE, "org.jcp.xml.dsig.internal.dom.DOMExcC14NMethod"); map.put("Alg.Alias.TransformService.EXCLUSIVE", CanonicalizationMethod.EXCLUSIVE); - map.put((String)"TransformService." + CanonicalizationMethod.EXCLUSIVE + + map.put("TransformService." + CanonicalizationMethod.EXCLUSIVE + " MechanismType", "DOM"); // ExclusiveWithComments C14N - map.put((String) "TransformService." + + map.put("TransformService." + CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS, "org.jcp.xml.dsig.internal.dom.DOMExcC14NMethod"); map.put("Alg.Alias.TransformService.EXCLUSIVE_WITH_COMMENTS", CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS); - map.put((String) "TransformService." + + map.put("TransformService." + CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS + " MechanismType", "DOM"); // Base64 Transform - map.put((String) "TransformService." + Transform.BASE64, + map.put("TransformService." + Transform.BASE64, "org.jcp.xml.dsig.internal.dom.DOMBase64Transform"); map.put("Alg.Alias.TransformService.BASE64", Transform.BASE64); - map.put((String) "TransformService." + Transform.BASE64 + + map.put("TransformService." + Transform.BASE64 + " MechanismType", "DOM"); // Enveloped Transform - map.put((String) "TransformService." + Transform.ENVELOPED, + map.put("TransformService." + Transform.ENVELOPED, "org.jcp.xml.dsig.internal.dom.DOMEnvelopedTransform"); map.put("Alg.Alias.TransformService.ENVELOPED", Transform.ENVELOPED); - map.put((String) "TransformService." + Transform.ENVELOPED + + map.put("TransformService." + Transform.ENVELOPED + " MechanismType", "DOM"); // XPath2 Transform - map.put((String) "TransformService." + Transform.XPATH2, + map.put("TransformService." + Transform.XPATH2, "org.jcp.xml.dsig.internal.dom.DOMXPathFilter2Transform"); map.put("Alg.Alias.TransformService.XPATH2", Transform.XPATH2); - map.put((String) "TransformService." + Transform.XPATH2 + + map.put("TransformService." + Transform.XPATH2 + " MechanismType", "DOM"); // XPath Transform - map.put((String) "TransformService." + Transform.XPATH, + map.put("TransformService." + Transform.XPATH, "org.jcp.xml.dsig.internal.dom.DOMXPathTransform"); map.put("Alg.Alias.TransformService.XPATH", Transform.XPATH); - map.put((String) "TransformService." + Transform.XPATH + + map.put("TransformService." + Transform.XPATH + " MechanismType", "DOM"); // XSLT Transform - map.put((String) "TransformService." + Transform.XSLT, + map.put("TransformService." + Transform.XSLT, "org.jcp.xml.dsig.internal.dom.DOMXSLTTransform"); map.put("Alg.Alias.TransformService.XSLT", Transform.XSLT); - map.put((String) "TransformService." + Transform.XSLT + - " MechanismType", "DOM"); + map.put("TransformService." + Transform.XSLT + " MechanismType", "DOM"); - AccessController.doPrivileged(new java.security.PrivilegedAction() { - public Object run() { + AccessController.doPrivileged(new PrivilegedAction() { + public Void run() { putAll(map); return null; }