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 2013/03/08 12:04:00 UTC
svn commit: r1454319 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/encryption/
main/java/org/apache/xml/security/keys/keyresolver/implementations/
main/java/org/apache/xml...
Author: coheigea
Date: Fri Mar 8 11:03:59 2013
New Revision: 1454319
URL: http://svn.apache.org/r1454319
Log:
Removing some Deprecated stuff
Removed:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementChecker.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementCheckerImpl.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/OldApiTest.java
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Serializer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/Transformer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Fri Mar 8 11:03:59 2013
@@ -113,7 +113,7 @@ public class DOMURIDereferencer implemen
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 {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Serializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Serializer.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Serializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Serializer.java Fri Mar 8 11:03:59 2013
@@ -34,18 +34,6 @@ public interface Serializer {
void setCanonicalizer(Canonicalizer canon);
/**
- * Returns a <code>String</code> representation of the specified
- * <code>Element</code>.
- *
- * @param element the <code>Element</code> to serialize.
- * @return the <code>String</code> representation of the serilaized
- * <code>Element</code>.
- * @throws Exception
- */
- @Deprecated
- String serialize(Element element) throws Exception;
-
- /**
* Returns a <code>byte[]</code> representation of the specified
* <code>Element</code>.
*
@@ -57,18 +45,6 @@ public interface Serializer {
byte[] serializeToByteArray(Element element) throws Exception;
/**
- * Returns a <code>String</code> representation of the specified
- * <code>NodeList</code>.
- *
- * @param content the <code>NodeList</code> to serialize.
- * @return the <code>String</code> representation of the serialized
- * <code>NodeList</code>.
- * @throws Exception
- */
- @Deprecated
- String serialize(NodeList content) throws Exception;
-
- /**
* Returns a <code>byte[]</code> representation of the specified
* <code>NodeList</code>.
*
@@ -82,15 +58,6 @@ public interface Serializer {
/**
* Use the Canonicalizer to serialize the node
* @param node
- * @return the canonicalization of the node
- * @throws Exception
- */
- @Deprecated
- String canonSerialize(Node node) throws Exception;
-
- /**
- * Use the Canonicalizer to serialize the node
- * @param node
* @return the (byte[]) canonicalization of the node
* @throws Exception
*/
@@ -102,14 +69,5 @@ public interface Serializer {
* @return the Node resulting from the parse of the source
* @throws XMLEncryptionException
*/
- @Deprecated
- Node deserialize(String source, Node ctx) throws XMLEncryptionException;
-
- /**
- * @param source
- * @param ctx
- * @return the Node resulting from the parse of the source
- * @throws XMLEncryptionException
- */
Node deserialize(byte[] source, Node ctx) throws XMLEncryptionException;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java Fri Mar 8 11:03:59 2013
@@ -129,7 +129,7 @@ public class XMLCipherInput {
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);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java Fri Mar 8 11:03:59 2013
@@ -226,7 +226,7 @@ public class KeyInfoReferenceResolver ex
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;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Fri Mar 8 11:03:59 2013
@@ -305,7 +305,7 @@ public class RetrievalMethodResolver ext
// 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");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/Transformer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/Transformer.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/Transformer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/Transformer.java Fri Mar 8 11:03:59 2013
@@ -36,7 +36,7 @@ public interface Transformer {
void setTransformer(Transformer transformer) throws XMLSecurityException;
- void setList(List list) throws XMLSecurityException;
+ void setList(List<?> list) throws XMLSecurityException;
XMLSecurityConstants.TransformMethod getPreferredTransformMethod(XMLSecurityConstants.TransformMethod forInput);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java Fri Mar 8 11:03:59 2013
@@ -101,7 +101,7 @@ public class XMLSecurityUtils {
}
}
- public static Class loadClass(String className) throws ClassNotFoundException {
+ public static Class<?> loadClass(String className) throws ClassNotFoundException {
return Thread.currentThread().getContextClassLoader().loadClass(className);
}
@@ -115,7 +115,7 @@ public class XMLSecurityUtils {
try {
childTransformer = transformerClass.newInstance();
if (methodParameter2 != null) {
- childTransformer.setList((List) methodParameter1);
+ childTransformer.setList((List<?>) methodParameter1);
childTransformer.setOutputStream((OutputStream) methodParameter2);
} else {
childTransformer.setTransformer((Transformer) methodParameter1);
@@ -133,7 +133,7 @@ public class XMLSecurityUtils {
for (int i = 0; i < objects.size(); i++) {
Object o = objects.get(i);
if (o instanceof JAXBElement) {
- o = ((JAXBElement) o).getValue();
+ o = ((JAXBElement<?>) o).getValue();
}
if (clazz.isAssignableFrom(o.getClass())) {
return (T) o;
@@ -147,7 +147,7 @@ public class XMLSecurityUtils {
for (int i = 0; i < objects.size(); i++) {
Object o = objects.get(i);
if (o instanceof JAXBElement) {
- JAXBElement jaxbElement = (JAXBElement) o;
+ JAXBElement<?> jaxbElement = (JAXBElement<?>) o;
if (jaxbElement.getName().equals(qName)) {
return (T) jaxbElement.getValue();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java Fri Mar 8 11:03:59 2013
@@ -92,7 +92,7 @@ public class XMLSecurityStreamWriter imp
}
@Override
- public Iterator getPrefixes(String namespaceURI) {
+ public Iterator<?> getPrefixes(String namespaceURI) {
List<String> prefixList = new ArrayList<String>(1);
if (namespaceContext != null) {
@SuppressWarnings("unchecked")
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java Fri Mar 8 11:03:59 2013
@@ -19,6 +19,7 @@
package org.apache.xml.security.stax.impl.transformer.canonicalizer;
import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import javax.xml.namespace.QName;
@@ -35,7 +36,7 @@ public class Canonicalizer11 extends Can
@Override
protected List<XMLSecAttribute> getInitialUtilizedAttributes(final XMLSecStartElement xmlSecStartElement,
- final C14NStack outputStack) {
+ final C14NStack<XMLSecEvent> outputStack) {
List<XMLSecAttribute> utilizedAttributes = Collections.emptyList();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java Fri Mar 8 11:03:59 2013
@@ -19,6 +19,7 @@
package org.apache.xml.security.stax.impl.transformer.canonicalizer;
import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
@@ -36,7 +37,7 @@ public abstract class Canonicalizer20010
@Override
protected List<XMLSecNamespace> getCurrentUtilizedNamespaces(final XMLSecStartElement xmlSecStartElement,
- final C14NStack outputStack) {
+ final C14NStack<XMLSecEvent> outputStack) {
List<XMLSecNamespace> utilizedNamespaces = Collections.emptyList();
XMLSecNamespace elementNamespace = xmlSecStartElement.getElementNamespace();
@@ -76,13 +77,13 @@ public abstract class Canonicalizer20010
@Override
protected List<XMLSecNamespace> getInitialUtilizedNamespaces(final XMLSecStartElement xmlSecStartElement,
- final C14NStack outputStack) {
+ final C14NStack<XMLSecEvent> outputStack) {
return getCurrentUtilizedNamespaces(xmlSecStartElement, outputStack);
}
@Override
protected List<XMLSecAttribute> getInitialUtilizedAttributes(final XMLSecStartElement xmlSecStartElement,
- final C14NStack outputStack) {
+ final C14NStack<XMLSecEvent> outputStack) {
List<XMLSecAttribute> utilizedAttributes = Collections.emptyList();
@SuppressWarnings("unchecked")
List<XMLSecAttribute> comparableAttributes = xmlSecStartElement.getOnElementDeclaredAttributes();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java Fri Mar 8 11:03:59 2013
@@ -66,7 +66,7 @@ public abstract class CanonicalizerBase
}
private static final Map<String, byte[]> cache = new WeakHashMap<String, byte[]>();
- private final C14NStack outputStack = new C14NStack();
+ private final C14NStack<XMLSecEvent> outputStack = new C14NStack<XMLSecEvent>();
private boolean includeComments = false;
private DocumentLevel currentDocumentLevel = DocumentLevel.NODE_BEFORE_DOCUMENT_ELEMENT;
private boolean firstCall = true;
@@ -78,7 +78,7 @@ public abstract class CanonicalizerBase
@Override
@SuppressWarnings("unchecked")
- public void setList(List list) throws XMLSecurityException {
+ public void setList(@SuppressWarnings("rawtypes") List list) throws XMLSecurityException {
this.inclusiveNamespaces = prefixList2Set(list);
}
@@ -109,7 +109,7 @@ public abstract class CanonicalizerBase
}
protected List<XMLSecNamespace> getCurrentUtilizedNamespaces(final XMLSecStartElement xmlSecStartElement,
- final C14NStack outputStack) {
+ final C14NStack<XMLSecEvent> outputStack) {
List<XMLSecNamespace> utilizedNamespaces = Collections.emptyList();
@@ -168,7 +168,7 @@ public abstract class CanonicalizerBase
}
protected List<XMLSecAttribute> getCurrentUtilizedAttributes(final XMLSecStartElement xmlSecStartElement,
- final C14NStack outputStack) {
+ final C14NStack<XMLSecEvent> outputStack) {
List<XMLSecAttribute> comparableAttributes = xmlSecStartElement.getOnElementDeclaredAttributes();
if (comparableAttributes.isEmpty()) {
return Collections.emptyList();
@@ -178,7 +178,7 @@ public abstract class CanonicalizerBase
}
protected List<XMLSecNamespace> getInitialUtilizedNamespaces(final XMLSecStartElement xmlSecStartElement,
- final C14NStack outputStack) {
+ final C14NStack<XMLSecEvent> outputStack) {
final List<XMLSecNamespace> utilizedNamespaces = new ArrayList<XMLSecNamespace>();
List<XMLSecNamespace> visibleNamespaces = new ArrayList<XMLSecNamespace>();
@@ -206,7 +206,7 @@ public abstract class CanonicalizerBase
}
protected List<XMLSecAttribute> getInitialUtilizedAttributes(final XMLSecStartElement xmlSecStartElement,
- final C14NStack outputStack) {
+ final C14NStack<XMLSecEvent> outputStack) {
List<XMLSecAttribute> utilizedAttributes = Collections.emptyList();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/FuncHere.java Fri Mar 8 11:03:59 2013
@@ -140,7 +140,7 @@ public class FuncHere extends Function {
* @param vars
* @param globalsSize
*/
- public void fixupVariables(java.util.Vector vars, int globalsSize) {
+ public void fixupVariables(@SuppressWarnings("rawtypes") java.util.Vector vars, int globalsSize) {
// do nothing
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java Fri Mar 8 11:03:59 2013
@@ -366,24 +366,6 @@ public abstract class ElementProxy {
}
/**
- * Method getBytesFromChildElement
- * @deprecated
- * @param localname
- * @param namespace
- * @return the bytes
- * @throws XMLSecurityException
- */
- public byte[] getBytesFromChildElement(String localname, String namespace)
- throws XMLSecurityException {
- Element e =
- XMLUtils.selectNode(
- getFirstChild(), namespace, localname, 0
- );
-
- return Base64.decode(e);
- }
-
- /**
* Method getTextFromChildElement
*
* @param localname
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Fri Mar 8 11:03:59 2013
@@ -61,20 +61,6 @@ public class ResourceResolver {
*
* @param uri
* @param baseURI
- * @return the instance
- *
- * @throws ResourceResolverException
- */
- public static final ResourceResolver getInstance(Attr uri, String baseURI)
- throws ResourceResolverException {
- return getInstance(uri, baseURI, false);
- }
-
- /**
- * Method getInstance
- *
- * @param uri
- * @param baseURI
* @param secureValidation
* @return the instance
*
@@ -273,14 +259,6 @@ public class ResourceResolver {
}
/**
- * @deprecated New clients should use {@link #resolve(Attr, String, boolean)}
- */
- public XMLSignatureInput resolve(Attr uri, String baseURI)
- throws ResourceResolverException {
- return resolve(uri, baseURI, true);
- }
-
- /**
* Method resolve
*
* @param uri
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java Fri Mar 8 11:03:59 2013
@@ -19,7 +19,6 @@
package org.apache.xml.security.utils.resolver;
import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.w3c.dom.Attr;
/**
* This Exception is thrown if something related to the
@@ -100,34 +99,6 @@ public class ResourceResolverException e
}
/**
- * @deprecated New clients should use {@link #ResourceResolverException(String, Object[], Exception, String, String)}
- */
- public ResourceResolverException(String msgID, Exception originalException,
- Attr uri, String baseURI) {
-
- this(msgID, originalException, getNodeValue(uri), baseURI);
- }
-
- /**
- * @deprecated New clients should use {@link #ResourceResolverException(String, String, String)}
- */
- public ResourceResolverException(String msgID, Attr uri, String baseURI) {
- this(msgID, getNodeValue(uri), baseURI);
- }
-
- /**
- * @deprecated New clients should use {@link #ResourceResolverException(String, Object[], String, String)}
- */
- public ResourceResolverException(String _msgID, Object exArgs[], Attr uri,
- String BaseURI) {
- this(_msgID, exArgs, getNodeValue(uri), BaseURI);
- }
-
- private static String getNodeValue(Attr uri) {
- return (uri != null) ? uri.getNodeValue() : null;
- }
-
- /**
*
* @param uri
*/
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java Fri Mar 8 11:03:59 2013
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.xml.security.signature.XMLSignatureInput;
-import org.w3c.dom.Attr;
/**
* During reference validation, we have to retrieve resources from somewhere.
@@ -39,30 +38,6 @@ public abstract class ResourceResolverSp
protected java.util.Map<String, String> properties = null;
/**
- * Deprecated - used to carry state about whether resolution was being done in a secure fashion,
- * but was not thread safe, so the resolution information is now passed as parameters to methods.
- *
- * @deprecated Secure validation flag is now passed to methods.
- */
- protected final boolean secureValidation = true;
-
- /**
- * This is the workhorse method used to resolve resources.
- *
- * @param uri
- * @param BaseURI
- * @return the resource wrapped around a XMLSignatureInput
- *
- * @throws ResourceResolverException
- *
- * @deprecated New clients should override {@link #engineResolveURI(ResourceResolverContext)}
- */
- public XMLSignatureInput engineResolve(Attr uri, String BaseURI)
- throws ResourceResolverException {
- throw new UnsupportedOperationException();
- }
-
- /**
* This is the workhorse method used to resolve resources.
* @param context Context to use to resolve resources.
*
@@ -72,9 +47,7 @@ public abstract class ResourceResolverSp
*/
public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
throws ResourceResolverException {
- // The default implementation, to preserve backwards compatibility in the
- // test cases, calls the old resolver API.
- return engineResolve(context.attr, context.baseUri);
+ throw new UnsupportedOperationException();
}
/**
@@ -130,30 +103,13 @@ public abstract class ResourceResolverSp
* This method helps the {@link ResourceResolver} to decide whether a
* {@link ResourceResolverSpi} is able to perform the requested action.
*
- * @param uri
- * @param BaseURI
- * @return true if the engine can resolve the uri
- *
- * @deprecated See {@link #engineCanResolveURI(ResourceResolverContext)}
- */
- public boolean engineCanResolve(Attr uri, String BaseURI) {
- // This method used to be abstract, so any calls to "super" are bogus.
- throw new UnsupportedOperationException();
- }
-
- /**
- * This method helps the {@link ResourceResolver} to decide whether a
- * {@link ResourceResolverSpi} is able to perform the requested action.
- *
* <p>New clients should override this method, and not override {@link #engineCanResolve(Attr, String)}
* </p>
* @param context Context in which to do resolution.
* @return true if the engine can resolve the uri
*/
public boolean engineCanResolveURI(ResourceResolverContext context) {
- // To preserve backward compatibility with existing resolvers that might override the old method,
- // call the old deprecated API.
- return engineCanResolve( (Attr) context.attr, context.baseUri );
+ throw new UnsupportedOperationException();
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java Fri Mar 8 11:03:59 2013
@@ -53,6 +53,7 @@ public class ResolverFragment extends Re
* @param uri
* @param baseURI
*/
+ @Override
public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
throws ResourceResolverException {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java Fri Mar 8 11:03:59 2013
@@ -57,7 +57,7 @@ public class ResolverDirectHTTPTest exte
uri.setNodeValue("urn:ddd:uuu");
((Element) doc.createElement("test")).setAttributeNode(uri);
try {
- ResourceResolver resolver = ResourceResolver.getInstance(uri, null);
+ ResourceResolver resolver = ResourceResolver.getInstance(uri, null, true);
fail("No exception thrown, but resolver found: " + resolver);
} catch (ResourceResolverException e) {
//
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java?rev=1454319&r1=1454318&r2=1454319&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java Fri Mar 8 11:03:59 2013
@@ -54,7 +54,7 @@ public class ResourceResolverTest extend
Attr uriAttr = doc.createAttribute("URI");
uriAttr.setValue("http://www.apache.org");
ResourceResolver res =
- ResourceResolver.getInstance(uriAttr, "http://www.apache.org");
+ ResourceResolver.getInstance(uriAttr, "http://www.apache.org", true);
try {
uriAttr.setValue("http://xmldsig.pothole.com/xml-stylesheet.txt");
res.resolve(uriAttr, null, true);
@@ -80,7 +80,7 @@ public class ResourceResolverTest extend
String basedir = System.getProperty("basedir");
String file = new File(basedir, "pom.xml").toURI().toString();
uriAttr.setValue(file);
- ResourceResolver res = ResourceResolver.getInstance(uriAttr, file);
+ ResourceResolver res = ResourceResolver.getInstance(uriAttr, file, false);
try {
res.resolve(uriAttr, "", true);
} catch (Exception e) {