Hi Santuario-dev,
I noticed minor deprecations warnings in the code on trunk - probably
worth fixing:
Patch attached.
Please let me know if I should file a bug instead.
Eric.
Index:
src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
===================================================================
--- src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
(revision 1449985)
+++ src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
(working copy)
@@ -113,7 +113,7 @@
try {
ResourceResolver apacheResolver =
ResourceResolver.getInstance(uriAttr, baseURI, secVal);
- XMLSignatureInput in = apacheResolver.resolve(uriAttr, baseURI);
+ XMLSignatureInput in = apacheResolver.resolve(uriAttr, baseURI,
secVal);
if (in.isOctetStream()) {
return new ApacheOctetStreamData(in);
} else {
Index: src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
===================================================================
--- src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
(revision 1449985)
+++ src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
(working copy)
@@ -129,7 +129,7 @@
try {
ResourceResolver resolver =
ResourceResolver.getInstance(uriAttr, null,
secureValidation);
- input = resolver.resolve(uriAttr, null);
+ input = resolver.resolve(uriAttr, null, secureValidation);
} catch (ResourceResolverException ex) {
throw new XMLEncryptionException("empty", ex);
}
Index:
src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
===================================================================
---
src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
(revision 1449985)
+++
src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
(working copy)
@@ -226,7 +226,7 @@
private XMLSignatureInput resolveInput(Attr uri, String baseURI, boolean
secureValidation)
throws XMLSecurityException {
ResourceResolver resRes = ResourceResolver.getInstance(uri, baseURI,
secureValidation);
- XMLSignatureInput resource = resRes.resolve(uri, baseURI);
+ XMLSignatureInput resource = resRes.resolve(uri, baseURI,
secureValidation);
return resource;
}
Index:
src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
===================================================================
---
src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
(revision 1449985)
+++
src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
(working copy)
@@ -305,7 +305,7 @@
// Apply the transforms
Transforms transforms = rm.getTransforms();
ResourceResolver resRes = ResourceResolver.getInstance(uri, baseURI,
secureValidation);
- XMLSignatureInput resource = resRes.resolve(uri, baseURI);
+ XMLSignatureInput resource = resRes.resolve(uri, baseURI,
secureValidation);
if (transforms != null) {
if (log.isDebugEnabled()) {
log.debug("We have Transforms");
Index: src/main/java/org/apache/xml/security/signature/Reference.java
===================================================================
--- src/main/java/org/apache/xml/security/signature/Reference.java
(revision 1449985)
+++ src/main/java/org/apache/xml/security/signature/Reference.java
(working copy)
@@ -414,7 +414,7 @@
);
resolver.addProperties(this.manifest.getResolverProperties());
- return resolver.resolve(uriAttr, this.baseURI);
+ return resolver.resolve(uriAttr, this.baseURI, secureValidation);
} catch (ResourceResolverException ex) {
throw new ReferenceNotInitializedException("empty", ex);
}
