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 2007/10/05 00:08:06 UTC
svn commit: r582018 - in /xml/security/trunk/src/org/apache/xml/security:
signature/XMLSignature.java utils/XMLUtils.java
Author: mullan
Date: Thu Oct 4 15:08:05 2007
New Revision: 582018
URL: http://svn.apache.org/viewvc?rev=582018&view=rev
Log:
Fixed Bug 42597: Unnecessary namespace declarations on Signature children
Modified:
xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java
xml/security/trunk/src/org/apache/xml/security/utils/XMLUtils.java
Modified: xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java?rev=582018&r1=582017&r2=582018&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/signature/XMLSignature.java Thu Oct 4 15:08:05 2007
@@ -197,6 +197,15 @@
super(doc);
+ String xmlnsDsPrefix =
+ getDefaultPrefixBindings(Constants.SignatureSpecNS);
+ if (xmlnsDsPrefix == null || xmlnsDsPrefix.length() == 0) {
+ this._constructionElement.setAttributeNS
+ (Constants.NamespaceSpecNS, "xmlns", Constants.SignatureSpecNS);
+ } else {
+ this._constructionElement.setAttributeNS
+ (Constants.NamespaceSpecNS, xmlnsDsPrefix, Constants.SignatureSpecNS);
+ }
XMLUtils.addReturnToElement(this._constructionElement);
this._baseURI = BaseURI;
@@ -229,6 +238,15 @@
super(doc);
+ String xmlnsDsPrefix =
+ getDefaultPrefixBindings(Constants.SignatureSpecNS);
+ if (xmlnsDsPrefix == null || xmlnsDsPrefix.length() == 0) {
+ this._constructionElement.setAttributeNS
+ (Constants.NamespaceSpecNS, "xmlns", Constants.SignatureSpecNS);
+ } else {
+ this._constructionElement.setAttributeNS
+ (Constants.NamespaceSpecNS, xmlnsDsPrefix, Constants.SignatureSpecNS);
+ }
XMLUtils.addReturnToElement(this._constructionElement);
this._baseURI = BaseURI;
Modified: xml/security/trunk/src/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/utils/XMLUtils.java?rev=582018&r1=582017&r2=582018&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/utils/XMLUtils.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/utils/XMLUtils.java Thu Oct 4 15:08:05 2007
@@ -243,15 +243,8 @@
throw new RuntimeException("Document is null");
}
-
if ((dsPrefix == null) || (dsPrefix.length() == 0)) {
- Element element = doc.createElementNS(Constants.SignatureSpecNS,
- elementName);
-
- element.setAttributeNS(Constants.NamespaceSpecNS, "xmlns",
- Constants.SignatureSpecNS);
-
- return element;
+ return doc.createElementNS(Constants.SignatureSpecNS, elementName);
}
String namePrefix=(String) namePrefixes.get(elementName);
if (namePrefix==null) {
@@ -261,14 +254,8 @@
namePrefix=tag.toString();
namePrefixes.put(elementName,namePrefix);
}
- Element element = doc.createElementNS(Constants.SignatureSpecNS, namePrefix);
- element.setAttributeNS(Constants.NamespaceSpecNS, xmlnsDsPrefix,
- Constants.SignatureSpecNS);
-
- return element;
-
+ return doc.createElementNS(Constants.SignatureSpecNS, namePrefix);
}
-
/**
* Returns true if the element is in XML Signature namespace and the local