amattheu 2003/04/29 14:37:00
Modified: . build.xml
src/org/apache/xml/security/algorithms JCEMapper.java
MessageDigestAlgorithm.java SignatureAlgorithm.java
SignatureAlgorithmSpi.java
src/org/apache/xml/security/algorithms/encryption
EncryptionMethod.java EncryptionMethodSpi.java
src/org/apache/xml/security/algorithms/encryption/helper
OAEPCipher.java PKCS15Cipher.java
src/org/apache/xml/security/algorithms/implementations
IntegrityHmac.java SignatureBaseRSA.java
SignatureDSA.java
src/org/apache/xml/security/encryption XMLCipher.java
src/org/apache/xml/security/keys KeyInfo.java
src/org/apache/xml/security/keys/content KeyName.java
KeyValue.java MgmtData.java PGPData.java
RetrievalMethod.java SPKIData.java X509Data.java
src/org/apache/xml/security/keys/content/keyvalues
DSAKeyValue.java RSAKeyValue.java
src/org/apache/xml/security/keys/content/x509
XMLX509CRL.java XMLX509Certificate.java
XMLX509IssuerSerial.java XMLX509SKI.java
XMLX509SubjectName.java
src/org/apache/xml/security/keys/keyresolver
KeyResolver.java KeyResolverSpi.java
src/org/apache/xml/security/keys/keyresolver/implementations
RSAKeyValueResolver.java
RetrievalMethodResolver.java
X509CertificateResolver.java
X509IssuerSerialResolver.java X509SKIResolver.java
X509SubjectNameResolver.java
src/org/apache/xml/security/keys/storage
StorageResolver.java
src/org/apache/xml/security/keys/storage/implementations
CertsInFilesystemDirectoryResolver.java
src/org/apache/xml/security/resource config.xml
src/org/apache/xml/security/signature Manifest.java
ObjectContainer.java Reference.java
SignatureProperties.java SignatureProperty.java
SignedInfo.java XMLSignature.java
src/org/apache/xml/security/transforms Transform.java
TransformSpi.java Transforms.java
src/org/apache/xml/security/transforms/implementations
TransformXPath.java TransformXPath2Filter.java
TransformXPath2Filter04.java
src/org/apache/xml/security/utils Base64.java Constants.java
ElementProxy.java HelperNodeList.java
IdResolver.java IgnoreAllErrorHandler.java
JavaUtils.java RFC2253Parser.java XMLUtils.java
src/org/apache/xml/security/utils/resolver
ResourceResolver.java ResourceResolverSpi.java
src/org/apache/xml/security/utils/resolver/implementations
ResolverAnonymous.java ResolverDirectHTTP.java
ResolverFragment.java ResolverLocalFilesystem.java
ResolverXPointer.java
src_samples/org/apache/xml/security/samples/iaik
IAIKInterOp.java
src_samples/org/apache/xml/security/samples/signature
CreateCollectableSignature.java
CreateDonaldsAdditionalURISignature.java
CreateEnvelopingSignature.java
CreateMerlinsExampleSixteen.java
CreateNullURIReference.java CreateSignature.java
HereSigner.java NullURIReferenceResolver.java
VerifyCollectableSignature.java
VerifyMerlinsExamplesFifteen.java
VerifyMerlinsExamplesSixteen.java
src_samples/org/apache/xml/security/samples/transforms
SampleTransformNone.java
src_samples/org/apache/xml/security/samples/utils/resolver
OfflineResolver.java
src_unitTests/org/apache/xml/security/test AllTests.java
InteropTest.java ModuleTest.java
src_unitTests/org/apache/xml/security/test/algorithms/implementations
KeyWrapTest.java SignatureDSATest.java
src_unitTests/org/apache/xml/security/test/c14n/helper
C14nHelperTest.java
src_unitTests/org/apache/xml/security/test/c14n/implementations
C14NInterop.java
Canonicalizer20010315ExclusiveTest.java
Canonicalizer20010315Test.java
ExclusiveC14NInterop.java
src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI
AttributeAncestorOrSelf.java XalanBug1425Test.java
src_unitTests/org/apache/xml/security/test/interop
BaltimoreTest.java IAIKTest.java IBMTest.java
InteropTest.java RSASecurityTest.java
src_unitTests/org/apache/xml/security/test/resource
TestVectorResolver.java
src_unitTests/org/apache/xml/security/test/signature
XMLSignatureInputTest.java
src_unitTests/org/apache/xml/security/test/transforms/implementations
TransformBase64DecodeTest.java
src_unitTests/org/apache/xml/security/test/utils
Base64Test.java
src_unitTests/org/apache/xml/security/test/utils/resolver
OfflineResolver.java ResourceResolverSpiTest.java
Log:
Replaced dependency on Log4J with commons-logging in keeping with the Apache
Commons policy.
Revision Changes Path
1.55 +26 -1 xml-security/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-security/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 9 Sep 2002 14:14:24 -0000 1.54
+++ build.xml 29 Apr 2003 21:36:52 -0000 1.55
@@ -86,6 +86,7 @@
<property name="lib.jce"
value="${dir.libs}/bc-${jce.download.file}" />
<property name="lib.junit" value="${dir.libs}/junit3.7.jar"
/>
<property name="lib.log4j"
value="${dir.libs}/jakarta-log4j-1.2.6.jar" />
+ <property name="lib.logging"
value="${dir.libs}/commons-logging-1.0.3.jar" />
<property name="lib.styleApache"
value="${dir.libs}/style-apachexml.jar" />
<property name="lib.stylebook"
value="${dir.libs}/stylebook-1.0-b3_xalan-2.jar" />
<property name="lib.xalan.1" value="${dir.libs}/xalan.jar" />
@@ -99,6 +100,7 @@
<pathelement path="${lib.xalan.1}" />
<pathelement path="${lib.xalan.2}" />
<pathelement path="${lib.log4j}" />
+ <pathelement path="${lib.logging}" />
<pathelement path="${lib.jce}" />
</path>
@@ -648,6 +650,7 @@
<mkdir dir="${build.bindist}/${dir.libs}" />
<copy todir="${build.bindist}/${dir.libs}" file="${lib.junit}" />
<copy todir="${build.bindist}/${dir.libs}" file="${lib.log4j}" />
+ <copy todir="${build.bindist}/${dir.libs}" file="${lib.logging}" />
<copy todir="${build.bindist}/${dir.libs}" file="${lib.styleApache}" />
<copy todir="${build.bindist}/${dir.libs}" file="${lib.stylebook}" />
<copy todir="${build.bindist}/${dir.libs}" file="${lib.xerces.1}" />
@@ -733,6 +736,28 @@
<classpath refid="classpath.test" />
</java>
</target>
+
+ <target name="axis-sign"
+ description="axis sign sample"
+ depends="compile">
+ <java classname="org.apache.xml.security.samples.AxisSigner"
+ fork="yes"
+ taskname="SignAxis"
+ failonerror="true">
+ <classpath refid="classpath.test" />
+ </java>
+ </target>
+
+ <target name="axis-verify"
+ description="axis verify sample"
+ depends="compile">
+ <java classname="org.apache.xml.security.samples.AxisVerifier"
+ fork="yes"
+ taskname="VerifyAxis"
+ failonerror="true">
+ <classpath refid="classpath.test" />
+ </java>
+ </target>
<target name="signAndVerify"
description="creates and verifies a signature"
@@ -780,4 +805,4 @@
<classpath refid="classpath.library" />
</java>
</target>
-</project>
\ No newline at end of file
+</project>
1.16 +19 -19
xml-security/src/org/apache/xml/security/algorithms/JCEMapper.java
Index: JCEMapper.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/JCEMapper.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JCEMapper.java 11 Feb 2003 16:02:45 -0000 1.15
+++ JCEMapper.java 29 Apr 2003 21:36:53 -0000 1.16
@@ -81,9 +81,9 @@
*/
public class JCEMapper {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(JCEMapper.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(JCEMapper.class.getName());
/** Field _providerList */
private static Element _providerList = null;
@@ -128,7 +128,7 @@
.newInstance();
if (java.security.Security.getProvider(Id) == null) {
- cat.debug("The provider " + Id
+ log.debug("The provider " + Id
+ " had to be added to the java.security.Security");
java.security.Security.addProvider(prov);
@@ -211,7 +211,7 @@
*/
public static ProviderIdClass translateURItoJCEID(String AlgorithmURI) {
- cat.debug("Request for URI " + AlgorithmURI);
+ log.debug("Request for URI " + AlgorithmURI);
try {
@@ -237,14 +237,14 @@
ProviderIdClass result = new ProviderIdClass(jceName,
providerId);
- cat.debug("Found " + result.getAlgorithmID() + " from
provider "
+ log.debug("Found " + result.getAlgorithmID() + " from
provider "
+ result.getProviderId());
return result;
}
}
} catch (TransformerException ex) {
- cat.debug("Found nothing: " + ex.getMessage());
+ log.debug("Found nothing: " + ex.getMessage());
}
return null;
@@ -260,7 +260,7 @@
public static ProviderIdClass translateURItoJCEID(String AlgorithmURI,
String requestedProviderId) {
- cat.debug("Request for URI " + AlgorithmURI + " from provider "
+ log.debug("Request for URI " + AlgorithmURI + " from provider "
+ requestedProviderId);
if (!JCEMapper.getProviderIsInClassPath(requestedProviderId)) {
@@ -280,12 +280,12 @@
ProviderIdClass result = new ProviderIdClass(jceName,
requestedProviderId);
- cat.debug("Found " + result.getAlgorithmID() + " from provider "
+ log.debug("Found " + result.getAlgorithmID() + " from provider "
+ result.getProviderId());
return result;
} catch (TransformerException ex) {
- cat.debug("Found nothing: " + ex.getMessage());
+ log.debug("Found nothing: " + ex.getMessage());
}
return null;
@@ -299,7 +299,7 @@
*/
public static String getAlgorithmClassFromURI(String AlgorithmURI) {
- cat.debug("Request for URI " + AlgorithmURI);
+ log.debug("Request for URI " + AlgorithmURI);
try {
NodeList providers =
XPathAPI.selectNodeList(JCEMapper._providerList,
@@ -311,12 +311,12 @@
Element pro = (Element) providers.item(i);
Attr jceName = pro.getAttributeNodeNS(null, "JCEName");
- cat.debug("Found " + jceName.getNodeValue());
+ log.debug("Found " + jceName.getNodeValue());
}
return ((Element) providers.item(0)).getAttributeNS(null,
"JCEName");
} catch (TransformerException ex) {
- cat.debug("Found nothing: " + ex.getMessage());
+ log.debug("Found nothing: " + ex.getMessage());
return "";
}
@@ -354,7 +354,7 @@
}
}
} catch (TransformerException ex) {
- cat.debug("Found nothing: " + ex.getMessage());
+ log.debug("Found nothing: " + ex.getMessage());
}
return -1;
@@ -379,7 +379,7 @@
return Integer.parseInt(algoclassAttr.getNodeValue());
}
} catch (TransformerException ex) {
- cat.debug("Found nothing: " + ex.getMessage());
+ log.debug("Found nothing: " + ex.getMessage());
}
return 0;
@@ -408,7 +408,7 @@
return algoclassAttr.getNodeValue();
}
} catch (TransformerException ex) {
- cat.debug("Found nothing: " + ex.getMessage());
+ log.debug("Found nothing: " + ex.getMessage());
}
return null;
@@ -431,7 +431,7 @@
return algoclassAttr.getNodeValue();
}
} catch (TransformerException ex) {
- cat.debug("Found nothing: " + ex.getMessage());
+ log.debug("Found nothing: " + ex.getMessage());
}
return null;
@@ -476,7 +476,7 @@
return URI.getNodeValue();
}
} catch (TransformerException ex) {
- cat.debug("Found nothing: " + ex.getMessage());
+ log.debug("Found nothing: " + ex.getMessage());
}
return null;
1.11 +4 -4
xml-security/src/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
Index: MessageDigestAlgorithm.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MessageDigestAlgorithm.java 11 Feb 2003 16:02:46 -0000 1.10
+++ MessageDigestAlgorithm.java 29 Apr 2003 21:36:53 -0000 1.11
@@ -78,10 +78,10 @@
*/
public class MessageDigestAlgorithm extends Algorithm {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(MessageDigestAlgorithm.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ MessageDigestAlgorithm.class.getName());
// Message Digest - NOT RECOMMENDED MD5
public static final String ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5 =
Constants.MoreAlgorithmsSpecNS + "md5";
1.16 +11 -11
xml-security/src/org/apache/xml/security/algorithms/SignatureAlgorithm.java
Index: SignatureAlgorithm.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/SignatureAlgorithm.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SignatureAlgorithm.java 11 Feb 2003 16:02:46 -0000 1.15
+++ SignatureAlgorithm.java 29 Apr 2003 21:36:53 -0000 1.16
@@ -79,9 +79,9 @@
*/
public class SignatureAlgorithm extends Algorithm {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(SignatureAlgorithm.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(SignatureAlgorithm.class.getName());
/** Field _alreadyInitialized */
static boolean _alreadyInitialized = false;
@@ -108,7 +108,7 @@
String implementingClass =
SignatureAlgorithm.getImplementingClass(algorithmURI);
- cat.debug("Create URI \"" + algorithmURI + "\" class \""
+ log.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
this._signatureAlgorithm =
@@ -174,7 +174,7 @@
String implementingClass =
SignatureAlgorithm.getImplementingClass(algorithmURI);
- cat.debug("Create URI \"" + algorithmURI + "\" class \""
+ log.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
this._signatureAlgorithm =
@@ -362,13 +362,13 @@
*/
public static void providerInit() {
- if (SignatureAlgorithm.cat == null) {
- SignatureAlgorithm.cat =
- org.apache.log4j.Category
- .getInstance(SignatureAlgorithm.class.getName());
+ if (SignatureAlgorithm.log == null) {
+ SignatureAlgorithm.log =
+ org.apache.commons.logging.LogFactory
+ .getLog(SignatureAlgorithm.class.getName());
}
- cat.debug("Init() called");
+ log.debug("Init() called");
if (!SignatureAlgorithm._alreadyInitialized) {
SignatureAlgorithm._algorithmHash = new HashMap(10);
@@ -387,7 +387,7 @@
throws AlgorithmAlreadyRegisteredException {
{
- cat.debug("Try to register " + algorithmURI + " " +
implementingClass);
+ log.debug("Try to register " + algorithmURI + " " +
implementingClass);
// are we already registered?
String registeredClass =
1.7 +4 -5
xml-security/src/org/apache/xml/security/algorithms/SignatureAlgorithmSpi.java
Index: SignatureAlgorithmSpi.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/SignatureAlgorithmSpi.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SignatureAlgorithmSpi.java 11 Feb 2003 16:02:46 -0000 1.6
+++ SignatureAlgorithmSpi.java 29 Apr 2003 21:36:53 -0000 1.7
@@ -75,10 +75,9 @@
*/
public abstract class SignatureAlgorithmSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(SignatureAlgorithmSpi.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(SignatureAlgorithmSpi.class.getName());
/** Field _signatureAlgorithmObject */
private SignatureAlgorithm _signatureAlgorithmObject = null;
1.11 +11 -11
xml-security/src/org/apache/xml/security/algorithms/encryption/EncryptionMethod.java
Index: EncryptionMethod.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/encryption/EncryptionMethod.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- EncryptionMethod.java 11 Feb 2003 16:02:46 -0000 1.10
+++ EncryptionMethod.java 29 Apr 2003 21:36:53 -0000 1.11
@@ -85,9 +85,9 @@
*/
public class EncryptionMethod extends Algorithm {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(EncryptionMethod.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(EncryptionMethod.class.getName());
/** Field _emSpi */
EncryptionMethodSpi _emSpi = null;
@@ -219,7 +219,7 @@
if ((this._emSpi != null)
&& this._emSpi.getRequiredProviderAvailable()) {
- cat.debug("Create URI \"" + algorithmURI + "\" class \""
+ log.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
break searchForWorkingClass;
@@ -278,7 +278,7 @@
if ((this._emSpi != null)
&& this._emSpi.getRequiredProviderAvailable()) {
- cat.debug("Create URI \"" + algorithmURI + "\" class \""
+ log.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
break searchForWorkingClass;
@@ -474,22 +474,22 @@
return true;
} else {
- cat.debug("Try to register class " + implementingClass
+ log.debug("Try to register class " + implementingClass
+ " but Provider " + emSpi.getRequiredProviderName()
+ " not available");
}
} else {
- cat.debug("Try to register class " + implementingClass
+ log.debug("Try to register class " + implementingClass
+ " but Class not available");
}
} catch (ClassNotFoundException ex) {
- cat.debug("Try to register class " + implementingClass
+ log.debug("Try to register class " + implementingClass
+ " but Class not found: ", ex);
} catch (IllegalAccessException ex) {
- cat.debug("Try to register class " + implementingClass
+ log.debug("Try to register class " + implementingClass
+ " but Class not found: ", ex);
} catch (InstantiationException ex) {
- cat.debug("Try to register class " + implementingClass
+ log.debug("Try to register class " + implementingClass
+ " but Class not found: ", ex);
}
1.8 +3 -3
xml-security/src/org/apache/xml/security/algorithms/encryption/EncryptionMethodSpi.java
Index: EncryptionMethodSpi.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/encryption/EncryptionMethodSpi.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EncryptionMethodSpi.java 11 Feb 2003 16:02:46 -0000 1.7
+++ EncryptionMethodSpi.java 29 Apr 2003 21:36:53 -0000 1.8
@@ -77,9 +77,9 @@
*/
public abstract class EncryptionMethodSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(EncryptionMethodSpi.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(EncryptionMethodSpi.class.getName());
/**
* Return <CODE>true</CODE> if this Provider which is required by this
1.4 +1 -6
xml-security/src/org/apache/xml/security/algorithms/encryption/helper/OAEPCipher.java
Index: OAEPCipher.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/encryption/helper/OAEPCipher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OAEPCipher.java 11 Feb 2003 16:02:46 -0000 1.3
+++ OAEPCipher.java 29 Apr 2003 21:36:53 -0000 1.4
@@ -76,13 +76,11 @@
import org.apache.xml.security.utils.Base64;
import org.apache.xml.security.utils.HexDump;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
/**
*
* @author $Author$
- * @see org.bouncycastle.crypto.encodings.OAEPEncoding
*/
public class OAEPCipher {
@@ -448,9 +446,6 @@
* @throws Exception
*/
public static void main(String[] args) throws Exception {
-
- Security.addProvider(new BouncyCastleProvider());
-
Cipher rsaCipher = Cipher.getInstance("RSA", "BC");
MessageDigest sha1 = MessageDigest.getInstance("SHA-1", "BC");
byte encodingParams[] = Base64.decode("9lWu3Q==");
1.4 +1 -2
xml-security/src/org/apache/xml/security/algorithms/encryption/helper/PKCS15Cipher.java
Index: PKCS15Cipher.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/encryption/helper/PKCS15Cipher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PKCS15Cipher.java 11 Feb 2003 16:02:46 -0000 1.3
+++ PKCS15Cipher.java 29 Apr 2003 21:36:53 -0000 1.4
@@ -71,7 +71,6 @@
/**
*
* @author $Author$
- * @see org.bouncycastle.crypto.encodings.PKCS1Encoding
*/
public class PKCS15Cipher {
1.7 +24 -24
xml-security/src/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
Index: IntegrityHmac.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IntegrityHmac.java 11 Feb 2003 16:02:47 -0000 1.6
+++ IntegrityHmac.java 29 Apr 2003 21:36:53 -0000 1.7
@@ -89,10 +89,10 @@
* @author $Author$
*/
public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
-
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(IntegrityHmacSHA1.class.getName());
+
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(IntegrityHmacSHA1.class.getName());
/**
* Method engineGetURI
@@ -117,7 +117,7 @@
JCEMapper.ProviderIdClass algorithmID =
JCEMapper.translateURItoJCEID(this.engineGetURI());
- cat.debug("Created IntegrityHmacSHA1 using "
+ log.debug("Created IntegrityHmacSHA1 using "
+ algorithmID.getAlgorithmID() + " "
+ algorithmID.getProviderId());
@@ -164,22 +164,22 @@
byte[] completeResult = this._macAlgorithm.doFinal();
if ((this._HMACOutputLength == 0) || (this._HMACOutputLength >=
160)) {
- cat.debug("completeResult = "
+ log.debug("completeResult = "
+ HexDump.byteArrayToHexString(completeResult));
- cat.debug("signature = "
+ log.debug("signature = "
+ HexDump.byteArrayToHexString(signature));
return MessageDigestAlgorithm.isEqual(completeResult, signature);
} else {
- cat.debug("completeResult = "
+ log.debug("completeResult = "
+ HexDump.byteArrayToHexString(completeResult));
byte[] stripped = IntegrityHmac.reduceBitLength(completeResult,
this._HMACOutputLength);
- cat.debug("stripped = "
+ log.debug("stripped = "
+ HexDump.byteArrayToHexString(stripped));
- cat.debug("signature = "
+ log.debug("signature = "
+ HexDump.byteArrayToHexString(signature));
return MessageDigestAlgorithm.isEqual(stripped, signature);
@@ -387,7 +387,7 @@
*/
protected String engineGetJCEAlgorithmString() {
- cat.debug("engineGetJCEAlgorithmString()");
+ log.debug("engineGetJCEAlgorithmString()");
return this._macAlgorithm.getAlgorithm();
}
1.7 +17 -17
xml-security/src/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
Index: SignatureBaseRSA.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SignatureBaseRSA.java 11 Feb 2003 16:02:48 -0000 1.6
+++ SignatureBaseRSA.java 29 Apr 2003 21:36:53 -0000 1.7
@@ -82,9 +82,9 @@
*/
public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(SignatureBaseRSA.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(SignatureBaseRSA.class.getName());
/**
* Method engineGetURI
@@ -106,7 +106,7 @@
JCEMapper.ProviderIdClass algorithmID =
JCEMapper.translateURItoJCEID(this.engineGetURI());
- cat.debug("Created SignatureDSA using " + algorithmID.getAlgorithmID()
+ log.debug("Created SignatureDSA using " + algorithmID.getAlgorithmID()
+ " " + algorithmID.getProviderId());
try {
1.8 +6 -125
xml-security/src/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
Index: SignatureDSA.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/algorithms/implementations/SignatureDSA.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SignatureDSA.java 11 Feb 2003 16:02:48 -0000 1.7
+++ SignatureDSA.java 29 Apr 2003 21:36:53 -0000 1.8
@@ -78,22 +78,15 @@
import org.apache.xml.security.utils.Constants;
-/*
-import org.bouncycastle.asn1.DERConstructedSequence;
-import org.bouncycastle.asn1.DERInputStream;
-import org.bouncycastle.asn1.DERInteger;
-import org.bouncycastle.asn1.DEROutputStream;
-*/
-
/**
*
* @author $Author$
*/
public class SignatureDSA extends SignatureAlgorithmSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(SignatureDSA.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(SignatureDSA.class.getName());
/** Field _URI */
public static final String _URI = Constants.SignatureSpecNS + "dsa-sha1";
@@ -120,7 +113,7 @@
JCEMapper.ProviderIdClass algorithmID =
JCEMapper.translateURItoJCEID(SignatureDSA._URI);
- cat.debug("Created SignatureDSA using " + algorithmID.getAlgorithmID()
+ log.debug("Created SignatureDSA using " + algorithmID.getAlgorithmID()
+ " " + algorithmID.getProviderId());
try {
@@ -169,7 +162,7 @@
throws XMLSignatureException {
try {
- cat.debug("Called DSA.verify() on " + Base64.encode(signature));
+ log.debug("Called DSA.verify() on " + Base64.encode(signature));
byte[] jcebytes = SignatureDSA.convertXMLDSIGtoASN1(signature);
@@ -348,118 +341,6 @@
return this._signatureAlgorithm.getProvider().getName();
}
- /*
- * Converts a XML Signature DSA Value to an ASN.1 DSA value.
- *
- * The JAVA JCE DSA Signature algorithm creates ASN.1 encoded (r,s) value
- * pairs; the XML Signature requires the core BigInteger values.
- *
- * @param xmldsigbytes
- *
- * @throws IOException
- * @see org.bouncycastle.jce.provider.JDKDSASigner#derEncode
- * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1";>6.4.1
DSA</A>
- private static byte[] convertXMLDSIGtoASN1_BOUNCY(byte[] xmldsigbytes)
- throws IOException {
-
- byte rbytes[] = new byte[21];
- byte sbytes[] = new byte[21];
-
- rbytes[0] = (byte) 0x00;
- sbytes[0] = (byte) 0x00;
-
- System.arraycopy(xmldsigbytes, 0, rbytes, 1, 20);
- System.arraycopy(xmldsigbytes, 20, sbytes, 1, 20);
-
- BigInteger r = new BigInteger(rbytes);
- BigInteger s = new BigInteger(sbytes);
-
- cat.debug("Verify DSA r=" + r.toString());
- cat.debug("Verify DSA s=" + s.toString());
-
- ByteArrayOutputStream bOut = new ByteArrayOutputStream();
- DEROutputStream dOut = new DEROutputStream(bOut);
- DERConstructedSequence seq = new DERConstructedSequence();
-
- seq.addObject(new DERInteger(r));
- seq.addObject(new DERInteger(s));
- dOut.writeObject(seq);
-
- return bOut.toByteArray();
- }
- */
-
- /*
- * Converts an ASN.1 DSA value to a XML Signature DSA Value.
- *
- * The JAVA JCE DSA Signature algorithm creates ASN.1 encoded (r,s) value
- * pairs; the XML Signature requires the core BigInteger values.
- *
- * @param derbytes
- *
- * @throws IOException
- * @see org.bouncycastle.jce.provider.JDKDSASigner#derDecode
- * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1";>6.4.1
DSA</A>
- private static byte[] convertASN1toXMLDSIG_BOUNCY(byte derbytes[])
- throws IOException {
-
- cat.debug("Input convertASN1toXMLDSIG("
- + HexDump.byteArrayToHexString(derbytes) + ")");
-
- ByteArrayInputStream bIn = new ByteArrayInputStream(derbytes);
- DERInputStream dIn = new DERInputStream(bIn);
- DERConstructedSequence seq = (DERConstructedSequence) dIn.readObject();
- BigInteger r = ((DERInteger) seq.getObjectAt(0)).getValue();
- BigInteger s = ((DERInteger) seq.getObjectAt(1)).getValue();
-
- cat.debug("Created DSA r=" + r.toString());
- cat.debug("Created DSA s=" + s.toString());
-
- byte rbytes[] = r.toByteArray();
- byte sbytes[] = s.toByteArray();
-
- cat.debug("r1=" + HexDump.byteArrayToHexString(rbytes));
- cat.debug("s1=" + HexDump.byteArrayToHexString(sbytes));
-
- rbytes = SignatureDSA.normalizeBigIntegerArray(rbytes);
- sbytes = SignatureDSA.normalizeBigIntegerArray(sbytes);
-
- cat.debug("r2=" + HexDump.byteArrayToHexString(rbytes));
- cat.debug("s2=" + HexDump.byteArrayToHexString(sbytes));
-
- byte result[] = new byte[40];
-
- System.arraycopy(rbytes, 0, result, 0, 20);
- System.arraycopy(sbytes, 0, result, 20, 20);
-
- return result;
- }
- */
-
- /*
- *
- * @see org.bouncycastle.jce.provider.JDKDSASigner#derEncode
- * @param bigIntegerArray
- *
- * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1";>6.4.1
DSA</A>
- private static byte[] normalizeBigIntegerArray(byte bigIntegerArray[]) {
-
- byte resultBytes[] = new byte[20];
-
- for (int i = 0; i < 20; i++) {
- resultBytes[i] = (byte) 0x00;
- }
-
- if (bigIntegerArray.length == 21) {
- System.arraycopy(bigIntegerArray, 1, resultBytes, 0, 20);
- } else {
- System.arraycopy(bigIntegerArray, 0, resultBytes,
- 20 - bigIntegerArray.length,
bigIntegerArray.length);
- }
-
- return resultBytes;
- }
- */
/**
* Converts an ASN.1 DSA value to a XML Signature DSA Value.
1.2 +44 -45
xml-security/src/org/apache/xml/security/encryption/XMLCipher.java
Index: XMLCipher.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/encryption/XMLCipher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLCipher.java 18 Mar 2003 22:51:23 -0000 1.1
+++ XMLCipher.java 29 Apr 2003 21:36:53 -0000 1.2
@@ -88,7 +88,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.log4j.*;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.EncryptionConstants;
@@ -122,12 +121,9 @@
* @author Christian Geuer-Pollmann
*/
public class XMLCipher {
- private static final Logger logger =
- Logger.getLogger(XMLCipher.class.getName());
- static {
- BasicConfigurator.configure();
- }
+ private static org.apache.commons.logging.Log logger =
+
org.apache.commons.logging.LogFactory.getLog(XMLCipher.class.getName());
public static final String TRIPLEDES =
EncryptionConstants.ALGO_ID_BLOCKCIPHER_TRIPLEDES;
@@ -279,10 +275,10 @@
XMLEncryptionException {
// sanity checks
logger.info("Getting XMLCipher...");
- logger.assertLog(null != transformation,
- "Transformation unexpectedly null...");
- logger.assertLog(isValidEncryptionAlgorithm(transformation),
- "Alogorithm unvalid, expected one of " + ENC_ALGORITHMS);
+ if (null == transformation)
+ logger.error("Transformation unexpectedly null...");
+ if(!isValidEncryptionAlgorithm(transformation))
+ logger.error("Alogorithm unvalid, expected one of " +
ENC_ALGORITHMS);
if (null == instance) {
instance = new XMLCipher();
@@ -319,14 +315,14 @@
throws XMLEncryptionException {
// sanity checks
logger.info("Getting XMLCipher...");
- logger.assertLog(null != transformation,
- "Transformation unexpectedly null...");
- logger.assertLog(null != provider,
- "Provider unexpectedly null..");
- logger.assertLog("" != provider,
- "Provider's value unexpectedly not specified...");
- logger.assertLog(isValidEncryptionAlgorithm(transformation),
- "Alogorithm unvalid, expected one of " + ENC_ALGORITHMS);
+ if (null == transformation)
+ logger.error("Transformation unexpectedly null...");
+ if(null == provider)
+ logger.error("Provider unexpectedly null..");
+ if("" == provider)
+ logger.error("Provider's value unexpectedly not specified...");
+ if(!isValidEncryptionAlgorithm(transformation))
+ logger.error("Alogorithm unvalid, expected one of " +
ENC_ALGORITHMS);
if (null == instance) {
instance = new XMLCipher();
@@ -367,8 +363,8 @@
public void init(int opmode, Key key) throws XMLEncryptionException {
// sanity checks
logger.info("Initializing XMLCipher...");
- logger.assertLog(opmode == ENCRYPT_MODE || opmode == DECRYPT_MODE,
- "Mode unexpectedly invalid...");
+ if (opmode != ENCRYPT_MODE && opmode != DECRYPT_MODE)
+ logger.error("Mode unexpectedly invalid...");
logger.debug("opmode = " +
((opmode == ENCRYPT_MODE) ? "ENCRYPT_MODE" : "DECRYPT_MODE"));
@@ -394,9 +390,10 @@
private Document encryptElement(Element element) throws
XMLEncryptionException {
logger.info("Encrypting element...");
- logger.assertLog(null != element, "Element unexpectedly null...");
- logger.assertLog((cipherMode == ENCRYPT_MODE),
- "XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ if(null == element)
+ logger.error("Element unexpectedly null...");
+ if(cipherMode != ENCRYPT_MODE)
+ logger.error("XMLCipher unexpectedly not in ENCRYPT_MODE...");
String serializedOctets = serializer.serialize(element);
logger.debug("Serialized octets:\n" + serializedOctets);
@@ -461,9 +458,10 @@
private Document encryptElementContent(Element element) throws
XMLEncryptionException {
logger.info("Encrypting element content...");
- logger.assertLog(null != element, "Element unexpectedly null...");
- logger.assertLog((cipherMode == ENCRYPT_MODE),
- "XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ if(null == element)
+ logger.error("Element unexpectedly null...");
+ if(cipherMode != ENCRYPT_MODE)
+ logger.error("XMLCipher unexpectedly not in ENCRYPT_MODE...");
NodeList children = element.getChildNodes();
String serializedOctets = null;
@@ -530,10 +528,10 @@
public Document doFinal(Document context, Document source) throws
XMLEncryptionException {
logger.info("Processing source document...");
- logger.assertLog(null != context,
- "Context document unexpectedly null...");
- logger.assertLog(null != source,
- "Source document unexpectedly null...");
+ if(null == context)
+ logger.error("Context document unexpectedly null...");
+ if(null == source)
+ logger.error("Source document unexpectedly null...");
instance.contextDocument = context;
@@ -570,10 +568,10 @@
public Document doFinal(Document context, Element element) throws
XMLEncryptionException {
logger.info("Processing source element...");
- logger.assertLog(null != context,
- "Context document unexpectedly null...");
- logger.assertLog(null != element,
- "Source element unexpectedly null...");
+ if(null == context)
+ logger.error("Context document unexpectedly null...");
+ if(null == element)
+ logger.error("Source element unexpectedly null...");
instance.contextDocument = context;
@@ -612,10 +610,10 @@
public Document doFinal(Document context, Element element, boolean
content)
throws XMLEncryptionException {
logger.info("Processing source element...");
- logger.assertLog(null != context,
- "Context document unexpectedly null...");
- logger.assertLog(null != element,
- "Source element unexpectedly null...");
+ if(null == context)
+ logger.error("Context document unexpectedly null...");
+ if(null == element)
+ logger.error("Source element unexpectedly null...");
instance.contextDocument = context;
@@ -704,11 +702,12 @@
public EncryptedData encryptData(Document context, Element element)
throws
XMLEncryptionException {
logger.info("Encrypting element...");
- logger.assertLog(null != context,
- "Context document unexpectedly null...");
- logger.assertLog(null != element, "Element unexpectedly null...");
- logger.assertLog((cipherMode == ENCRYPT_MODE),
- "XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ if(null == context)
+ logger.error("Context document unexpectedly null...");
+ if(null == element)
+ logger.error("Element unexpectedly null...");
+ if(cipherMode != ENCRYPT_MODE)
+ logger.error("XMLCipher unexpectedly not in ENCRYPT_MODE...");
instance.contextDocument = context;
@@ -787,8 +786,8 @@
private Document decryptElement(Element element) throws
XMLEncryptionException {
logger.info("Decrypting element...");
- logger.assertLog((cipherMode == DECRYPT_MODE),
- "XMLCipher unexpectedly not in DECRYPT_MODE...");
+ if(cipherMode != DECRYPT_MODE)
+ logger.error("XMLCipher unexpectedly not in DECRYPT_MODE...");
EncryptedData encryptedData = factory.newEncryptedData(element);
1.12 +20 -20
xml-security/src/org/apache/xml/security/keys/KeyInfo.java
Index: KeyInfo.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/KeyInfo.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- KeyInfo.java 11 Feb 2003 16:02:49 -0000 1.11
+++ KeyInfo.java 29 Apr 2003 21:36:53 -0000 1.12
@@ -126,9 +126,9 @@
*/
public class KeyInfo extends SignatureElementProxy {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(KeyInfo.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(KeyInfo.class.getName());
/** Field _dsns */
Element _dsns = null;
@@ -721,21 +721,21 @@
PublicKey pk = this.getPublicKeyFromInternalResolvers();
if (pk != null) {
- cat.debug("I could find a key using the per-KeyInfo key resolvers");
+ log.debug("I could find a key using the per-KeyInfo key resolvers");
return pk;
} else {
- cat.debug("I couldn't find a key using the per-KeyInfo key
resolvers");
+ log.debug("I couldn't find a key using the per-KeyInfo key
resolvers");
}
pk = this.getPublicKeyFromStaticResolvers();
if (pk != null) {
- cat.debug("I could find a key using the system-wide key resolvers");
+ log.debug("I could find a key using the system-wide key resolvers");
return pk;
} else {
- cat.debug("I couldn't find a key using the system-wide key
resolvers");
+ log.debug("I couldn't find a key using the system-wide key
resolvers");
}
return null;
@@ -811,7 +811,7 @@
for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
- cat.debug("Try " + keyResolver.getClass().getName());
+ log.debug("Try " + keyResolver.getClass().getName());
for (int j = 0;
j < this._constructionElement.getChildNodes().getLength();
@@ -874,12 +874,12 @@
X509Certificate cert = this.getX509CertificateFromInternalResolvers();
if (cert != null) {
- cat.debug(
+ log.debug(
"I could find a X509Certificate using the per-KeyInfo key
resolvers");
return cert;
} else {
- cat.debug(
+ log.debug(
"I couldn't find a X509Certificate using the per-KeyInfo key
resolvers");
}
@@ -887,12 +887,12 @@
cert = this.getX509CertificateFromStaticResolvers();
if (cert != null) {
- cat.debug(
+ log.debug(
"I could find a X509Certificate using the system-wide key
resolvers");
return cert;
} else {
- cat.debug(
+ log.debug(
"I couldn't find a X509Certificate using the system-wide key
resolvers");
}
@@ -910,7 +910,7 @@
X509Certificate getX509CertificateFromStaticResolvers()
throws KeyResolverException {
- cat.debug("Start getX509CertificateFromStaticResolvers() with "
+ log.debug("Start getX509CertificateFromStaticResolvers() with "
+ KeyResolver.length() + " resolvers");
for (int i = 0; i < KeyResolver.length(); i++) {
@@ -972,13 +972,13 @@
X509Certificate getX509CertificateFromInternalResolvers()
throws KeyResolverException {
- cat.debug("Start getX509CertificateFromInternalResolvers() with "
+ log.debug("Start getX509CertificateFromInternalResolvers() with "
+ this.lengthInternalKeyResolver() + " resolvers");
for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
- cat.debug("Try " + keyResolver.getClass().getName());
+ log.debug("Try " + keyResolver.getClass().getName());
for (int j = 0;
j < this._constructionElement.getChildNodes().getLength();
@@ -1092,16 +1092,16 @@
public static void init() {
if (!KeyInfo._alreadyInitialized) {
- if (KeyInfo.cat == null) {
+ if (KeyInfo.log == null) {
/**
* $todo$ why the hell does the static initialization from the
* start not work ?
*/
- KeyInfo.cat =
-
org.apache.log4j.Category.getInstance(KeyInfo.class.getName());
+ KeyInfo.log =
+
org.apache.commons.logging.LogFactory.getLog(KeyInfo.class.getName());
- cat.error("Had to assign cat in the init() function");
+ log.error("Had to assign log in the init() function");
}
// KeyInfo._contentHandlerHash = new HashMap(10);
1.7 +4 -4
xml-security/src/org/apache/xml/security/keys/content/KeyName.java
Index: KeyName.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/KeyName.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KeyName.java 11 Feb 2003 16:02:49 -0000 1.6
+++ KeyName.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -73,9 +73,9 @@
*/
public class KeyName extends SignatureElementProxy implements KeyInfoContent
{
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(KeyName.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(KeyName.class.getName());
/**
* Constructor KeyName
1.7 +4 -4
xml-security/src/org/apache/xml/security/keys/content/KeyValue.java
Index: KeyValue.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/KeyValue.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KeyValue.java 11 Feb 2003 16:02:49 -0000 1.6
+++ KeyValue.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -89,9 +89,9 @@
*/
public class KeyValue extends SignatureElementProxy implements
KeyInfoContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(KeyValue.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(KeyValue.class.getName());
/**
* Constructor KeyValue
1.7 +4 -4
xml-security/src/org/apache/xml/security/keys/content/MgmtData.java
Index: MgmtData.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/MgmtData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MgmtData.java 11 Feb 2003 16:02:50 -0000 1.6
+++ MgmtData.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -73,9 +73,9 @@
*/
public class MgmtData extends SignatureElementProxy implements
KeyInfoContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(MgmtData.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(MgmtData.class.getName());
/**
* Constructor MgmtData
1.7 +4 -4
xml-security/src/org/apache/xml/security/keys/content/PGPData.java
Index: PGPData.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/PGPData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PGPData.java 11 Feb 2003 16:02:50 -0000 1.6
+++ PGPData.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -73,9 +73,9 @@
*/
public class PGPData extends SignatureElementProxy implements KeyInfoContent
{
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(PGPData.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(PGPData.class.getName());
/**
* Constructor PGPData
1.10 +4 -4
xml-security/src/org/apache/xml/security/keys/content/RetrievalMethod.java
Index: RetrievalMethod.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/RetrievalMethod.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RetrievalMethod.java 11 Feb 2003 16:02:50 -0000 1.9
+++ RetrievalMethod.java 29 Apr 2003 21:36:54 -0000 1.10
@@ -81,9 +81,9 @@
public class RetrievalMethod extends SignatureElementProxy
implements KeyInfoContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(RetrievalMethod.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(RetrievalMethod.class.getName());
//J-
public static final String TYPE_DSA = Constants.SignatureSpecNS +
"DSAKeyValue";
public static final String TYPE_RSA = Constants.SignatureSpecNS +
"RSAKeyValue";
1.7 +4 -4
xml-security/src/org/apache/xml/security/keys/content/SPKIData.java
Index: SPKIData.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/SPKIData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SPKIData.java 11 Feb 2003 16:02:50 -0000 1.6
+++ SPKIData.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -73,9 +73,9 @@
*/
public class SPKIData extends SignatureElementProxy implements
KeyInfoContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(SPKIData.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(SPKIData.class.getName());
/**
* Constructor SPKIData
1.8 +6 -6
xml-security/src/org/apache/xml/security/keys/content/X509Data.java
Index: X509Data.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/X509Data.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- X509Data.java 11 Feb 2003 16:02:50 -0000 1.7
+++ X509Data.java 29 Apr 2003 21:36:54 -0000 1.8
@@ -85,9 +85,9 @@
*/
public class X509Data extends SignatureElementProxy implements
KeyInfoContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(X509Data.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(X509Data.class.getName());
/**
* Constructor X509Data
@@ -157,12 +157,12 @@
this.add(crl);
} else {
- cat.warn("Found a " + currentElem.getTagName() + " element in
"
+ log.warn("Found a " + currentElem.getTagName() + " element in
"
+ Constants._TAG_X509DATA);
this.addUnknownElement(currentElem);
}
} else {
- cat.warn("Found a " + currentElem.getTagName() + " element in "
+ log.warn("Found a " + currentElem.getTagName() + " element in "
+ Constants._TAG_X509DATA);
this.addUnknownElement(currentElem);
}
1.8 +4 -4
xml-security/src/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
Index: DSAKeyValue.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DSAKeyValue.java 11 Feb 2003 16:02:50 -0000 1.7
+++ DSAKeyValue.java 29 Apr 2003 21:36:54 -0000 1.8
@@ -86,9 +86,9 @@
public class DSAKeyValue extends SignatureElementProxy
implements KeyValueContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(DSAKeyValue.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(DSAKeyValue.class.getName());
/**
* Constructor DSAKeyValue
1.8 +5 -4
xml-security/src/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
Index: RSAKeyValue.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RSAKeyValue.java 11 Feb 2003 16:02:50 -0000 1.7
+++ RSAKeyValue.java 29 Apr 2003 21:36:54 -0000 1.8
@@ -87,9 +87,10 @@
public class RSAKeyValue extends SignatureElementProxy
implements KeyValueContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(RSAKeyValue.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ RSAKeyValue.class.getName());
/**
* Constructor RSAKeyValue
1.7 +4 -4
xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509CRL.java
Index: XMLX509CRL.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509CRL.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLX509CRL.java 11 Feb 2003 16:02:50 -0000 1.6
+++ XMLX509CRL.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -78,9 +78,9 @@
public class XMLX509CRL extends SignatureElementProxy
implements XMLX509DataContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(XMLX509CRL.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(XMLX509CRL.class.getName());
/**
* Constructor XMLX509CRL
1.8 +4 -4
xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
Index: XMLX509Certificate.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLX509Certificate.java 11 Feb 2003 16:02:50 -0000 1.7
+++ XMLX509Certificate.java 29 Apr 2003 21:36:54 -0000 1.8
@@ -81,9 +81,9 @@
public class XMLX509Certificate extends SignatureElementProxy
implements XMLX509DataContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(XMLX509Certificate.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(XMLX509Certificate.class.getName());
/** Field JCA_CERT_ID */
public static final String JCA_CERT_ID = "X.509";
1.8 +6 -6
xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
Index: XMLX509IssuerSerial.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLX509IssuerSerial.java 11 Feb 2003 16:02:50 -0000 1.7
+++ XMLX509IssuerSerial.java 29 Apr 2003 21:36:54 -0000 1.8
@@ -79,10 +79,10 @@
public class XMLX509IssuerSerial extends SignatureElementProxy
implements XMLX509DataContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(XMLX509IssuerSerial.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ XMLX509IssuerSerial.class.getName());
/**
* Constructor XMLX509IssuerSerial
@@ -164,7 +164,7 @@
this.getTextFromChildElement(Constants._TAG_X509SERIALNUMBER,
Constants.SignatureSpecNS);
- cat.debug("In dem X509SerialNumber wurde gefunden: " + text);
+ log.debug("In dem X509SerialNumber wurde gefunden: " + text);
return new BigInteger(text);
}
1.7 +5 -5
xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
Index: XMLX509SKI.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509SKI.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLX509SKI.java 11 Feb 2003 16:02:50 -0000 1.6
+++ XMLX509SKI.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -83,9 +83,9 @@
public class XMLX509SKI extends SignatureElementProxy
implements XMLX509DataContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(XMLX509SKI.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(XMLX509SKI.class.getName());
/**
* <CODE>SubjectKeyIdentifier (id-ce-subjectKeyIdentifier)
(2.5.29.14)</CODE>:
@@ -198,7 +198,7 @@
byte abyte0[] = new byte[derEncodedValue.length - 4];
System.arraycopy(derEncodedValue, 4, abyte0, 0, abyte0.length);
*/
- cat.debug("Base64 of SKI is " + Base64.encode(abyte0));
+ log.debug("Base64 of SKI is " + Base64.encode(abyte0));
return abyte0;
} catch (IOException ex) {
1.8 +4 -4
xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java
Index: XMLX509SubjectName.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLX509SubjectName.java 11 Feb 2003 16:02:50 -0000 1.7
+++ XMLX509SubjectName.java 29 Apr 2003 21:36:54 -0000 1.8
@@ -80,9 +80,9 @@
public class XMLX509SubjectName extends SignatureElementProxy
implements XMLX509DataContent {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(XMLX509SubjectName.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(XMLX509SubjectName.class.getName());
/**
* Constructor X509SubjectName
1.7 +5 -5
xml-security/src/org/apache/xml/security/keys/keyresolver/KeyResolver.java
Index: KeyResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/KeyResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KeyResolver.java 11 Feb 2003 16:02:50 -0000 1.6
+++ KeyResolver.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -81,9 +81,9 @@
*/
public class KeyResolver {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(KeyResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(KeyResolver.class.getName());
/** Field _alreadyInitialized */
static boolean _alreadyInitialized = false;
@@ -172,7 +172,7 @@
throw new KeyResolverException("utils.resolver.noClass", exArgs,
e);
}
- cat.debug("check resolvability by class " + currentClass);
+ log.debug("check resolvability by class " + currentClass);
if ((resolver != null)
&& resolver.canResolve(element, BaseURI, storage)) {
1.8 +5 -5
xml-security/src/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
Index: KeyResolverSpi.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- KeyResolverSpi.java 11 Feb 2003 16:02:50 -0000 1.7
+++ KeyResolverSpi.java 29 Apr 2003 21:36:54 -0000 1.8
@@ -84,9 +84,9 @@
*/
public abstract class KeyResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(KeyResolverSpi.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(KeyResolverSpi.class.getName());
/**
* This method helps the [EMAIL PROTECTED] ResourceResolver} to decide
whether a
1.6 +7 -7
xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
Index: RSAKeyValueResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RSAKeyValueResolver.java 11 Feb 2003 16:02:51 -0000 1.5
+++ RSAKeyValueResolver.java 29 Apr 2003 21:36:54 -0000 1.6
@@ -83,10 +83,10 @@
*/
public class RSAKeyValueResolver extends KeyResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(RSAKeyValueResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ RSAKeyValueResolver.class.getName());
/** Field _rsaKeyElement */
private Element _rsaKeyElement = null;
@@ -102,7 +102,7 @@
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
- cat.debug("Can I resolve " + element.getTagName());
+ log.debug("Can I resolve " + element.getTagName());
if (element == null) {
return false;
@@ -164,7 +164,7 @@
return rsaKeyValue.getPublicKey();
} catch (XMLSecurityException ex) {
- cat.debug("XMLSecurityException", ex);
+ log.debug("XMLSecurityException", ex);
}
return null;
1.7 +24 -24
xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
Index: RetrievalMethodResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RetrievalMethodResolver.java 11 Feb 2003 16:02:51 -0000 1.6
+++ RetrievalMethodResolver.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -97,10 +97,10 @@
*/
public class RetrievalMethodResolver extends KeyResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(RetrievalMethodResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ RetrievalMethodResolver.class.getName());
/**
* Method engineCanResolve
@@ -148,18 +148,18 @@
if (resRes != null) {
XMLSignatureInput resource = resRes.resolve(uri, BaseURI);
- cat.debug("Before applying Transforms, resource has "
+ log.debug("Before applying Transforms, resource has "
+ resource.getBytes().length + "bytes");
if (transforms != null) {
- cat.debug("We have Transforms");
+ log.debug("We have Transforms");
resource = transforms.performTransforms(resource);
}
- cat.debug("After applying Transforms, resource has "
+ log.debug("After applying Transforms, resource has "
+ resource.getBytes().length + "bytes");
- cat.debug("Resolved to resource " + resource.getSourceURI());
+ log.debug("Resolved to resource " + resource.getSourceURI());
byte inputBytes[] = resource.getBytes();
@@ -179,11 +179,11 @@
} else {
// otherwise, we parse the resource, create an Element and
delegate
- cat.debug("we have to parse " + inputBytes.length + " bytes");
+ log.debug("we have to parse " + inputBytes.length + " bytes");
Element e = this.getDocFromBytes(inputBytes);
- cat.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ log.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ e.getLocalName() + " Element");
if (e != null) {
@@ -198,11 +198,11 @@
}
}
} catch (XMLSecurityException ex) {
- cat.debug("XMLSecurityException", ex);
+ log.debug("XMLSecurityException", ex);
} catch (CertificateException ex) {
- cat.debug("CertificateException", ex);
+ log.debug("CertificateException", ex);
} catch (IOException ex) {
- cat.debug("IOException", ex);
+ log.debug("IOException", ex);
}
return null;
@@ -227,25 +227,25 @@
String type = rm.getType();
Transforms transforms = rm.getTransforms();
- cat.debug("Asked to resolve URI " + uri);
+ log.debug("Asked to resolve URI " + uri);
ResourceResolver resRes = ResourceResolver.getInstance(uri,
BaseURI);
if (resRes != null) {
XMLSignatureInput resource = resRes.resolve(uri, BaseURI);
- cat.debug("Before applying Transforms, resource has "
+ log.debug("Before applying Transforms, resource has "
+ resource.getBytes().length + "bytes");
if (transforms != null) {
- cat.debug("We have Transforms");
+ log.debug("We have Transforms");
resource = transforms.performTransforms(resource);
}
- cat.debug("After applying Transforms, resource has "
+ log.debug("After applying Transforms, resource has "
+ resource.getBytes().length + "bytes");
- cat.debug("Resolved to resource " + resource.getSourceURI());
+ log.debug("Resolved to resource " + resource.getSourceURI());
byte inputBytes[] = resource.getBytes();
@@ -266,11 +266,11 @@
} else {
// otherwise, we parse the resource, create an Element and
delegate
- cat.debug("we have to parse " + inputBytes.length + " bytes");
+ log.debug("we have to parse " + inputBytes.length + " bytes");
Element e = this.getDocFromBytes(inputBytes);
- cat.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ log.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ e.getLocalName() + " Element");
if (e != null) {
@@ -285,11 +285,11 @@
}
}
} catch (XMLSecurityException ex) {
- cat.debug("XMLSecurityException", ex);
+ log.debug("XMLSecurityException", ex);
} catch (CertificateException ex) {
- cat.debug("CertificateException", ex);
+ log.debug("CertificateException", ex);
} catch (IOException ex) {
- cat.debug("IOException", ex);
+ log.debug("IOException", ex);
}
return null;
1.6 +9 -10
xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
Index: X509CertificateResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- X509CertificateResolver.java 11 Feb 2003 16:02:51 -0000 1.5
+++ X509CertificateResolver.java 29 Apr 2003 21:36:54 -0000 1.6
@@ -87,10 +87,9 @@
*/
public class X509CertificateResolver extends KeyResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(X509CertificateResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(X509CertificateResolver.class.getName());
/** Field _dsaKeyElement */
NodeList _x509CertKeyElements = null;
@@ -106,13 +105,13 @@
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
- cat.debug("Can I resolve " + element.getTagName() + "?");
+ log.debug("Can I resolve " + element.getTagName() + "?");
try {
XMLUtils.guaranteeThatElementInSignatureSpace(element,
Constants._TAG_X509DATA);
} catch (XMLSignatureException ex) {
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
@@ -125,13 +124,13 @@
if ((this._x509CertKeyElements != null)
&& (this._x509CertKeyElements.getLength() > 0)) {
- cat.debug("Yes Sir, I can");
+ log.debug("Yes Sir, I can");
return true;
}
} catch (TransformerException ex) {}
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
@@ -207,7 +206,7 @@
return null;
} catch (XMLSecurityException ex) {
- cat.debug("XMLSecurityException", ex);
+ log.debug("XMLSecurityException", ex);
throw new KeyResolverException("generic.EmptyMessage", ex);
}
1.6 +18 -18
xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
Index: X509IssuerSerialResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- X509IssuerSerialResolver.java 11 Feb 2003 16:02:51 -0000 1.5
+++ X509IssuerSerialResolver.java 29 Apr 2003 21:36:54 -0000 1.6
@@ -81,10 +81,10 @@
*/
public class X509IssuerSerialResolver extends KeyResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(X509IssuerSerialResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ X509IssuerSerialResolver.class.getName());
/**
* Method engineCanResolve
@@ -97,23 +97,23 @@
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
- cat.debug("Can I resolve " + element.getTagName() + "?");
+ log.debug("Can I resolve " + element.getTagName() + "?");
X509Data x509data = null;
try {
x509data = new X509Data(element, BaseURI);
} catch (XMLSignatureException ex) {
- cat.debug("I can't");
+ log.debug("I can't");
return false;
} catch (XMLSecurityException ex) {
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
if (x509data == null) {
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
@@ -121,7 +121,7 @@
return true;
}
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
@@ -168,7 +168,7 @@
new KeyResolverException("KeyResolver.needStorageResolver",
exArgs);
- cat.info("", ex);
+ log.info("", ex);
throw ex;
}
@@ -179,33 +179,33 @@
X509Certificate cert = storage.next();
XMLX509IssuerSerial certSerial = new
XMLX509IssuerSerial(element.getOwnerDocument(), cert);
- cat.debug("Found Certificate Issuer: "
+ log.debug("Found Certificate Issuer: "
+ certSerial.getIssuerName());
- cat.debug("Found Certificate Serial: "
+ log.debug("Found Certificate Serial: "
+ certSerial.getSerialNumber().toString());
for (int i=0; i<noOfISS; i++) {
XMLX509IssuerSerial xmliss = x509data.itemIssuerSerial(i);
- cat.debug("Found Element Issuer: "
+ log.debug("Found Element Issuer: "
+ xmliss.getIssuerName());
- cat.debug("Found Element Serial: "
+ log.debug("Found Element Serial: "
+ xmliss.getSerialNumber().toString());
if (certSerial.equals(xmliss)) {
- cat.debug("match !!! ");
+ log.debug("match !!! ");
return cert;
} else {
- cat.debug("no match...");
+ log.debug("no match...");
}
}
}
return null;
} catch (XMLSecurityException ex) {
- cat.debug("XMLSecurityException", ex);
+ log.debug("XMLSecurityException", ex);
throw new KeyResolverException("generic.EmptyMessage", ex);
}
1.6 +10 -10
xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
Index: X509SKIResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- X509SKIResolver.java 11 Feb 2003 16:02:51 -0000 1.5
+++ X509SKIResolver.java 29 Apr 2003 21:36:54 -0000 1.6
@@ -86,9 +86,9 @@
*/
public class X509SKIResolver extends KeyResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(X509SKIResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(X509SKIResolver.class.getName());
/** Field _x509childNodes */
private NodeList _x509childNodes = null;
@@ -110,13 +110,13 @@
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
- cat.debug("Can I resolve " + element.getTagName() + "?");
+ log.debug("Can I resolve " + element.getTagName() + "?");
try {
XMLUtils.guaranteeThatElementInSignatureSpace(element,
Constants._TAG_X509DATA);
} catch (XMLSignatureException ex) {
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
@@ -129,13 +129,13 @@
if ((this._x509childNodes != null)
&& (this._x509childNodes.getLength() > 0)) {
- cat.debug("Yes Sir, I can");
+ log.debug("Yes Sir, I can");
return true;
}
} catch (TransformerException ex) {}
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
@@ -192,7 +192,7 @@
new KeyResolverException("KeyResolver.needStorageResolver",
exArgs);
- cat.info("", ex);
+ log.info("", ex);
throw ex;
}
@@ -211,7 +211,7 @@
for (int i = 0; i < this._x509childObject.length; i++) {
if (certSKI.equals(this._x509childObject[i])) {
- cat.debug("Return PublicKey from "
+ log.debug("Return PublicKey from "
+ cert.getSubjectDN().getName());
return cert;
1.7 +15 -15
xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
Index: X509SubjectNameResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- X509SubjectNameResolver.java 11 Feb 2003 16:02:51 -0000 1.6
+++ X509SubjectNameResolver.java 29 Apr 2003 21:36:54 -0000 1.7
@@ -84,10 +84,10 @@
*/
public class X509SubjectNameResolver extends KeyResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(X509SubjectNameResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ X509SubjectNameResolver.class.getName());
/** Field _x509childNodes */
private NodeList _x509childNodes = null;
@@ -109,13 +109,13 @@
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
- cat.debug("Can I resolve " + element.getTagName() + "?");
+ log.debug("Can I resolve " + element.getTagName() + "?");
try {
XMLUtils.guaranteeThatElementInSignatureSpace(element,
Constants._TAG_X509DATA);
} catch (XMLSignatureException ex) {
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
@@ -130,13 +130,13 @@
if ((this._x509childNodes != null)
&& (this._x509childNodes.getLength() > 0)) {
- cat.debug("Yes Sir, I can");
+ log.debug("Yes Sir, I can");
return true;
}
} catch (TransformerException ex) {}
- cat.debug("I can't");
+ log.debug("I can't");
return false;
}
@@ -193,7 +193,7 @@
new KeyResolverException("KeyResolver.needStorageResolver",
exArgs);
- cat.info("", ex);
+ log.info("", ex);
throw ex;
}
@@ -212,25 +212,25 @@
XMLX509SubjectName certSN =
new XMLX509SubjectName(element.getOwnerDocument(), cert);
- cat.debug("Found Certificate SN: " + certSN.getSubjectName());
+ log.debug("Found Certificate SN: " + certSN.getSubjectName());
for (int i = 0; i < this._x509childObject.length; i++) {
- cat.debug("Found Element SN: "
+ log.debug("Found Element SN: "
+ this._x509childObject[i].getSubjectName());
if (certSN.equals(this._x509childObject[i])) {
- cat.debug("match !!! ");
+ log.debug("match !!! ");
return cert;
} else {
- cat.debug("no match...");
+ log.debug("no match...");
}
}
}
return null;
} catch (XMLSecurityException ex) {
- cat.debug("XMLSecurityException", ex);
+ log.debug("XMLSecurityException", ex);
throw new KeyResolverException("generic.EmptyMessage", ex);
}
1.6 +7 -7
xml-security/src/org/apache/xml/security/keys/storage/StorageResolver.java
Index: StorageResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/storage/StorageResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StorageResolver.java 11 Feb 2003 16:02:51 -0000 1.5
+++ StorageResolver.java 29 Apr 2003 21:36:55 -0000 1.6
@@ -77,9 +77,9 @@
*/
public class StorageResolver {
- /** Field cat */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(StorageResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(StorageResolver.class.getName());
/** Field _storageResolvers */
Vector _storageResolvers = new Vector();
@@ -133,7 +133,7 @@
try {
this.add(new KeyStoreResolver(keyStore));
} catch (StorageResolverException ex) {
- cat.error("Could not add KeyStore because of: ", ex);
+ log.error("Could not add KeyStore because of: ", ex);
}
}
1.5 +13 -13
xml-security/src/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
Index: CertsInFilesystemDirectoryResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CertsInFilesystemDirectoryResolver.java 11 Feb 2003 16:02:51 -0000
1.4
+++ CertsInFilesystemDirectoryResolver.java 29 Apr 2003 21:36:55 -0000
1.5
@@ -87,10 +87,10 @@
*/
public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
- /** Field cat */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(CertsInFilesystemDirectoryResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ CertsInFilesystemDirectoryResolver.class.getName());
/** Field _merlinsCertificatesDir */
String _merlinsCertificatesDir = null;
@@ -169,19 +169,19 @@
dn = cert.getSubjectDN().getName();
added = true;
} catch (FileNotFoundException ex) {
- cat.debug("Could not add certificate from file " + filename, ex);
+ log.debug("Could not add certificate from file " + filename, ex);
} catch (IOException ex) {
- cat.debug("Could not add certificate from file " + filename, ex);
+ log.debug("Could not add certificate from file " + filename, ex);
} catch (CertificateNotYetValidException ex) {
- cat.debug("Could not add certificate from file " + filename, ex);
+ log.debug("Could not add certificate from file " + filename, ex);
} catch (CertificateExpiredException ex) {
- cat.debug("Could not add certificate from file " + filename, ex);
+ log.debug("Could not add certificate from file " + filename, ex);
} catch (CertificateException ex) {
- cat.debug("Could not add certificate from file " + filename, ex);
+ log.debug("Could not add certificate from file " + filename, ex);
}
if (added) {
- cat.debug("Added certificate: " + dn);
+ log.debug("Added certificate: " + dn);
}
}
}
1.31 +1 -1
xml-security/src/org/apache/xml/security/resource/config.xml
Index: config.xml
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/resource/config.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config.xml 28 Sep 2002 08:49:51 -0000 1.30
+++ config.xml 29 Apr 2003 21:36:55 -0000 1.31
@@ -515,7 +515,7 @@
-->
<root>
<priority value ="debug" />
- <!-- <appender-ref ref="LOGTXT" /> -->
+ <!-- appender-ref ref="LOGTXT" /-->
<appender-ref ref="NULL" />
<!-- <appender-ref ref="chainsaw" /> -->
</root>
1.25 +9 -9
xml-security/src/org/apache/xml/security/signature/Manifest.java
Index: Manifest.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/signature/Manifest.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Manifest.java 11 Feb 2003 16:02:51 -0000 1.24
+++ Manifest.java 29 Apr 2003 21:36:55 -0000 1.25
@@ -94,9 +94,9 @@
*/
public class Manifest extends SignatureElementProxy {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Manifest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(Manifest.class.getName());
/** Field _references */
Vector _references;
@@ -327,11 +327,11 @@
public boolean verifyReferences(boolean followManifests)
throws MissingResourceFailureException, XMLSecurityException {
- cat.debug(
+ log.debug(
"verify "
+ this.length(Constants.SignatureSpecNS, Constants._TAG_REFERENCE)
+ " References");
- cat.debug("I am " + (followManifests
+ log.debug("I am " + (followManifests
? ""
: "not") + " requested to follow nested
Manifests");
@@ -366,12 +366,12 @@
verify = false;
}
- cat.debug("The Reference has Type " + currentRef.getType());
+ log.debug("The Reference has Type " + currentRef.getType());
// was verification successful till now and do we want to verify
the Manifest?
if (verify && followManifests
&& currentRef.typeIsReferenceToManifest()) {
- cat.debug("We have to follow a nested Manifest");
+ log.debug("We have to follow a nested Manifest");
try {
currentRef.dereferenceURIandPerformTransforms();
@@ -421,9 +421,9 @@
if (!referencedManifestValid) {
verify = false;
- cat.warn("The nested Manifest was invalid (bad)");
+ log.warn("The nested Manifest was invalid (bad)");
} else {
- cat.debug("The nested Manifest was valid (good)");
+ log.debug("The nested Manifest was valid (good)");
}
} catch (IOException ex) {
throw new ReferenceNotInitializedException("empty", ex);
1.11 +3 -3
xml-security/src/org/apache/xml/security/signature/ObjectContainer.java
Index: ObjectContainer.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/signature/ObjectContainer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ObjectContainer.java 11 Feb 2003 16:02:51 -0000 1.10
+++ ObjectContainer.java 29 Apr 2003 21:36:55 -0000 1.11
@@ -79,9 +79,9 @@
*/
public class ObjectContainer extends SignatureElementProxy {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(ObjectContainer.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(ObjectContainer.class.getName());
/**
* Constructs [EMAIL PROTECTED] ObjectContainer}
1.30 +7 -7
xml-security/src/org/apache/xml/security/signature/Reference.java
Index: Reference.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/signature/Reference.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Reference.java 11 Feb 2003 16:02:51 -0000 1.29
+++ Reference.java 29 Apr 2003 21:36:55 -0000 1.30
@@ -140,9 +140,9 @@
/** Field CacheSignedNodes */
public static boolean CacheSignedNodes = false;
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Reference.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(Reference.class.getName());
/** Field OBJECT_URI */
public static final String OBJECT_URI = Constants.SignatureSpecNS
@@ -793,9 +793,9 @@
//J-
if (data.length < 20) {
- cat.debug(new String(data));
+ log.debug(new String(data));
} else {
- cat.debug(new String(data).substring(0, 20) + " ...");
+ log.debug(new String(data).substring(0, 20) + " ...");
}
//J+
return calculatedDigestValue;
@@ -833,9 +833,9 @@
boolean equal = MessageDigestAlgorithm.isEqual(elemDig, calcDig);
if (!equal) {
- cat.warn("Verification failed for URI \"" + this.getURI() + "\"");
+ log.warn("Verification failed for URI \"" + this.getURI() + "\"");
} else {
- cat.info("Verification successful for URI \"" + this.getURI() +
"\"");
+ log.info("Verification successful for URI \"" + this.getURI() +
"\"");
}
return equal;
1.9 +3 -4
xml-security/src/org/apache/xml/security/signature/SignatureProperties.java
Index: SignatureProperties.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/signature/SignatureProperties.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SignatureProperties.java 11 Feb 2003 16:02:51 -0000 1.8
+++ SignatureProperties.java 29 Apr 2003 21:36:55 -0000 1.9
@@ -84,10 +84,9 @@
*/
public class SignatureProperties extends SignatureElementProxy {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(SignatureProperties.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(SignatureProperties.class.getName());
/**
* Constructor SignatureProperties
1.10 +4 -6
xml-security/src/org/apache/xml/security/signature/SignatureProperty.java
Index: SignatureProperty.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/signature/SignatureProperty.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SignatureProperty.java 11 Feb 2003 16:02:51 -0000 1.9
+++ SignatureProperty.java 29 Apr 2003 21:36:55 -0000 1.10
@@ -58,8 +58,6 @@
*/
package org.apache.xml.security.signature;
-
-
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.IdResolver;
@@ -68,7 +66,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
/**
* Handles <code><ds:SignatureProperty></code> elements
* Addittional information item concerning the generation of the
signature(s) can
@@ -78,9 +75,10 @@
*/
public class SignatureProperty extends SignatureElementProxy {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(SignatureProperty.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ SignatureProperty.class.getName());
/**
* [EMAIL PROTECTED] SignatureProperty} using specified
<code>Target</code> attribute
1.18 +1 -1
xml-security/src/org/apache/xml/security/signature/SignedInfo.java
Index: SignedInfo.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/signature/SignedInfo.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SignedInfo.java 11 Feb 2003 16:02:51 -0000 1.17
+++ SignedInfo.java 29 Apr 2003 21:36:55 -0000 1.18
@@ -344,7 +344,7 @@
for (int i = 0; i < children.getLength(); i++) {
Node n = children.item(i);
- cat.debug("Looking for SignatureMethodURI in " + n);
+ log.debug("Looking for SignatureMethodURI in " + n);
if (n.getNodeType() == Node.ELEMENT_NODE) {
boolean found = true;
1.35 +10 -9
xml-security/src/org/apache/xml/security/signature/XMLSignature.java
Index: XMLSignature.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/signature/XMLSignature.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XMLSignature.java 11 Feb 2003 16:02:51 -0000 1.34
+++ XMLSignature.java 29 Apr 2003 21:36:55 -0000 1.35
@@ -117,9 +117,10 @@
*/
public final class XMLSignature extends SignatureElementProxy {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(XMLSignature.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(XMLSignature.class.getName());
+
//J-
/** MAC - Required HMAC-SHA1 */
public static final String ALGO_ID_MAC_HMAC_SHA1 =
Constants.SignatureSpecNS + "hmac-sha1";
@@ -654,10 +655,10 @@
new SignatureAlgorithm(this.getSignedInfo()
.getSignatureMethodElement(), this.getBaseURI());
- cat.debug("SignatureMethodURI = " + sa.getAlgorithmURI());
- cat.debug("jceSigAlgorithm = " + sa.getJCEAlgorithmString());
- cat.debug("jceSigProvider = " + sa.getJCEProviderName());
- cat.debug("PublicKey = " + pk);
+ log.debug("SignatureMethodURI = " + sa.getAlgorithmURI());
+ log.debug("jceSigAlgorithm = " + sa.getJCEAlgorithmString());
+ log.debug("jceSigProvider = " + sa.getJCEProviderName());
+ log.debug("PublicKey = " + pk);
sa.initVerify(pk);
// Get the canonicalized (normalized) SignedInfo
@@ -669,7 +670,7 @@
//retrieve the byte[] from the stored signature
byte sigBytes[] = this.getSignatureValue();
- cat.debug("SignatureValue = "
+ log.debug("SignatureValue = "
+ HexDump.byteArrayToHexString(sigBytes));
//Have SignatureAlgorithm sign the input bytes and compare them to
the
1.12 +5 -5
xml-security/src/org/apache/xml/security/transforms/Transform.java
Index: Transform.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/transforms/Transform.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Transform.java 11 Feb 2003 16:02:52 -0000 1.11
+++ Transform.java 29 Apr 2003 21:36:55 -0000 1.12
@@ -97,9 +97,9 @@
*/
public final class Transform extends SignatureElementProxy {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Transform.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(Transform.class.getName());
/** Field _alreadyInitialized */
static boolean _alreadyInitialized = false;
@@ -130,9 +130,9 @@
String implementingClass =
Transform.getImplementingClass(algorithmURI);
- cat.debug("Create URI \"" + algorithmURI + "\" class \""
+ log.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
- cat.debug("The NodeList is " + contextNodes);
+ log.debug("The NodeList is " + contextNodes);
// create the custom Transform object
this.transformSpi =
1.4 +3 -3
xml-security/src/org/apache/xml/security/transforms/TransformSpi.java
Index: TransformSpi.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/transforms/TransformSpi.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransformSpi.java 11 Feb 2003 16:02:52 -0000 1.3
+++ TransformSpi.java 29 Apr 2003 21:36:55 -0000 1.4
@@ -79,9 +79,9 @@
*/
public abstract class TransformSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(TransformSpi.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(TransformSpi.class.getName());
protected Transform _transformObject = null;
protected void setTransform(Transform transform) {
1.12 +7 -7
xml-security/src/org/apache/xml/security/transforms/Transforms.java
Index: Transforms.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/transforms/Transforms.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Transforms.java 11 Feb 2003 16:02:52 -0000 1.11
+++ Transforms.java 29 Apr 2003 21:36:55 -0000 1.12
@@ -91,9 +91,9 @@
*/
public class Transforms extends SignatureElementProxy {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Transforms.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(Transforms.class.getName());
//J-
/** Canonicalization - Required Canonical XML (omits comments) */
public static final String TRANSFORM_C14N_OMIT_COMMENTS =
Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
@@ -171,7 +171,7 @@
throws TransformationException {
try {
- cat.debug("Transforms.addTransform(" + transformURI + ")");
+ log.debug("Transforms.addTransform(" + transformURI + ")");
Transform transform = Transform.getInstance(this._doc,
transformURI);
@@ -193,7 +193,7 @@
throws TransformationException {
try {
- cat.debug("Transforms.addTransform(" + transformURI + ")");
+ log.debug("Transforms.addTransform(" + transformURI + ")");
Transform transform = Transform.getInstance(this._doc, transformURI,
contextElement);
@@ -232,7 +232,7 @@
*/
private void addTransform(Transform transform) {
- cat.debug("Transforms.addTransform(" + transform.getURI() + ")");
+ log.debug("Transforms.addTransform(" + transform.getURI() + ")");
Element transformElement = transform.getElement();
@@ -254,7 +254,7 @@
for (int i = 0; i < this.getLength(); i++) {
Transform t = this.item(i);
- cat.debug("Preform the (" + i + ")th " + t.getURI() + "
transform");
+ log.debug("Preform the (" + i + ")th " + t.getURI() + "
transform");
xmlSignatureInput = t.performTransform(xmlSignatureInput);
}
1.12 +5 -4
xml-security/src/org/apache/xml/security/transforms/implementations/TransformXPath.java
Index: TransformXPath.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformXPath.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TransformXPath.java 11 Feb 2003 16:02:52 -0000 1.11
+++ TransformXPath.java 29 Apr 2003 21:36:56 -0000 1.12
@@ -98,8 +98,9 @@
*/
public class TransformXPath extends TransformSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(TransformXPath.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(TransformXPath.class.getName());
/** Field implementedTransformURI */
public static final String implementedTransformURI =
@@ -204,9 +205,9 @@
if (includeInResult.bool()) {
resultNodes.add(currentNode);
- // cat.debug(" Added " +
org.apache.xml.security.c14n.implementations.Canonicalizer20010315.getXPath(currentNode));
+ // log.debug(" Added " +
org.apache.xml.security.c14n.implementations.Canonicalizer20010315.getXPath(currentNode));
} else {
- // cat.debug("Not added " +
org.apache.xml.security.c14n.implementations.Canonicalizer20010315.getXPath(currentNode));
+ // log.debug("Not added " +
org.apache.xml.security.c14n.implementations.Canonicalizer20010315.getXPath(currentNode));
}
}
1.8 +8 -6
xml-security/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
Index: TransformXPath2Filter.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TransformXPath2Filter.java 11 Feb 2003 16:02:52 -0000 1.7
+++ TransformXPath2Filter.java 29 Apr 2003 21:36:56 -0000 1.8
@@ -100,8 +100,10 @@
*/
public class TransformXPath2Filter extends TransformSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- // static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(TransformXPath2Filter.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+// static org.apache.commons.logging.Log log =
+// org.apache.commons.logging.LogFactory.getLog(
+// TransformXPath2Filter.class.getName());
/** Field implementedTransformURI */
public static final String implementedTransformURI =
@@ -288,7 +290,7 @@
/*
if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
- cat.debug(i + " " + ((Element) currentNode).getTagName()
+ log.debug(i + " " + ((Element) currentNode).getTagName()
+ " is " + type + " of " + rootNode.getNodeName());
}
*/
@@ -314,7 +316,7 @@
/*
if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
- cat.debug("The intersect operation from step " + I
+ log.debug("The intersect operation from step " + I
+ " does not include " + currentNode.getNodeName());
}
*/
@@ -325,7 +327,7 @@
/*
if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
- cat.debug("The subtract operation from step " + I
+ log.debug("The subtract operation from step " + I
+ " does subtract " + currentNode.getNodeName());
}
*/
1.4 +8 -8
xml-security/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter04.java
Index: TransformXPath2Filter04.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/transforms/implementations/TransformXPath2Filter04.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransformXPath2Filter04.java 11 Feb 2003 16:02:52 -0000 1.3
+++ TransformXPath2Filter04.java 29 Apr 2003 21:36:56 -0000 1.4
@@ -97,10 +97,10 @@
*/
public class TransformXPath2Filter04 extends TransformSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(TransformXPath2Filter04.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ TransformXPath2Filter04.class.getName());
/** Field implementedTransformURI */
public static final String implementedTransformURI =
@@ -135,7 +135,7 @@
try {
Set inputSet = input.getNodeSet();
- cat.debug("perform xfilter2 on " + inputSet.size() + " nodes");
+ log.debug("perform xfilter2 on " + inputSet.size() + " nodes");
CachedXPathFuncHereAPI xPathFuncHereAPI =
new CachedXPathFuncHereAPI(input.getCachedXPathAPI());
@@ -177,7 +177,7 @@
xpathContainer.getXPathFilterTextNode(),
xpathContainer.getElement());
- cat.debug("subtreeRoots contains " + subtreeRoots.getLength()
+ log.debug("subtreeRoots contains " + subtreeRoots.getLength()
+ " nodes");
/*
@@ -211,7 +211,7 @@
}
}
- cat.debug("selection process identified " + selectedNodes.size()
+ log.debug("selection process identified " + selectedNodes.size()
+ " nodes");
Set resultNodes = new HashSet();
1.10 +5 -5
xml-security/src/org/apache/xml/security/utils/Base64.java
Index: Base64.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/Base64.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Base64.java 11 Feb 2003 16:02:53 -0000 1.9
+++ Base64.java 29 Apr 2003 21:36:56 -0000 1.10
@@ -90,9 +90,9 @@
*/
public class Base64 {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Base64.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(Base64.class.getName());
/** Field LINE_SEPARATOR */
public static final String LINE_SEPARATOR = "\n";
@@ -352,9 +352,9 @@
try {
if (base64.length() < 30) {
- cat.debug("I was asked to decode \"" + base64 + "\"");
+ log.debug("I was asked to decode \"" + base64 + "\"");
} else {
- cat.debug("I was asked to decode \"" + base64.substring(0, 20)
+ log.debug("I was asked to decode \"" + base64.substring(0, 20)
+ "...\"");
}
1.12 +4 -4
xml-security/src/org/apache/xml/security/utils/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/Constants.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Constants.java 11 Feb 2003 16:02:53 -0000 1.11
+++ Constants.java 29 Apr 2003 21:36:56 -0000 1.12
@@ -74,9 +74,9 @@
*/
public class Constants {
- /** Log4j logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Constants.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(Constants.class.getName());
/** Field configurationFile */
public static String configurationFile = "data/websig.conf";
1.23 +6 -6
xml-security/src/org/apache/xml/security/utils/ElementProxy.java
Index: ElementProxy.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/ElementProxy.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ElementProxy.java 11 Feb 2003 16:02:53 -0000 1.22
+++ ElementProxy.java 29 Apr 2003 21:36:56 -0000 1.23
@@ -84,9 +84,9 @@
*/
public abstract class ElementProxy {
- /** Field cat */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(ElementProxy.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(ElementProxy.class.getName());
//J-
public static final int MODE_CREATE = 0;
public static final int MODE_PROCESS = 1;
@@ -206,7 +206,7 @@
throw new XMLSecurityException("ElementProxy.nullElement");
}
- cat.debug("setElement(" + element.getTagName() + ", \"" + BaseURI +
"\"");
+ log.debug("setElement(" + element.getTagName() + ", \"" + BaseURI +
"\"");
this._doc = element.getOwnerDocument();
this._state = ElementProxy.MODE_PROCESS;
@@ -230,7 +230,7 @@
throw new XMLSecurityException("ElementProxy.nullElement");
}
- cat.debug("setElement(\"" + element.getTagName() + "\", \"" + BaseURI
+ log.debug("setElement(\"" + element.getTagName() + "\", \"" + BaseURI
+ "\")");
this._doc = element.getOwnerDocument();
1.6 +4 -4
xml-security/src/org/apache/xml/security/utils/HelperNodeList.java
Index: HelperNodeList.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/HelperNodeList.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HelperNodeList.java 11 Feb 2003 16:02:53 -0000 1.5
+++ HelperNodeList.java 29 Apr 2003 21:36:56 -0000 1.6
@@ -76,9 +76,9 @@
*/
public class HelperNodeList implements NodeList {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(HelperNodeList.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(HelperNodeList.class.getName());
/** Field nodes */
ArrayList nodes = new ArrayList(20);
@@ -101,7 +101,7 @@
*/
public Node item(int index) {
- // cat.debug("item(" + index + ") of " + this.getLength() + " nodes");
+ // log.debug("item(" + index + ") of " + this.getLength() + " nodes");
return (Node) nodes.get(index);
}
1.12 +22 -22
xml-security/src/org/apache/xml/security/utils/IdResolver.java
Index: IdResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/IdResolver.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- IdResolver.java 11 Feb 2003 16:02:53 -0000 1.11
+++ IdResolver.java 29 Apr 2003 21:36:56 -0000 1.12
@@ -85,9 +85,9 @@
*/
public class IdResolver {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(IdResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(IdResolver.class.getName());
/**
* Constructor IdResolver
@@ -136,7 +136,7 @@
result = IdResolver.getElementByIdType(doc, id);
if (result != null) {
- cat.debug(
+ log.debug(
"I could find an Element using the simple getElementById method:
"
+ result.getTagName());
@@ -146,7 +146,7 @@
result = IdResolver.getElementByIdInDSNamespace(doc, id);
if (result != null) {
- cat.debug(
+ log.debug(
"I could find an Element using the advanced ds:Namespace
searcher method: "
+ result.getTagName());
@@ -159,7 +159,7 @@
result = IdResolver.getElementByIdInXENCNamespace(doc, id);
if (result != null) {
- cat.debug(
+ log.debug(
"I could find an Element using the advanced xenc:Namespace
searcher method: "
+ result.getTagName());
@@ -172,7 +172,7 @@
result = IdResolver.getElementByIdInSOAPSignatureNamespace(doc, id);
if (result != null) {
- cat.debug(
+ log.debug(
"I could find an Element using the advanced SOAP-SEC:id searcher
method: "
+ result.getTagName());
@@ -185,7 +185,7 @@
result = IdResolver.getElementByIdInXKMSNamespace(doc, id);
if (result != null) {
- cat.debug("I could find an Element using the XKMS searcher method: "
+ log.debug("I could find an Element using the XKMS searcher method: "
+ result.getTagName());
// register the ID to speed up further queries on that ID
@@ -197,7 +197,7 @@
result = IdResolver.getElementByIdUnsafeMatchByIdName(doc, id);
if (result != null) {
- cat.warn(
+ log.warn(
"I could find an Element using the totally stupid and insecure
Id/ID/id searcher method: "
+ result.getTagName());
@@ -217,7 +217,7 @@
*/
private static Element getElementByIdType(Document doc, String id) {
- cat.debug("getElementByIdType() Search for ID " + id);
+ log.debug("getElementByIdType() Search for ID " + id);
return doc.getElementById(id);
}
@@ -231,7 +231,7 @@
*/
private static Element getElementByIdInDSNamespace(Document doc, String
id) {
- cat.debug("getElementByIdInDSNamespace() Search for ID " + id);
+ log.debug("getElementByIdInDSNamespace() Search for ID " + id);
try {
Element nscontext = XMLUtils.createDSctx(doc, "ds",
@@ -245,7 +245,7 @@
NodeList dsElements = XPathAPI.selectNodeList(doc, "//ds:*",
nscontext);
- cat.debug("Found ds:Elements: " + dsElements.getLength());
+ log.debug("Found ds:Elements: " + dsElements.getLength());
for (int i = 0; i < dsElements.getLength(); i++) {
Element currentElem = (Element) dsElements.item(i);
@@ -259,7 +259,7 @@
}
*/
} catch (TransformerException ex) {
- cat.fatal("empty", ex);
+ log.fatal("empty", ex);
}
return null;
@@ -275,7 +275,7 @@
private static Element getElementByIdInXENCNamespace(Document doc,
String id) {
- cat.debug("getElementByIdInXENCNamespace() Search for ID " + id);
+ log.debug("getElementByIdInXENCNamespace() Search for ID " + id);
try {
Element nscontext =
@@ -287,7 +287,7 @@
return element;
} catch (TransformerException ex) {
- cat.fatal("empty", ex);
+ log.fatal("empty", ex);
}
return null;
@@ -303,7 +303,7 @@
private static Element getElementByIdInSOAPSignatureNamespace(Document
doc,
String id) {
- cat.debug("getElementByIdInSOAPSignatureNamespace() Search for ID " +
id);
+ log.debug("getElementByIdInSOAPSignatureNamespace() Search for ID " +
id);
try {
Element nscontext = XMLUtils.createDSctx(
@@ -314,7 +314,7 @@
return element;
} catch (TransformerException ex) {
- cat.fatal("empty", ex);
+ log.fatal("empty", ex);
}
return null;
@@ -339,7 +339,7 @@
<attribute name="RequestID" type="ID" use="optional"/>
<attribute name="ResponseID" type="ID" use="required"/>
*/
- cat.debug("getElementByIdInXKMSNamespace() Search for ID " + id);
+ log.debug("getElementByIdInXKMSNamespace() Search for ID " + id);
try {
Element nscontext =
@@ -361,7 +361,7 @@
return null;
} catch (TransformerException ex) {
- cat.fatal("empty", ex);
+ log.fatal("empty", ex);
}
return null;
@@ -377,7 +377,7 @@
private static Element getElementByIdUnsafeMatchByIdName(Document doc,
String id) {
- cat.debug("getElementByIdUnsafeMatchByIdName() Search for ID " + id);
+ log.debug("getElementByIdUnsafeMatchByIdName() Search for ID " + id);
try {
Element element_Id = (Element) XPathAPI.selectSingleNode(doc,
@@ -401,7 +401,7 @@
return element_id;
}
} catch (TransformerException ex) {
- cat.fatal("empty", ex);
+ log.fatal("empty", ex);
}
return null;
1.4 +6 -7
xml-security/src/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
Index: IgnoreAllErrorHandler.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/IgnoreAllErrorHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IgnoreAllErrorHandler.java 29 Jan 2002 08:32:36 -0000 1.3
+++ IgnoreAllErrorHandler.java 29 Apr 2003 21:36:56 -0000 1.4
@@ -73,10 +73,9 @@
*/
public class IgnoreAllErrorHandler implements ErrorHandler {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(IgnoreAllErrorHandler.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(IgnoreAllErrorHandler.class.getName());
/** Field throwExceptions */
static final boolean warnOnExceptions = true;
@@ -87,7 +86,7 @@
//J-
public void warning (SAXParseException ex) throws SAXException {
if (IgnoreAllErrorHandler.warnOnExceptions) {
- cat.warn("", ex);
+ log.warn("", ex);
}
if (IgnoreAllErrorHandler.throwExceptions) {
throw ex;
@@ -95,7 +94,7 @@
}
public void error (SAXParseException ex) throws SAXException {
if (IgnoreAllErrorHandler.warnOnExceptions) {
- cat.error("", ex);
+ log.error("", ex);
}
if (IgnoreAllErrorHandler.throwExceptions) {
throw ex;
@@ -103,7 +102,7 @@
}
public void fatalError (SAXParseException ex) throws SAXException {
if (IgnoreAllErrorHandler.warnOnExceptions) {
- cat.warn("", ex);
+ log.warn("", ex);
}
if (IgnoreAllErrorHandler.throwExceptions) {
throw ex;
1.7 +9 -9
xml-security/src/org/apache/xml/security/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/JavaUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JavaUtils.java 11 Feb 2003 16:02:53 -0000 1.6
+++ JavaUtils.java 29 Apr 2003 21:36:56 -0000 1.7
@@ -77,9 +77,9 @@
*/
public class JavaUtils {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(JavaUtils.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(JavaUtils.class.getName());
private JavaUtils() {
// we don't allow instantiation
@@ -267,7 +267,7 @@
fos.write(bytes);
fos.close();
} else {
- cat.debug("writeBytesToFilename got null byte[] pointed");
+ log.debug("writeBytesToFilename got null byte[] pointed");
}
} catch (Exception ex) {}
}
@@ -306,7 +306,7 @@
*/
public static void runGC() {
- cat.debug("<METHOD name=runGC()>");
+ log.debug("<METHOD name=runGC()>");
Runtime runtime = Runtime.getRuntime();
long lFreeMemBefore = runtime.freeMemory();
@@ -321,17 +321,17 @@
long lFreeMemAfter = runtime.freeMemory();
long lTotalMemAfter = runtime.totalMemory();
- cat.debug("* Garbage collection took " + time + " seconds.");
- cat.debug("* Memory before gc()... free:" + lFreeMemBefore + "= "
+ log.debug("* Garbage collection took " + time + " seconds.");
+ log.debug("* Memory before gc()... free:" + lFreeMemBefore + "= "
+ lFreeMemBefore / 1024 + "KB,...total:" + lTotalMemBefore
+ "= " + lTotalMemBefore / 1024 + "KB,... used:"
+ (lTotalMemBefore - lFreeMemBefore) + "= "
+ (lTotalMemBefore - lFreeMemBefore) / 1024 + "KB");
- cat.debug("* Memory after: gc()... free:" + lFreeMemAfter + "= "
+ log.debug("* Memory after: gc()... free:" + lFreeMemAfter + "= "
+ lFreeMemAfter / 1024 + "KB,...total:" + lTotalMemAfter +
"= "
+ lTotalMemAfter / 1024 + "KB,... used:"
+ (lTotalMemAfter - lFreeMemAfter) + "= "
+ (lTotalMemAfter - lFreeMemAfter) / 1024 + "KB");
- cat.debug("</METHOD>");
+ log.debug("</METHOD>");
}
}
1.5 +6 -5
xml-security/src/org/apache/xml/security/utils/RFC2253Parser.java
Index: RFC2253Parser.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/RFC2253Parser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RFC2253Parser.java 11 Feb 2003 16:02:53 -0000 1.4
+++ RFC2253Parser.java 29 Apr 2003 21:36:56 -0000 1.5
@@ -70,11 +70,12 @@
*/
public class RFC2253Parser {
- /** Field cat */
-
- /* static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(RFC2253Parser.class.getName());
+
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ /* static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(RFC2253Parser.class.getName());
*/
+
static boolean _TOXML = true;
/**
1.31 +15 -5
xml-security/src/org/apache/xml/security/utils/XMLUtils.java
Index: XMLUtils.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/XMLUtils.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XMLUtils.java 11 Feb 2003 16:02:53 -0000 1.30
+++ XMLUtils.java 29 Apr 2003 21:36:56 -0000 1.31
@@ -95,9 +95,9 @@
*/
public class XMLUtils {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(XMLUtils.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(XMLUtils.class.getName());
/**
* Constructor XMLUtils
@@ -341,7 +341,7 @@
}
}
- /**
+ /**
* Method spitOutVersions
*
* @param cat
@@ -350,6 +350,16 @@
cat.debug(XMLUtils.getXercesVersion());
cat.debug(XMLUtils.getXalanVersion());
}
+
+ /**
+ * Method spitOutVersions
+ *
+ * @param log
+ */
+ public static void spitOutVersions(org.apache.commons.logging.Log log) {
+ log.debug(XMLUtils.getXercesVersion());
+ log.debug(XMLUtils.getXalanVersion());
+ }
/** Field nodeTypeString */
private static String[] nodeTypeString = new String[]{ "", "ELEMENT",
@@ -931,7 +941,7 @@
throws XMLSignatureException {
/*
- cat.debug("guaranteeThatElementInSignatureSpace(" + element + ", "
+ log.debug("guaranteeThatElementInSignatureSpace(" + element + ", "
+ localName + ")");
*/
if (element == null) {
1.6 +9 -9
xml-security/src/org/apache/xml/security/utils/resolver/ResourceResolver.java
Index: ResourceResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/ResourceResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceResolver.java 11 Feb 2003 16:02:54 -0000 1.5
+++ ResourceResolver.java 29 Apr 2003 21:36:56 -0000 1.6
@@ -90,9 +90,9 @@
*/
public class ResourceResolver {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(ResourceResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(ResourceResolver.class.getName());
/** Field _alreadyInitialized */
static boolean _alreadyInitialized = false;
@@ -157,7 +157,7 @@
exArgs, e, uri, BaseURI);
}
- cat.debug("check resolvability by class " + currentClass);
+ log.debug("check resolvability by class " + currentClass);
if ((resolver != null) && resolver.canResolve(uri, BaseURI)) {
return resolver;
@@ -185,8 +185,8 @@
Attr uri, String BaseURI, Vector individualResolvers)
throws ResourceResolverException {
- cat.debug("I was asked to create a ResourceResolver and got " +
individualResolvers.size());
- cat.debug(" extra resolvers to my existing " +
ResourceResolver._resolverVector.size() + " system-wide resolvers");
+ log.debug("I was asked to create a ResourceResolver and got " +
individualResolvers.size());
+ log.debug(" extra resolvers to my existing " +
ResourceResolver._resolverVector.size() + " system-wide resolvers");
// first check the individual Resolvers
if ((individualResolvers != null) && (individualResolvers.size() > 0))
{
@@ -197,7 +197,7 @@
if (resolver != null) {
String currentClass =
resolver._resolverSpi.getClass().getName();
- cat.debug("check resolvability by class " + currentClass);
+ log.debug("check resolvability by class " + currentClass);
if (resolver.canResolve(uri, BaseURI)) {
return resolver;
@@ -222,7 +222,7 @@
exArgs, e, uri, BaseURI);
}
- cat.debug("check resolvability by class " + currentClass);
+ log.debug("check resolvability by class " + currentClass);
if ((resolver != null) && resolver.canResolve(uri, BaseURI)) {
return resolver;
1.7 +6 -6
xml-security/src/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
Index: ResourceResolverSpi.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceResolverSpi.java 11 Feb 2003 16:02:54 -0000 1.6
+++ ResourceResolverSpi.java 29 Apr 2003 21:36:56 -0000 1.7
@@ -74,10 +74,10 @@
*/
public abstract class ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(ResourceResolverSpi.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ ResourceResolverSpi.class.getName());
/** Field _properties */
protected java.util.Map _properties = new java.util.HashMap(10);
@@ -329,7 +329,7 @@
&& (ch3 != '/'));
if (isDosFilename) {
- cat.debug("Found DOS filename: " + str);
+ log.debug("Found DOS filename: " + str);
}
}
1.6 +5 -4
xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java
Index: ResolverAnonymous.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverAnonymous.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResolverAnonymous.java 11 Feb 2003 16:02:55 -0000 1.5
+++ ResolverAnonymous.java 29 Apr 2003 21:36:57 -0000 1.6
@@ -14,9 +14,10 @@
* @author $Author$
*/
public class ResolverAnonymous extends ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(ResolverAnonymous.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ ResolverAnonymous.class.getName());
private XMLSignatureInput _input = null;
1.9 +11 -10
xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
Index: ResolverDirectHTTP.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResolverDirectHTTP.java 11 Feb 2003 16:02:55 -0000 1.8
+++ ResolverDirectHTTP.java 29 Apr 2003 21:36:57 -0000 1.9
@@ -102,9 +102,10 @@
*/
public class ResolverDirectHTTP extends ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(ResolverDirectHTTP.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ ResolverDirectHTTP.class.getName());
/** Field properties[] */
static final String properties[] = { "http.proxy.host", "http.proxy.port",
@@ -168,7 +169,7 @@
// switch on proxy usage
if (useProxy) {
- cat.debug("Use of HTTP proxy enabled: " + proxyHost + ":"
+ log.debug("Use of HTTP proxy enabled: " + proxyHost + ":"
+ proxyPort);
System.getProperties().put("http.proxySet", "true");
System.getProperties().put("http.proxyHost", proxyHost);
@@ -253,7 +254,7 @@
summarized += read;
}
- cat.debug("Fetched " + summarized + " bytes from URI "
+ log.debug("Fetched " + summarized + " bytes from URI "
+ uriNew.toString());
XMLSignatureInput result = new
XMLSignatureInput(baos.toByteArray());
@@ -289,7 +290,7 @@
public boolean engineCanResolve(Attr uri, String BaseURI) {
if (uri == null) {
- cat.debug("quick fail, uri == null");
+ log.debug("quick fail, uri == null");
return false;
}
@@ -297,7 +298,7 @@
String uriNodeValue = uri.getNodeValue();
if (uriNodeValue.equals("") || uriNodeValue.startsWith("#")) {
- cat.debug("quick fail for empty URIs and local ones");
+ log.debug("quick fail for empty URIs and local ones");
return false;
}
@@ -307,16 +308,16 @@
try {
uriNew = getNewURI(uri.getNodeValue(), BaseURI);
} catch (URI.MalformedURIException ex) {
- cat.debug("", ex);
+ log.debug("", ex);
}
if ((uriNew != null) && uriNew.getScheme().equals("http")) {
- cat.debug("I state that I can resolve " + uriNew.toString());
+ log.debug("I state that I can resolve " + uriNew.toString());
return true;
}
- cat.debug("I state that I can't resolve " + uriNew.toString());
+ log.debug("I state that I can't resolve " + uriNew.toString());
return false;
}
1.14 +15 -14
xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
Index: ResolverFragment.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ResolverFragment.java 11 Feb 2003 16:02:55 -0000 1.13
+++ ResolverFragment.java 29 Apr 2003 21:36:57 -0000 1.14
@@ -87,9 +87,10 @@
*/
public class ResolverFragment extends ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(ResolverFragment.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ ResolverFragment.class.getName());
/**
* Method engineResolve
@@ -121,7 +122,7 @@
* resource containing the signature
*/
- cat.debug("ResolverFragment with empty URI (means complete
document)");
+ log.debug("ResolverFragment with empty URI (means complete
document)");
try {
resultNodes =
cXPathAPI.selectNodeList(doc,
@@ -145,7 +146,7 @@
// Element selectedElem = doc.getElementById(id);
Element selectedElem = IdResolver.getElementById(doc, id);
- cat.debug("Try to catch an Element with ID " + id + " and Element
was " + selectedElem);
+ log.debug("Try to catch an Element with ID " + id + " and Element
was " + selectedElem);
if (selectedElem == null) {
resultNodes = new HelperNodeList();
} else {
@@ -164,7 +165,7 @@
Set resultSet = XMLUtils.convertNodelistToSet(resultNodes);
XMLSignatureInput result = new XMLSignatureInput(resultSet, cXPathAPI);
- cat.debug("We return a nodeset with " + resultNodes.getLength() + "
nodes");
+ log.debug("We return a nodeset with " + resultNodes.getLength() + "
nodes");
result.setMIMEType("text/xml");
try {
@@ -188,7 +189,7 @@
public boolean engineCanResolve(Attr uri, String BaseURI) {
if (uri == null) {
- cat.debug("Quick fail for null uri");
+ log.debug("Quick fail for null uri");
return false;
}
@@ -197,10 +198,10 @@
if (uriNodeValue.equals("")
|| (uriNodeValue.startsWith("#")
&&!uriNodeValue.startsWith("#xpointer("))) {
- cat.debug("State I can resolve reference: \"" + uriNodeValue +
"\"");
+ log.debug("State I can resolve reference: \"" + uriNodeValue +
"\"");
return true;
}
- cat.debug("Do not seem to be able to resolve reference: \"" +
uriNodeValue + "\"");
+ log.debug("Do not seem to be able to resolve reference: \"" +
uriNodeValue + "\"");
return false;
}
@@ -237,7 +238,7 @@
* throws ResourceResolverException {
*
* try {
- * cat.debug("Got " + input.getBytes().length
+ * log.debug("Got " + input.getBytes().length
* + " bytes from source and URI oif " +
input.getSourceURI());
* } catch (Exception ex) {
* throw new ResourceResolverException("generic.EmptyMessage", ex,
uri,
@@ -257,14 +258,14 @@
* Document doc =
* db.parse(new java.io.ByteArrayInputStream(input.getBytes()));
*
- * cat.debug("Owner Document " +
doc.getDocumentElement().getTagName());
- * cat.debug("try to select fragment " + fragment);
+ * log.debug("Owner Document " +
doc.getDocumentElement().getTagName());
+ * log.debug("try to select fragment " + fragment);
*
* // Element selectedElem = doc.getElementById(fragment);
* Element selectedElem = IdResolver.getElementById(doc, fragment);
*
* if (selectedElem != null) {
- * cat.debug("Selection hat geklappt!!!: "
+ * log.debug("Selection hat geklappt!!!: "
* + selectedElem.getTagName());
* }
*
1.8 +7 -7
xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
Index: ResolverLocalFilesystem.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResolverLocalFilesystem.java 11 Feb 2003 16:02:55 -0000 1.7
+++ ResolverLocalFilesystem.java 29 Apr 2003 21:36:57 -0000 1.8
@@ -76,10 +76,10 @@
*/
public class ResolverLocalFilesystem extends ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(ResolverLocalFilesystem.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ ResolverLocalFilesystem.class.getName());
/**
* Method resolve
@@ -177,16 +177,16 @@
try {
URI uriNew = new URI(new URI(BaseURI), uri.getNodeValue());
- cat.debug("I was asked whether I can resolve " + uriNew.toString());
+ log.debug("I was asked whether I can resolve " + uriNew.toString());
if (uriNew.getScheme().equals("file")) {
- cat.debug("I state that I can resolve " + uriNew.toString());
+ log.debug("I state that I can resolve " + uriNew.toString());
return true;
}
} catch (Exception e) {}
- cat.debug("But I can't");
+ log.debug("But I can't");
return false;
}
1.15 +8 -7
xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
Index: ResolverXPointer.java
===================================================================
RCS file:
/home/cvs/xml-security/src/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ResolverXPointer.java 11 Feb 2003 16:02:55 -0000 1.14
+++ ResolverXPointer.java 29 Apr 2003 21:36:57 -0000 1.15
@@ -93,9 +93,10 @@
*/
public class ResolverXPointer extends ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(ResolverXPointer.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ ResolverXPointer.class.getName());
/**
* Method engineResolve
@@ -129,7 +130,7 @@
String id = getXPointerId(uri, BaseURI);
Element selectedElem = IdResolver.getElementById(doc, id);
- // cat.debug("Use #xpointer(id('" + id + "')) on element " +
selectedElem);
+ // log.debug("Use #xpointer(id('" + id + "')) on element " +
selectedElem);
if (selectedElem == null) {
Object exArgs[] = { id };
@@ -235,13 +236,13 @@
uriNodeValue.length()
- "))".length());
- // cat.debug("idPlusDelim=" + idPlusDelim);
+ // log.debug("idPlusDelim=" + idPlusDelim);
if (((idPlusDelim.charAt(0) == '"') && (idPlusDelim
.charAt(idPlusDelim.length() - 1) == '"')) || ((idPlusDelim
.charAt(0) == '\'') && (idPlusDelim
.charAt(idPlusDelim.length() - 1) == '\''))) {
- cat.debug("Id="
+ log.debug("Id="
+ idPlusDelim.substring(1, idPlusDelim.length() - 1));
return true;
1.5 +3 -3
xml-security/src_samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java
Index: IAIKInterOp.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/iaik/IAIKInterOp.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IAIKInterOp.java 11 Feb 2003 16:02:55 -0000 1.4
+++ IAIKInterOp.java 29 Apr 2003 21:36:57 -0000 1.5
@@ -82,9 +82,9 @@
*/
public class IAIKInterOp {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(IAIKInterOp.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(IAIKInterOp.class.getName());
/** Field schemaValidate */
static final boolean schemaValidate = false;
1.8 +4 -4
xml-security/src_samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java
Index: CreateCollectableSignature.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/CreateCollectableSignature.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CreateCollectableSignature.java 11 Feb 2003 16:02:56 -0000 1.7
+++ CreateCollectableSignature.java 29 Apr 2003 21:36:57 -0000 1.8
@@ -85,10 +85,10 @@
*/
public class CreateCollectableSignature {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(CreateCollectableSignature.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ CreateCollectableSignature.class.getName());
/** Field passphrase */
public static final String passphrase =
1.5 +5 -5
xml-security/src_samples/org/apache/xml/security/samples/signature/CreateDonaldsAdditionalURISignature.java
Index: CreateDonaldsAdditionalURISignature.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/CreateDonaldsAdditionalURISignature.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CreateDonaldsAdditionalURISignature.java 11 Feb 2003 16:02:56 -0000
1.4
+++ CreateDonaldsAdditionalURISignature.java 29 Apr 2003 21:36:57 -0000
1.5
@@ -86,10 +86,10 @@
*/
public class CreateDonaldsAdditionalURISignature {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(CreateMerlinsExampleSixteen.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ CreateMerlinsExampleSixteen.class.getName());
static Document createDocument(DocumentBuilder db) throws Exception {
Document doc = db.newDocument();
1.8 +3 -3
xml-security/src_samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java
Index: CreateEnvelopingSignature.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/CreateEnvelopingSignature.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CreateEnvelopingSignature.java 11 Feb 2003 16:02:56 -0000 1.7
+++ CreateEnvelopingSignature.java 29 Apr 2003 21:36:57 -0000 1.8
@@ -82,9 +82,9 @@
*/
public class CreateEnvelopingSignature {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(CreateSignature.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(CreateSignature.class.getName());
/**
* Method main
1.13 +4 -5
xml-security/src_samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java
Index: CreateMerlinsExampleSixteen.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/CreateMerlinsExampleSixteen.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CreateMerlinsExampleSixteen.java 11 Feb 2003 16:02:56 -0000 1.12
+++ CreateMerlinsExampleSixteen.java 29 Apr 2003 21:36:57 -0000 1.13
@@ -97,11 +97,10 @@
* @author $Author$
*/
public class CreateMerlinsExampleSixteen {
-
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(CreateMerlinsExampleSixteen.class.getName());
+
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(CreateMerlinsExampleSixteen.class.getName());
/**
* Method main
1.4 +5 -5
xml-security/src_samples/org/apache/xml/security/samples/signature/CreateNullURIReference.java
Index: CreateNullURIReference.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/CreateNullURIReference.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CreateNullURIReference.java 11 Feb 2003 16:02:56 -0000 1.3
+++ CreateNullURIReference.java 29 Apr 2003 21:36:57 -0000 1.4
@@ -80,10 +80,10 @@
*/
public class CreateNullURIReference {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(CreateNullURIReference.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ CreateNullURIReference.class.getName());
/**
* Method main
1.8 +3 -3
xml-security/src_samples/org/apache/xml/security/samples/signature/CreateSignature.java
Index: CreateSignature.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/CreateSignature.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CreateSignature.java 11 Feb 2003 16:02:56 -0000 1.7
+++ CreateSignature.java 29 Apr 2003 21:36:57 -0000 1.8
@@ -81,9 +81,9 @@
*/
public class CreateSignature {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(CreateSignature.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(CreateSignature.class.getName());
/**
* Method main
1.7 +3 -3
xml-security/src_samples/org/apache/xml/security/samples/signature/HereSigner.java
Index: HereSigner.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/HereSigner.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HereSigner.java 11 Feb 2003 16:02:56 -0000 1.6
+++ HereSigner.java 29 Apr 2003 21:36:57 -0000 1.7
@@ -85,9 +85,9 @@
*/
public class HereSigner {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(HereSigner.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(HereSigner.class.getName());
/**
* Method main
1.4 +5 -5
xml-security/src_samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java
Index: NullURIReferenceResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/NullURIReferenceResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NullURIReferenceResolver.java 11 Feb 2003 16:02:56 -0000 1.3
+++ NullURIReferenceResolver.java 29 Apr 2003 21:36:57 -0000 1.4
@@ -74,10 +74,10 @@
*/
public class NullURIReferenceResolver extends ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(NullURIReferenceResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ NullURIReferenceResolver.class.getName());
/** Field _data[] */
byte _data[] = null;
1.4 +3 -4
xml-security/src_samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java
Index: VerifyCollectableSignature.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/VerifyCollectableSignature.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VerifyCollectableSignature.java 11 Feb 2003 16:02:56 -0000 1.3
+++ VerifyCollectableSignature.java 29 Apr 2003 21:36:57 -0000 1.4
@@ -77,10 +77,9 @@
*/
public class VerifyCollectableSignature {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(VerifyCollectableSignature.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(VerifyCollectableSignature.class.getName());
/**
* Method main
1.7 +4 -4
xml-security/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
Index: VerifyMerlinsExamplesFifteen.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VerifyMerlinsExamplesFifteen.java 11 Feb 2003 16:02:56 -0000 1.6
+++ VerifyMerlinsExamplesFifteen.java 29 Apr 2003 21:36:57 -0000 1.7
@@ -79,10 +79,10 @@
*/
public class VerifyMerlinsExamplesFifteen {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(VerifyMerlinsExamplesFifteen.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ VerifyMerlinsExamplesFifteen.class.getName());
/** Field schemaValidate */
static final boolean schemaValidate = false;
1.12 +4 -4
xml-security/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java
Index: VerifyMerlinsExamplesSixteen.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesSixteen.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- VerifyMerlinsExamplesSixteen.java 11 Feb 2003 16:02:56 -0000 1.11
+++ VerifyMerlinsExamplesSixteen.java 29 Apr 2003 21:36:57 -0000 1.12
@@ -82,10 +82,10 @@
*/
public class VerifyMerlinsExamplesSixteen {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(VerifyMerlinsExamplesSixteen.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ VerifyMerlinsExamplesSixteen.class.getName());
/** Field schemaValidate */
static final boolean schemaValidate = false;
1.4 +4 -4
xml-security/src_samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java
Index: SampleTransformNone.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SampleTransformNone.java 11 Feb 2003 16:02:56 -0000 1.3
+++ SampleTransformNone.java 29 Apr 2003 21:36:57 -0000 1.4
@@ -72,10 +72,10 @@
*/
public class SampleTransformNone extends TransformSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(SampleTransformNone.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ SampleTransformNone.class.getName());
/** Field implementedTransformURI */
public static final String implementedTransformURI =
1.6 +8 -8
xml-security/src_samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java
Index: OfflineResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src_samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OfflineResolver.java 11 Feb 2003 16:02:57 -0000 1.5
+++ OfflineResolver.java 29 Apr 2003 21:36:57 -0000 1.6
@@ -82,9 +82,9 @@
*/
public class OfflineResolver extends ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(OfflineResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(OfflineResolver.class.getName());
/**
* Method engineResolve
@@ -103,11 +103,11 @@
if (OfflineResolver._uriMap.containsKey(URI)) {
String newURI = (String) OfflineResolver._uriMap.get(URI);
- cat.debug("Mapped " + URI + " to " + newURI);
+ log.debug("Mapped " + URI + " to " + newURI);
InputStream is = new FileInputStream(newURI);
- cat.debug("Available bytes = " + is.available());
+ log.debug("Available bytes = " + is.available());
XMLSignatureInput result = new XMLSignatureInput(is);
@@ -148,12 +148,12 @@
URI uriNew = new URI(new URI(BaseURI), uri.getNodeValue());
if (uriNew.getScheme().equals("http")) {
- cat.debug("I state that I can resolve " + uriNew.toString());
+ log.debug("I state that I can resolve " + uriNew.toString());
return true;
}
- cat.debug("I state that I can't resolve " + uriNew.toString());
+ log.debug("I state that I can't resolve " + uriNew.toString());
} catch (URI.MalformedURIException ex) {}
return false;
1.14 +20 -19
xml-security/src_unitTests/org/apache/xml/security/test/AllTests.java
Index: AllTests.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/AllTests.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AllTests.java 11 Feb 2003 16:02:57 -0000 1.13
+++ AllTests.java 29 Apr 2003 21:36:58 -0000 1.14
@@ -73,9 +73,10 @@
*/
public class AllTests extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(AllTests.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ AllTests.class.getName());
public AllTests(String test) {
super(test);
@@ -106,22 +107,22 @@
*/
public static void main(String[] args) {
- XMLUtils.spitOutVersions(cat);
- cat.debug("java.class.path : " +
System.getProperty("java.class.path"));
- cat.debug("java.library.path : " +
System.getProperty("java.library.path"));
- cat.debug("java.runtime.name : " +
System.getProperty("java.runtime.name"));
- cat.debug("java.runtime.version : " +
System.getProperty("java.runtime.version"));
- cat.debug("java.specification.name : " +
System.getProperty("java.specification.name"));
- cat.debug("java.specification.vendor : " +
System.getProperty("java.specification.vendor"));
- cat.debug("java.specification.version : " +
System.getProperty("java.specification.version"));
- cat.debug("java.vendor : " +
System.getProperty("java.vendor"));
- cat.debug("java.version : " +
System.getProperty("java.version"));
- cat.debug("java.vm.info : " +
System.getProperty("java.vm.info"));
- cat.debug("java.vm.name : " +
System.getProperty("java.vm.name"));
- cat.debug("java.vm.version : " +
System.getProperty("java.vm.version"));
- cat.debug("os.arch : " +
System.getProperty("os.arch"));
- cat.debug("os.name : " +
System.getProperty("os.name"));
- cat.debug("os.version : " +
System.getProperty("os.version"));
+ XMLUtils.spitOutVersions(log);
+ log.debug("java.class.path : " +
System.getProperty("java.class.path"));
+ log.debug("java.library.path : " +
System.getProperty("java.library.path"));
+ log.debug("java.runtime.name : " +
System.getProperty("java.runtime.name"));
+ log.debug("java.runtime.version : " +
System.getProperty("java.runtime.version"));
+ log.debug("java.specification.name : " +
System.getProperty("java.specification.name"));
+ log.debug("java.specification.vendor : " +
System.getProperty("java.specification.vendor"));
+ log.debug("java.specification.version : " +
System.getProperty("java.specification.version"));
+ log.debug("java.vendor : " +
System.getProperty("java.vendor"));
+ log.debug("java.version : " +
System.getProperty("java.version"));
+ log.debug("java.vm.info : " +
System.getProperty("java.vm.info"));
+ log.debug("java.vm.name : " +
System.getProperty("java.vm.name"));
+ log.debug("java.vm.version : " +
System.getProperty("java.vm.version"));
+ log.debug("os.arch : " +
System.getProperty("os.arch"));
+ log.debug("os.name : " +
System.getProperty("os.name"));
+ log.debug("os.version : " +
System.getProperty("os.version"));
boolean useTextUI = true;
1.6 +5 -5
xml-security/src_unitTests/org/apache/xml/security/test/InteropTest.java
Index: InteropTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/InteropTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InteropTest.java 11 Feb 2003 16:02:57 -0000 1.5
+++ InteropTest.java 29 Apr 2003 21:36:58 -0000 1.6
@@ -17,9 +17,9 @@
public class InteropTest extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(InteropTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(InteropTest.class.getName());
public InteropTest(String test) {
super(test);
@@ -70,7 +70,7 @@
*/
public static void main(String[] args) {
- XMLUtils.spitOutVersions(cat);
+ XMLUtils.spitOutVersions(log);
boolean useTextUI = true;
1.6 +4 -4
xml-security/src_unitTests/org/apache/xml/security/test/ModuleTest.java
Index: ModuleTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/ModuleTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ModuleTest.java 11 Feb 2003 16:00:51 -0000 1.5
+++ ModuleTest.java 29 Apr 2003 21:36:58 -0000 1.6
@@ -8,9 +8,9 @@
public class ModuleTest extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(ModuleTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(ModuleTest.class.getName());
public ModuleTest(String test) {
super(test);
@@ -50,7 +50,7 @@
*/
public static void main(String[] args) {
- XMLUtils.spitOutVersions(cat);
+ XMLUtils.spitOutVersions(log);
boolean useTextUI = true;
1.6 +6 -7
xml-security/src_unitTests/org/apache/xml/security/test/algorithms/implementations/KeyWrapTest.java
Index: KeyWrapTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/algorithms/implementations/KeyWrapTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- KeyWrapTest.java 11 Feb 2003 16:02:57 -0000 1.5
+++ KeyWrapTest.java 29 Apr 2003 21:36:58 -0000 1.6
@@ -82,10 +82,9 @@
*/
public class KeyWrapTest extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(KeyWrapTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(KeyWrapTest.class.getName());
/** Field FAILURE_OK */
static final int FAILURE_OK = 0;
@@ -196,7 +195,7 @@
if (!MessageDigest.isEqual(result,
HexDump.hexStringToByteArray(WrappedStr))) {
- cat.info("Wrap failed: " + HexDump.byteArrayToHexString(result));
+ log.info("Wrap failed: " + HexDump.byteArrayToHexString(result));
return FAILURE_WRAP;
}
@@ -205,7 +204,7 @@
SecretKeySpec unwrapped = (SecretKeySpec) kwa.unwrap(result, kek,
cekURI);
if (!MessageDigest.isEqual(unwrapped.getEncoded(), CEK)) {
- cat.info("Unwrap failed: " +
HexDump.byteArrayToHexString(unwrapped.getEncoded()));
+ log.info("Unwrap failed: " +
HexDump.byteArrayToHexString(unwrapped.getEncoded()));
return FAILURE_UNWRAP;
}
1.5 +4 -5
xml-security/src_unitTests/org/apache/xml/security/test/algorithms/implementations/SignatureDSATest.java
Index: SignatureDSATest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/algorithms/implementations/SignatureDSATest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SignatureDSATest.java 11 Feb 2003 16:02:57 -0000 1.4
+++ SignatureDSATest.java 29 Apr 2003 21:36:58 -0000 1.5
@@ -80,10 +80,9 @@
*/
public class SignatureDSATest extends TestCase{
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(SignatureDSATest.class.getName());
-
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(SignatureDSATest.class.getName());
public SignatureDSATest(String name) {
super(name);
1.5 +3 -3
xml-security/src_unitTests/org/apache/xml/security/test/c14n/helper/C14nHelperTest.java
Index: C14nHelperTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/c14n/helper/C14nHelperTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- C14nHelperTest.java 11 Feb 2003 16:02:58 -0000 1.4
+++ C14nHelperTest.java 29 Apr 2003 21:36:58 -0000 1.5
@@ -78,9 +78,9 @@
*/
public class C14nHelperTest extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(C14nHelperTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(C14nHelperTest.class.getName());
/**
* Method suite
1.7 +11 -11
xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/C14NInterop.java
Index: C14NInterop.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/C14NInterop.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- C14NInterop.java 11 Feb 2003 16:02:58 -0000 1.6
+++ C14NInterop.java 29 Apr 2003 21:36:58 -0000 1.7
@@ -88,9 +88,9 @@
*/
public class C14NInterop extends InteropTest {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(C14NInterop.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(C14NInterop.class.getName());
/**
* Method suite
@@ -208,7 +208,7 @@
long end = System.currentTimeMillis();
- cat.debug("fixSubtree took " + (int) (end - start));
+ log.debug("fixSubtree took " + (int) (end - start));
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
@@ -225,9 +225,9 @@
signature.getSignedInfo().getVerificationResult(i);
if (refVerify) {
- cat.debug("Reference " + i + " was OK");
+ log.debug("Reference " + i + " was OK");
} else {
- cat.debug("Reference " + i + " failed");
+ log.debug("Reference " + i + " failed");
failures++;
@@ -287,7 +287,7 @@
A_A.appendChild(A_B);
A_B.appendChild(A_C);
- cat.info("Created document");
+ log.info("Created document");
Canonicalizer20010315OmitComments c = new
Canonicalizer20010315OmitComments();
@@ -304,15 +304,15 @@
XPath2FilterContainer xf2_2 =
XPath2FilterContainer.newInstanceSubtract(doc,
"//namespace::*[local-name()='B']");
transforms.addTransform(Transforms.TRANSFORM_XPATH2FILTER,
xf2_2.getElement());
- cat.info("Created signature object");
+ log.info("Created signature object");
sig.addDocument("", transforms);
- cat.info("Reference added");
+ log.info("Reference added");
sig.sign(sig.createSecretKey("secret".getBytes()));
- cat.info("Signing finished");
+ log.info("Signing finished");
XMLSignatureInput s =
sig.getSignedInfo().getReferencedContentAfterTransformsItem(0);
Set nodes = s.getNodeSet();
@@ -326,7 +326,7 @@
System.out.println("<" + ((Element)n).getTagName() + " />");
}
}
- cat.info("finished");
+ log.info("finished");
System.out.println("###########################");
System.out.println(new String(s.getBytes()));
1.7 +4 -4
xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
Index: Canonicalizer20010315ExclusiveTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315ExclusiveTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Canonicalizer20010315ExclusiveTest.java 11 Feb 2003 16:02:58 -0000
1.6
+++ Canonicalizer20010315ExclusiveTest.java 29 Apr 2003 21:36:58 -0000
1.7
@@ -100,10 +100,10 @@
org.apache.xml.security.Init.init();
}
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(Canonicalizer20010315ExclusiveTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ Canonicalizer20010315ExclusiveTest.class.getName());
/**
* Method suite
1.15 +6 -7
xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java
Index: Canonicalizer20010315Test.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/Canonicalizer20010315Test.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Canonicalizer20010315Test.java 11 Feb 2003 16:02:58 -0000 1.14
+++ Canonicalizer20010315Test.java 29 Apr 2003 21:36:58 -0000 1.15
@@ -106,10 +106,9 @@
*/
public class Canonicalizer20010315Test extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(Canonicalizer20010315Test.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(Canonicalizer20010315Test.class.getName());
/**
* Method suite
@@ -769,7 +768,7 @@
*
* if (!equal) {
* JavaUtils.writeBytesToFilename(fileOut, c14nBytes);
- * cat.debug("Wrote malicious output from Test \"" + descri
+ * log.debug("Wrote malicious output from Test \"" + descri
* + "\" to file " + fileOut);
* }
*
@@ -832,7 +831,7 @@
} catch (CanonicalizationException cex) {
// if we reach this point - good.
- cat.debug("We catched the C14nEx, that's good: " +
cex.getMessage());
+ log.debug("We catched the C14nEx, that's good: " +
cex.getMessage());
weCatchedTheRelativeNS = true;
}
@@ -1218,7 +1217,7 @@
FileOutputStream fos = new FileOutputStream(f);
fos.write(c14nBytes);
- cat.debug("Wrote errornous result to file " + f.toURL().toString());
+ log.debug("Wrote errornous result to file " + f.toURL().toString());
}
return result;
1.9 +7 -7
xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInterop.java
Index: ExclusiveC14NInterop.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/c14n/implementations/ExclusiveC14NInterop.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExclusiveC14NInterop.java 11 Feb 2003 16:02:58 -0000 1.8
+++ ExclusiveC14NInterop.java 29 Apr 2003 21:36:58 -0000 1.9
@@ -82,9 +82,9 @@
*/
public class ExclusiveC14NInterop extends InteropTest {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(
- ExclusiveC14NInterop.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(ExclusiveC14NInterop.class.getName());
/**
* Method suite
@@ -197,7 +197,7 @@
long end = System.currentTimeMillis();
- cat.debug("fixSubtree took " + (int) (end - start));
+ log.debug("fixSubtree took " + (int) (end - start));
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
@@ -207,7 +207,7 @@
boolean verify =
signature.checkSignatureValue(signature.getKeyInfo().getPublicKey());
- cat.debug(" signature.checkSignatureValue finished: " + verify);
+ log.debug(" signature.checkSignatureValue finished: " + verify);
int failures = 0;
@@ -221,7 +221,7 @@
JavaUtils.writeBytesToFilename(directory + "/c14n-" + i +
".apache.html",
signature.getSignedInfo().item(i).getHTMLRepresentation().getBytes());
if (refVerify) {
- cat.debug("Reference " + i + " was OK");
+ log.debug("Reference " + i + " was OK");
} else {
failures++;
@@ -235,7 +235,7 @@
String algo = reference.getTransforms().item(length
- 1).getURI();
- cat.debug("Reference " + i + " failed: " + algo);
+ log.debug("Reference " + i + " failed: " + algo);
}
}
1.6 +5 -5
xml-security/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/AttributeAncestorOrSelf.java
Index: AttributeAncestorOrSelf.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/AttributeAncestorOrSelf.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AttributeAncestorOrSelf.java 11 Feb 2003 16:02:58 -0000 1.5
+++ AttributeAncestorOrSelf.java 29 Apr 2003 21:36:58 -0000 1.6
@@ -86,10 +86,10 @@
*/
public class AttributeAncestorOrSelf extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(AttributeAncestorOrSelf.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ AttributeAncestorOrSelf.class.getName());
/** Field xercesVerStr */
static String xercesVerStr = XMLUtils.getXercesVersion();
1.6 +4 -3
xml-security/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/XalanBug1425Test.java
Index: XalanBug1425Test.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/external/org/apache/xalan/XPathAPI/XalanBug1425Test.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanBug1425Test.java 11 Feb 2003 16:02:58 -0000 1.5
+++ XalanBug1425Test.java 29 Apr 2003 21:36:58 -0000 1.6
@@ -88,9 +88,10 @@
*/
public class XalanBug1425Test extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(XalanBug1425Test.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ XalanBug1425Test.class.getName());
/** Field xercesVerStr */
static String xercesVerStr = XMLUtils.getXercesVersion();
1.8 +21 -21
xml-security/src_unitTests/org/apache/xml/security/test/interop/BaltimoreTest.java
Index: BaltimoreTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/interop/BaltimoreTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaltimoreTest.java 11 Feb 2003 16:02:58 -0000 1.7
+++ BaltimoreTest.java 29 Apr 2003 21:36:58 -0000 1.8
@@ -77,9 +77,9 @@
*/
public class BaltimoreTest extends InteropTest {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(BaltimoreTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(BaltimoreTest.class.getName());
/** Field merlinsDir15 */
static final String merlinsDir15 =
@@ -129,7 +129,7 @@
"secret".getBytes("ASCII"));
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -151,12 +151,12 @@
try {
verify = this.verifyHMAC(filename, resolver, followManifests,
hmacKey);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -177,12 +177,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -203,12 +203,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -229,12 +229,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -255,12 +255,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -281,12 +281,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -307,12 +307,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -334,12 +334,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
1.8 +29 -28
xml-security/src_unitTests/org/apache/xml/security/test/interop/IAIKTest.java
Index: IAIKTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/interop/IAIKTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IAIKTest.java 11 Feb 2003 16:02:58 -0000 1.7
+++ IAIKTest.java 29 Apr 2003 21:36:58 -0000 1.8
@@ -78,9 +78,10 @@
*/
public class IAIKTest extends InteropTest {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(IAIKTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ IAIKTest.class.getName());
/** Field gregorsDir */
static final String gregorsDir = "data/at/iaik/ixsil/";
@@ -136,13 +137,13 @@
try {
verify = this.verifyHMAC(filename, resolver, followManifests,
hmacKey);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -166,13 +167,13 @@
try {
verify = this.verifyHMAC(filename, resolver, followManifests,
hmacKey);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -195,13 +196,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Core validation crashed for " + filename);
+ log.error("Core validation crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Core validation failed for " + filename);
+ log.error("Core validation failed for " + filename);
}
assertTrue("Core validation failed for " + filename, verify);
@@ -224,13 +225,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Following the ds:Manifest failed for " + filename);
+ log.error("Following the ds:Manifest failed for " + filename);
}
assertTrue("Following the ds:Manifest failed for " + filename, verify);
@@ -253,13 +254,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue("Verification failed for " + filename, verify);
@@ -284,13 +285,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -313,13 +314,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -342,13 +343,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -371,13 +372,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -398,13 +399,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -427,13 +428,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -454,13 +455,13 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
1.10 +20 -20
xml-security/src_unitTests/org/apache/xml/security/test/interop/IBMTest.java
Index: IBMTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/interop/IBMTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IBMTest.java 11 Feb 2003 16:02:58 -0000 1.9
+++ IBMTest.java 29 Apr 2003 21:36:58 -0000 1.10
@@ -83,9 +83,9 @@
*/
public class IBMTest extends InteropTest {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(IBMTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(IBMTest.class.getName());
/** Field kentsDir */
static final String kentsDir = "data/com/ibm/xss4j-20011029/";
@@ -139,12 +139,12 @@
try {
verify = this.verifyHMAC(filename, resolver, followManifests,
hmacKey);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -164,12 +164,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -189,12 +189,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -214,12 +214,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -239,12 +239,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -264,12 +264,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -289,12 +289,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -318,12 +318,12 @@
try {
verify = this.verify(filename, resolver, followManifests);
} catch (RuntimeException ex) {
- cat.error("Verification crashed for " + filename);
+ log.error("Verification crashed for " + filename);
throw ex;
}
if (verify) {
- cat.error("Verification failed for " + filename + ", had to be
broken but was successful");
+ log.error("Verification failed for " + filename + ", had to be
broken but was successful");
}
assertTrue(filename, !verify);
1.8 +4 -4
xml-security/src_unitTests/org/apache/xml/security/test/interop/InteropTest.java
Index: InteropTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/interop/InteropTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InteropTest.java 11 Feb 2003 16:02:58 -0000 1.7
+++ InteropTest.java 29 Apr 2003 21:36:58 -0000 1.8
@@ -22,9 +22,9 @@
*/
public class InteropTest extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(BaltimoreTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(BaltimoreTest.class.getName());
/** Field xercesVerStr */
static String xercesVerStr = XMLUtils.getXercesVersion();
1.5 +6 -6
xml-security/src_unitTests/org/apache/xml/security/test/interop/RSASecurityTest.java
Index: RSASecurityTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/interop/RSASecurityTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RSASecurityTest.java 11 Feb 2003 16:02:58 -0000 1.4
+++ RSASecurityTest.java 29 Apr 2003 21:36:58 -0000 1.5
@@ -76,9 +76,9 @@
*/
public class RSASecurityTest extends InteropTest {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(RSASecurityTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(RSASecurityTest.class.getName());
/** Field blakesDir */
static final String blakesDir =
@@ -123,7 +123,7 @@
boolean verify = this.verify(filename, resolver, followManifests);
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
@@ -138,7 +138,7 @@
boolean verify = this.verify(filename, resolver, followManifests);
if (!verify) {
- cat.error("Verification failed for " + filename);
+ log.error("Verification failed for " + filename);
}
assertTrue(filename, verify);
1.5 +9 -8
xml-security/src_unitTests/org/apache/xml/security/test/resource/TestVectorResolver.java
Index: TestVectorResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/resource/TestVectorResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestVectorResolver.java 11 Feb 2003 16:02:58 -0000 1.4
+++ TestVectorResolver.java 29 Apr 2003 21:36:59 -0000 1.5
@@ -80,9 +80,10 @@
*/
public class TestVectorResolver implements EntityResolver {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
-
org.apache.log4j.Category.getInstance(TestVectorResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ TestVectorResolver.class.getName());
/** Field _firstEntityResolved */
boolean _firstEntityResolved = false;
@@ -160,7 +161,7 @@
this._firstEntitySystemIdDirectory = getFilePath(systemId);
- cat.debug("this._firstEntitySystemIdDirectory = "
+ log.debug("this._firstEntitySystemIdDirectory = "
+ this._firstEntitySystemIdDirectory);
}
@@ -172,14 +173,14 @@
*/
private InputStream getInputStream(String systemId) {
- cat.debug("getInputStream(" + systemId + ")");
+ log.debug("getInputStream(" + systemId + ")");
// we don't use the file system but the ZIP resource
// return new InputSource(new FileInputStream(systemId));
byte result[] = (byte[]) TestVectorResolver.vectors.get(systemId);
if (result == null) {
- cat.fatal("requested " + systemId + " resulted in null");
+ log.fatal("requested " + systemId + " resulted in null");
}
return new ByteArrayInputStream(result);
@@ -201,7 +202,7 @@
systemId = this.getFileName(systemId);
- cat.debug("publicId=\"" + publicId + "\" systemId=\"" + systemId
+ log.debug("publicId=\"" + publicId + "\" systemId=\"" + systemId
+ "\"");
// InputStream result = this.getInputStream(systemId);
@@ -251,7 +252,7 @@
.getBytesFromStream(zis);
TestVectorResolver.vectors.put(ze.getName(), data);
- cat.debug("Contents of " + thisClass + "/" + testVectorFile
+ log.debug("Contents of " + thisClass + "/" + testVectorFile
+ "#" + ze.getName() + " " + data.length
+ " bytes");
}
1.12 +4 -4
xml-security/src_unitTests/org/apache/xml/security/test/signature/XMLSignatureInputTest.java
Index: XMLSignatureInputTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/signature/XMLSignatureInputTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLSignatureInputTest.java 11 Feb 2003 16:02:59 -0000 1.11
+++ XMLSignatureInputTest.java 29 Apr 2003 21:36:59 -0000 1.12
@@ -98,9 +98,9 @@
*/
public class XMLSignatureInputTest extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
org.apache.log4j.Category.getInstance(
- XMLSignatureInputTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(XMLSignatureInputTest.class.getName());
/**
* Method suite
@@ -149,7 +149,7 @@
private void printNodeSet(NodeList nl) {
for (int i = 0; i < nl.getLength(); i++) {
- cat.debug("Type "
+ log.debug("Type "
+ XMLUtils.getNodeTypeString(nl.item(i).getNodeType()));
}
}
1.7 +5 -5
xml-security/src_unitTests/org/apache/xml/security/test/transforms/implementations/TransformBase64DecodeTest.java
Index: TransformBase64DecodeTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/transforms/implementations/TransformBase64DecodeTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TransformBase64DecodeTest.java 11 Feb 2003 16:02:59 -0000 1.6
+++ TransformBase64DecodeTest.java 29 Apr 2003 21:37:00 -0000 1.7
@@ -95,10 +95,10 @@
*/
public class TransformBase64DecodeTest extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(TransformBase64DecodeTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ TransformBase64DecodeTest.class.getName());
/**
* Method suite
@@ -143,7 +143,7 @@
if (doc == null) {
throw new RuntimeException("Could not create a Document");
} else {
- cat.debug("I could create the Document");
+ log.debug("I could create the Document");
}
return doc;
}
1.6 +3 -3
xml-security/src_unitTests/org/apache/xml/security/test/utils/Base64Test.java
Index: Base64Test.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/utils/Base64Test.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Base64Test.java 11 Feb 2003 16:02:59 -0000 1.5
+++ Base64Test.java 29 Apr 2003 21:37:00 -0000 1.6
@@ -75,9 +75,9 @@
*/
public class Base64Test extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Base64Test.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(Base64Test.class.getName());
/**
* Method suite
1.5 +8 -8
xml-security/src_unitTests/org/apache/xml/security/test/utils/resolver/OfflineResolver.java
Index: OfflineResolver.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/utils/resolver/OfflineResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OfflineResolver.java 11 Feb 2003 16:02:59 -0000 1.4
+++ OfflineResolver.java 29 Apr 2003 21:37:00 -0000 1.5
@@ -87,9 +87,9 @@
*/
public class OfflineResolver extends ResourceResolverSpi {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(OfflineResolver.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+
org.apache.commons.logging.LogFactory.getLog(OfflineResolver.class.getName());
/**
* Method engineResolve
@@ -108,11 +108,11 @@
if (OfflineResolver._uriMap.containsKey(URI)) {
String newURI = (String) OfflineResolver._uriMap.get(URI);
- cat.debug("Mapped " + URI + " to " + newURI);
+ log.debug("Mapped " + URI + " to " + newURI);
InputStream is = new FileInputStream(newURI);
- cat.debug("Available bytes = " + is.available());
+ log.debug("Available bytes = " + is.available());
XMLSignatureInput result = new XMLSignatureInput(is);
@@ -153,12 +153,12 @@
URI uriNew = new URI(new URI(BaseURI), uri.getNodeValue());
if (uriNew.getScheme().equals("http")) {
- cat.debug("I state that I can resolve " + uriNew.toString());
+ log.debug("I state that I can resolve " + uriNew.toString());
return true;
}
- cat.debug("I state that I can't resolve " + uriNew.toString());
+ log.debug("I state that I can't resolve " + uriNew.toString());
} catch (URI.MalformedURIException ex) {}
return false;
1.5 +5 -5
xml-security/src_unitTests/org/apache/xml/security/test/utils/resolver/ResourceResolverSpiTest.java
Index: ResourceResolverSpiTest.java
===================================================================
RCS file:
/home/cvs/xml-security/src_unitTests/org/apache/xml/security/test/utils/resolver/ResourceResolverSpiTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceResolverSpiTest.java 11 Feb 2003 16:02:59 -0000 1.4
+++ ResourceResolverSpiTest.java 29 Apr 2003 21:37:00 -0000 1.5
@@ -78,10 +78,10 @@
*/
public class ResourceResolverSpiTest extends TestCase {
- /** [EMAIL PROTECTED] org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category
- .getInstance(ResourceResolverSpiTest.class.getName());
+ /** [EMAIL PROTECTED] org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(
+ ResourceResolverSpiTest.class.getName());
/**
* Method suite
