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/03/24 11:51:19 UTC
svn commit: r1084895 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/
main/java/org/apache/xml/security/c14n/implementations/
test/java/org/apache/xml/security/test/signature/
Author: coheigea
Date: Thu Mar 24 10:51:18 2011
New Revision: 1084895
URL: http://svn.apache.org/viewvc?rev=1084895&view=rev
Log:
Made some changes to make it easier to use a recursive sed expression to change the logging implementation.
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/c14n/implementations/Canonicalizer11.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/XPointerResourceResolver.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=1084895&r1=1084894&r2=1084895&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 Thu Mar 24 10:51:18 2011
@@ -130,7 +130,7 @@ public class Init {
}
} catch (ClassNotFoundException e) {
Object exArgs[] = { URI, JAVACLASS };
- log.fatal(I18n.translate("algorithm.classDoesNotExist", exArgs));
+ log.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
}
}
}
@@ -151,7 +151,7 @@ public class Init {
} catch (ClassNotFoundException e) {
Object exArgs[] = { URI, JAVACLASS };
- log.fatal(I18n.translate("algorithm.classDoesNotExist", exArgs));
+ log.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
} catch (NoClassDefFoundError ex) {
log.warn("Not able to found dependencies for algorithm, I'll keep working.");
}
@@ -182,7 +182,7 @@ public class Init {
} catch (ClassNotFoundException e) {
Object exArgs[] = { URI, JAVACLASS };
- log.fatal(I18n.translate("algorithm.classDoesNotExist", exArgs));
+ log.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
}
}
}
@@ -265,7 +265,7 @@ public class Init {
}
}
} catch (Exception e) {
- log.fatal("Bad: ", e);
+ log.error("Bad: ", e);
e.printStackTrace();
}
alreadyInitialized = true;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java?rev=1084895&r1=1084894&r2=1084895&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java Thu Mar 24 10:51:18 2011
@@ -36,8 +36,6 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.xml.security.c14n.CanonicalizationException;
import org.apache.xml.security.c14n.helper.C14nHelper;
import org.apache.xml.security.signature.XMLSignatureInput;
@@ -57,7 +55,8 @@ public abstract class Canonicalizer11 ex
static final String XMLNS_URI = Constants.NamespaceSpecNS;
static final String XML_LANG_URI = Constants.XML_LANG_SPACE_SpecNS;
- static Log log = LogFactory.getLog(Canonicalizer11.class.getName());
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(Canonicalizer11.class.getName());
static class XmlAttrStack {
static class XmlsStackElement {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/XPointerResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/XPointerResourceResolver.java?rev=1084895&r1=1084894&r2=1084895&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/XPointerResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/signature/XPointerResourceResolver.java Thu Mar 24 10:51:18 2011
@@ -29,8 +29,6 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.test.DSNamespaceContext;
import org.apache.xml.security.utils.resolver.ResourceResolverException;
@@ -45,7 +43,8 @@ import org.w3c.dom.NodeList;
* @author wglas
*/
public class XPointerResourceResolver extends ResourceResolverSpi {
- private static Log log = LogFactory.getLog(XPointerResourceResolver.class);
+ private static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(XPointerResourceResolver.class);
private static final String XP_OPEN = "xpointer(";
private static final String XNS_OPEN = "xmlns(";