You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by am...@apache.org on 2003/05/01 20:20:25 UTC
cvs commit: xml-security/src/org/apache/xml/security/utils XMLUtils.java
amattheu 2003/05/01 11:20:25
Modified: . build.xml
src/org/apache/xml/security/resource config.xml
src/org/apache/xml/security/algorithms Algorithm.java
src/org/apache/xml/security Init.java
src/org/apache/xml/security/utils XMLUtils.java
Added: src/org/apache/xml/security/resource log4j.properties
Log:
Completed migration from dependency on Log4J to commons-logging. Any loggin mechanism can now be used becuase of the abstract nature of commons-logging. See src/org/apache/xml/security/resource/log4j.properties for more information.
Revision Changes Path
1.56 +3 -0 xml-security/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-security/build.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- build.xml 29 Apr 2003 21:36:52 -0000 1.55
+++ build.xml 1 May 2003 18:20:24 -0000 1.56
@@ -284,6 +284,9 @@
<copy file="./LICENSE.txt"
tofile="${build.classes}/Apache-${product.shortname}-${product_version}-LICENSE.txt" />
+ <!-- copy log4j.properties file so that it is in the classpath -->
+ <copy file="${dir.src}/org/apache/xml/security/resource/log4j.properties"
+ tofile="${build.classes}/log4j.properties" />
<!-- copy src files -->
<copy todir="${build.src}">
1.32 +505 -574 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config.xml 29 Apr 2003 21:36:55 -0000 1.31
+++ config.xml 1 May 2003 18:20:24 -0000 1.32
@@ -1,574 +1,505 @@
-<?xml version="1.0"?>
-<!--
-<!DOCTYPE Configuration SYSTEM "config.dtd">
--->
-<!-- This configuration file is used for configuration of the org.apache.xml.security package -->
-<Configuration target="org.apache.xml.security" xmlns="http://www.xmlsecurity.org/NS/#configuration">
- <CanonicalizationMethods>
- <CanonicalizationMethod URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
- JAVACLASS="org.apache.xml.security.c14n.implementations.Canonicalizer20010315OmitComments" />
- <CanonicalizationMethod URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
- JAVACLASS="org.apache.xml.security.c14n.implementations.Canonicalizer20010315WithComments" />
-
- <CanonicalizationMethod URI="http://www.w3.org/2001/10/xml-exc-c14n#"
- JAVACLASS="org.apache.xml.security.c14n.implementations.Canonicalizer20010315ExclOmitComments"/>
- <CanonicalizationMethod URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
- JAVACLASS="org.apache.xml.security.c14n.implementations.Canonicalizer20010315ExclWithComments"/>
- </CanonicalizationMethods>
- <TransformAlgorithms>
- <!-- Base64 -->
- <TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#base64"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformBase64Decode" />
- <!-- c14n omitting comments -->
- <TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformC14N" />
- <!-- c14n with comments -->
- <TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformC14NWithComments" />
- <!-- exclusive c14n omitting comments -->
- <TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformC14NExclusive" />
- <!-- exclusive c14n with comments -->
- <TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformC14NExclusiveWithComments" />
-
- <!-- XPath transform -->
- <TransformAlgorithm URI="http://www.w3.org/TR/1999/REC-xpath-19991116"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXPath" />
- <!-- enveloped signature -->
- <TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#enveloped-signature"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformEnvelopedSignature" />
- <!-- XSLT -->
- <TransformAlgorithm URI="http://www.w3.org/TR/1999/REC-xslt-19991116"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXSLT" />
- <!-- XPath version 2 -->
- <TransformAlgorithm URI="http://www.w3.org/2002/04/xmldsig-filter2"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXPath2Filter04" />
- <!-- XPath version 2b -->
- <TransformAlgorithm URI="http://www.w3.org/2002/06/xmldsig-filter2"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXPath2Filter" />
- <!-- Christian Geuer-Pollmanns approach for XPath 2; experimantal -->
- <TransformAlgorithm URI="http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter"
- JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXPathFilterCHGP" />
- </TransformAlgorithms>
- <SignatureAlgorithms>
- <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#dsa-sha1"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureDSA" />
- <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#rsa-sha1"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA1" />
- <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#hmac-sha1"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA1" />
-
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSAMD5" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSARIPEMD160" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA256" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA384" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA512" />
-
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacMD5" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacRIPEMD160" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA256" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA384" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
- JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA512" />
- </SignatureAlgorithms>
- <JCEAlgorithmMappings>
- <!-- Here, individual providers can be registered; each provider
- is identified by Id which is referenced by ProviderId of the
- Provider Element in the Algorithm Element -->
- <Providers>
- <Provider Id="BC"
- Class="org.bouncycastle.jce.provider.BouncyCastleProvider"
- Info="BouncyCastle Security Provider v1.09"
- ProviderURL="http://www.bouncycastle.org/" />
- <Provider Id="SUN"
- Class="sun.security.provider.Sun"
- Info="SUN (DSA key/parameter generation; DSA signing; SHA-1, MD5 digests; SecureRandom; X.509 certificates; JKS keystore)"
- ProviderURL="http://java.sun.com/" />
- <Provider Id="SunRsaSign"
- Class="com.sun.rsajca.Provider"
- Info="SUN's provider for RSA signatures"
- ProviderURL="http://java.sun.com/" />
- <Provider Id="SunJCE"
- Class="com.sun.crypto.provider.SunJCE"
- Info="SunJCE Provider (implements DES, Triple DES, Blowfish, PBE, Diffie-Hellman, HMAC-MD5, HMAC-SHA1)"
- ProviderURL="http://java.sun.com/" />
- <Provider Id="IAIK"
- Class="iaik.security.provider.IAIK"
- Info="IAIK Security Provider v2.6"
- ProviderURL="http://www.iaik.at/" />
- <Provider Id="Cryptix"
- Class="cryptix.provider.Cryptix"
- Info="Cryptix JCE provider v3.001002"
- ProviderURL="http://www.cryptix.org//" />
- </Providers>
- <Algorithms>
- <!-- MessageDigest Algorithms -->
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#md5"
- Description="MD5 message digest from RFC 1321"
- AlgorithmClass="MessageDigest"
- RequirementLevel="NOT RECOMMENDED"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="MD5" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#ripemd160"
- Description="RIPEMD-160 message digest"
- AlgorithmClass="MessageDigest"
- RequirementLevel="OPTIONAL">
- <ProviderAlgo ProviderId="BC"
- JCEName="RIPEMD160" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="RIPEMD160" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2000/09/xmldsig#sha1"
- Description="SHA-1 message digest"
- AlgorithmClass="MessageDigest"
- RequirementLevel="REQUIRED">
- <ProviderAlgo ProviderId="BC"
- JCEName="SHA-1" />
- <ProviderAlgo ProviderId="SUN"
- JCEName="SHA-1" />
- <ProviderAlgo ProviderId="IAIK"
- JCEName="SHA-1" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="SHA-1" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha256"
- Description="SHA-1 message digest with 256 bit"
- AlgorithmClass="MessageDigest"
- RequirementLevel="RECOMMENDED">
- <ProviderAlgo ProviderId="BC"
- JCEName="SHA-256" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#sha384"
- Description="SHA message digest with 384 bit"
- AlgorithmClass="MessageDigest"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="SHA-384" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha512"
- Description="SHA-1 message digest with 512 bit"
- AlgorithmClass="MessageDigest"
- RequirementLevel="OPTIONAL">
- <ProviderAlgo ProviderId="BC"
- JCEName="SHA-512" />
- </Algorithm>
-
- <!-- Signature Algorithms -->
- <Algorithm URI="http://www.w3.org/2000/09/xmldsig#dsa-sha1"
- Description="Digital Signature Algorithm with SHA-1 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="REQUIRED">
- <ProviderAlgo ProviderId="BC"
- JCEName="DSA" />
- <ProviderAlgo ProviderId="SUN"
- JCEName="DSAWithSHA1" />
- <ProviderAlgo ProviderId="IAIK"
- JCEName="DSA" />
- </Algorithm>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
- Description="RSA Signature with MD5 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="NOT RECOMMENDED"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="MD5WithRSAEncryption" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"
- Description="RSA Signature with RIPEMD-160 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="RIPEMD160WithRSAEncryption" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2000/09/xmldsig#rsa-sha1"
- Description="RSA Signature with SHA-1 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="RECOMMENDED">
- <ProviderAlgo ProviderId="BC"
- JCEName="SHA1WithRSAEncryption" />
- <ProviderAlgo ProviderId="SunRsaSign"
- JCEName="SHA1withRSA" />
- <ProviderAlgo ProviderId="IAIK"
- JCEName="SHA-1/RSA" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="SHA-1/RSA" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
- Description="RSA Signature with SHA-256 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="SHA256withRSAEncryption" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
- Description="RSA Signature with SHA-384 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="SHA384withRSAEncryption" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
- Description="RSA Signature with SHA-512 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="SHA512withRSAEncryption" />
- </Algorithm>
-
- <!-- MAC Algorithms -->
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"
- Description="Message Authentication code using MD5"
- AlgorithmClass="Mac"
- RequirementLevel="NOT RECOMMENDED"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="HMACMD5" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"
- Description="Message Authentication code using RIPEMD-160"
- AlgorithmClass="Mac"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="HMACRIPEMD160" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2000/09/xmldsig#hmac-sha1"
- Description="Message Authentication code using SHA1"
- AlgorithmClass="Mac"
- RequirementLevel="REQUIRED">
- <ProviderAlgo ProviderId="BC"
- JCEName="HMACSHA1" />
- <ProviderAlgo ProviderId="SunJCE"
- JCEName="HmacSHA1" />
- <ProviderAlgo ProviderId="IAIK"
- JCEName="HMAC/SHA" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="HMAC-SHA-1" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
- Description="Message Authentication code using SHA-256"
- AlgorithmClass="Mac"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="HMACSHA256" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
- Description="Message Authentication code using SHA-384"
- AlgorithmClass="Mac"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="HMACSHA384" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
- Description="Message Authentication code using SHA-512"
- AlgorithmClass="Mac"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
- <ProviderAlgo ProviderId="BC"
- JCEName="HMACSHA512" />
- </Algorithm>
-
- <!-- Block encryption Algorithms -->
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
- Description="Block encryption using Triple-DES"
- AlgorithmClass="BlockEncryption"
- RequirementLevel="REQUIRED"
- KeyLength="192">
- <ProviderAlgo ProviderId="BC"
- RequiredKey="DESEDE"
- JCEName="DESEDE/CBC/ISO10126PADDING"
- IVJCEName="DESEDE/ECB/NOPADDING" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="DES-EDE3/CBC" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
- Description="Block encryption using AES with a key length of 128 bit"
- AlgorithmClass="BlockEncryption"
- RequirementLevel="REQUIRED"
- KeyLength="128">
- <ProviderAlgo ProviderId="BC"
- RequiredKey="AES"
- JCEName="AES/CBC/ISO10126PADDING"
- IVJCEName="AES/ECB/NOPADDING" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="Rijndael" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes192-cbc"
- Description="Block encryption using AES with a key length of 192 bit"
- AlgorithmClass="BlockEncryption"
- RequirementLevel="OPTIONAL"
- KeyLength="192">
- <ProviderAlgo ProviderId="BC"
- RequiredKey="AES"
- JCEName="AES/CBC/ISO10126PADDING"
- IVJCEName="AES/ECB/NOPADDING" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="Rijndael" />
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes256-cbc"
- Description="Block encryption using AES with a key length of 256 bit"
- AlgorithmClass="BlockEncryption"
- RequirementLevel="REQUIRED"
- KeyLength="256">
- <ProviderAlgo ProviderId="BC"
- RequiredKey="AES"
- JCEName="AES/CBC/ISO10126PADDING"
- IVJCEName="AES/ECB/NOPADDING" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="Rijndael" />
- </Algorithm>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#rsa-1_5"
- Description="Key Transport RSA-v1.5"
- AlgorithmClass="KeyTransport"
- RequirementLevel="REQUIRED">
- <!-- You have to provide a core RSA mechanism here, even for
- the bouncy castle -->
- <ProviderAlgo ProviderId="BC"
- JCEName="RSA"
- RequiredKey="RSA" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="RSA"
- RequiredKey="RSA" />
- <!-- <ProviderAlgo ProviderId="BC"
- JCEName="RSA/PKCS1"
- RequiredKey="RSA" />
- <ProviderAlgo ProviderId="Cryptix"
- JCEName="RSA/ECB/PKCS#1" /> -->
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"
- Description="Key Transport RSA-OAEP"
- AlgorithmClass="KeyTransport"
- RequirementLevel="REQUIRED">
- <!-- You have to provide a core RSA mechanism here, even for
- the bouncy castle -->
- <ProviderAlgo ProviderId="BC"
- JCEName="RSA"
- RequiredKey="RSA" />
- <!-- <ProviderAlgo ProviderId="BC" JCEName="RSA/OAEP" RequiredKey="RSA" /> -->
- </Algorithm>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#dh"
- Description="Key Agreement Diffie-Hellman"
- AlgorithmClass="KeyAgreement"
- RequirementLevel="OPTIONAL">
- </Algorithm>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-tripledes"
- Description="Symmetric Key Wrap using Triple DES"
- AlgorithmClass="SymmetricKeyWrap"
- RequirementLevel="REQUIRED"
- KeyLength="192">
- <!-- We need a Triple DES in CipherBlockChaining (CBC) mode here without padding -->
- <ProviderAlgo ProviderId="BC"
- RequiredKey="DESEDE"
- JCEName="DESEDE/CBC/NOPADDING" />
- <!-- <ProviderAlgo ProviderId="BC" JCEName="DESEDEWrap" RequiredKey="DESEDE" /> -->
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes128"
- Description="Symmetric Key Wrap using AES with a key length of 128 bit"
- AlgorithmClass="SymmetricKeyWrap"
- RequirementLevel="REQUIRED"
- KeyLength="128">
- <!-- We need an AES in ElectronicCodeBook (ECB) mode here without padding -->
- <ProviderAlgo ProviderId="BC"
- JCEName="AES/ECB/NOPADDING"
- RequiredKey="AES" />
- <!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap" RequiredKey="AES" /> -->
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes192"
- Description="Symmetric Key Wrap using AES with a key length of 192 bit"
- AlgorithmClass="SymmetricKeyWrap"
- RequirementLevel="OPTIONAL"
- KeyLength="192">
- <!-- We need an AES in ElectronicCodeBook (ECB) mode here without padding -->
- <ProviderAlgo ProviderId="BC"
- JCEName="AES/ECB/NOPADDING"
- RequiredKey="AES" />
- <!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap" RequiredKey="AES" /> -->
- </Algorithm>
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes256"
- Description="Symmetric Key Wrap using AES with a key length of 256 bit"
- AlgorithmClass="SymmetricKeyWrap"
- RequirementLevel="REQUIRED"
- KeyLength="256">
- <!-- We need an AES in ElectronicCodeBook (ECB) mode here without padding -->
- <ProviderAlgo ProviderId="BC"
- JCEName="AES/ECB/NOPADDING"
- RequiredKey="AES" />
- <!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap" RequiredKey="AES" /> -->
- </Algorithm>
- </Algorithms>
- </JCEAlgorithmMappings>
- <ResourceBundles defaultLanguageCode="en" defaultCountryCode="US">
- <ResourceBundle LanguageCode="en"
- CountryCode="US"
- LOCATION="org.apache.xml.security/resource/xmlsecurity_en.properties" />
- <ResourceBundle LanguageCode="de"
- CountryCode="DE"
- LOCATION="org.apache.xml.security/resource/xmlsecurity_de.properties" />
- </ResourceBundles>
- <ResourceResolvers>
- <Resolver JAVACLASS="org.apache.xml.security.utils.resolver.implementations.ResolverDirectHTTP"
- DESCRIPTION="A simple resolver for requests to HTTP space" />
- <Resolver JAVACLASS="org.apache.xml.security.utils.resolver.implementations.ResolverLocalFilesystem"
- DESCRIPTION="A simple resolver for requests to the local file system" />
- <Resolver JAVACLASS="org.apache.xml.security.utils.resolver.implementations.ResolverFragment"
- DESCRIPTION="A simple resolver for requests of same-document URIs" />
- <Resolver JAVACLASS="org.apache.xml.security.utils.resolver.implementations.ResolverXPointer"
- DESCRIPTION="A simple resolver for requests of XPointer fragents" />
- </ResourceResolvers>
- <!-- <defaultLocale languageCode="en" countryCode="US" /> -->
- <KeyInfo>
- <ContentHandler LOCALNAME="KeyName"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="org.apache.xml.security.keys.content.KeyName" />
- <ContentHandler LOCALNAME="KeyValue"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="org.apache.xml.security.keys.content.KeyValue" />
- <ContentHandler LOCALNAME="RetrievalMethod"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="org.apache.xml.security.keys.content.RetrievalMethod" />
- <ContentHandler LOCALNAME="X509Data"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="org.apache.xml.security.keys.content.X509Data" />
- <ContentHandler LOCALNAME="PGPData"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="org.apache.xml.security.keys.content.PGPData" />
- <ContentHandler LOCALNAME="SPKIData"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="org.apache.xml.security.keys.content.SPKIData" />
- <ContentHandler LOCALNAME="MgmtData"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="org.apache.xml.security.keys.content.MgmtData" />
- </KeyInfo>
- <KeyResolver>
- <!-- This section contains a list of KeyResolvers that are available in
- every KeyInfo object -->
- <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.RSAKeyValueResolver"
- DESCRIPTION="Can extract RSA public keys" />
- <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.DSAKeyValueResolver"
- DESCRIPTION="Can extract DSA public keys" />
- <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.X509CertificateResolver"
- DESCRIPTION="Can extract public keys from X509 certificates" />
- <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.X509SKIResolver"
- DESCRIPTION="Uses an X509v3 SubjectKeyIdentifier extension to retrieve a certificate from the storages" />
- <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.RetrievalMethodResolver"
- DESCRIPTION="Resolves keys and certificates using ResourceResolvers" />
- <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.X509SubjectNameResolver"
- DESCRIPTION="Uses an X509 SubjectName to retrieve a certificate from the storages" />
- <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.X509IssuerSerialResolver"
- DESCRIPTION="Uses an X509 IssuerName and IssuerSerial to retrieve a certificate from the storages" />
- </KeyResolver>
- <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <!-- http://jakarta.apache.org/log4j/docs/api/org/apache/log4j/xml/DOMConfigurator.html -->
- <appender name="LOGTXT" class="org.apache.log4j.FileAppender">
- <param name="File" value="log.txt" />
- <!--
- <param name="File" value="System.out" />
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
-
- <param name="ConversionPattern" value="%-5p %C{1}:%L - %m\n"/>
- <!--
- <param name="ConversionPattern" value="%d %-5p %C{10}:%-4L - %m\n"/>
- -->
- </layout>
- </appender>
-
- <appender name="NULL" class="org.apache.xml.security.utils.NullAppender" />
-
- <!--
- <appender name="chainsaw" class="org.apache.log4j.net.SocketAppender">
- <param name="RemoteHost" value="localhost" />
- <param name="Port" value="4445" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%-5p %C{1}:%L - %m\n"/>
- </layout>
- </appender>
- -->
-
- <!-- if you use the LOGTXT appender-ref, a log.txt file is created in
- your working directory.
- If you use the NULL appender-ref, all logging is disabled.
- -->
- <root>
- <priority value ="debug" />
- <!-- appender-ref ref="LOGTXT" /-->
- <appender-ref ref="NULL" />
- <!-- <appender-ref ref="chainsaw" /> -->
- </root>
-
- <category name="org.apache.log4j.xml">
- <priority value="info" />
- </category>
-
- <category name="org.apache.xml.security">
- <priority value="debug" />
- </category>
-
- <category name="org.apache.xml.security.test.AllTests">
- <priority value="debug" />
- </category>
-
- <!--
- <category name="org.apache.xml.security.test.AllTests">
- <priority value="debug" />
- </category>
- <category name="org.apache.xml.security.utils">
- <priority value="fatal" />
- </category>
- <category name="org.apache.xml.security.test">
- <priority value="debug" />
- </category>
- <category name="org.apache.xml.security.util.IgnoreAllErrorHandler">
- <priority value="fatal" />
- </category>
- <category name="org.apache.xml.security.Init">
- <priority value="error" />
- </category>
- -->
- </log4j:configuration>
- <PrefixMappings>
- <!-- Many classes create Elements which are in a specific namespace;
- here, the prefixes for these namespaces are defined. But this
- can also be overwritten using the ElementProxy#setDefaultPrefix()
- method. You can even set all prefixes to "" so that the corresponding
- elements are created using the default namespace -->
- <PrefixMapping namespace="http://www.w3.org/2000/09/xmldsig#"
- prefix="ds" />
- <PrefixMapping namespace="http://www.w3.org/2001/04/xmlenc#"
- prefix="xenc" />
- <PrefixMapping namespace="http://www.xmlsecurity.org/experimental#"
- prefix="experimental" />
- <PrefixMapping namespace="http://www.w3.org/2002/04/xmldsig-filter2"
- prefix="dsig-xpath-old" />
- <PrefixMapping namespace="http://www.w3.org/2002/06/xmldsig-filter2"
- prefix="dsig-xpath" />
- <PrefixMapping namespace="http://www.w3.org/2001/10/xml-exc-c14n#"
- prefix="ec" />
- <PrefixMapping namespace="http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter"
- prefix="xx" />
- </PrefixMappings>
-</Configuration>
+<?xml version="1.0"?>
+<!--
+<!DOCTYPE Configuration SYSTEM "config.dtd">
+-->
+<!-- This configuration file is used for configuration of the org.apache.xml.security package -->
+<Configuration target="org.apache.xml.security" xmlns="http://www.xmlsecurity.org/NS/#configuration">
+ <CanonicalizationMethods>
+ <CanonicalizationMethod URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+ JAVACLASS="org.apache.xml.security.c14n.implementations.Canonicalizer20010315OmitComments" />
+ <CanonicalizationMethod URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
+ JAVACLASS="org.apache.xml.security.c14n.implementations.Canonicalizer20010315WithComments" />
+
+ <CanonicalizationMethod URI="http://www.w3.org/2001/10/xml-exc-c14n#"
+ JAVACLASS="org.apache.xml.security.c14n.implementations.Canonicalizer20010315ExclOmitComments"/>
+ <CanonicalizationMethod URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
+ JAVACLASS="org.apache.xml.security.c14n.implementations.Canonicalizer20010315ExclWithComments"/>
+ </CanonicalizationMethods>
+ <TransformAlgorithms>
+ <!-- Base64 -->
+ <TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#base64"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformBase64Decode" />
+ <!-- c14n omitting comments -->
+ <TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformC14N" />
+ <!-- c14n with comments -->
+ <TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformC14NWithComments" />
+ <!-- exclusive c14n omitting comments -->
+ <TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformC14NExclusive" />
+ <!-- exclusive c14n with comments -->
+ <TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformC14NExclusiveWithComments" />
+
+ <!-- XPath transform -->
+ <TransformAlgorithm URI="http://www.w3.org/TR/1999/REC-xpath-19991116"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXPath" />
+ <!-- enveloped signature -->
+ <TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#enveloped-signature"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformEnvelopedSignature" />
+ <!-- XSLT -->
+ <TransformAlgorithm URI="http://www.w3.org/TR/1999/REC-xslt-19991116"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXSLT" />
+ <!-- XPath version 2 -->
+ <TransformAlgorithm URI="http://www.w3.org/2002/04/xmldsig-filter2"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXPath2Filter04" />
+ <!-- XPath version 2b -->
+ <TransformAlgorithm URI="http://www.w3.org/2002/06/xmldsig-filter2"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXPath2Filter" />
+ <!-- Christian Geuer-Pollmanns approach for XPath 2; experimantal -->
+ <TransformAlgorithm URI="http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter"
+ JAVACLASS="org.apache.xml.security.transforms.implementations.TransformXPathFilterCHGP" />
+ </TransformAlgorithms>
+ <SignatureAlgorithms>
+ <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#dsa-sha1"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureDSA" />
+ <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#rsa-sha1"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA1" />
+ <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#hmac-sha1"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA1" />
+
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSAMD5" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSARIPEMD160" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA256" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA384" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA512" />
+
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacMD5" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacRIPEMD160" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA256" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA384" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
+ JAVACLASS="org.apache.xml.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA512" />
+ </SignatureAlgorithms>
+ <JCEAlgorithmMappings>
+ <!-- Here, individual providers can be registered; each provider
+ is identified by Id which is referenced by ProviderId of the
+ Provider Element in the Algorithm Element -->
+ <Providers>
+ <Provider Id="BC"
+ Class="org.bouncycastle.jce.provider.BouncyCastleProvider"
+ Info="BouncyCastle Security Provider v1.09"
+ ProviderURL="http://www.bouncycastle.org/" />
+ <Provider Id="SUN"
+ Class="sun.security.provider.Sun"
+ Info="SUN (DSA key/parameter generation; DSA signing; SHA-1, MD5 digests; SecureRandom; X.509 certificates; JKS keystore)"
+ ProviderURL="http://java.sun.com/" />
+ <Provider Id="SunRsaSign"
+ Class="com.sun.rsajca.Provider"
+ Info="SUN's provider for RSA signatures"
+ ProviderURL="http://java.sun.com/" />
+ <Provider Id="SunJCE"
+ Class="com.sun.crypto.provider.SunJCE"
+ Info="SunJCE Provider (implements DES, Triple DES, Blowfish, PBE, Diffie-Hellman, HMAC-MD5, HMAC-SHA1)"
+ ProviderURL="http://java.sun.com/" />
+ <Provider Id="IAIK"
+ Class="iaik.security.provider.IAIK"
+ Info="IAIK Security Provider v2.6"
+ ProviderURL="http://www.iaik.at/" />
+ <Provider Id="Cryptix"
+ Class="cryptix.provider.Cryptix"
+ Info="Cryptix JCE provider v3.001002"
+ ProviderURL="http://www.cryptix.org//" />
+ </Providers>
+ <Algorithms>
+ <!-- MessageDigest Algorithms -->
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#md5"
+ Description="MD5 message digest from RFC 1321"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="NOT RECOMMENDED"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="MD5" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#ripemd160"
+ Description="RIPEMD-160 message digest"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="OPTIONAL">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="RIPEMD160" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="RIPEMD160" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2000/09/xmldsig#sha1"
+ Description="SHA-1 message digest"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="REQUIRED">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="SHA-1" />
+ <ProviderAlgo ProviderId="SUN"
+ JCEName="SHA-1" />
+ <ProviderAlgo ProviderId="IAIK"
+ JCEName="SHA-1" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="SHA-1" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha256"
+ Description="SHA-1 message digest with 256 bit"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="RECOMMENDED">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="SHA-256" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#sha384"
+ Description="SHA message digest with 384 bit"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="SHA-384" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha512"
+ Description="SHA-1 message digest with 512 bit"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="OPTIONAL">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="SHA-512" />
+ </Algorithm>
+
+ <!-- Signature Algorithms -->
+ <Algorithm URI="http://www.w3.org/2000/09/xmldsig#dsa-sha1"
+ Description="Digital Signature Algorithm with SHA-1 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="REQUIRED">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="DSA" />
+ <ProviderAlgo ProviderId="SUN"
+ JCEName="DSAWithSHA1" />
+ <ProviderAlgo ProviderId="IAIK"
+ JCEName="DSA" />
+ </Algorithm>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
+ Description="RSA Signature with MD5 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="NOT RECOMMENDED"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="MD5WithRSAEncryption" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"
+ Description="RSA Signature with RIPEMD-160 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="RIPEMD160WithRSAEncryption" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2000/09/xmldsig#rsa-sha1"
+ Description="RSA Signature with SHA-1 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="RECOMMENDED">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="SHA1WithRSAEncryption" />
+ <ProviderAlgo ProviderId="SunRsaSign"
+ JCEName="SHA1withRSA" />
+ <ProviderAlgo ProviderId="IAIK"
+ JCEName="SHA-1/RSA" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="SHA-1/RSA" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
+ Description="RSA Signature with SHA-256 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="SHA256withRSAEncryption" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
+ Description="RSA Signature with SHA-384 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="SHA384withRSAEncryption" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
+ Description="RSA Signature with SHA-512 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="SHA512withRSAEncryption" />
+ </Algorithm>
+
+ <!-- MAC Algorithms -->
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"
+ Description="Message Authentication code using MD5"
+ AlgorithmClass="Mac"
+ RequirementLevel="NOT RECOMMENDED"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="HMACMD5" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"
+ Description="Message Authentication code using RIPEMD-160"
+ AlgorithmClass="Mac"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="HMACRIPEMD160" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2000/09/xmldsig#hmac-sha1"
+ Description="Message Authentication code using SHA1"
+ AlgorithmClass="Mac"
+ RequirementLevel="REQUIRED">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="HMACSHA1" />
+ <ProviderAlgo ProviderId="SunJCE"
+ JCEName="HmacSHA1" />
+ <ProviderAlgo ProviderId="IAIK"
+ JCEName="HMAC/SHA" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="HMAC-SHA-1" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
+ Description="Message Authentication code using SHA-256"
+ AlgorithmClass="Mac"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="HMACSHA256" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
+ Description="Message Authentication code using SHA-384"
+ AlgorithmClass="Mac"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="HMACSHA384" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
+ Description="Message Authentication code using SHA-512"
+ AlgorithmClass="Mac"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt">
+ <ProviderAlgo ProviderId="BC"
+ JCEName="HMACSHA512" />
+ </Algorithm>
+
+ <!-- Block encryption Algorithms -->
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+ Description="Block encryption using Triple-DES"
+ AlgorithmClass="BlockEncryption"
+ RequirementLevel="REQUIRED"
+ KeyLength="192">
+ <ProviderAlgo ProviderId="BC"
+ RequiredKey="DESEDE"
+ JCEName="DESEDE/CBC/ISO10126PADDING"
+ IVJCEName="DESEDE/ECB/NOPADDING" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="DES-EDE3/CBC" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
+ Description="Block encryption using AES with a key length of 128 bit"
+ AlgorithmClass="BlockEncryption"
+ RequirementLevel="REQUIRED"
+ KeyLength="128">
+ <ProviderAlgo ProviderId="BC"
+ RequiredKey="AES"
+ JCEName="AES/CBC/ISO10126PADDING"
+ IVJCEName="AES/ECB/NOPADDING" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="Rijndael" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes192-cbc"
+ Description="Block encryption using AES with a key length of 192 bit"
+ AlgorithmClass="BlockEncryption"
+ RequirementLevel="OPTIONAL"
+ KeyLength="192">
+ <ProviderAlgo ProviderId="BC"
+ RequiredKey="AES"
+ JCEName="AES/CBC/ISO10126PADDING"
+ IVJCEName="AES/ECB/NOPADDING" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="Rijndael" />
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes256-cbc"
+ Description="Block encryption using AES with a key length of 256 bit"
+ AlgorithmClass="BlockEncryption"
+ RequirementLevel="REQUIRED"
+ KeyLength="256">
+ <ProviderAlgo ProviderId="BC"
+ RequiredKey="AES"
+ JCEName="AES/CBC/ISO10126PADDING"
+ IVJCEName="AES/ECB/NOPADDING" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="Rijndael" />
+ </Algorithm>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#rsa-1_5"
+ Description="Key Transport RSA-v1.5"
+ AlgorithmClass="KeyTransport"
+ RequirementLevel="REQUIRED">
+ <!-- You have to provide a core RSA mechanism here, even for
+ the bouncy castle -->
+ <ProviderAlgo ProviderId="BC"
+ JCEName="RSA"
+ RequiredKey="RSA" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="RSA"
+ RequiredKey="RSA" />
+ <!-- <ProviderAlgo ProviderId="BC"
+ JCEName="RSA/PKCS1"
+ RequiredKey="RSA" />
+ <ProviderAlgo ProviderId="Cryptix"
+ JCEName="RSA/ECB/PKCS#1" /> -->
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"
+ Description="Key Transport RSA-OAEP"
+ AlgorithmClass="KeyTransport"
+ RequirementLevel="REQUIRED">
+ <!-- You have to provide a core RSA mechanism here, even for
+ the bouncy castle -->
+ <ProviderAlgo ProviderId="BC"
+ JCEName="RSA"
+ RequiredKey="RSA" />
+ <!-- <ProviderAlgo ProviderId="BC" JCEName="RSA/OAEP" RequiredKey="RSA" /> -->
+ </Algorithm>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#dh"
+ Description="Key Agreement Diffie-Hellman"
+ AlgorithmClass="KeyAgreement"
+ RequirementLevel="OPTIONAL">
+ </Algorithm>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-tripledes"
+ Description="Symmetric Key Wrap using Triple DES"
+ AlgorithmClass="SymmetricKeyWrap"
+ RequirementLevel="REQUIRED"
+ KeyLength="192">
+ <!-- We need a Triple DES in CipherBlockChaining (CBC) mode here without padding -->
+ <ProviderAlgo ProviderId="BC"
+ RequiredKey="DESEDE"
+ JCEName="DESEDE/CBC/NOPADDING" />
+ <!-- <ProviderAlgo ProviderId="BC" JCEName="DESEDEWrap" RequiredKey="DESEDE" /> -->
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes128"
+ Description="Symmetric Key Wrap using AES with a key length of 128 bit"
+ AlgorithmClass="SymmetricKeyWrap"
+ RequirementLevel="REQUIRED"
+ KeyLength="128">
+ <!-- We need an AES in ElectronicCodeBook (ECB) mode here without padding -->
+ <ProviderAlgo ProviderId="BC"
+ JCEName="AES/ECB/NOPADDING"
+ RequiredKey="AES" />
+ <!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap" RequiredKey="AES" /> -->
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes192"
+ Description="Symmetric Key Wrap using AES with a key length of 192 bit"
+ AlgorithmClass="SymmetricKeyWrap"
+ RequirementLevel="OPTIONAL"
+ KeyLength="192">
+ <!-- We need an AES in ElectronicCodeBook (ECB) mode here without padding -->
+ <ProviderAlgo ProviderId="BC"
+ JCEName="AES/ECB/NOPADDING"
+ RequiredKey="AES" />
+ <!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap" RequiredKey="AES" /> -->
+ </Algorithm>
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes256"
+ Description="Symmetric Key Wrap using AES with a key length of 256 bit"
+ AlgorithmClass="SymmetricKeyWrap"
+ RequirementLevel="REQUIRED"
+ KeyLength="256">
+ <!-- We need an AES in ElectronicCodeBook (ECB) mode here without padding -->
+ <ProviderAlgo ProviderId="BC"
+ JCEName="AES/ECB/NOPADDING"
+ RequiredKey="AES" />
+ <!-- <ProviderAlgo ProviderId="BC" JCEName="AESWrap" RequiredKey="AES" /> -->
+ </Algorithm>
+ </Algorithms>
+ </JCEAlgorithmMappings>
+ <ResourceBundles defaultLanguageCode="en" defaultCountryCode="US">
+ <ResourceBundle LanguageCode="en"
+ CountryCode="US"
+ LOCATION="org.apache.xml.security/resource/xmlsecurity_en.properties" />
+ <ResourceBundle LanguageCode="de"
+ CountryCode="DE"
+ LOCATION="org.apache.xml.security/resource/xmlsecurity_de.properties" />
+ </ResourceBundles>
+ <ResourceResolvers>
+ <Resolver JAVACLASS="org.apache.xml.security.utils.resolver.implementations.ResolverDirectHTTP"
+ DESCRIPTION="A simple resolver for requests to HTTP space" />
+ <Resolver JAVACLASS="org.apache.xml.security.utils.resolver.implementations.ResolverLocalFilesystem"
+ DESCRIPTION="A simple resolver for requests to the local file system" />
+ <Resolver JAVACLASS="org.apache.xml.security.utils.resolver.implementations.ResolverFragment"
+ DESCRIPTION="A simple resolver for requests of same-document URIs" />
+ <Resolver JAVACLASS="org.apache.xml.security.utils.resolver.implementations.ResolverXPointer"
+ DESCRIPTION="A simple resolver for requests of XPointer fragents" />
+ </ResourceResolvers>
+ <!-- <defaultLocale languageCode="en" countryCode="US" /> -->
+ <KeyInfo>
+ <ContentHandler LOCALNAME="KeyName"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="org.apache.xml.security.keys.content.KeyName" />
+ <ContentHandler LOCALNAME="KeyValue"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="org.apache.xml.security.keys.content.KeyValue" />
+ <ContentHandler LOCALNAME="RetrievalMethod"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="org.apache.xml.security.keys.content.RetrievalMethod" />
+ <ContentHandler LOCALNAME="X509Data"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="org.apache.xml.security.keys.content.X509Data" />
+ <ContentHandler LOCALNAME="PGPData"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="org.apache.xml.security.keys.content.PGPData" />
+ <ContentHandler LOCALNAME="SPKIData"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="org.apache.xml.security.keys.content.SPKIData" />
+ <ContentHandler LOCALNAME="MgmtData"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="org.apache.xml.security.keys.content.MgmtData" />
+ </KeyInfo>
+ <KeyResolver>
+ <!-- This section contains a list of KeyResolvers that are available in
+ every KeyInfo object -->
+ <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.RSAKeyValueResolver"
+ DESCRIPTION="Can extract RSA public keys" />
+ <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.DSAKeyValueResolver"
+ DESCRIPTION="Can extract DSA public keys" />
+ <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.X509CertificateResolver"
+ DESCRIPTION="Can extract public keys from X509 certificates" />
+ <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.X509SKIResolver"
+ DESCRIPTION="Uses an X509v3 SubjectKeyIdentifier extension to retrieve a certificate from the storages" />
+ <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.RetrievalMethodResolver"
+ DESCRIPTION="Resolves keys and certificates using ResourceResolvers" />
+ <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.X509SubjectNameResolver"
+ DESCRIPTION="Uses an X509 SubjectName to retrieve a certificate from the storages" />
+ <Resolver JAVACLASS="org.apache.xml.security.keys.keyresolver.implementations.X509IssuerSerialResolver"
+ DESCRIPTION="Uses an X509 IssuerName and IssuerSerial to retrieve a certificate from the storages" />
+ </KeyResolver>
+
+ <PrefixMappings>
+ <!-- Many classes create Elements which are in a specific namespace;
+ here, the prefixes for these namespaces are defined. But this
+ can also be overwritten using the ElementProxy#setDefaultPrefix()
+ method. You can even set all prefixes to "" so that the corresponding
+ elements are created using the default namespace -->
+ <PrefixMapping namespace="http://www.w3.org/2000/09/xmldsig#"
+ prefix="ds" />
+ <PrefixMapping namespace="http://www.w3.org/2001/04/xmlenc#"
+ prefix="xenc" />
+ <PrefixMapping namespace="http://www.xmlsecurity.org/experimental#"
+ prefix="experimental" />
+ <PrefixMapping namespace="http://www.w3.org/2002/04/xmldsig-filter2"
+ prefix="dsig-xpath-old" />
+ <PrefixMapping namespace="http://www.w3.org/2002/06/xmldsig-filter2"
+ prefix="dsig-xpath" />
+ <PrefixMapping namespace="http://www.w3.org/2001/10/xml-exc-c14n#"
+ prefix="ec" />
+ <PrefixMapping namespace="http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter"
+ prefix="xx" />
+ </PrefixMappings>
+</Configuration>
1.1 xml-security/src/org/apache/xml/security/resource/log4j.properties
Index: log4j.properties
===================================================================
# ------------------------------------------------------------------------
#
# Logging Configuration
#
# ------------------------------------------------------------------------
#
log4j.rootLogger=DEBUG, LOGTXT
########################################################################
#
# Logging based on packages
#
########################################################################
log4j.logger.org.apache.xml.security=DEBUG, LOGTXT
log4j.logger.org.apache.xml.security.test.AllTests=DEBUG, LOGTXT
########################################################################
#
# Logfile definitions
#
########################################################################
#Console Log
log4j.appender.Console=org.apache.log4j.ConsoleAppender
log4j.appender.Console.Threshold=DEBUG
log4j.appender.Console.layout=org.apache.log4j.PatternLayout
log4j.appender.Console.layout.ConversionPattern=%-5p %C{1}:%L - %m\n
log4j.appender.Console.Target=System.err
#LOGTXT Log
log4j.appender.LOGTXT=org.apache.log4j.FileAppender
log4j.appender.LOGTXT.File=log.txt
log4j.appender.LOGTXT.Append=true
log4j.appender.LOGTXT.Threshold=DEBUG
log4j.appender.LOGTXT.layout=org.apache.log4j.PatternLayout
log4j.appender.LOGTXT.layout.ConversionPattern=%-5p %C{1}:%L - %m\n
1.11 +3 -3 xml-security/src/org/apache/xml/security/algorithms/Algorithm.java
Index: Algorithm.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/algorithms/Algorithm.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Algorithm.java 11 Feb 2003 16:02:45 -0000 1.10
+++ Algorithm.java 1 May 2003 18:20:25 -0000 1.11
@@ -73,9 +73,9 @@
*/
public abstract class Algorithm extends ElementProxy {
- /** Field cat */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Algorithm.class.getName());
+ /** {@link org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(Algorithm.class.getName());
/**
*
1.20 +42 -85 xml-security/src/org/apache/xml/security/Init.java
Index: Init.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/Init.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Init.java 11 Feb 2003 14:55:45 -0000 1.19
+++ Init.java 1 May 2003 18:20:25 -0000 1.20
@@ -93,9 +93,9 @@
*/
public class Init {
- /** {@link org.apache.log4j} logging facility */
- static org.apache.log4j.Category cat =
- org.apache.log4j.Category.getInstance(Init.class.getName());
+ /** {@link org.apache.commons.logging} logging facility */
+ static org.apache.commons.logging.Log log =
+ org.apache.commons.logging.LogFactory.getLog(Init.class.getName());
/** Field _initialized */
private static boolean _alreadyInitialized = false;
@@ -146,49 +146,7 @@
context.setAttributeNS(
Constants.NamespaceSpecNS, "xmlns:x",
- "http://www.xmlsecurity.org/NS/#configuration");
- context.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:log4j",
- "http://jakarta.apache.org/log4j/");
-
- long XX_configure_log4j_start = System.currentTimeMillis();
-
- /* Cliff Collins <co...@sybase.com> suggested the following change
- * in order to let existing log4j systems work (2002-08-19).
- */
- org.apache.log4j.Logger root =
- org.apache.log4j.Logger.getRootLogger();
- Enumeration enum = root.getAllAppenders();
-
- if (enum instanceof org.apache.log4j.helpers.NullEnumeration) {
-
- /* configure logging */
- Element log4jElem = (Element) XPathAPI.selectSingleNode(doc,
- "//log4j:configuration[1]", context);
-
- try {
- Attr logfile = (Attr) XPathAPI.selectSingleNode(
- log4jElem,
- "./x:appender[@name='STDOUT']/x:param[@name='File']/@value",
- context);
-
- if (logfile != null) {
- String logFileName = logfile.getNodeValue();
- File f = new File(logFileName);
-
- if (f.exists()) {
- f.delete();
- }
- }
- } catch (Exception ex) {}
-
- org.apache.log4j.xml.DOMConfigurator.configure(log4jElem);
- cat.info("Logging is working");
- cat.info("Date: "
- + new Date(System.currentTimeMillis()).toString());
- cat.info("Version: " + Version.getVersion());
- }
-
- long XX_configure_log4j_end = System.currentTimeMillis();
+ "http://www.xmlsecurity.org/NS/#configuration");
long XX_configure_i18n_start = System.currentTimeMillis();
{
@@ -221,7 +179,7 @@
{
FunctionTable.installFunction("here", new FuncHere());
- cat.debug(
+ log.debug(
"Registered class " + FuncHere.class.getName()
+ " for XPath function 'here()' function in internal table");
@@ -235,7 +193,7 @@
FuncLoader loader = FunctionTable.m_functions[i];
if (loader != null) {
- cat.debug("Func " + i + " " + loader.getName());
+ log.debug("Func " + i + " " + loader.getName());
if (loader.getName().equals(funcHereLoader.getName())) {
FunctionTable.m_functions[i] = funcHereLoader;
@@ -272,20 +230,20 @@
if (currMeth.getDeclaringClass().getName()
.equals(JAVACLASS)) {
- cat.debug(currMeth.getDeclaringClass());
+ log.debug(currMeth.getDeclaringClass());
}
}
} catch (ClassNotFoundException e) {
Object exArgs[] = { URI, JAVACLASS };
- cat.fatal(I18n.translate("algorithm.classDoesNotExist",
+ log.fatal(I18n.translate("algorithm.classDoesNotExist",
exArgs));
registerClass = false;
}
if (registerClass) {
- cat.debug("Canonicalizer.register(" + URI + ", "
+ log.debug("Canonicalizer.register(" + URI + ", "
+ JAVACLASS + ")");
Canonicalizer.register(URI, JAVACLASS);
}
@@ -316,14 +274,14 @@
} catch (ClassNotFoundException e) {
Object exArgs[] = { URI, JAVACLASS };
- cat.fatal(I18n.translate("algorithm.classDoesNotExist",
+ log.fatal(I18n.translate("algorithm.classDoesNotExist",
exArgs));
registerClass = false;
}
if (registerClass) {
- cat.debug("Transform.register(" + URI + ", " + JAVACLASS
+ log.debug("Transform.register(" + URI + ", " + JAVACLASS
+ ")");
Transform.register(URI, JAVACLASS);
}
@@ -370,20 +328,20 @@
if (currMeth.getDeclaringClass().getName()
.equals(JAVACLASS)) {
- cat.debug(currMeth.getDeclaringClass());
+ log.debug(currMeth.getDeclaringClass());
}
}
} catch (ClassNotFoundException e) {
Object exArgs[] = { URI, JAVACLASS };
- cat.fatal(I18n.translate("algorithm.classDoesNotExist",
+ log.fatal(I18n.translate("algorithm.classDoesNotExist",
exArgs));
registerClass = false;
}
if (registerClass) {
- cat.debug("SignatureAlgorithm.register(" + URI + ", "
+ log.debug("SignatureAlgorithm.register(" + URI + ", "
+ JAVACLASS + ")");
SignatureAlgorithm.register(URI, JAVACLASS);
}
@@ -410,10 +368,10 @@
"DESCRIPTION");
if ((Description != null) && (Description.length() > 0)) {
- cat.debug("Register Resolver: " + JAVACLASS + ": "
+ log.debug("Register Resolver: " + JAVACLASS + ": "
+ Description);
} else {
- cat.debug("Register Resolver: " + JAVACLASS
+ log.debug("Register Resolver: " + JAVACLASS
+ ": For unknown purposes");
}
@@ -447,7 +405,7 @@
((Element) keyElem.item(i)).getAttributeNS(null,
"JAVACLASS");
- cat.debug("KeyInfoContent: " + namespace + " "
+ log.debug("KeyInfoContent: " + namespace + " "
+ localname + " " + JAVACLASS);
Init.registerKeyInfoContentHandler(namespace,
localname,
@@ -480,10 +438,10 @@
"DESCRIPTION");
if ((Description != null) && (Description.length() > 0)) {
- cat.debug("Register Resolver: " + JAVACLASS + ": "
+ log.debug("Register Resolver: " + JAVACLASS + ": "
+ Description);
} else {
- cat.debug("Register Resolver: " + JAVACLASS
+ log.debug("Register Resolver: " + JAVACLASS
+ ": For unknown purposes");
}
@@ -495,7 +453,7 @@
long XX_configure_reg_prefixes_start = System.currentTimeMillis();
{
- cat.debug("Now I try to bind prefixes:");
+ log.debug("Now I try to bind prefixes:");
NodeList nl = XPathAPI.selectNodeList(
doc, "/x:Configuration/x:PrefixMappings/x:PrefixMapping",
@@ -507,7 +465,7 @@
String prefix = ((Element) nl.item(i)).getAttributeNS(null,
"prefix");
- cat.debug("Now I try to bind " + prefix + " to " + namespace);
+ log.debug("Now I try to bind " + prefix + " to " + namespace);
org.apache.xml.security.utils.ElementProxy
.setDefaultPrefix(namespace, prefix);
}
@@ -517,23 +475,22 @@
long XX_init_end = System.currentTimeMillis();
//J-
- cat.debug("XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
- cat.debug(" XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
- cat.debug(" XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
- cat.debug(" XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
- cat.debug(" XX_configure_log4j " + ((int)(XX_configure_log4j_end- XX_configure_log4j_start)) + " ms");
- cat.debug(" XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
- cat.debug(" XX_configure_reg_here " + ((int)(XX_configure_reg_here_end- XX_configure_reg_here_start)) + " ms");
- cat.debug(" XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
- cat.debug(" XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
- cat.debug(" XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
- cat.debug(" XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
- cat.debug(" XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
- cat.debug(" XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
- cat.debug(" XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
+ log.debug("XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
+ log.debug(" XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
+ log.debug(" XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
+ log.debug(" XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
+ log.debug(" XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
+ log.debug(" XX_configure_reg_here " + ((int)(XX_configure_reg_here_end- XX_configure_reg_here_start)) + " ms");
+ log.debug(" XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
+ log.debug(" XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
+ log.debug(" XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
+ log.debug(" XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
+ log.debug(" XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
+ log.debug(" XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
+ log.debug(" XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
//J+
} catch (Exception e) {
- cat.fatal("Bad: ", e);
+ log.fatal("Bad: ", e);
e.printStackTrace();
}
}
@@ -653,7 +610,7 @@
// are we already registered?
if (Init._contentHandlerHash.containsKey(namespacequali)) {
- cat.error("Already registered");
+ log.error("Already registered");
Object exArgs[] = { namespacequali,
((String) Init._contentHandlerHash
@@ -665,9 +622,9 @@
synchronized (Init._contentHandlerHash) {
Init._contentHandlerHash.put(namespacequali, implementingClass);
- cat.debug("Init._contentHandlerHash.put(\"" + namespacequali
+ log.debug("Init._contentHandlerHash.put(\"" + namespacequali
+ "\", \"" + implementingClass + "\")");
- cat.debug("Init._contentHandlerHash.size()="
+ log.debug("Init._contentHandlerHash.size()="
+ Init._contentHandlerHash.size());
}
}
@@ -705,16 +662,16 @@
*/
String namespacequali = Init.qualifyNamespace(namespace, localname);
- cat.debug("Asked for handler for " + namespacequali);
+ log.debug("Asked for handler for " + namespacequali);
if (Init._contentHandlerHash == null) {
- cat.debug("But I can't help (hash==null) ");
+ log.debug("But I can't help (hash==null) ");
return null;
}
if (Init._contentHandlerHash.size() == 0) {
- cat.debug("But I can't help (size()==0)");
+ log.debug("But I can't help (size()==0)");
return null;
}
1.32 +0 -9 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XMLUtils.java 29 Apr 2003 21:36:56 -0000 1.31
+++ XMLUtils.java 1 May 2003 18:20:25 -0000 1.32
@@ -341,15 +341,6 @@
}
}
- /**
- * Method spitOutVersions
- *
- * @param cat
- */
- public static void spitOutVersions(org.apache.log4j.Category cat) {
- cat.debug(XMLUtils.getXercesVersion());
- cat.debug(XMLUtils.getXalanVersion());
- }
/**
* Method spitOutVersions