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 2011/04/20 11:45:30 UTC
svn commit: r1095341 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security:
./ resource/ utils/resolver/ utils/resolver/implementations/
Author: coheigea
Date: Wed Apr 20 09:45:30 2011
New Revision: 1095341
URL: http://svn.apache.org/viewvc?rev=1095341&view=rev
Log:
[SANTUARIO-254] - Reworked ResourceResolver stuff on trunk
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/resource/config.xml
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/implementations/ResolverAnonymous.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1095341&r1=1095340&r2=1095341&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Wed Apr 20 09:45:30 2011
@@ -651,6 +651,11 @@ public class Init {
key, (Class<CanonicalizerSpi>)defaultC14nAlgorithms.get(key)
);
}
+
+ //
+ // Register the default resolvers
+ //
+ ResourceResolver.registerDefaultResolvers();
} catch (Exception ex) {
log.error(ex);
ex.printStackTrace();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/resource/config.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/resource/config.xml?rev=1095341&r1=1095340&r2=1095341&view=diff
==============================================================================
Binary files - no diff available.
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=1095341&r1=1095340&r2=1095341&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 Wed Apr 20 09:45:30 2011
@@ -21,6 +21,10 @@ import java.util.List;
import java.util.Map;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.utils.resolver.implementations.ResolverDirectHTTP;
+import org.apache.xml.security.utils.resolver.implementations.ResolverFragment;
+import org.apache.xml.security.utils.resolver.implementations.ResolverLocalFilesystem;
+import org.apache.xml.security.utils.resolver.implementations.ResolverXPointer;
import org.w3c.dom.Attr;
/**
@@ -34,12 +38,22 @@ public class ResourceResolver {
/** {@link org.apache.commons.logging} logging facility */
private static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(ResourceResolver.class);
-
+
/** these are the system-wide resolvers */
- private static List<ResourceResolver> resolverVector = new ArrayList<ResourceResolver>(10);
-
- /** Field transformSpi */
- protected ResourceResolverSpi resolverSpi = null;
+ private static List<ResourceResolver> resolverList = new ArrayList<ResourceResolver>();
+
+ private static List<Class<? extends ResourceResolverSpi>> defaultResolverList =
+ new ArrayList<Class<? extends ResourceResolverSpi>>();
+
+ static {
+ defaultResolverList.add(ResolverFragment.class);
+ defaultResolverList.add(ResolverLocalFilesystem.class);
+ defaultResolverList.add(ResolverXPointer.class);
+ defaultResolverList.add(ResolverDirectHTTP.class);
+ }
+
+ /** Field resolverSpi */
+ private final ResourceResolverSpi resolverSpi;
/**
* Constructor ResourceResolver
@@ -49,10 +63,9 @@ public class ResourceResolver {
* @throws IllegalAccessException
* @throws InstantiationException
*/
- private ResourceResolver(String className)
- throws ClassNotFoundException, IllegalAccessException, InstantiationException {
- this.resolverSpi =
- (ResourceResolverSpi) Class.forName(className).newInstance();
+ private ResourceResolver(Class<? extends ResourceResolverSpi> className)
+ throws IllegalAccessException, InstantiationException {
+ this.resolverSpi = className.newInstance();
}
/**
@@ -73,38 +86,34 @@ public class ResourceResolver {
*
* @throws ResourceResolverException
*/
- public synchronized static final ResourceResolver getInstance(Attr uri, String baseURI)
+ public static final ResourceResolver getInstance(Attr uri, String baseURI)
throws ResourceResolverException {
- for (int i = 0; i < resolverVector.size(); i++) {
- ResourceResolver resolver = resolverVector.get(i);
- ResourceResolver resolverTmp = null;
-
- if (resolver.resolverSpi.engineIsThreadSafe()) {
- resolverTmp = resolver;
- } else {
- try {
- resolverTmp =
- new ResourceResolver(
- (ResourceResolverSpi)resolver.resolverSpi.getClass().newInstance()
- );
- } catch (InstantiationException e) {
- throw new ResourceResolverException("", e, uri, baseURI);
- } catch (IllegalAccessException e) {
- throw new ResourceResolverException("", e, uri, baseURI);
+ synchronized (resolverList) {
+ for (ResourceResolver resolver : resolverList) {
+ ResourceResolver resolverTmp = resolver;
+ if (!resolver.resolverSpi.engineIsThreadSafe()) {
+ try {
+ resolverTmp =
+ new ResourceResolver(resolver.resolverSpi.getClass().newInstance());
+ } catch (InstantiationException e) {
+ throw new ResourceResolverException("", e, uri, baseURI);
+ } catch (IllegalAccessException e) {
+ throw new ResourceResolverException("", e, uri, baseURI);
+ }
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug(
+ "check resolvability by class " + resolverTmp.getClass().getName()
+ );
+ }
+
+ if ((resolverTmp != null) && resolverTmp.canResolve(uri, baseURI)) {
+ return resolverTmp;
}
- }
-
- if (log.isDebugEnabled()) {
- log.debug(
- "check resolvability by class " + resolver.resolverSpi.getClass().getName()
- );
- }
-
- if ((resolverTmp != null) && resolverTmp.canResolve(uri, baseURI)) {
- return resolverTmp;
}
}
-
+
Object exArgs[] = { ((uri != null) ? uri.getNodeValue() : "null"), baseURI };
throw new ResourceResolverException("utils.resolver.noClass", exArgs, uri, baseURI);
@@ -120,7 +129,7 @@ public class ResourceResolver {
*
* @throws ResourceResolverException
*/
- public static final ResourceResolver getInstance(
+ public static ResourceResolver getInstance(
Attr uri, String baseURI, List<ResourceResolver> individualResolvers
) throws ResourceResolverException {
if (log.isDebugEnabled()) {
@@ -136,8 +145,8 @@ public class ResourceResolver {
ResourceResolver resolver = individualResolvers.get(i);
if (resolver != null) {
- String currentClass = resolver.resolverSpi.getClass().getName();
if (log.isDebugEnabled()) {
+ String currentClass = resolver.resolverSpi.getClass().getName();
log.debug("check resolvability by class " + currentClass);
}
@@ -157,8 +166,17 @@ public class ResourceResolver {
*
* @param className the name of the ResourceResolverSpi class to be registered
*/
+ @SuppressWarnings("unchecked")
public static void register(String className) {
- register(className, false);
+ try {
+ Class<ResourceResolverSpi> resourceResolverClass =
+ (Class<ResourceResolverSpi>) Class.forName(className);
+ register(resourceResolverClass, false);
+ } catch (NoClassDefFoundError e) {
+ log.warn("Error loading resolver " + className + " disabling it");
+ } catch (ClassNotFoundException e) {
+ log.warn("Error loading resolver " + className + " disabling it");
+ }
}
/**
@@ -167,42 +185,56 @@ public class ResourceResolver {
*
* @param className the name of the ResourceResolverSpi class to be registered
*/
+ @SuppressWarnings("unchecked")
public static void registerAtStart(String className) {
- register(className, true);
+ try {
+ Class<ResourceResolverSpi> resourceResolverClass =
+ (Class<ResourceResolverSpi>) Class.forName(className);
+ register(resourceResolverClass, true);
+ } catch (NoClassDefFoundError e) {
+ log.warn("Error loading resolver " + className + " disabling it");
+ } catch (ClassNotFoundException e) {
+ log.warn("Error loading resolver " + className + " disabling it");
+ }
}
- private synchronized static void register(String className, boolean start) {
+ /**
+ * Registers a ResourceResolverSpi class. This method logs a warning if the class
+ * cannot be registered.
+ * @param className
+ * @param start
+ */
+ public static void register(Class<ResourceResolverSpi> className, boolean start) {
try {
ResourceResolver resolver = new ResourceResolver(className);
- if (start) {
- resolverVector.add(0, resolver);
- } else {
- resolverVector.add(resolver);
+ synchronized(resolverList) {
+ if (start) {
+ resolverList.add(0, resolver);
+ } else {
+ resolverList.add(resolver);
+ }
}
if (log.isDebugEnabled()) {
log.debug("Registered resolver: " + className);
}
} catch (Exception e) {
- log.warn("Error loading resolver " + className +" disabling it");
- } catch (NoClassDefFoundError e) {
- log.warn("Error loading resolver " + className +" disabling it");
+ log.warn("Error loading resolver " + className + " disabling it");
}
}
-
+
/**
- * Method resolveStatic
- *
- * @param uri
- * @param baseURI
- * @return the resource
- *
- * @throws ResourceResolverException
+ * Register the default ResourceResolvers
*/
- public static XMLSignatureInput resolveStatic(Attr uri, String baseURI)
- throws ResourceResolverException {
- ResourceResolver myResolver = ResourceResolver.getInstance(uri, baseURI);
-
- return myResolver.resolve(uri, baseURI);
+ public static void registerDefaultResolvers() {
+ synchronized(resolverList) {
+ for (Class<? extends ResourceResolverSpi> defaultResolverClass : defaultResolverList) {
+ try {
+ resolverList.add(new ResourceResolver(defaultResolverClass));
+ } catch (Exception e) {
+ log.warn("Error loading resolver " + defaultResolverClass + " disabling it");
+ }
+ }
+ }
}
/**
@@ -216,7 +248,7 @@ public class ResourceResolver {
*/
public XMLSignatureInput resolve(Attr uri, String baseURI)
throws ResourceResolverException {
- return this.resolverSpi.engineResolve(uri, baseURI);
+ return resolverSpi.engineResolve(uri, baseURI);
}
/**
@@ -226,7 +258,7 @@ public class ResourceResolver {
* @param value
*/
public void setProperty(String key, String value) {
- this.resolverSpi.engineSetProperty(key, value);
+ resolverSpi.engineSetProperty(key, value);
}
/**
@@ -236,7 +268,7 @@ public class ResourceResolver {
* @return the value of the property
*/
public String getProperty(String key) {
- return this.resolverSpi.engineGetProperty(key);
+ return resolverSpi.engineGetProperty(key);
}
/**
@@ -245,7 +277,7 @@ public class ResourceResolver {
* @param properties
*/
public void addProperties(Map<String, String> properties) {
- this.resolverSpi.engineAddProperies(properties);
+ resolverSpi.engineAddProperies(properties);
}
/**
@@ -254,7 +286,7 @@ public class ResourceResolver {
* @return all property keys.
*/
public String[] getPropertyKeys() {
- return this.resolverSpi.engineGetPropertyKeys();
+ return resolverSpi.engineGetPropertyKeys();
}
/**
@@ -264,7 +296,7 @@ public class ResourceResolver {
* @return true if the resolver understands the property
*/
public boolean understandsProperty(String propertyToTest) {
- return this.resolverSpi.understandsProperty(propertyToTest);
+ return resolverSpi.understandsProperty(propertyToTest);
}
/**
@@ -275,6 +307,6 @@ public class ResourceResolver {
* @return true if it can resolve the uri
*/
private boolean canResolve(Attr uri, String baseURI) {
- return this.resolverSpi.engineCanResolve(uri, baseURI);
+ return resolverSpi.engineCanResolve(uri, baseURI);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java?rev=1095341&r1=1095340&r2=1095341&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java Wed Apr 20 09:45:30 2011
@@ -55,14 +55,14 @@ public class ResolverAnonymous extends R
}
/** @inheritDoc */
- public XMLSignatureInput engineResolve(Attr uri, String BaseURI) {
+ public XMLSignatureInput engineResolve(Attr uri, String baseURI) {
return this.input;
}
/**
* @inheritDoc
*/
- public boolean engineCanResolve(Attr uri, String BaseURI) {
+ public boolean engineCanResolve(Attr uri, String baseURI) {
if (uri == null) {
return true;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java?rev=1095341&r1=1095340&r2=1095341&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java Wed Apr 20 09:45:30 2011
@@ -93,13 +93,13 @@ public class ResolverDirectHTTP extends
* Method resolve
*
* @param uri
- * @param BaseURI
+ * @param baseURI
*
* @throws ResourceResolverException
* @return
- * $todo$ calculate the correct URI from the attribute and the BaseURI
+ * $todo$ calculate the correct URI from the attribute and the baseURI
*/
- public XMLSignatureInput engineResolve(Attr uri, String BaseURI)
+ public XMLSignatureInput engineResolve(Attr uri, String baseURI)
throws ResourceResolverException {
try {
boolean useProxy = false;
@@ -134,9 +134,9 @@ public class ResolverDirectHTTP extends
// calculate new URI
URI uriNew = null;
try {
- uriNew = getNewURI(uri.getNodeValue(), BaseURI);
+ uriNew = getNewURI(uri.getNodeValue(), baseURI);
} catch (URISyntaxException ex) {
- throw new ResourceResolverException("generic.EmptyMessage", ex, uri, BaseURI);
+ throw new ResourceResolverException("generic.EmptyMessage", ex, uri, baseURI);
}
URL url = uriNew.toURL();
@@ -214,9 +214,9 @@ public class ResolverDirectHTTP extends
return result;
} catch (MalformedURLException ex) {
- throw new ResourceResolverException("generic.EmptyMessage", ex, uri, BaseURI);
+ throw new ResourceResolverException("generic.EmptyMessage", ex, uri, baseURI);
} catch (IOException ex) {
- throw new ResourceResolverException("generic.EmptyMessage", ex, uri, BaseURI);
+ throw new ResourceResolverException("generic.EmptyMessage", ex, uri, baseURI);
}
}
@@ -224,10 +224,10 @@ public class ResolverDirectHTTP extends
* We resolve http URIs <I>without</I> fragment...
*
* @param uri
- * @param BaseURI
+ * @param baseURI
* @return true if can be resolved
*/
- public boolean engineCanResolve(Attr uri, String BaseURI) {
+ public boolean engineCanResolve(Attr uri, String baseURI) {
if (uri == null) {
if (log.isDebugEnabled()) {
log.debug("quick fail, uri == null");
@@ -249,7 +249,7 @@ public class ResolverDirectHTTP extends
}
if (uriNodeValue.startsWith("http:") ||
- (BaseURI != null && BaseURI.startsWith("http:") )) {
+ (baseURI != null && baseURI.startsWith("http:") )) {
if (log.isDebugEnabled()) {
log.debug("I state that I can resolve " + uriNodeValue);
}
@@ -270,12 +270,12 @@ public class ResolverDirectHTTP extends
return (String[]) ResolverDirectHTTP.properties.clone();
}
- private static URI getNewURI(String uri, String BaseURI) throws URISyntaxException {
+ private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
- if (BaseURI == null || "".equals(BaseURI)) {
+ if (baseURI == null || "".equals(baseURI)) {
newUri = new URI(uri);
} else {
- newUri = new URI(BaseURI).resolve(uri);
+ newUri = new URI(baseURI).resolve(uri);
}
// if the URI contains a fragment, ignore it
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=1095341&r1=1095340&r2=1095341&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 Wed Apr 20 09:45:30 2011
@@ -48,9 +48,9 @@ public class ResolverFragment extends Re
*
* @inheritDoc
* @param uri
- * @param BaseURI
+ * @param baseURI
*/
- public XMLSignatureInput engineResolve(Attr uri, String BaseURI)
+ public XMLSignatureInput engineResolve(Attr uri, String baseURI)
throws ResourceResolverException {
String uriNodeValue = uri.getNodeValue();
@@ -81,7 +81,7 @@ public class ResolverFragment extends Re
if (selectedElem == null) {
Object exArgs[] = { id };
throw new ResourceResolverException(
- "signature.Verification.MissingID", exArgs, uri, BaseURI
+ "signature.Verification.MissingID", exArgs, uri, baseURI
);
}
if (log.isDebugEnabled()) {
@@ -95,8 +95,8 @@ public class ResolverFragment extends Re
result.setExcludeComments(true);
result.setMIMEType("text/xml");
- if (BaseURI != null && BaseURI.length() > 0) {
- result.setSourceURI(BaseURI.concat(uri.getNodeValue()));
+ if (baseURI != null && baseURI.length() > 0) {
+ result.setSourceURI(baseURI.concat(uri.getNodeValue()));
} else {
result.setSourceURI(uri.getNodeValue());
}
@@ -107,9 +107,9 @@ public class ResolverFragment extends Re
* Method engineCanResolve
* @inheritDoc
* @param uri
- * @param BaseURI
+ * @param baseURI
*/
- public boolean engineCanResolve(Attr uri, String BaseURI) {
+ public boolean engineCanResolve(Attr uri, String baseURI) {
if (uri == null) {
if (log.isDebugEnabled()) {
log.debug("Quick fail for null uri");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java?rev=1095341&r1=1095340&r2=1095341&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java Wed Apr 20 09:45:30 2011
@@ -46,11 +46,11 @@ public class ResolverLocalFilesystem ext
/**
* @inheritDoc
*/
- public XMLSignatureInput engineResolve(Attr uri, String BaseURI)
+ public XMLSignatureInput engineResolve(Attr uri, String baseURI)
throws ResourceResolverException {
try {
// calculate new URI
- URI uriNew = getNewURI(uri.getNodeValue(), BaseURI);
+ URI uriNew = getNewURI(uri.getNodeValue(), baseURI);
String fileName =
ResolverLocalFilesystem.translateUriToFilename(uriNew.toString());
@@ -61,7 +61,7 @@ public class ResolverLocalFilesystem ext
return result;
} catch (Exception e) {
- throw new ResourceResolverException("generic.EmptyMessage", e, uri, BaseURI);
+ throw new ResourceResolverException("generic.EmptyMessage", e, uri, baseURI);
}
}
@@ -103,7 +103,7 @@ public class ResolverLocalFilesystem ext
/**
* @inheritDoc
*/
- public boolean engineCanResolve(Attr uri, String BaseURI) {
+ public boolean engineCanResolve(Attr uri, String baseURI) {
if (uri == null) {
return false;
}
@@ -120,7 +120,7 @@ public class ResolverLocalFilesystem ext
log.debug("I was asked whether I can resolve " + uriNodeValue);
}
- if (uriNodeValue.startsWith("file:") || BaseURI.startsWith("file:")) {
+ if (uriNodeValue.startsWith("file:") || baseURI.startsWith("file:")) {
if (log.isDebugEnabled()) {
log.debug("I state that I can resolve " + uriNodeValue);
}
@@ -135,12 +135,12 @@ public class ResolverLocalFilesystem ext
return false;
}
- private static URI getNewURI(String uri, String BaseURI) throws URISyntaxException {
+ private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
- if (BaseURI == null || "".equals(BaseURI)) {
+ if (baseURI == null || "".equals(baseURI)) {
newUri = new URI(uri);
} else {
- newUri = new URI(BaseURI).resolve(uri);
+ newUri = new URI(baseURI).resolve(uri);
}
// if the URI contains a fragment, ignore it
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java?rev=1095341&r1=1095340&r2=1095341&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java Wed Apr 20 09:45:30 2011
@@ -56,7 +56,7 @@ public class ResolverXPointer extends Re
/**
* @inheritDoc
*/
- public XMLSignatureInput engineResolve(Attr uri, String BaseURI)
+ public XMLSignatureInput engineResolve(Attr uri, String baseURI)
throws ResourceResolverException {
Node resultNode = null;
@@ -73,7 +73,7 @@ public class ResolverXPointer extends Re
Object exArgs[] = { id };
throw new ResourceResolverException(
- "signature.Verification.MissingID", exArgs, uri, BaseURI
+ "signature.Verification.MissingID", exArgs, uri, baseURI
);
}
}
@@ -81,8 +81,8 @@ public class ResolverXPointer extends Re
XMLSignatureInput result = new XMLSignatureInput(resultNode);
result.setMIMEType("text/xml");
- if (BaseURI != null && BaseURI.length() > 0) {
- result.setSourceURI(BaseURI.concat(uri.getNodeValue()));
+ if (baseURI != null && baseURI.length() > 0) {
+ result.setSourceURI(baseURI.concat(uri.getNodeValue()));
} else {
result.setSourceURI(uri.getNodeValue());
}
@@ -93,7 +93,7 @@ public class ResolverXPointer extends Re
/**
* @inheritDoc
*/
- public boolean engineCanResolve(Attr uri, String BaseURI) {
+ public boolean engineCanResolve(Attr uri, String baseURI) {
if (uri == null) {
return false;
}