You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2014/05/20 13:40:04 UTC
svn commit: r1596208 - in
/santuario/xml-security-java/branches/1.5.x-fixes/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/utils/
test/java/javax/xml/crypto/test/dsig/
Author: coheigea
Date: Tue May 20 11:40:04 2014
New Revision: 1596208
URL: http://svn.apache.org/r1596208
Log:
Fixing build with JDK 5
Modified:
santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/XMLUtils.java
santuario/xml-security-java/branches/1.5.x-fixes/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java?rev=1596208&r1=1596207&r2=1596208&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java Tue May 20 11:40:04 2014
@@ -245,11 +245,9 @@ public abstract class DOMDigestMethod ex
SHA224(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return SHA224;
}
- @Override
String getMessageDigestAlgorithm() {
return "SHA-224";
}
@@ -311,11 +309,9 @@ public abstract class DOMDigestMethod ex
RIPEMD160(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return DigestMethod.RIPEMD160;
}
- @Override
String getMessageDigestAlgorithm() {
return "RIPEMD160";
}
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1596208&r1=1596207&r2=1596208&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/main/java/org/apache/xml/security/utils/XMLUtils.java Tue May 20 11:40:04 2014
@@ -923,7 +923,7 @@ public class XMLUtils {
Element foundElement = null;
String id = value.trim();
- if (!id.isEmpty() && id.charAt(0) == '#') {
+ if (!"".equals(id) && id.charAt(0) == '#') {
id = id.substring(1);
}
@@ -983,7 +983,7 @@ public class XMLUtils {
Node processedNode = null;
String id = value.trim();
- if (!id.isEmpty() && id.charAt(0) == '#') {
+ if (!"".equals(id) && id.charAt(0) == '#') {
id = id.substring(1);
}
Modified: santuario/xml-security-java/branches/1.5.x-fixes/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.5.x-fixes/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java?rev=1596208&r1=1596207&r2=1596208&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.5.x-fixes/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java (original)
+++ santuario/xml-security-java/branches/1.5.x-fixes/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java Tue May 20 11:40:04 2014
@@ -174,7 +174,6 @@ public class SignatureDigestMethodTest e
dsc.setDefaultNamespacePrefix("dsig");
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
// XMLUtils.outputDOM(doc.getDocumentElement(), System.out);