You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by th...@apache.org on 2011/02/19 09:18:32 UTC
svn commit: r1072267 - in
/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart:
./ builder/ policy/ util/
Author: thilinamb
Date: Sat Feb 19 08:18:32 2011
New Revision: 1072267
URL: http://svn.apache.org/viewvc?rev=1072267&view=rev
Log:
improving logging in Rampart Core and Rampart Policy moduels.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java Sat Feb 19 08:18:32 2011
@@ -52,6 +52,7 @@ import javax.xml.namespace.QName;
public class MessageBuilder {
private static Log log = LogFactory.getLog(MessageBuilder.class);
+ private static boolean doDebug = log.isDebugEnabled();
public void build(MessageContext msgCtx) throws WSSPolicyException,
RampartException, WSSecurityException, AxisFault {
@@ -135,13 +136,17 @@ public class MessageBuilder {
}
if(rpd.isTransportBinding()) {
- log.debug("Building transport binding");
- TransportBindingBuilder building = new TransportBindingBuilder();
- building.build(rmd);
+ if (doDebug) {
+ log.debug("Building transport binding");
+ }
+ TransportBindingBuilder building = new TransportBindingBuilder();
+ building.build(rmd);
} else if(rpd.isSymmetricBinding()) {
- log.debug("Building SymmetricBinding");
- SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
- builder.build(rmd);
+ if (doDebug) {
+ log.debug("Building SymmetricBinding");
+ }
+ SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
+ builder.build(rmd);
} else {
AsymmetricBindingBuilder builder = new AsymmetricBindingBuilder();
builder.build(rmd);
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java Sat Feb 19 08:18:32 2011
@@ -815,7 +815,9 @@ public class PolicyBasedResultsValidator
}
}
- log.debug("WSHandler: Certificate path could not be verified for certificate with subject " + subjectString);
+ if (doDebug) {
+ log.debug("WSHandler: Certificate path could not be verified for certificate with subject " + subjectString);
+ }
return false;
}
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java Sat Feb 19 08:18:32 2011
@@ -53,7 +53,8 @@ public class AsymmetricBindingBuilder ex
private static Log log = LogFactory.getLog(AsymmetricBindingBuilder.class);
private static Log tlog = LogFactory.getLog(RampartConstants.TIME_LOG);
- private boolean dotDebug = false;
+ private static boolean doDebug = log.isDebugEnabled();
+ private static boolean dotDebug = tlog.isDebugEnabled();
private Token sigToken;
@@ -77,12 +78,10 @@ public class AsymmetricBindingBuilder ex
private Element signatureElement;
- public AsymmetricBindingBuilder(){
- dotDebug = tlog.isDebugEnabled();
- }
-
public void build(RampartMessageData rmd) throws RampartException {
- log.debug("AsymmetricBindingBuilder build invoked");
+ if (doDebug) {
+ log.debug("AsymmetricBindingBuilder build invoked");
+ }
RampartPolicyData rpd = rmd.getPolicyData();
if (rpd.isIncludeTimestamp()) {
@@ -95,7 +94,9 @@ public class AsymmetricBindingBuilder ex
this.doSignBeforeEncrypt(rmd);
}
- log.debug("AsymmetricBindingBuilder build invoked : DONE");
+ if (doDebug) {
+ log.debug("AsymmetricBindingBuilder build invoked : DONE");
+ }
}
private void doEncryptBeforeSig(RampartMessageData rmd)
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java Sat Feb 19 08:18:32 2011
@@ -70,7 +70,8 @@ import java.util.Map.Entry;
public abstract class BindingBuilder {
private static Log log = LogFactory.getLog(BindingBuilder.class);
-
+ private static boolean doDebug = log.isDebugEnabled();
+
private Element insertionLocation;
protected String mainSigId = null;
@@ -86,8 +87,10 @@ public abstract class BindingBuilder {
* @param rmd
*/
protected void addTimestamp(RampartMessageData rmd) {
- log.debug("Adding timestamp");
-
+ if (doDebug) {
+ log.debug("Adding timestamp");
+ }
+
WSSecTimestamp timestampBuilder = new WSSecTimestamp();
timestampBuilder.setWsConfig(rmd.getConfig());
@@ -97,13 +100,17 @@ public abstract class BindingBuilder {
timestampBuilder.build(rmd.getDocument(), rmd
.getSecHeader());
-
- log.debug("Timestamp id: " + timestampBuilder.getId());
+
+ if (doDebug) {
+ log.debug("Timestamp id: " + timestampBuilder.getId());
+ }
rmd.setTimestampId(timestampBuilder.getId());
this.timestampElement = timestampBuilder.getElement();
- log.debug("Adding timestamp: DONE");
+ if (doDebug) {
+ log.debug("Adding timestamp: DONE");
+ }
}
/**
@@ -113,9 +120,11 @@ public abstract class BindingBuilder {
* @throws RampartException
*/
protected WSSecUsernameToken addUsernameToken(RampartMessageData rmd, UsernameToken token) throws RampartException {
-
- log.debug("Adding a UsernameToken");
-
+
+ if (doDebug) {
+ log.debug("Adding a UsernameToken");
+ }
+
RampartPolicyData rpd = rmd.getPolicyData();
//Get the user
@@ -130,8 +139,10 @@ public abstract class BindingBuilder {
}
if(user != null && !"".equals(user)) {
- log.debug("User : " + user);
-
+ if (doDebug) {
+ log.debug("User : " + user);
+ }
+
// If NoPassword property is set we don't need to set the password
if (token.isNoPassword()) {
WSSecUsernameToken utBuilder = new WSSecUsernameToken();
@@ -170,9 +181,11 @@ public abstract class BindingBuilder {
//get the password
password = cb[0].getPassword();
}
-
- log.debug("Password : " + password);
-
+
+ if (doDebug) {
+ log.debug("Password : " + password);
+ }
+
if(password != null && !"".equals(password)) {
//If the password is available then build the token
@@ -196,7 +209,9 @@ public abstract class BindingBuilder {
}
} else {
- log.debug("No user value specified in the configuration");
+ if (doDebug) {
+ log.debug("No user value specified in the configuration");
+ }
throw new RampartException("userMissing");
}
@@ -258,9 +273,11 @@ public abstract class BindingBuilder {
WSSecSignature sig = new WSSecSignature();
checkForX509PkiPath(sig, token);
sig.setWsConfig(rmd.getConfig());
-
- log.debug("Token inclusion: " + token.getInclusion());
-
+
+ if (doDebug) {
+ log.debug("Token inclusion: " + token.getInclusion());
+ }
+
RampartUtil.setKeyIdentifierType(rmd, sig, token);
String user = null;
@@ -283,8 +300,10 @@ public abstract class BindingBuilder {
String password = null;
if(user != null && !"".equals(user)) {
- log.debug("User : " + user);
-
+ if (doDebug) {
+ log.debug("User : " + user);
+ }
+
//Get the password
CallbackHandler handler = RampartUtil.getPasswordCB(rmd);
@@ -300,7 +319,9 @@ public abstract class BindingBuilder {
handler.handle(cb);
if(cb[0].getPassword() != null && !"".equals(cb[0].getPassword())) {
password = cb[0].getPassword();
- log.debug("Password : " + password);
+ if (doDebug) {
+ log.debug("Password : " + password);
+ }
} else {
//If there's no password then throw an exception
throw new RampartException("noPasswordForUser",
@@ -315,7 +336,9 @@ public abstract class BindingBuilder {
}
} else {
- log.debug("No user value specified in the configuration");
+ if (doDebug) {
+ log.debug("No user value specified in the configuration");
+ }
throw new RampartException("userMissing");
}
@@ -347,8 +370,10 @@ public abstract class BindingBuilder {
if(suppTokens != null && suppTokens.getTokens() != null &&
suppTokens.getTokens().size() > 0) {
- log.debug("Processing supporting tokens");
-
+ if (doDebug) {
+ log.debug("Processing supporting tokens");
+ }
+
ArrayList tokens = suppTokens.getTokens();
for (Iterator iter = tokens.iterator(); iter.hasNext();) {
Token token = (Token) iter.next();
@@ -782,7 +807,7 @@ public abstract class BindingBuilder {
// prepare a SignatureConfirmation token
WSSecSignatureConfirmation wsc = new WSSecSignatureConfirmation();
if (signatureActions.size() > 0) {
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Signature Confirmation: number of Signature results: "
+ signatureActions.size());
}
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java Sat Feb 19 08:18:32 2011
@@ -63,17 +63,15 @@ public class SymmetricBindingBuilder ext
private static Log log = LogFactory.getLog(SymmetricBindingBuilder.class);
private static Log tlog = LogFactory.getLog(RampartConstants.TIME_LOG);
- private boolean dotDebug = false;
-
-
- public SymmetricBindingBuilder(){
- dotDebug = tlog.isDebugEnabled();
- }
-
+ private static boolean dotDebug = tlog.isDebugEnabled();
+ private static boolean doDebug = log.isDebugEnabled();
+
public void build(RampartMessageData rmd) throws RampartException {
-
- log.debug("SymmetricBindingBuilder build invoked");
-
+
+ if (doDebug) {
+ log.debug("SymmetricBindingBuilder build invoked");
+ }
+
RampartPolicyData rpd = rmd.getPolicyData();
if(rpd.isIncludeTimestamp()) {
this.addTimestamp(rmd);
@@ -91,9 +89,11 @@ public class SymmetricBindingBuilder ext
this.doSignBeforeEncrypt(rmd);
}
-
- log.debug("SymmetricBindingBuilder build invoked : DONE");
-
+
+ if (doDebug) {
+ log.debug("SymmetricBindingBuilder build invoked : DONE");
+ }
+
}
private void doEncryptBeforeSig(RampartMessageData rmd) throws RampartException {
@@ -125,10 +125,14 @@ public class SymmetricBindingBuilder ext
if(encryptionToken instanceof IssuedToken) {
tokenId = rmd.getIssuedEncryptionTokenId();
- log.debug("Issued EncryptionToken Id : " + tokenId);
+ if (doDebug) {
+ log.debug("Issued EncryptionToken Id : " + tokenId);
+ }
} else if(encryptionToken instanceof SecureConversationToken) {
tokenId = rmd.getSecConvTokenId();
- log.debug("SCT Id : " + tokenId);
+ if (doDebug) {
+ log.debug("SCT Id : " + tokenId);
+ }
} else if (encryptionToken instanceof X509Token) {
if (rmd.isInitiator()) {
tokenId = setupEncryptedKey(rmd, encryptionToken);
@@ -176,8 +180,10 @@ public class SymmetricBindingBuilder ext
AlgorithmSuite algorithmSuite = rpd.getAlgorithmSuite();
if(encryptionToken.isDerivedKeys()) {
- log.debug("Use drived keys");
-
+ if (doDebug) {
+ log.debug("Use drived keys");
+ }
+
dkEncr = new WSSecDKEncrypt();
if(attached && tok.getAttachedReference() != null) {
@@ -208,7 +214,9 @@ public class SymmetricBindingBuilder ext
throw new RampartException("errorInDKEncr");
}
} else {
- log.debug("NO derived keys, use the shared secret");
+ if (doDebug) {
+ log.debug("NO derived keys, use the shared secret");
+ }
encr = new WSSecEncrypt();
encr.setWsConfig(rmd.getConfig());
@@ -341,7 +349,9 @@ public class SymmetricBindingBuilder ext
if(dotDebug){
t3 = System.currentTimeMillis();
}
- log.debug("Signature protection");
+ if (doDebug) {
+ log.debug("Signature protection");
+ }
Vector secondEncrParts = new Vector();
//Now encrypt the signature using the above token
@@ -809,7 +819,6 @@ public class SymmetricBindingBuilder ext
/**
* Setup the required tokens
* @param rmd
- * @param rpd
* @throws RampartException
*/
private void initializeTokens(RampartMessageData rmd) throws RampartException {
@@ -818,19 +827,25 @@ public class SymmetricBindingBuilder ext
MessageContext msgContext = rmd.getMsgContext();
if(rpd.isSymmetricBinding() && !msgContext.isServerSide()) {
- log.debug("Processing symmetric binding: " +
- "Setting up encryption token and signature token");
+ if (doDebug) {
+ log.debug("Processing symmetric binding: " +
+ "Setting up encryption token and signature token");
+ }
//Setting up encryption token and signature token
Token sigTok = rpd.getSignatureToken();
Token encrTok = rpd.getEncryptionToken();
if(sigTok instanceof IssuedToken) {
-
- log.debug("SignatureToken is an IssuedToken");
-
+
+ if (doDebug) {
+ log.debug("SignatureToken is an IssuedToken");
+ }
+
if(rmd.getIssuedSignatureTokenId() == null) {
- log.debug("No Issuedtoken found, requesting a new token");
-
+ if (doDebug) {
+ log.debug("No Issuedtoken found, requesting a new token");
+ }
+
IssuedToken issuedToken = (IssuedToken)sigTok;
String id = RampartUtil.getIssuedToken(rmd,
@@ -840,9 +855,11 @@ public class SymmetricBindingBuilder ext
}
} else if(sigTok instanceof SecureConversationToken) {
-
- log.debug("SignatureToken is a SecureConversationToken");
-
+
+ if (doDebug) {
+ log.debug("SignatureToken is a SecureConversationToken");
+ }
+
//TODO check for an existing token and use it
String secConvTokenId = rmd.getSecConvTokenId();
@@ -871,10 +888,12 @@ public class SymmetricBindingBuilder ext
if (secConvTokenId == null
|| (secConvTokenId != null &&
(!RampartUtil.isTokenValid(rmd, secConvTokenId) && !cancelReqResp))) {
-
- log.debug("No SecureConversationToken found, " +
- "requesting a new token");
-
+
+ if (doDebug) {
+ log.debug("No SecureConversationToken found, " +
+ "requesting a new token");
+ }
+
SecureConversationToken secConvTok =
(SecureConversationToken) sigTok;
@@ -892,21 +911,27 @@ public class SymmetricBindingBuilder ext
//If it was the ProtectionToken assertion then sigTok is the
//same as encrTok
if(sigTok.equals(encrTok) && sigTok instanceof IssuedToken) {
-
- log.debug("Symmetric binding uses a ProtectionToken, both" +
- " SignatureToken and EncryptionToken are the same");
-
+
+ if (doDebug) {
+ log.debug("Symmetric binding uses a ProtectionToken, both" +
+ " SignatureToken and EncryptionToken are the same");
+ }
+
rmd.setIssuedEncryptionTokenId(rmd.getIssuedEncryptionTokenId());
} else {
//Now we'll have to obtain the encryption token as well :-)
//ASSUMPTION: SecureConversationToken is used as a
//ProtectionToken therefore we only have to process a issued
//token here
-
- log.debug("Obtaining the Encryption Token");
+
+ if (doDebug) {
+ log.debug("Obtaining the Encryption Token");
+ }
if(rmd.getIssuedEncryptionTokenId() != null) {
-
- log.debug("EncrytionToken not alredy set");
+
+ if (doDebug) {
+ log.debug("EncrytionToken not alredy set");
+ }
IssuedToken issuedToken = (IssuedToken)encrTok;
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java Sat Feb 19 08:18:32 2011
@@ -16,10 +16,6 @@
package org.apache.rampart.builder;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Vector;
-
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.context.MessageContext;
@@ -54,20 +50,23 @@ import org.apache.ws.security.message.WS
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
+
public class TransportBindingBuilder extends BindingBuilder {
private static Log log = LogFactory.getLog(TransportBindingBuilder.class);
private static Log tlog = LogFactory.getLog(RampartConstants.TIME_LOG);
- private boolean dotDebug = false;
-
- public TransportBindingBuilder(){
- dotDebug = tlog.isDebugEnabled();
- }
+ private static boolean dotDebug = tlog.isDebugEnabled();
+ private static boolean doDebug = log.isDebugEnabled();
public void build(RampartMessageData rmd) throws RampartException {
-
- log.debug("TransportBindingBuilder build invoked");
-
+
+ if (doDebug) {
+ log.debug("TransportBindingBuilder build invoked");
+ }
+
long t0 = 0, t1 = 0;
if(dotDebug){
t1 = System.currentTimeMillis();
@@ -89,9 +88,11 @@ public class TransportBindingBuilder ext
if(sgndSuppTokens != null && sgndSuppTokens.getTokens() != null &&
sgndSuppTokens.getTokens().size() > 0) {
-
- log.debug("Processing signed supporting tokens");
-
+
+ if (doDebug) {
+ log.debug("Processing signed supporting tokens");
+ }
+
ArrayList tokens = sgndSuppTokens.getTokens();
for (Iterator iter = tokens.iterator(); iter.hasNext();) {
@@ -115,9 +116,11 @@ public class TransportBindingBuilder ext
SupportingToken sgndEndSuppTokens = rpd.getSignedEndorsingSupportingTokens();
if(sgndEndSuppTokens != null && sgndEndSuppTokens.getTokens() != null &&
sgndEndSuppTokens.getTokens().size() > 0) {
-
- log.debug("Processing endorsing signed supporting tokens");
-
+
+ if (doDebug) {
+ log.debug("Processing endorsing signed supporting tokens");
+ }
+
ArrayList tokens = sgndEndSuppTokens.getTokens();
SignedEncryptedParts signdParts = sgndEndSuppTokens.getSignedParts();
for (Iterator iter = tokens.iterator(); iter.hasNext();) {
@@ -133,7 +136,9 @@ public class TransportBindingBuilder ext
SupportingToken endSupptokens = rpd.getEndorsingSupportingTokens();
if(endSupptokens != null && endSupptokens.getTokens() != null &&
endSupptokens.getTokens().size() > 0) {
- log.debug("Processing endorsing supporting tokens");
+ if (doDebug) {
+ log.debug("Processing endorsing supporting tokens");
+ }
ArrayList tokens = endSupptokens.getTokens();
SignedEncryptedParts signdParts = endSupptokens.getSignedParts();
for (Iterator iter = tokens.iterator(); iter.hasNext();) {
@@ -614,10 +619,12 @@ public class TransportBindingBuilder ext
if (secConvTokenId == null
|| (secConvTokenId != null &&
(!RampartUtil.isTokenValid(rmd, secConvTokenId) && !cancelReqResp))) {
-
- log.debug("No SecureConversationToken found, " +
- "requesting a new token");
-
+
+ if (doDebug) {
+ log.debug("No SecureConversationToken found, " +
+ "requesting a new token");
+ }
+
try {
secConvTokenId = RampartUtil.getSecConvToken(rmd, secConvTok);
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java Sat Feb 19 08:18:32 2011
@@ -49,7 +49,8 @@ import java.util.List;
public class RampartPolicyBuilder {
private static Log log = LogFactory.getLog(RampartPolicyBuilder.class);
-
+ private static boolean doDebug = log.isDebugEnabled();
+
/**
* Compile the parsed security data into one Policy data block.
*
@@ -110,8 +111,10 @@ public class RampartPolicyBuilder {
} else if (assertion instanceof MTOMAssertion){
processMTOMSerialization((MTOMAssertion)assertion, rpd);
} else {
- log.debug("Unknown top level PED found: "
- + assertion.getClass().getName());
+ if (doDebug) {
+ log.debug("Unknown top level PED found: "
+ + assertion.getClass().getName());
+ }
}
}
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1072267&r1=1072266&r2=1072267&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Sat Feb 19 08:18:32 2011
@@ -97,6 +97,7 @@ public class RampartUtil {
private static final String CRYPTO_PROVIDER = "org.apache.ws.security.crypto.provider";
private static Log log = LogFactory.getLog(RampartUtil.class);
+ private static boolean doDebug = log.isDebugEnabled();
private static Map<String, CachedCrypto> cryptoStore = new ConcurrentHashMap<String, CachedCrypto>();
@@ -133,7 +134,9 @@ public class RampartUtil {
String cbHandlerClass = rpd.getRampartConfig().getPwCbClass();
ClassLoader classLoader = msgContext.getAxisService().getClassLoader();
- log.debug("loading class : " + cbHandlerClass);
+ if (doDebug) {
+ log.debug("loading class : " + cbHandlerClass);
+ }
Class cbClass;
try {
@@ -180,7 +183,9 @@ public class RampartUtil {
String cbHandlerClass = rpd.getRampartConfig().getPolicyValidatorCbClass();
ClassLoader classLoader = msgContext.getAxisService().getClassLoader();
- log.debug("loading class : " + cbHandlerClass);
+ if (doDebug) {
+ log.debug("loading class : " + cbHandlerClass);
+ }
Class cbClass;
try {
@@ -213,7 +218,9 @@ public class RampartUtil {
String cbHandlerClass = rpd.getRampartConfig().getRampartConfigCbClass();
ClassLoader classLoader = msgContext.getAxisService().getClassLoader();
- log.debug("loading class : " + cbHandlerClass);
+ if (doDebug) {
+ log.debug("loading class : " + cbHandlerClass);
+ }
Class cbClass;
try {
@@ -292,7 +299,7 @@ public class RampartUtil {
public static Crypto getEncryptionCrypto(RampartConfig config, ClassLoader loader)
throws RampartException {
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Loading encryption crypto");
}
@@ -301,7 +308,7 @@ public class RampartUtil {
if (config != null && config.getEncrCryptoConfig() != null) {
CryptoConfig cryptoConfig = config.getEncrCryptoConfig();
String provider = cryptoConfig.getProvider();
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Using provider: " + provider);
}
Properties prop = cryptoConfig.getProp();
@@ -334,7 +341,7 @@ public class RampartUtil {
}
}
} else {
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Trying the signature crypto info");
}
crypto = getSignatureCrypto(config, loader);
@@ -353,7 +360,7 @@ public class RampartUtil {
public static Crypto getSignatureCrypto(RampartConfig config, ClassLoader loader)
throws RampartException {
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Loading Signature crypto");
}
@@ -362,7 +369,7 @@ public class RampartUtil {
if (config != null && config.getSigCryptoConfig() != null) {
CryptoConfig cryptoConfig = config.getSigCryptoConfig();
String provider = cryptoConfig.getProvider();
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Using provider: " + provider);
}
Properties prop = cryptoConfig.getProp();
@@ -513,7 +520,9 @@ public class RampartUtil {
public static OMElement createRSTTempalteForSCT(int conversationVersion,
int wstVersion) throws RampartException {
try {
- log.debug("Creating RSTTemplate for an SCT request");
+ if (doDebug) {
+ log.debug("Creating RSTTemplate for an SCT request");
+ }
OMFactory fac = OMAbstractFactory.getOMFactory();
OMNamespace wspNs = fac.createOMNamespace(SPConstants.P_NS, "wsp");
@@ -617,7 +626,9 @@ public class RampartUtil {
Policy bsPol = secConvTok.getBootstrapPolicy();
if(bsPol != null) {
- log.debug("BootstrapPolicy found");
+ if (doDebug) {
+ log.debug("BootstrapPolicy found");
+ }
bsPol.addAssertion(rmd.getPolicyData().getRampartConfig());
//copy the <wsoma:OptimizedMimeSerialization/> to BootstrapPolicy
if (rmd.getPolicyData().getMTOMAssertion() != null) {
@@ -626,14 +637,18 @@ public class RampartUtil {
stsPolicy = bsPol;
} else {
//No bootstrap policy use issuer policy
- log.debug("No bootstrap policy, using issuer policy");
+ if (doDebug) {
+ log.debug("No bootstrap policy, using issuer policy");
+ }
stsPolicy = rmd.getPolicyData().getIssuerPolicy();
}
String id = getToken(rmd, rstTemplate,
issuerEprAddress, action, stsPolicy);
- log.debug("SecureConversationToken obtained: id=" + id);
+ if (doDebug) {
+ log.debug("SecureConversationToken obtained: id=" + id);
+ }
return id;
}
@@ -673,7 +688,9 @@ public class RampartUtil {
String id = getToken(rmd, rstTemplate, issuerEprAddress, action,
stsPolicy);
- log.debug("Issued token obtained: id=" + id);
+ if (doDebug) {
+ log.debug("Issued token obtained: id=" + id);
+ }
return id;
} catch (TrustException e) {
throw new RampartException("errorInObtainingToken", e);
@@ -1725,18 +1742,18 @@ public class RampartUtil {
if (refreshInterval != null) {
if (cachedCrypto.creationTime + new Long(refreshInterval).longValue() > Calendar
.getInstance().getTimeInMillis()) {
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Cache Hit : Crypto Object was found in cache.");
}
return cachedCrypto.crypto;
} else {
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Cache Miss : Crypto Object found in cache is expired.");
}
return null;
}
} else {
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Cache Hit : Crypto Object was found in cache.");
}
return cachedCrypto.crypto;
@@ -1744,7 +1761,7 @@ public class RampartUtil {
}
// cache miss
else {
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Cache Miss : Crypto Object was not found in cache.");
}
return null;
@@ -1754,7 +1771,7 @@ public class RampartUtil {
private static void cacheCrypto(String cryptoKey, Crypto crypto) {
cryptoStore.put(cryptoKey, new CachedCrypto(crypto, Calendar.getInstance()
.getTimeInMillis()));
- if (log.isDebugEnabled()) {
+ if (doDebug) {
log.debug("Crypto object is inserted into the Cache.");
}