You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2004/09/25 21:42:23 UTC
cvs commit: xml-security/src/org/apache/xml/security/transforms/implementations TransformXPath2Filter04.java
raul 2004/09/25 12:42:23
Modified: src/org/apache/xml/security/keys/keyresolver/implementations
RSAKeyValueResolver.java
RetrievalMethodResolver.java
X509IssuerSerialResolver.java
X509CertificateResolver.java X509SKIResolver.java
EncryptedKeyResolver.java
X509SubjectNameResolver.java
src/org/apache/xml/security/keys KeyInfo.java
src/org/apache/xml/security/transforms Transforms.java
Transform.java
src/org/apache/xml/security/utils/resolver
ResourceResolverSpi.java ResourceResolver.java
src/org/apache/xml/security/signature Manifest.java
src/org/apache/xml/security/algorithms/implementations
SignatureBaseRSA.java SignatureDSA.java
IntegrityHmac.java
src/org/apache/xml/security/keys/keyresolver
KeyResolver.java
src/org/apache/xml/security/algorithms
SignatureAlgorithm.java JCEMapper.java
src/org/apache/xml/security/utils/resolver/implementations
ResolverXPointer.java ResolverDirectHTTP.java
ResolverLocalFilesystem.java ResolverFragment.java
src/org/apache/xml/security Init.java
src/org/apache/xml/security/utils IdResolver.java
JavaUtils.java XMLUtils.java
src/org/apache/xml/security/keys/storage/implementations
CertsInFilesystemDirectoryResolver.java
src/org/apache/xml/security/keys/content/x509
XMLX509SKI.java XMLX509IssuerSerial.java
src/org/apache/xml/security/transforms/implementations
TransformXPath2Filter04.java
Log:
wrapped all debug instances where + is used with if log.debugEnabled()
Revision Changes Path
1.10 +3 -3 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RSAKeyValueResolver.java 24 Sep 2004 20:54:29 -0000 1.9
+++ RSAKeyValueResolver.java 25 Sep 2004 19:42:21 -0000 1.10
@@ -49,8 +49,8 @@
/** @inheritDoc */
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
-
- log.debug("Can I resolve " + element.getTagName());
+ if (log.isDebugEnabled())
+ log.debug("Can I resolve " + element.getTagName());
if (element == null) {
return false;
1.12 +24 -18 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RetrievalMethodResolver.java 3 Aug 2004 18:01:20 -0000 1.11
+++ RetrievalMethodResolver.java 25 Sep 2004 19:42:21 -0000 1.12
@@ -103,8 +103,8 @@
if (resRes != null) {
XMLSignatureInput resource = resRes.resolve(uri, BaseURI);
-
- log.debug("Before applying Transforms, resource has "
+ if (log.isDebugEnabled())
+ log.debug("Before applying Transforms, resource has "
+ resource.getBytes().length + "bytes");
if (transforms != null) {
@@ -112,10 +112,11 @@
resource = transforms.performTransforms(resource);
}
-
- log.debug("After applying Transforms, resource has "
+ if (log.isDebugEnabled()) {
+ log.debug("After applying Transforms, resource has "
+ resource.getBytes().length + "bytes");
- log.debug("Resolved to resource " + resource.getSourceURI());
+ log.debug("Resolved to resource " + resource.getSourceURI());
+ }
byte inputBytes[] = resource.getBytes();
@@ -135,11 +136,12 @@
} else {
// otherwise, we parse the resource, create an Element and delegate
- log.debug("we have to parse " + inputBytes.length + " bytes");
+ if (log.isDebugEnabled())
+ log.debug("we have to parse " + inputBytes.length + " bytes");
Element e = this.getDocFromBytes(inputBytes);
-
- log.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ if (log.isDebugEnabled())
+ log.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ e.getLocalName() + " Element");
if (e != null) {
@@ -180,15 +182,15 @@
RetrievalMethod rm = new RetrievalMethod(element, BaseURI);
Attr uri = rm.getURIAttr();
Transforms transforms = rm.getTransforms();
-
- log.debug("Asked to resolve URI " + uri);
+ if (log.isDebugEnabled())
+ log.debug("Asked to resolve URI " + uri);
ResourceResolver resRes = ResourceResolver.getInstance(uri, BaseURI);
if (resRes != null) {
XMLSignatureInput resource = resRes.resolve(uri, BaseURI);
-
- log.debug("Before applying Transforms, resource has "
+ if (log.isDebugEnabled())
+ log.debug("Before applying Transforms, resource has "
+ resource.getBytes().length + "bytes");
if (transforms != null) {
@@ -196,10 +198,12 @@
resource = transforms.performTransforms(resource);
}
-
- log.debug("After applying Transforms, resource has "
+
+ if (log.isDebugEnabled()) {
+ log.debug("After applying Transforms, resource has "
+ resource.getBytes().length + "bytes");
- log.debug("Resolved to resource " + resource.getSourceURI());
+ log.debug("Resolved to resource " + resource.getSourceURI());
+ }
byte inputBytes[] = resource.getBytes();
@@ -220,11 +224,13 @@
} else {
// otherwise, we parse the resource, create an Element and delegate
- log.debug("we have to parse " + inputBytes.length + " bytes");
+ if (log.isDebugEnabled())
+ log.debug("we have to parse " + inputBytes.length + " bytes");
Element e = this.getDocFromBytes(inputBytes);
- log.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ if (log.isDebugEnabled())
+ log.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ e.getLocalName() + " Element");
if (e != null) {
1.9 +11 -8 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- X509IssuerSerialResolver.java 24 Sep 2004 20:54:29 -0000 1.8
+++ X509IssuerSerialResolver.java 25 Sep 2004 19:42:22 -0000 1.9
@@ -47,8 +47,8 @@
/** @inheritDoc */
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
-
- log.debug("Can I resolve " + element.getTagName() + "?");
+ if (log.isDebugEnabled())
+ log.debug("Can I resolve " + element.getTagName() + "?");
X509Data x509data = null;
try {
@@ -114,19 +114,22 @@
X509Certificate cert = storage.next();
XMLX509IssuerSerial certSerial = new XMLX509IssuerSerial(element.getOwnerDocument(), cert);
- log.debug("Found Certificate Issuer: "
+ if (log.isDebugEnabled()) {
+ log.debug("Found Certificate Issuer: "
+ certSerial.getIssuerName());
- log.debug("Found Certificate Serial: "
+ log.debug("Found Certificate Serial: "
+ certSerial.getSerialNumber().toString());
+ }
for (int i=0; i<noOfISS; i++) {
XMLX509IssuerSerial xmliss = x509data.itemIssuerSerial(i);
- log.debug("Found Element Issuer: "
+ if (log.isDebugEnabled()) {
+ log.debug("Found Element Issuer: "
+ xmliss.getIssuerName());
- log.debug("Found Element Serial: "
+ log.debug("Found Element Serial: "
+ xmliss.getSerialNumber().toString());
-
+ }
if (certSerial.equals(xmliss)) {
log.debug("match !!! ");
1.10 +3 -3 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- X509CertificateResolver.java 3 Aug 2004 18:01:20 -0000 1.9
+++ X509CertificateResolver.java 25 Sep 2004 19:42:22 -0000 1.10
@@ -58,8 +58,8 @@
*/
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
-
- log.debug("Can I resolve " + element.getTagName() + "?");
+ if (log.isDebugEnabled())
+ log.debug("Can I resolve " + element.getTagName() + "?");
if (!XMLUtils.elementIsInSignatureSpace(element,
Constants._TAG_X509DATA)) {
1.11 +4 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- X509SKIResolver.java 3 Aug 2004 18:01:20 -0000 1.10
+++ X509SKIResolver.java 25 Sep 2004 19:42:22 -0000 1.11
@@ -60,8 +60,9 @@
*/
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
-
- log.debug("Can I resolve " + element.getTagName() + "?");
+ if (log.isDebugEnabled()) {
+ log.debug("Can I resolve " + element.getTagName() + "?");
+ }
if (!XMLUtils.elementIsInSignatureSpace(element,
Constants._TAG_X509DATA)) {
1.5 +2 -2 xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
Index: EncryptedKeyResolver.java
===================================================================
RCS file: /home/cvs/xml-security/src/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EncryptedKeyResolver.java 24 Sep 2004 20:54:29 -0000 1.4
+++ EncryptedKeyResolver.java 25 Sep 2004 19:42:22 -0000 1.5
@@ -92,8 +92,8 @@
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
-
- log.debug("EncryptedKeyResolver - Can I resolve " + element.getTagName());
+ if (log.isDebugEnabled())
+ log.debug("EncryptedKeyResolver - Can I resolve " + element.getTagName());
if (element == null) {
return false;
1.12 +3 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- X509SubjectNameResolver.java 3 Aug 2004 18:01:21 -0000 1.11
+++ X509SubjectNameResolver.java 25 Sep 2004 19:42:22 -0000 1.12
@@ -59,8 +59,8 @@
*/
public boolean engineCanResolve(Element element, String BaseURI,
StorageResolver storage) {
-
- log.debug("Can I resolve " + element.getTagName() + "?");
+ if (log.isDebugEnabled())
+ log.debug("Can I resolve " + element.getTagName() + "?");
if (!XMLUtils.elementIsInSignatureSpace(element,
1.21 +10 -10 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- KeyInfo.java 24 Sep 2004 20:54:26 -0000 1.20
+++ KeyInfo.java 25 Sep 2004 19:42:22 -0000 1.21
@@ -785,8 +785,8 @@
for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
-
- log.debug("Try " + keyResolver.getClass().getName());
+ if (log.isDebugEnabled())
+ log.debug("Try " + keyResolver.getClass().getName());
Node currentChild=this._constructionElement.getFirstChild();
while (currentChild!=null) {
@@ -881,8 +881,8 @@
*/
X509Certificate getX509CertificateFromStaticResolvers()
throws KeyResolverException {
-
- log.debug("Start getX509CertificateFromStaticResolvers() with "
+ if (log.isDebugEnabled())
+ log.debug("Start getX509CertificateFromStaticResolvers() with "
+ KeyResolver.length() + " resolvers");
for (int i = 0; i < KeyResolver.length(); i++) {
@@ -938,14 +938,14 @@
*/
X509Certificate getX509CertificateFromInternalResolvers()
throws KeyResolverException {
-
- log.debug("Start getX509CertificateFromInternalResolvers() with "
+ if (log.isDebugEnabled())
+ log.debug("Start getX509CertificateFromInternalResolvers() with "
+ this.lengthInternalKeyResolver() + " resolvers");
for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
-
- log.debug("Try " + keyResolver.getClass().getName());
+ if (log.isDebugEnabled())
+ log.debug("Try " + keyResolver.getClass().getName());
Node currentChild=this._constructionElement.getFirstChild();
while (currentChild!=null) {
@@ -1089,8 +1089,8 @@
for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
-
- log.debug("Try " + keyResolver.getClass().getName());
+ if (log.isDebugEnabled())
+ log.debug("Try " + keyResolver.getClass().getName());
Node currentChild=this._constructionElement.getFirstChild();
while (currentChild!=null) {
1.18 +6 -4 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Transforms.java 23 Sep 2004 20:23:20 -0000 1.17
+++ Transforms.java 25 Sep 2004 19:42:22 -0000 1.18
@@ -129,7 +129,8 @@
throws TransformationException {
try {
- log.debug("Transforms.addTransform(" + transformURI + ")");
+ if (log.isDebugEnabled())
+ log.debug("Transforms.addTransform(" + transformURI + ")");
Transform transform = Transform.getInstance(this._doc, transformURI);
@@ -151,7 +152,8 @@
throws TransformationException {
try {
- log.debug("Transforms.addTransform(" + transformURI + ")");
+ if (log.isDebugEnabled())
+ log.debug("Transforms.addTransform(" + transformURI + ")");
Transform transform = Transform.getInstance(this._doc, transformURI,
contextElement);
@@ -189,8 +191,8 @@
* @param transform {@link Transform} object
*/
private void addTransform(Transform transform) {
-
- log.debug("Transforms.addTransform(" + transform.getURI() + ")");
+ if (log.isDebugEnabled())
+ log.debug("Transforms.addTransform(" + transform.getURI() + ")");
Element transformElement = transform.getElement();
1.16 +4 -3 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Transform.java 23 Sep 2004 20:23:20 -0000 1.15
+++ Transform.java 25 Sep 2004 19:42:22 -0000 1.16
@@ -89,10 +89,11 @@
String implementingClass =
Transform.getImplementingClass(algorithmURI);
-
- log.debug("Create URI \"" + algorithmURI + "\" class \""
+ if (log.isDebugEnabled()) {
+ log.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
- log.debug("The NodeList is " + contextNodes);
+ log.debug("The NodeList is " + contextNodes);
+ }
// create the custom Transform object
this.transformSpi =
1.11 +3 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ResourceResolverSpi.java 24 Sep 2004 20:54:26 -0000 1.10
+++ ResourceResolverSpi.java 25 Sep 2004 19:42:22 -0000 1.11
@@ -253,7 +253,8 @@
&& (ch3 != '/'));
if (isDosFilename) {
- log.debug("Found DOS filename: " + str);
+ if (log.isDebugEnabled())
+ log.debug("Found DOS filename: " + str);
}
}
1.9 +11 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResourceResolver.java 24 Sep 2004 20:54:26 -0000 1.8
+++ ResourceResolver.java 25 Sep 2004 19:42:22 -0000 1.9
@@ -116,7 +116,8 @@
exArgs, e, uri, BaseURI);
}
- log.debug("check resolvability by class " + currentClass);
+ if (log.isDebugEnabled())
+ log.debug("check resolvability by class " + currentClass);
if ((resolver != null) && resolver.canResolve(uri, BaseURI)) {
return resolver;
@@ -144,9 +145,10 @@
public static final ResourceResolver getInstance(
Attr uri, String BaseURI, Vector individualResolvers)
throws ResourceResolverException {
-
- 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");
+ if (log.isDebugEnabled()) {
+ 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)) {
@@ -156,8 +158,8 @@
if (resolver != null) {
String currentClass = resolver._resolverSpi.getClass().getName();
-
- log.debug("check resolvability by class " + currentClass);
+ if (log.isDebugEnabled())
+ log.debug("check resolvability by class " + currentClass);
if (resolver.canResolve(uri, BaseURI)) {
return resolver;
@@ -181,8 +183,8 @@
throw new ResourceResolverException("utils.resolver.noClass",
exArgs, e, uri, BaseURI);
}
-
- log.debug("check resolvability by class " + currentClass);
+ if (log.isDebugEnabled())
+ log.debug("check resolvability by class " + currentClass);
if ((resolver != null) && resolver.canResolve(uri, BaseURI)) {
return resolver;
1.30 +4 -7 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Manifest.java 23 Sep 2004 20:23:19 -0000 1.29
+++ Manifest.java 25 Sep 2004 19:42:22 -0000 1.30
@@ -287,11 +287,8 @@
public boolean verifyReferences(boolean followManifests)
throws MissingResourceFailureException, XMLSecurityException {
if (log.isDebugEnabled()) {
- log.debug(
- "verify "
- +_referencesEl.length
- + " References");
- log.debug("I am " + (followManifests
+ log.debug("verify " +_referencesEl.length + " References");
+ log.debug("I am " + (followManifests
? ""
: "not") + " requested to follow nested Manifests");
}
@@ -320,8 +317,8 @@
if (!currentRefVerified) {
verify = false;
}
-
- log.debug("The Reference has Type " + currentRef.getType());
+ if (log.isDebugEnabled())
+ log.debug("The Reference has Type " + currentRef.getType());
// was verification successful till now and do we want to verify the Manifest?
if (verify && followManifests
1.10 +15 -15 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SignatureBaseRSA.java 24 Sep 2004 20:54:27 -0000 1.9
+++ SignatureBaseRSA.java 25 Sep 2004 19:42:22 -0000 1.10
@@ -59,8 +59,8 @@
JCEMapper.ProviderIdClass algorithmID =
JCEMapper.translateURItoJCEID(this.engineGetURI());
-
- log.debug("Created SignatureDSA using " + algorithmID.getAlgorithmID()
+ if (log.isDebugEnabled())
+ log.debug("Created SignatureDSA using " + algorithmID.getAlgorithmID()
+ " " + algorithmID.getProviderId());
try {
1.11 +5 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SignatureDSA.java 24 Sep 2004 20:54:27 -0000 1.10
+++ SignatureDSA.java 25 Sep 2004 19:42:22 -0000 1.11
@@ -70,8 +70,8 @@
JCEMapper.ProviderIdClass algorithmID =
JCEMapper.translateURItoJCEID(SignatureDSA._URI);
-
- log.debug("Created SignatureDSA using " + algorithmID.getAlgorithmID()
+ if (log.isDebugEnabled())
+ log.debug("Created SignatureDSA using " + algorithmID.getAlgorithmID()
+ " " + algorithmID.getProviderId());
try {
@@ -111,7 +111,8 @@
throws XMLSignatureException {
try {
- log.debug("Called DSA.verify() on " + Base64.encode(signature));
+ if (log.isDebugEnabled())
+ log.debug("Called DSA.verify() on " + Base64.encode(signature));
byte[] jcebytes = SignatureDSA.convertXMLDSIGtoASN1(signature);
1.11 +8 -8 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- IntegrityHmac.java 24 Sep 2004 20:54:27 -0000 1.10
+++ IntegrityHmac.java 25 Sep 2004 19:42:22 -0000 1.11
@@ -72,8 +72,8 @@
JCEMapper.ProviderIdClass algorithmID =
JCEMapper.translateURItoJCEID(this.engineGetURI());
-
- log.debug("Created IntegrityHmacSHA1 using "
+ if (log.isDebugEnabled())
+ log.debug("Created IntegrityHmacSHA1 using "
+ algorithmID.getAlgorithmID() + " "
+ algorithmID.getProviderId());
1.10 +3 -3 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- KeyResolver.java 24 Sep 2004 20:54:28 -0000 1.9
+++ KeyResolver.java 25 Sep 2004 19:42:22 -0000 1.10
@@ -130,8 +130,8 @@
throw new KeyResolverException("utils.resolver.noClass", exArgs, e);
}
-
- log.debug("check resolvability by class " + currentClass);
+ if (log.isDebugEnabled())
+ log.debug("check resolvability by class " + currentClass);
if ((resolver != null)
&& resolver.canResolve(element, BaseURI, storage)) {
1.19 +6 -5 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SignatureAlgorithm.java 24 Sep 2004 20:54:27 -0000 1.18
+++ SignatureAlgorithm.java 25 Sep 2004 19:42:22 -0000 1.19
@@ -65,8 +65,8 @@
try {
String implementingClass =
SignatureAlgorithm.getImplementingClass(algorithmURI);
-
- log.debug("Create URI \"" + algorithmURI + "\" class \""
+ if (log.isDebugEnabled())
+ log.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
this._signatureAlgorithm =
@@ -131,8 +131,8 @@
try {
String implementingClass =
SignatureAlgorithm.getImplementingClass(algorithmURI);
-
- log.debug("Create URI \"" + algorithmURI + "\" class \""
+ if (log.isDebugEnabled())
+ log.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
this._signatureAlgorithm =
@@ -346,7 +346,8 @@
throws AlgorithmAlreadyRegisteredException {
{
- log.debug("Try to register " + algorithmURI + " " + implementingClass);
+ if (log.isDebugEnabled())
+ log.debug("Try to register " + algorithmURI + " " + implementingClass);
// are we already registered?
String registeredClass =
1.24 +15 -13 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JCEMapper.java 25 Sep 2004 15:09:32 -0000 1.23
+++ JCEMapper.java 25 Sep 2004 19:42:22 -0000 1.24
@@ -136,7 +136,8 @@
.newInstance();
if (java.security.Security.getProvider(Id) == null) {
- log.debug("The provider " + Id
+ if (log.isDebugEnabled())
+ log.debug("The provider " + Id
+ " had to be added to the java.security.Security");
java.security.Security.addProvider(prov);
@@ -227,8 +228,8 @@
*
*/
public static ProviderIdClass translateURItoJCEID(String AlgorithmURI) {
-
- log.debug("Request for URI " + AlgorithmURI);
+ if (log.isDebugEnabled())
+ log.debug("Request for URI " + AlgorithmURI);
ProviderIdClass prov=(ProviderIdClass) uriToProvider.get(AlgorithmURI);
if (prov!=null) {
@@ -251,8 +252,8 @@
ProviderIdClass result = new ProviderIdClass(map.JCEName,
map.ProviderId);
-
- log.debug("Found " + result.getAlgorithmID() + " from provider "
+ if (log.isDebugEnabled())
+ log.debug("Found " + result.getAlgorithmID() + " from provider "
+ result.getProviderId());
uriToProvider.put(AlgorithmURI,result);
@@ -272,8 +273,8 @@
*/
public static ProviderIdClass translateURItoJCEID(String AlgorithmURI,
String requestedProviderId) {
-
- log.debug("Request for URI " + AlgorithmURI + " from provider "
+ if (log.isDebugEnabled())
+ log.debug("Request for URI " + AlgorithmURI + " from provider "
+ requestedProviderId);
if (!JCEMapper.getProviderIsInClassPath(requestedProviderId)) {
@@ -288,8 +289,8 @@
ProviderIdClass result = new ProviderIdClass(jceName,
requestedProviderId);
-
- log.debug("Found " + result.getAlgorithmID() + " from provider "
+ if (log.isDebugEnabled())
+ log.debug("Found " + result.getAlgorithmID() + " from provider "
+ result.getProviderId());
return result;
@@ -304,8 +305,8 @@
*
*/
public static String getAlgorithmClassFromURI(String AlgorithmURI) {
-
- log.debug("Request for URI " + AlgorithmURI);
+ if (log.isDebugEnabled())
+ log.debug("Request for URI " + AlgorithmURI);
Iterator alth=getAlgorithmMapping(AlgorithmURI).entrySet().iterator();
String uri=null;
@@ -314,7 +315,8 @@
String cur=((AlgorithmMapping)alth.next()).JCEName;
if (uri==null)
uri=cur;
- log.debug("Found " + cur);
+ if (log.isDebugEnabled())
+ log.debug("Found " + cur);
}
return uri;
1.22 +2 -1 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ResolverXPointer.java 24 Sep 2004 20:54:28 -0000 1.21
+++ ResolverXPointer.java 25 Sep 2004 19:42:22 -0000 1.22
@@ -159,7 +159,8 @@
.charAt(idPlusDelim.length() - 1) == '"')) || ((idPlusDelim
.charAt(0) == '\'') && (idPlusDelim
.charAt(idPlusDelim.length() - 1) == '\''))) {
- log.debug("Id="
+ if (log.isDebugEnabled())
+ log.debug("Id="
+ idPlusDelim.substring(1, idPlusDelim.length() - 1));
return true;
1.13 +7 -4 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ResolverDirectHTTP.java 24 Sep 2004 20:54:28 -0000 1.12
+++ ResolverDirectHTTP.java 25 Sep 2004 19:42:22 -0000 1.13
@@ -127,7 +127,8 @@
// switch on proxy usage
if (useProxy) {
- log.debug("Use of HTTP proxy enabled: " + proxyHost + ":"
+ if (log.isDebugEnabled())
+ log.debug("Use of HTTP proxy enabled: " + proxyHost + ":"
+ proxyPort);
System.getProperties().put("http.proxySet", "true");
System.getProperties().put("http.proxyHost", proxyHost);
@@ -268,12 +269,14 @@
}
if ((uriNew != null) && uriNew.getScheme().equals("http")) {
- log.debug("I state that I can resolve " + uriNew.toString());
+ if (log.isDebugEnabled())
+ log.debug("I state that I can resolve " + uriNew.toString());
return true;
}
- log.debug("I state that I can't resolve " + uriNew.toString());
+ if (log.isDebugEnabled())
+ log.debug("I state that I can't resolve " + uriNew.toString());
return false;
}
1.11 +5 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ResolverLocalFilesystem.java 24 Sep 2004 20:54:28 -0000 1.10
+++ ResolverLocalFilesystem.java 25 Sep 2004 19:42:22 -0000 1.11
@@ -133,11 +133,12 @@
try {
URI uriNew = new URI(new URI(BaseURI), uri.getNodeValue());
-
- log.debug("I was asked whether I can resolve " + uriNew.toString());
+ if (log.isDebugEnabled())
+ log.debug("I was asked whether I can resolve " + uriNew.toString());
if (uriNew.getScheme().equals("file")) {
- log.debug("I state that I can resolve " + uriNew.toString());
+ if (log.isDebugEnabled())
+ log.debug("I state that I can resolve " + uriNew.toString());
return true;
}
1.21 +6 -4 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ResolverFragment.java 18 Sep 2004 16:47:35 -0000 1.20
+++ ResolverFragment.java 25 Sep 2004 19:42:22 -0000 1.21
@@ -84,8 +84,8 @@
// Element selectedElem = doc.getElementById(id);
selectedElem = IdResolver.getElementById(doc, id);
-
- log.debug("Try to catch an Element with ID " + id + " and Element was " + selectedElem);
+ if (log.isDebugEnabled())
+ log.debug("Try to catch an Element with ID " + id + " and Element was " + selectedElem);
}
//Set resultSet = dereferenceSameDocumentURI(selectedElem);
@@ -125,10 +125,12 @@
if (uriNodeValue.equals("")
|| (uriNodeValue.startsWith("#")
&&!uriNodeValue.startsWith("#xpointer("))) {
- log.debug("State I can resolve reference: \"" + uriNodeValue + "\"");
+ if (log.isDebugEnabled())
+ log.debug("State I can resolve reference: \"" + uriNodeValue + "\"");
return true;
}
- log.debug("Do not seem to be able to resolve reference: \"" + uriNodeValue + "\"");
+ if (log.isDebugEnabled())
+ log.debug("Do not seem to be able to resolve reference: \"" + uriNodeValue + "\"");
return false;
}
1.28 +38 -31 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Init.java 25 Sep 2004 15:09:32 -0000 1.27
+++ Init.java 25 Sep 2004 19:42:23 -0000 1.28
@@ -194,7 +194,8 @@
log.debug(currMeth.getDeclaringClass());
}
}*/
- log.debug("Canonicalizer.register(" + URI + ", "
+ if (log.isDebugEnabled())
+ log.debug("Canonicalizer.register(" + URI + ", "
+ JAVACLASS + ")");
Canonicalizer.register(URI, JAVACLASS);
} catch (ClassNotFoundException e) {
@@ -221,7 +222,8 @@
"JAVACLASS");
try {
Class.forName(JAVACLASS);
- log.debug("Transform.register(" + URI + ", " + JAVACLASS
+ if (log.isDebugEnabled())
+ log.debug("Transform.register(" + URI + ", " + JAVACLASS
+ ")");
Transform.register(URI, JAVACLASS);
} catch (ClassNotFoundException e) {
@@ -272,7 +274,8 @@
// log.debug(currMeth.getDeclaringClass());
// }
// }
- log.debug("SignatureAlgorithm.register(" + URI + ", "
+ if (log.isDebugEnabled())
+ log.debug("SignatureAlgorithm.register(" + URI + ", "
+ JAVACLASS + ")");
SignatureAlgorithm.register(URI, JAVACLASS);
} catch (ClassNotFoundException e) {
@@ -304,10 +307,12 @@
"DESCRIPTION");
if ((Description != null) && (Description.length() > 0)) {
- log.debug("Register Resolver: " + JAVACLASS + ": "
+ if (log.isDebugEnabled())
+ log.debug("Register Resolver: " + JAVACLASS + ": "
+ Description);
} else {
- log.debug("Register Resolver: " + JAVACLASS
+ if (log.isDebugEnabled())
+ log.debug("Register Resolver: " + JAVACLASS
+ ": For unknown purposes");
}
@@ -338,10 +343,12 @@
"DESCRIPTION");
if ((Description != null) && (Description.length() > 0)) {
- log.debug("Register Resolver: " + JAVACLASS + ": "
+ if (log.isDebugEnabled())
+ log.debug("Register Resolver: " + JAVACLASS + ": "
+ Description);
} else {
- log.debug("Register Resolver: " + JAVACLASS
+ if (log.isDebugEnabled())
+ log.debug("Register Resolver: " + JAVACLASS
+ ": For unknown purposes");
}
@@ -353,7 +360,8 @@
if (tag.equals("PrefixMappings")){
XX_configure_reg_prefixes_start = System.currentTimeMillis();
- log.debug("Now I try to bind prefixes:");
+ if (log.isDebugEnabled())
+ log.debug("Now I try to bind prefixes:");
Element[] nl = XMLUtils.selectNodes(el.getFirstChild(), CONF_NS,"PrefixMapping");
@@ -362,8 +370,8 @@
"namespace");
String prefix = nl[i].getAttributeNS(null,
"prefix");
-
- log.debug("Now I try to bind " + prefix + " to " + namespace);
+ if (log.isDebugEnabled())
+ log.debug("Now I try to bind " + prefix + " to " + namespace);
org.apache.xml.security.utils.ElementProxy
.setDefaultPrefix(namespace, prefix);
}
@@ -374,24 +382,21 @@
long XX_init_end = System.currentTimeMillis();
//J-
- log.error("XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
- log.error(" XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
- log.error(" XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
-
- log.error(" XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
- log.error(" XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
- log.error(" XX_configure_reg_here " + ((int)(XX_configure_reg_here_end- XX_configure_reg_here_start)) + " ms");
- log.error(" XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
-
-
- log.error(" XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
-
- log.error(" XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
- log.error(" XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
- log.error(" XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
- log.error(" XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
- log.error(" XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
- //J+
+ if (log.isDebugEnabled()) {
+ log.error("XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
+ log.error(" XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
+ log.error(" XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
+ log.error(" XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
+ log.error(" XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
+ log.error(" XX_configure_reg_here " + ((int)(XX_configure_reg_here_end- XX_configure_reg_here_start)) + " ms");
+ log.error(" XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
+ log.error(" XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
+ log.error(" XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
+ log.error(" XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
+ log.error(" XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
+ log.error(" XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
+ log.error(" XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
+ }
} catch (Exception e) {
log.fatal("Bad: ", e);
e.printStackTrace();
@@ -410,7 +415,8 @@
*/
{
FunctionTable.installFunction("here", new FuncHere());
- log.debug("Registered class " + FuncHere.class.getName()
+ if (log.isDebugEnabled())
+ log.debug("Registered class " + FuncHere.class.getName()
+ " for XPath function 'here()' function in internal table");
/* The following tweak by "Eric Olson" <eg...@alum.mit.edu>
@@ -427,7 +433,8 @@
FuncLoader loader = m_functions[i];
if (loader != null) {
- log.debug("Func " + i + " " + loader.getName());
+ if (log.isDebugEnabled())
+ log.debug("Func " + i + " " + loader.getName());
if (loader.getName().equals(funcHereLoader.getName())) {
m_functions[i] = funcHereLoader;
1.19 +15 -12 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- IdResolver.java 3 Aug 2004 18:01:22 -0000 1.18
+++ IdResolver.java 25 Sep 2004 19:42:23 -0000 1.19
@@ -194,7 +194,8 @@
* @return the element obtained by the Id, or null if it is not found.
*/
private static Element getElementByIdUsingDOM(Document doc, String id) {
- log.debug("getElementByIdUsingDOM() Search for ID " + id);
+ if (log.isDebugEnabled())
+ log.debug("getElementByIdUsingDOM() Search for ID " + id);
return doc.getElementById(id);
}
@@ -206,7 +207,8 @@
* @return the element obtained by the Id, or null if it is not found.
*/
private static Element getElementByIdType(Document doc, String id) {
- log.debug("getElementByIdType() Search for ID " + id);
+ if (log.isDebugEnabled())
+ log.debug("getElementByIdType() Search for ID " + id);
WeakHashMap elementMap = (WeakHashMap) docMap.get(doc);
if (elementMap != null) {
WeakReference weakReference = (WeakReference) elementMap.get(id);
@@ -228,8 +230,8 @@
*/
private static Element getElementByIdInDSNamespace(Document doc, String id
,CachedXPathAPI cx) {
-
- log.debug("getElementByIdInDSNamespace() Search for ID " + id);
+ if (log.isDebugEnabled())
+ log.debug("getElementByIdInDSNamespace() Search for ID " + id);
try {
Element nscontext = XMLUtils.createDSctx(doc, "ds",
@@ -273,8 +275,8 @@
*/
private static Element getElementByIdInXENCNamespace(Document doc,
String id, CachedXPathAPI cx) {
-
- log.debug("getElementByIdInXENCNamespace() Search for ID " + id);
+ if (log.isDebugEnabled())
+ log.debug("getElementByIdInXENCNamespace() Search for ID " + id);
try {
Element nscontext =
@@ -302,8 +304,8 @@
*/
private static Element getElementByIdInSOAPSignatureNamespace(Document doc,
String id, CachedXPathAPI cx) {
-
- log.debug("getElementByIdInSOAPSignatureNamespace() Search for ID " + id);
+ if (log.isDebugEnabled())
+ log.debug("getElementByIdInSOAPSignatureNamespace() Search for ID " + id);
try {
Element nscontext = XMLUtils.createDSctx(
@@ -340,7 +342,8 @@
<attribute name="RequestID" type="ID" use="optional"/>
<attribute name="ResponseID" type="ID" use="required"/>
*/
- log.debug("getElementByIdInXKMSNamespace() Search for ID " + id);
+ if (log.isDebugEnabled())
+ log.debug("getElementByIdInXKMSNamespace() Search for ID " + id);
try {
Element nscontext =
@@ -378,8 +381,8 @@
*/
private static Element getElementByIdUnsafeMatchByIdName(Document doc,
String id, CachedXPathAPI cx) {
-
- log.debug("getElementByIdUnsafeMatchByIdName() Search for ID " + id);
+ if (log.isDebugEnabled())
+ log.debug("getElementByIdUnsafeMatchByIdName() Search for ID " + id);
try {
Element element_Id = (Element) cx.selectSingleNode(doc,
1.10 +6 -4 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JavaUtils.java 24 Sep 2004 20:54:27 -0000 1.9
+++ JavaUtils.java 25 Sep 2004 19:42:23 -0000 1.10
@@ -281,17 +281,19 @@
long lFreeMemAfter = runtime.freeMemory();
long lTotalMemAfter = runtime.totalMemory();
- log.debug("* Garbage collection took " + time + " seconds.");
- log.debug("* Memory before gc()... free:" + lFreeMemBefore + "= "
+ if (log.isDebugEnabled()) {
+ 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");
- log.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");
- log.debug("</METHOD>");
+ log.debug("</METHOD>");
+ }
}
}
1.44 +6 -3 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- XMLUtils.java 23 Sep 2004 20:23:19 -0000 1.43
+++ XMLUtils.java 25 Sep 2004 19:42:23 -0000 1.44
@@ -73,7 +73,8 @@
}
getSetRec(rootNode,result,exclude,com);
}
- static void getSetRec(Node rootNode,Set result,Node exclude ,boolean com) {
+ static final void getSetRec(final Node rootNode,final Set result,
+ final Node exclude ,final boolean com) {
//Set result = new HashSet();
if (rootNode==exclude) {
return;
@@ -350,8 +351,10 @@
* @param log
*/
public static void spitOutVersions(org.apache.commons.logging.Log log) {
- log.debug(XMLUtils.getXercesVersion());
- log.debug(XMLUtils.getXalanVersion());
+ if (log.isDebugEnabled()) {
+ log.debug(XMLUtils.getXercesVersion());
+ log.debug(XMLUtils.getXalanVersion());
+ }
}
/** Field nodeTypeString */
1.8 +5 -4 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CertsInFilesystemDirectoryResolver.java 24 Sep 2004 20:54:29 -0000 1.7
+++ CertsInFilesystemDirectoryResolver.java 25 Sep 2004 19:42:23 -0000 1.8
@@ -139,7 +139,8 @@
}
if (added) {
- log.debug("Added certificate: " + dn);
+ if (log.isDebugEnabled())
+ log.debug("Added certificate: " + dn);
}
}
}
1.12 +3 -2 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLX509SKI.java 24 Sep 2004 20:54:29 -0000 1.11
+++ XMLX509SKI.java 25 Sep 2004 19:42:23 -0000 1.12
@@ -195,7 +195,8 @@
byte abyte0[] = new byte[derEncodedValue.length - 4];
System.arraycopy(derEncodedValue, 4, abyte0, 0, abyte0.length);
*/
- log.debug("Base64 of SKI is " + Base64.encode(abyte0));
+ if (log.isDebugEnabled())
+ log.debug("Base64 of SKI is " + Base64.encode(abyte0));
return abyte0;
} catch (IOException ex) {
1.11 +3 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLX509IssuerSerial.java 24 Sep 2004 20:54:29 -0000 1.10
+++ XMLX509IssuerSerial.java 25 Sep 2004 19:42:23 -0000 1.11
@@ -121,8 +121,8 @@
String text =
this.getTextFromChildElement(Constants._TAG_X509SERIALNUMBER,
Constants.SignatureSpecNS);
-
- log.debug("In dem X509SerialNumber wurde gefunden: " + text);
+ if (log.isDebugEnabled())
+ log.debug("In dem X509SerialNumber wurde gefunden: " + text);
return new BigInteger(text);
}
1.9 +6 -6 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TransformXPath2Filter04.java 24 Sep 2004 20:54:28 -0000 1.8
+++ TransformXPath2Filter04.java 25 Sep 2004 19:42:23 -0000 1.9
@@ -90,8 +90,8 @@
try {
Set inputSet = input.getNodeSet();
-
- log.debug("perform xfilter2 on " + inputSet.size() + " nodes");
+ if (log.isDebugEnabled())
+ log.debug("perform xfilter2 on " + inputSet.size() + " nodes");
CachedXPathFuncHereAPI xPathFuncHereAPI =
new CachedXPathFuncHereAPI(input.getCachedXPathAPI().getCachedXPathAPI());
@@ -123,8 +123,8 @@
xpathContainer.getXPathFilterTextNode(),
CachedXPathFuncHereAPI.getStrFromNode(xpathContainer.getXPathFilterTextNode()),
xpathContainer.getElement());
-
- log.debug("subtreeRoots contains " + subtreeRoots.getLength()
+ if (log.isDebugEnabled())
+ log.debug("subtreeRoots contains " + subtreeRoots.getLength()
+ " nodes");
/*
@@ -157,8 +157,8 @@
throw new RuntimeException("unknown node type: " + currentRootNodeType + " " + currentRootNode);
}
}
-
- log.debug("selection process identified " + selectedNodes.size()
+ if (log.isDebugEnabled())
+ log.debug("selection process identified " + selectedNodes.size()
+ " nodes");
Set resultNodes = new HashSet();