From 9478044e7b285cce33d67e113e0f0255388d4b67 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Wed, 21 Feb 2007 21:47:07 +0000 Subject: [PATCH] Continuation of changes to switch to log4j from System.err. --- .../com/novell/casa/jaas/CasaLoginModule.java | 12 +-- .../casa/authtoksvc/AuthMechConfig.java | 12 +-- .../novell/casa/authtoksvc/AuthReqMsg.java | 24 +++--- .../com/novell/casa/authtoksvc/AuthToken.java | 21 +++-- .../casa/authtoksvc/AuthTokenConfig.java | 32 ++++---- .../casa/authtoksvc/CasaIdentityToken.java | 76 +++++++++---------- .../casa/authtoksvc/EnabledSvcsConfig.java | 46 +++++------ .../novell/casa/authtoksvc/GetAuthPolicy.java | 10 +-- .../casa/authtoksvc/GetAuthPolicyReqMsg.java | 20 ++--- .../casa/authtoksvc/GetAuthTokReqMsg.java | 24 +++--- .../novell/casa/authtoksvc/GetAuthToken.java | 10 +-- .../casa/authtoksvc/IdenTokenConfig.java | 22 +++--- .../casa/authtoksvc/Krb5Authenticate.java | 18 ++--- .../casa/authtoksvc/PwdAuthenticate.java | 16 ++-- .../novell/casa/authtoksvc/RealmsInfo.java | 2 +- .../src/com/novell/casa/authtoksvc/Rpc.java | 24 +++--- .../novell/casa/authtoksvc/SessionToken.java | 6 +- .../com/novell/casa/authtoksvc/SvcConfig.java | 45 ++++++----- .../novell/casa/authtoksvc/WSSecurity.java | 6 +- 19 files changed, 212 insertions(+), 214 deletions(-) diff --git a/CASA-auth-token/server-java/Jaas/src/com/novell/casa/jaas/CasaLoginModule.java b/CASA-auth-token/server-java/Jaas/src/com/novell/casa/jaas/CasaLoginModule.java index 6297f00f..bfe4279b 100644 --- a/CASA-auth-token/server-java/Jaas/src/com/novell/casa/jaas/CasaLoginModule.java +++ b/CASA-auth-token/server-java/Jaas/src/com/novell/casa/jaas/CasaLoginModule.java @@ -100,7 +100,7 @@ public final class CasaLoginModule implements LoginModule } catch (Exception e) { - m_log.error("CasaLoginModule.commit()- Exception caught associating principal, msg: " + e.getMessage()); + m_log.error("commit()- Exception caught associating principal, msg: " + e.getMessage()); throw new LoginException("Error encountered"); } } @@ -123,7 +123,7 @@ public final class CasaLoginModule implements LoginModule // Verify that a CallbackHandler was specified if (m_callbackHandler == null) { - m_log.error("CasaLoginModule.login()- Null CallbackHandler"); + m_log.error("login()- Null CallbackHandler"); throw new LoginException("Null CallbackHandler"); } @@ -157,7 +157,7 @@ public final class CasaLoginModule implements LoginModule } catch (Exception e) { - m_log.warn("CasaLoginModule.login()- Exception caught during nameCallback, msg: " + e.getMessage()); + m_log.warn("login()- Exception caught during nameCallback, msg: " + e.getMessage()); } // Check the username @@ -191,7 +191,7 @@ public final class CasaLoginModule implements LoginModule } catch (Exception e) { - m_log.warn("CasaLoginModule.login()- Exception caught during passwordCallback, msg: " + e.getMessage()); + m_log.warn("login()- Exception caught during passwordCallback, msg: " + e.getMessage()); } // Check the CasaAuthenticationToken @@ -213,14 +213,14 @@ public final class CasaLoginModule implements LoginModule catch (Exception e) { // The validation of one of the tokens failed - m_log.info("CasaLoginModule.login()- Exception caught during token processing, msg: " + e.getMessage()); + m_log.info("login()- Exception caught during token processing, msg: " + e.getMessage()); throw new FailedLoginException("Token validation failed"); } } else { // Token not provided - m_log.warn("CasaLoginModule.login()- Token not provided"); + m_log.warn("login()- Token not provided"); throw new FailedLoginException("CasaAuthenticationToken not obtained"); } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthMechConfig.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthMechConfig.java index eea49f9c..f9c12649 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthMechConfig.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthMechConfig.java @@ -59,7 +59,7 @@ public final class AuthMechConfig */ public AuthMechConfig() { - m_log.debug("Constructor- Default"); + m_log.debug("Constructor()- Default"); // Create a map to keep track of the token settings m_mechSettingsMap = new HashMap(); @@ -73,7 +73,7 @@ public final class AuthMechConfig */ public AuthMechConfig(String mechSettingsFileName) throws Exception { - m_log.debug("Constructor-"); + m_log.debug("Constructor()-"); // Create a map to keep track of the token settings m_mechSettingsMap = new HashMap(); @@ -96,22 +96,22 @@ public final class AuthMechConfig } catch (SAXException e) { - m_log.warn("Constructor- " + mechSettingsFileName + " format error, exception: " + e.toString()); + m_log.warn("Constructor()- " + mechSettingsFileName + " format error, exception: " + e.toString()); throw new Exception("Constructor- authtoken.settings format error", e); } catch (SecurityException e) { - m_log.warn("Constructor- SecurityException accessing " + mechSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructo()r- SecurityException accessing " + mechSettingsFileName + " Exception=" + e.toString()); throw new Exception("Constructor- Not able to access file", e); } catch (FileNotFoundException e) { - m_log.warn("Constructor- File " + mechSettingsFileName + " not found"); + m_log.warn("Constructor()- File " + mechSettingsFileName + " not found"); throw new Exception("Constructor- File not found", e); } catch (IOException e) { - m_log.warn("Constructor- IOException accessing " + mechSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- IOException accessing " + mechSettingsFileName + " Exception=" + e.toString()); throw new Exception("Constructor- Read error", e); } finally diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthReqMsg.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthReqMsg.java index 75b22066..b4275297 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthReqMsg.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthReqMsg.java @@ -102,7 +102,7 @@ public final class AuthReqMsg // Verify that we obtained all of the required elements if (m_state != DONE_PARSING) { - m_log.error("AuthReqMsg SAXHandler.endDocument()- Missing element"); + m_log.error("SAXHandler.endDocument()- Missing element"); throw new SAXException("Missing element"); } } @@ -130,7 +130,7 @@ public final class AuthReqMsg } else { - m_log.error("AuthReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -144,7 +144,7 @@ public final class AuthReqMsg } else { - m_log.error("AuthReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -158,7 +158,7 @@ public final class AuthReqMsg } else { - m_log.error("AuthReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -172,13 +172,13 @@ public final class AuthReqMsg } else { - m_log.error("AuthReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; default: - m_log.error("AuthReqMsg SAXHandler.startElement()- State error"); + m_log.error("SAXHandler.startElement()- State error"); throw new SAXException("State error"); } } @@ -205,7 +205,7 @@ public final class AuthReqMsg } else { - m_log.error("AuthReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -219,7 +219,7 @@ public final class AuthReqMsg } else { - m_log.error("AuthReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -233,7 +233,7 @@ public final class AuthReqMsg } else { - m_log.error("AuthReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -247,13 +247,13 @@ public final class AuthReqMsg } else { - m_log.error("AuthReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; default: - m_log.error("AuthReqMsg SAXHandler.endElement()- State error"); + m_log.error("SAXHandler.endElement()- State error"); throw new SAXException("State error"); } } @@ -363,7 +363,7 @@ public final class AuthReqMsg } catch (SAXException e) { - m_log.error("AuthReqMsg()- Parse exception: " + e.toString()); + m_log.error("Constructor()- Parse exception: " + e.toString()); throw new Exception("Protocol error", e); } } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthToken.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthToken.java index e7cc2038..fb4e8634 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthToken.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthToken.java @@ -141,7 +141,7 @@ public final class AuthToken } catch (Exception e) { - m_log.error("AuthToken()- Exception: " + e.toString()); + m_log.error("Constructor()- Exception: " + e.toString()); throw e; } finally @@ -161,7 +161,7 @@ public final class AuthToken } else { - m_log.error("AuthToken()- Error: Missing authentication token config for " + targetService); + m_log.error("Constructor()- Error: Missing authentication token config for " + targetService); throw new Exception("Error: Missing authentication token config for " + targetService); } } @@ -193,7 +193,7 @@ public final class AuthToken } catch (Exception e) { - m_log.warn("AuthToken()- Exception caught creating message, msg: " + e.getMessage()); + m_log.warn("Constructor()- Exception caught creating message, msg: " + e.getMessage()); throw new Exception("Invalid Authentication Token", e); } finally @@ -237,14 +237,14 @@ public final class AuthToken if (m_identityToken == null || m_identityTokenType == null) { - m_log.warn("AuthToken()- Required data missing from authentication token"); + m_log.warn("Constructor()- Required data missing from authentication token"); throw new Exception("Error: Required data missing from Authentication Token"); } } else { // Message verification failed - m_log.warn("AuthToken()- Invalid Authentication Token"); + m_log.warn("Constructor()- Invalid Authentication Token"); throw new Exception("Invalid Authentication Token"); } } @@ -302,7 +302,7 @@ public final class AuthToken } catch (Exception e) { - m_log.error("AuthToken.getMessage() - Exception caught building message, error: " + e.getMessage()); + m_log.error("getMessage() - Exception caught building message, error: " + e.getMessage()); secureMessage = null; } if (inStream != null) @@ -344,7 +344,7 @@ public final class AuthToken // Throw exeption if the lifetime parameter is not set if (m_lifetime.length() == 0) { - m_log.error("AuthToken.getLifetime() - Called when lifetime is not set"); + m_log.error("getLifetime() - Called when lifetime is not set"); throw new Exception("Error: Called getLifetime while not set"); } @@ -383,7 +383,7 @@ public final class AuthToken */ public static String validate(String authTokenString) { - m_log.debug("AuthToken.validate()- Start"); + m_log.debug("validate()- Start"); // Instantiate the AuthToken, this validates the token itself. try @@ -392,15 +392,14 @@ public final class AuthToken // If we are here is because the token validation succeeded, // return the identity token string. - m_log.debug("AuthToken.validate()- Returning identity token"); + m_log.debug("validate()- Returning identity token"); return authToken.getIdentityToken(); } catch (Exception e) { // The validation of one of the tokens failed - m_log.warn("AuthToken.validate()- Exception caught during token validation, msg: " + e.getMessage()); - + m_log.warn("validate()- Exception caught during token validation, msg: " + e.getMessage()); return null; } } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java index 3ad3debc..c60bea2a 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/AuthTokenConfig.java @@ -65,7 +65,7 @@ public final class AuthTokenConfig */ public AuthTokenConfig() { - m_log.debug("AuthTokenConfig()- Default"); + m_log.debug("Constructor()- Default"); // Create a map to keep track of the token settings m_tokenSettingsMap = new HashMap(); @@ -112,7 +112,7 @@ public final class AuthTokenConfig tokenLifetime = Integer.valueOf(getSetting(TokenLifetime)).intValue(); if (tokenLifetime < m_minimumTokenLifetimeValue) { - m_log.debug("AuthTokenConfig()- Configured token lifetime too small, defaulting to " + m_log.debug("Constructor()- Configured token lifetime too small, defaulting to " + Integer.toString(m_minimumTokenLifetimeValue) + " seconds"); tokenLifetime = m_minimumTokenLifetimeValue; @@ -122,7 +122,7 @@ public final class AuthTokenConfig } catch (NumberFormatException e) { - m_log.debug("AuthTokenConfig()- Invalid configured token lifetime value, defaulting to " + m_log.debug("Constructor()- Invalid configured token lifetime value, defaulting to " + Integer.toString(m_minimumTokenLifetimeValue) + " seconds"); tokenLifetime = m_minimumTokenLifetimeValue; @@ -136,7 +136,7 @@ public final class AuthTokenConfig lifetimeShorter = Integer.valueOf(getSetting(LifetimeShorter)).intValue(); if (lifetimeShorter < m_minimumLifetimeShorterValue) { - m_log.debug("AuthTokenConfig()- Configured lifetime shorter too small, defaulting to " + m_log.debug("Constructor()- Configured lifetime shorter too small, defaulting to " + Integer.toString(m_minimumLifetimeShorterValue) + " seconds"); lifetimeShorter = m_minimumLifetimeShorterValue; @@ -146,7 +146,7 @@ public final class AuthTokenConfig } catch (NumberFormatException e) { - m_log.debug("AuthTokenConfig()- Invalid configured lifetime shorter value, defaulting to " + m_log.debug("Constructor()- Invalid configured lifetime shorter value, defaulting to " + Integer.toString(m_minimumLifetimeShorterValue) + " seconds"); lifetimeShorter = m_minimumLifetimeShorterValue; @@ -157,7 +157,7 @@ public final class AuthTokenConfig if (lifetimeShorter > tokenLifetime || (tokenLifetime - lifetimeShorter) < m_minimumLifetimeShorterDifferential) { - m_log.debug("AuthTokenConfig()- Invalid lifetime shorter value, defaulting to " + m_log.debug("Constructor()- Invalid lifetime shorter value, defaulting to " + Integer.toString(m_minimumLifetimeShorterValue) + " seconds"); // Update the map with the new value for the setting @@ -166,22 +166,22 @@ public final class AuthTokenConfig } catch (SAXException e) { - m_log.warn("AuthTokenConfig()- " + authTokenSettingsFileName + " format error, exception: " + e.toString()); + m_log.warn("Constructor()- " + authTokenSettingsFileName + " format error, exception: " + e.toString()); throw new Exception("AuthTokenConfig()- authtoken.settings format error", e); } catch (SecurityException e) { - m_log.warn("AuthTokenConfig()- SecurityException accessing " + authTokenSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException accessing " + authTokenSettingsFileName + " Exception=" + e.toString()); throw new Exception("AuthTokenConfig()- Not able to access file", e); } catch (FileNotFoundException e) { - m_log.warn("AuthTokenConfig()- File " + authTokenSettingsFileName + " not found"); + m_log.warn("Constructor()- File " + authTokenSettingsFileName + " not found"); throw new Exception("AuthTokenConfig()- File not found", e); } catch (IOException e) { - m_log.warn("AuthTokenConfig()- IOException accessing " + authTokenSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- IOException accessing " + authTokenSettingsFileName + " Exception=" + e.toString()); throw new Exception("AuthTokenConfig()- Read error", e); } finally @@ -212,14 +212,14 @@ public final class AuthTokenConfig String value = m_tokenSettingsMap.get(settingName); if (value == null) { - m_log.debug("AuthTokenConfig.getSetting()- Did not find setting " + settingName); + m_log.debug("getSetting()- Did not find setting " + settingName); // The setting is not in our map, check if it is one to // which we have defaults. if (settingName.equalsIgnoreCase(TokenLifetime)) { value = m_defaultTokenLifetimeValue; - m_log.debug("AuthTokenConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_tokenSettingsMap.put(TokenLifetime, m_defaultTokenLifetimeValue); @@ -227,7 +227,7 @@ public final class AuthTokenConfig else if (settingName.equalsIgnoreCase(LifetimeShorter)) { value = m_defaultLifetimeShorterValue; - m_log.debug("AuthTokenConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_tokenSettingsMap.put(LifetimeShorter, m_defaultLifetimeShorterValue); @@ -235,7 +235,7 @@ public final class AuthTokenConfig else if (settingName.equalsIgnoreCase(IdentityTokenType)) { value = m_defaultLifetimeShorterValue; - m_log.debug("AuthTokenConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_tokenSettingsMap.put(IdentityTokenType, m_defaultIdentityTokenTypeValue); @@ -243,8 +243,8 @@ public final class AuthTokenConfig } else { - m_log.debug("AuthTokenConfig.getSetting()- Found setting " + settingName); - m_log.debug("AuthTokenConfig.getSetting()- Setting value = " + value); + m_log.debug("getSetting()- Found setting " + settingName); + m_log.debug("getSetting()- Setting value = " + value); } return value; diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java index edfab134..a87b1300 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java @@ -157,7 +157,7 @@ public final class CasaIdentityToken implements IdentityToken // Verify that we obtained all of the required elements if (m_state != DONE_PARSING) { - m_log.error("CasaIdentityToken SAXHandler.endDocument()- Missing element"); + m_log.error("SAXHandler.endDocument()- Missing element"); throw new SAXException("Missing element"); } } @@ -186,7 +186,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -200,7 +200,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -214,7 +214,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } @@ -229,7 +229,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -243,7 +243,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -257,7 +257,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -271,7 +271,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -296,7 +296,7 @@ public final class CasaIdentityToken implements IdentityToken break; default: - m_log.error("CasaIdentityToken SAXHandler.startElement()- State error"); + m_log.error("SAXHandler.startElement()- State error"); throw new SAXException("State error"); } } @@ -324,7 +324,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -338,7 +338,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -352,7 +352,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -366,7 +366,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -380,7 +380,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -394,7 +394,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -418,19 +418,19 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Attribute data not found"); + m_log.error("SAXHandler.endElement()- Attribute data not found"); throw new SAXException("Attribute data not found"); } } catch (NamingException e) { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Attribute data not found"); + m_log.error("SAXHandler.endElement()- Attribute data not found"); throw new SAXException("Attribute data not found", e); } } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Attribute not found"); + m_log.error("SAXHandler.endElement()- Attribute not found"); throw new SAXException("Attribute not found"); } @@ -447,13 +447,13 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; default: - m_log.error("CasaIdentityToken SAXHandler.endElement()- State error"); + m_log.error("SAXHandler.endElement()- State error"); throw new SAXException("State error"); } } @@ -563,19 +563,19 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.characters()- Attribute data not found"); + m_log.error("SAXHandler.characters()- Attribute data not found"); throw new SAXException("Attribute data not found"); } } catch (NamingException e) { - m_log.error("CasaIdentityToken SAXHandler.characters()- Attribute data not found"); + m_log.error("SAXHandler.characters()- Attribute data not found"); throw new SAXException("Attribute data not found", e); } } else { - m_log.error("CasaIdentityToken SAXHandler.characters()- Attribute not found"); + m_log.error("SAXHandler.characters()- Attribute not found"); throw new SAXException("Attribute not found"); } } @@ -630,19 +630,19 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken SAXHandler.characters()- Attribute data not found"); + m_log.error("SAXHandler.characters()- Attribute data not found"); throw new SAXException("Attribute data not found"); } } catch (NamingException e) { - m_log.error("CasaIdentityToken SAXHandler.characters()- Attribute data not found"); + m_log.error("SAXHandler.characters()- Attribute data not found"); throw new SAXException("Attribute data not found", e); } } else { - m_log.error("CasaIdentityToken SAXHandler.characters()- Attribute not found"); + m_log.error("SAXHandler.characters()- Attribute not found"); throw new SAXException("Attribute not found"); } } @@ -744,7 +744,7 @@ public final class CasaIdentityToken implements IdentityToken { Object attrValue = enumeration.next(); m_attributes.put(attr.getID(), attrValue); - m_log.debug("CasaIdentityToken.initialize()- Including attribute " + attr.getID()); + m_log.debug("initialize()- Including attribute " + attr.getID()); // Encrypt the attribute if necessary if (encryptAttributes) @@ -760,7 +760,7 @@ public final class CasaIdentityToken implements IdentityToken { // The attribute value is of type byte[], we need to encode it. sb.append("<"); sb.append(attr.getID()); sb.append(" type=\"binary\" encoding=\"base64\">"); sb.append(new String(Base64Coder.encode((byte[]) attrValue))); sb.append("\r\n"); - m_log.debug("Attribute " + attr.getID() + "included as " + new String(Base64Coder.encode((byte[]) attrValue))); + m_log.debug("initialize()- Attribute " + attr.getID() + "included as " + new String(Base64Coder.encode((byte[]) attrValue))); } else { @@ -777,12 +777,12 @@ public final class CasaIdentityToken implements IdentityToken } catch (NamingException e) { - m_log.error("CasaIdentityToken.initialize()- Exception: " + e.getExplanation()); + m_log.error("initialize()- Exception: " + e.getExplanation()); throw new Exception("Error obtaining identity data for token", e); } catch (Exception e) { - m_log.error("CasaIdentityToken.initialize()- Exception: " + e.toString()); + m_log.error("initialize()- Exception: " + e.toString()); throw new Exception("Error obtaining identity data for token", e); } } @@ -814,7 +814,7 @@ public final class CasaIdentityToken implements IdentityToken } catch (SAXException e) { - m_log.error("CasaIdentityToken()- Parse exception: " + e.toString()); + m_log.error("initialize()- Parse exception: " + e.toString()); throw new Exception("Token error", e); } finally @@ -850,7 +850,7 @@ public final class CasaIdentityToken implements IdentityToken } else { - m_log.error("CasaIdentityToken.toString()- Not initialized"); + m_log.error("getEncodedToken()- Not initialized"); throw new Exception("Not initialized"); } } @@ -878,7 +878,7 @@ public final class CasaIdentityToken implements IdentityToken return m_identityId; else { - m_log.error("CasaIdentityToken.getIdentityId()- Not initialized"); + m_log.error("getIdentityId()- Not initialized"); throw new Exception("Not initialized"); } } @@ -896,7 +896,7 @@ public final class CasaIdentityToken implements IdentityToken return m_sourceName; else { - m_log.error("CasaIdentityToken.getSourceName()- Not initialized"); + m_log.error("getSourceName()- Not initialized"); throw new Exception("Not initialized"); } } @@ -914,7 +914,7 @@ public final class CasaIdentityToken implements IdentityToken return m_sourceUrl; else { - m_log.error("CasaIdentityToken.getSourceUrl()- Not initialized"); + m_log.error("getSourceUrl()- Not initialized"); throw new Exception("Not initialized"); } } @@ -931,7 +931,7 @@ public final class CasaIdentityToken implements IdentityToken return m_service; else { - m_log.error("CasaIdentityToken.getTargetService()- Not initialized"); + m_log.error("getTargetService()- Not initialized"); throw new Exception("Not initialized"); } } @@ -949,7 +949,7 @@ public final class CasaIdentityToken implements IdentityToken return m_host; else { - m_log.error("CasaIdentityToken.getTargetHost()- Not initialized"); + m_log.error("getTargetHost()- Not initialized"); throw new Exception("Not initialized"); } } @@ -966,7 +966,7 @@ public final class CasaIdentityToken implements IdentityToken return m_attributes; else { - m_log.error("CasaIdentityToken.getIdentityAttributes()- Not initialized"); + m_log.error("getIdentityAttributes()- Not initialized"); throw new Exception("Not initialized"); } } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java index 708b9004..9946b2c7 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java @@ -95,8 +95,8 @@ public final class EnabledSvcsConfig public EnabledSvcsConfig(String svcConfigPath, boolean enabledSvcsOnly) throws Exception { - m_log.debug("EnabledSvcsConfig()-"); - m_log.debug("EnabledSvcsConfig()- SvcConfigPath = " + svcConfigPath); + m_log.debug("Constructor()-"); + m_log.debug("Constructor()- SvcConfigPath = " + svcConfigPath); // Remember the enabledSvcsOnly setting m_enabledSvcsOnly = enabledSvcsOnly; @@ -119,20 +119,20 @@ public final class EnabledSvcsConfig int bytesRead = inStream.read(m_defaultAuthPolicyData); if (bytesRead != m_defaultAuthPolicyData.length) { - m_log.warn("EnabledSvcsConfig()- Error reading default policy file"); + m_log.warn("Constructor()- Error reading default policy file"); } } catch (SecurityException e) { - m_log.warn("EnabledSvcsConfig()- SecurityException accessing " + configFolder + File.separator + m_authPolicyFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException accessing " + configFolder + File.separator + m_authPolicyFileName + " Exception=" + e.toString()); } catch (FileNotFoundException e) { - m_log.warn("EnabledSvcsConfig()- File " + configFolder + File.separator + m_authPolicyFileName + " not found"); + m_log.warn("Constructor()- File " + configFolder + File.separator + m_authPolicyFileName + " not found"); } catch (IOException e) { - m_log.warn("EnabledSvcsConfig()- IOException reading " + configFolder + File.separator + m_authPolicyFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- IOException reading " + configFolder + File.separator + m_authPolicyFileName + " Exception=" + e.toString()); } finally { @@ -191,7 +191,7 @@ public final class EnabledSvcsConfig { if (hostFolder.isDirectory()) { - m_log.debug("EnabledSvcsConfig()- Host folder " + hostFolder + " is directory"); + m_log.debug("Constructor()- Host folder " + hostFolder + " is directory"); // Now go through the services configured for this host String[] hostFolderObjs = hostFolder.list(); @@ -204,12 +204,12 @@ public final class EnabledSvcsConfig { // Check if we are dealing with a file or a folder File serviceFolder = new File(hostFolder, hostFolderObjs[ii]); - m_log.debug("EnabledSvcsConfig()- Service folder " + serviceFolder); + m_log.debug("Constructor()- Service folder " + serviceFolder); try { if (serviceFolder.isDirectory()) { - m_log.debug("EnabledSvcsConfig()- Service folder " + serviceFolder + " is directory"); + m_log.debug("Constructor()- Service folder " + serviceFolder + " is directory"); // We are dealing with a folder, remember that the folder name matches the name // of the enabled service. Check and see if there are authentication policy and @@ -227,20 +227,20 @@ public final class EnabledSvcsConfig int bytesRead = inStream.read(authPolicyData); if (bytesRead != authPolicyData.length) { - m_log.warn("EnabledSvcsConfig()- Error reading policy file for " + servicesConfigFolderObjs[i] + " " + hostFolderObjs[ii]); + m_log.warn("Constructor()- Error reading policy file for " + servicesConfigFolderObjs[i] + " " + hostFolderObjs[ii]); } } catch (SecurityException e) { - m_log.warn("EnabledSvcsConfig()- SecurityException accessing " + serviceFolder + File.separator + m_authPolicyFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException accessing " + serviceFolder + File.separator + m_authPolicyFileName + " Exception=" + e.toString()); } catch (FileNotFoundException e) { - m_log.warn("EnabledSvcsConfig()- No authentication policy file for " + serviceFolder); + m_log.warn("Constructor()- No authentication policy file for " + serviceFolder); } catch (IOException e) { - m_log.warn("EnabledSvcsConfig()- IOException reading " + serviceFolder + File.separator + m_authPolicyFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- IOException reading " + serviceFolder + File.separator + m_authPolicyFileName + " Exception=" + e.toString()); } finally { @@ -263,7 +263,7 @@ public final class EnabledSvcsConfig } catch (Exception e) { - m_log.warn("EnabledSvcsConfig()- Exception accessing " + serviceFolder + File.separator + m_authTokenSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- Exception accessing " + serviceFolder + File.separator + m_authTokenSettingsFileName + " Exception=" + e.toString()); } try @@ -272,7 +272,7 @@ public final class EnabledSvcsConfig } catch (Exception e) { - m_log.warn("EnabledSvcsConfig()- Exception accessing " + serviceFolder + File.separator + m_idenTokenSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- Exception accessing " + serviceFolder + File.separator + m_idenTokenSettingsFileName + " Exception=" + e.toString()); } // Make sure that we have a policy file @@ -285,18 +285,18 @@ public final class EnabledSvcsConfig (idenTokenConfig != null) ? idenTokenConfig : m_defaultIdenTokenConfig); // Add this entry to our map - m_log.debug("EnabledSvcsConfig()- Adding entry in map for " + servicesConfigFolderObjs[i] + " " + hostFolderObjs[ii]); + m_log.debug("Constructor()- Adding entry in map for " + servicesConfigFolderObjs[i] + " " + hostFolderObjs[ii]); enabledSvcsConfigMap.put(hostFolderObjs[ii], svcConfigEntry); } else { - m_log.warn("EnabledSvcsConfig()- Unable to enable " + servicesConfigFolderObjs[i] + " " + hostFolderObjs[ii] + " due to no configured authentication policy"); + m_log.warn("Constructor()- Unable to enable " + servicesConfigFolderObjs[i] + " " + hostFolderObjs[ii] + " due to no configured authentication policy"); } } } catch (SecurityException e) { - m_log.warn("EnabledSvcsConfig()- SecurityException accessing " + serviceFolder + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException accessing " + serviceFolder + " Exception=" + e.toString()); } // Add this hosts enabled services configuration map to the hosts map @@ -305,29 +305,29 @@ public final class EnabledSvcsConfig } else { - m_log.debug("EnabledSvcsConfig()- No services configured for " + hostFolder); + m_log.debug("Constructor()- No services configured for " + hostFolder); } } } catch (SecurityException e) { - m_log.warn("EnabledSvcsConfig()- SecurityException accessing " + hostFolder + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException accessing " + hostFolder + " Exception=" + e.toString()); } } } else { - m_log.warn("EnabledSvcsConfig()- Unable to obtain services folder " + servicesConfigFolder + " objects"); + m_log.warn("Constructor()- Unable to obtain services folder " + servicesConfigFolder + " objects"); } } catch (SecurityException e) { - m_log.warn("EnabledSvcsConfig()- SecurityException accessing " + servicesConfigFolder + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException accessing " + servicesConfigFolder + " Exception=" + e.toString()); } } catch (SecurityException e) { - m_log.warn("EnabledSvcsConfig()- SecurityException accessing " + configFolder + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException accessing " + configFolder + " Exception=" + e.toString()); } } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java index 9620783b..1151ad3d 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicy.java @@ -75,7 +75,7 @@ public final class GetAuthPolicy implements RpcMethod { try { - m_log.debug("GetAuthPolicy.invoke()"); + m_log.debug("invoke()"); // Read and parse the GetAuthPolicyReqMsg sent from the client GetAuthPolicyReqMsg getAuthPolicyReqMsg = new GetAuthPolicyReqMsg(inStream); @@ -96,7 +96,7 @@ public final class GetAuthPolicy implements RpcMethod } else { - m_log.debug("GetAuthPolicy.invoke()- authPolicy is null for enabled service: " + getAuthPolicyReqMsg.getServiceName()); + m_log.debug("invoke()- authPolicy is null for enabled service: " + getAuthPolicyReqMsg.getServiceName()); GetAuthPolicyRespMsg getAuthPolicyRespMsg = new GetAuthPolicyRespMsg(ProtoDefs.httpServerErrorStatusMsg, ProtoDefs.httpServerErrorStatusCode); out.println(getAuthPolicyRespMsg.toString()); @@ -109,7 +109,7 @@ public final class GetAuthPolicy implements RpcMethod ProtoDefs.httpNotFoundStatusCode); out.println(getAuthPolicyRespMsg.toString()); - m_log.warn("GetAuthPolicy.invoke()- Service " + m_log.warn("invoke()- Service " + getAuthPolicyReqMsg.getServiceName() + " at " + getAuthPolicyReqMsg.getHostName() + " not enabled"); @@ -117,7 +117,7 @@ public final class GetAuthPolicy implements RpcMethod } catch (Exception e) { - m_log.error("GetAuthPolicy.invoke()- Exception: " + e.toString()); + m_log.error("invoke()- Exception: " + e.toString()); // Write out the response try @@ -128,7 +128,7 @@ public final class GetAuthPolicy implements RpcMethod } catch (Exception e2) { - m_log.error("GetAuthPolicy.invoke()- Exception trying to construct response msg: " + e2.toString()); + m_log.error("invoke()- Exception trying to construct response msg: " + e2.toString()); } } } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java index 55bdb5fa..f4dee3a8 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java @@ -95,7 +95,7 @@ public final class GetAuthPolicyReqMsg // Verify that we obtained all of the required elements if (m_state != DONE_PARSING) { - m_log.error("GetAuthPolicyReqMsg SAXHandler.endDocument()- Missing element"); + m_log.error("SAXHandler.endDocument()- Missing element"); throw new SAXException("Missing element"); } } @@ -123,7 +123,7 @@ public final class GetAuthPolicyReqMsg } else { - m_log.error("GetAuthPolicyReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -137,7 +137,7 @@ public final class GetAuthPolicyReqMsg } else { - m_log.error("GetAuthPolicyReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -151,14 +151,14 @@ public final class GetAuthPolicyReqMsg } else { - m_log.error("GetAuthPolicyReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; default: - m_log.error("GetAuthPolicyReqMsg SAXHandler.startElement()- State error"); + m_log.error("SAXHandler.startElement()- State error"); throw new SAXException("State error"); } } @@ -185,7 +185,7 @@ public final class GetAuthPolicyReqMsg } else { - m_log.error("GetAuthPolicyReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -199,7 +199,7 @@ public final class GetAuthPolicyReqMsg } else { - m_log.error("GetAuthPolicyReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -213,13 +213,13 @@ public final class GetAuthPolicyReqMsg } else { - m_log.error("GetAuthPolicyReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; default: - m_log.error("GetAuthPolicyReqMsg SAXHandler.endElement()- State error"); + m_log.error("SAXHandler.endElement()- State error"); throw new SAXException("State error"); } } @@ -291,7 +291,7 @@ public final class GetAuthPolicyReqMsg } catch (SAXException e) { - m_log.error("GetAuthPolicyReqMsg()- Parse exception: " + e.toString()); + m_log.error("Constructor()- Parse exception: " + e.toString()); throw new Exception("Protocol error", e); } } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java index 98215173..30b4baf5 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java @@ -100,7 +100,7 @@ public final class GetAuthTokReqMsg // Verify that we obtained all of the required elements if (m_state != DONE_PARSING) { - m_log.error("GetAuthTokReqMsg SAXHandler.endDocument()- Missing element"); + m_log.error("SAXHandler.endDocument()- Missing element"); throw new SAXException("Missing element"); } } @@ -128,7 +128,7 @@ public final class GetAuthTokReqMsg } else { - m_log.error("GetAuthTokReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -142,7 +142,7 @@ public final class GetAuthTokReqMsg } else { - m_log.error("GetAuthTokReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -156,7 +156,7 @@ public final class GetAuthTokReqMsg } else { - m_log.error("GetAuthTokReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } @@ -171,13 +171,13 @@ public final class GetAuthTokReqMsg } else { - m_log.error("GetAuthTokReqMsg SAXHandler.startElement()- Un-expected element"); + m_log.error("SAXHandler.startElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; default: - m_log.error("GetAuthTokReqMsg SAXHandler.startElement()- State error"); + m_log.error("SAXHandler.startElement()- State error"); throw new SAXException("State error"); } } @@ -204,7 +204,7 @@ public final class GetAuthTokReqMsg } else { - m_log.error("GetAuthTokReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -218,7 +218,7 @@ public final class GetAuthTokReqMsg } else { - m_log.error("GetAuthTokReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -232,7 +232,7 @@ public final class GetAuthTokReqMsg } else { - m_log.error("GetAuthTokReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; @@ -246,13 +246,13 @@ public final class GetAuthTokReqMsg } else { - m_log.error("GetAuthTokReqMsg SAXHandler.endElement()- Un-expected element"); + m_log.error("SAXHandler.endElement()- Un-expected element"); throw new SAXException("Un-expected element"); } break; default: - m_log.error("GetAuthTokReqMsg SAXHandler.endElement()- State error"); + m_log.error("SAXHandler.endElement()- State error"); throw new SAXException("State error"); } } @@ -337,7 +337,7 @@ public final class GetAuthTokReqMsg } catch (SAXException e) { - m_log.error("GetAuthTokReqMsg()- Parse exception: " + e.toString()); + m_log.error("Constructor()- Parse exception: " + e.toString()); throw new Exception("Protocol error", e); } } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthToken.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthToken.java index 378a167f..38a2e1e8 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthToken.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/GetAuthToken.java @@ -76,7 +76,7 @@ public final class GetAuthToken implements RpcMethod { try { - m_log.debug("GetAuthToken.invoke()"); + m_log.debug("invoke()"); // Parse the GetAuthTokReqMsg sent from the client GetAuthTokReqMsg getAuthTokReqMsg = new GetAuthTokReqMsg(inStream); @@ -108,7 +108,7 @@ public final class GetAuthToken implements RpcMethod } catch (Exception e) { - m_log.info("GetAuthToken.invoke()- Exception: " + e.toString()); + m_log.info("invoke()- Exception: " + e.toString()); // Write out the response try @@ -119,7 +119,7 @@ public final class GetAuthToken implements RpcMethod } catch (Exception e2) { - m_log.error("GetAuthToken.invoke()- Exception trying to construct response msg: " + e2.toString()); + m_log.error("invoke()- Exception trying to construct response msg: " + e2.toString()); } } } @@ -133,7 +133,7 @@ public final class GetAuthToken implements RpcMethod } catch (Exception e) { - m_log.error("GetAuthToken.invoke()- Exception: " + e.toString()); + m_log.error("invoke()- Exception: " + e.toString()); // Write out the response try @@ -144,7 +144,7 @@ public final class GetAuthToken implements RpcMethod } catch (Exception e2) { - m_log.error("GetAuthToken.invoke()- Exception trying to construct response msg: " + e2.toString()); + m_log.error("invoke()- Exception trying to construct response msg: " + e2.toString()); } } } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java index 7565fa2b..5b4c0c08 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/IdenTokenConfig.java @@ -59,7 +59,7 @@ public final class IdenTokenConfig */ public IdenTokenConfig() { - m_log.debug("IdenTokenConfig()- Default"); + m_log.debug("Constructor()- Default"); // Create a map to keep track of the token settings m_tokenSettingsMap = new HashMap(); @@ -76,7 +76,7 @@ public final class IdenTokenConfig */ public IdenTokenConfig(String idenTokenSettingsFileName) throws Exception { - m_log.debug("IdenTokenConfig()-"); + m_log.debug("Constructor()-"); // Create a map to keep track of the token settings m_tokenSettingsMap = new HashMap(); @@ -100,7 +100,7 @@ public final class IdenTokenConfig // Process the specified attributes if (m_tokenSettingsMap.containsKey(Attributes) == false) { - m_log.debug("IdenTokenConfig()- Attributes not configured, defaulting them."); + m_log.debug("Constructor()- Attributes not configured, defaulting them."); m_tokenSettingsMap.put(Attributes, m_defaultAttributesValue); } String attributes = m_tokenSettingsMap.get(Attributes); @@ -108,22 +108,22 @@ public final class IdenTokenConfig } catch (SAXException e) { - m_log.warn("IdenTokenConfig()- " + idenTokenSettingsFileName + " format error, exception: " + e.toString()); + m_log.warn("Constructor()- " + idenTokenSettingsFileName + " format error, exception: " + e.toString()); throw new Exception("IdenTokenConfig()- authtoken.settings format error", e); } catch (SecurityException e) { - m_log.warn("IdenTokenConfig()- SecurityException accessing " + idenTokenSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException accessing " + idenTokenSettingsFileName + " Exception=" + e.toString()); throw new Exception("IdenTokenConfig()- Not able to access file", e); } catch (FileNotFoundException e) { - m_log.warn("IdenTokenConfig()- File " + idenTokenSettingsFileName + " not found"); + m_log.warn("Constructor()- File " + idenTokenSettingsFileName + " not found"); throw new Exception("IdenTokenConfig()- File not found", e); } catch (IOException e) { - m_log.warn("IdenTokenConfig()- IOException accessing " + idenTokenSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- IOException accessing " + idenTokenSettingsFileName + " Exception=" + e.toString()); throw new Exception("IdenTokenConfig()- Read error", e); } finally @@ -154,14 +154,14 @@ public final class IdenTokenConfig String value = m_tokenSettingsMap.get(settingName); if (value == null) { - m_log.debug("IdenTokenConfig.getSetting()- Did not find setting " + settingName); + m_log.debug("getSetting()- Did not find setting " + settingName); // The setting is not in our map, check if it is one to // which we have defaults. if (settingName.equalsIgnoreCase(EncryptAttributes)) { value = m_defaultEncryptAttributesValue; - m_log.debug("AuthTokenConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_tokenSettingsMap.put(EncryptAttributes, m_defaultEncryptAttributesValue); @@ -169,8 +169,8 @@ public final class IdenTokenConfig } else { - m_log.debug("IdenTokenConfig.getSetting()- Found setting " + settingName); - m_log.debug("IdenTokenConfig.getSetting()- Setting value = " + value); + m_log.debug("getSetting()- Found setting " + settingName); + m_log.debug("getSetting()- Setting value = " + value); } return value; diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java index 66619e3e..2b42024a 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java @@ -108,7 +108,7 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable } catch (GSSException e) { - m_log.warn("Krb5Authenticate Krb5Token()- GSS Exception caught: " + e.getLocalizedMessage()); + m_log.warn("Krb5Token Constructor()- GSS Exception caught: " + e.getLocalizedMessage()); throw new Exception("Authentication Failure", e); } } @@ -176,13 +176,13 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable } catch (GSSException e) { - m_log.warn("Krb5Authenticate()- GSS Exception caught: " + e.getLocalizedMessage()); + m_log.warn("Constructor()- GSS Exception caught: " + e.getLocalizedMessage()); throw new Exception("Failed to instantiate needed GSS objects", e); } } else { - m_log.warn("Krb5Authenticate()- Service Principal Name not configured"); + m_log.warn("Constructor()- Service Principal Name not configured"); throw new Exception("Service Principal Name not configured"); } } @@ -200,7 +200,7 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable try { - m_log.debug("Krb5Authenticate.invoke()"); + m_log.debug("invoke()"); // Now parse the Kerberos Token Krb5Token krb5Token = new Krb5Token(authReqMsg.getAuthMechToken(), this); @@ -240,13 +240,13 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable searchString = "(userPrincipalName={0})"; else { - m_log.warn("Krb5Authenticate.invoke()- Unsupported realm type " + realmType); + m_log.warn("invoke()- Unsupported realm type " + realmType); throw new Exception("Realm configuration error"); } } else { - m_log.warn("Krb5Authenticate.invoke()- Failed to obtain realm type for realm " + authReqMsg.getRealm()); + m_log.warn("invoke()- Failed to obtain realm type for realm " + authReqMsg.getRealm()); throw new Exception("Realm configuration error"); } @@ -275,18 +275,18 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable } else { - m_log.info("Krb5Authenticate.invoke()- No matching identity entities found"); + m_log.info("invoke()- No matching identity entities found"); } } } catch (NamingException e) { // Log the error - m_log.warn("Krb5Authenticate.invoke()- NamingException: " + e.toString()); + m_log.warn("invoke()- NamingException: " + e.toString()); } catch (Exception e) { - m_log.warn("Krb5Authenticate.invoke()- Exception: " + e.toString()); + m_log.warn("invoke()- Exception: " + e.toString()); } // Return the authentication result diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java index 1618c6cc..d6122550 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java @@ -99,7 +99,7 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable // Check against zero length passwords if (m_password.equals("")) { - m_log.warn("PwToken()- Zero length password diss-allowed"); + m_log.warn("PwToken Constructor()- Zero length password diss-allowed"); throw new Exception("Zero length password"); } } @@ -175,7 +175,7 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable try { - m_log.debug("PwdAuthenticate.invoke()"); + m_log.debug("invoke()"); // Now parse the PW Token PwToken pwToken = new PwToken(authReqMsg.getAuthMechToken()); @@ -218,13 +218,13 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable searchString = "(sAMAccountName={0})"; else { - m_log.warn("PwdAuthenticate.invoke()- Unsupported realm type " + realmType); + m_log.warn("invoke()- Unsupported realm type " + realmType); throw new Exception("Realm configuration error"); } } else { - m_log.warn("PwdAuthenticate.invoke()- Failed to obtain realm type for realm " + authReqMsg.getRealm()); + m_log.warn("invoke()- Failed to obtain realm type for realm " + authReqMsg.getRealm()); throw new Exception("Realm configuration error"); } } @@ -270,7 +270,7 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable } catch (NamingException e) { - m_log.warn("PwdAuthenticate.invoke()- NamingException: " + e.getExplanation()); + m_log.warn("invoke()- NamingException: " + e.getExplanation()); } } } @@ -278,17 +278,17 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable // Check if we did not resolve the identity if (identId == null) { - m_log.warn("PwdAuthenticate.invoke()- Failed to resolve identity for entity " + pwToken.getUsername()); + m_log.warn("invoke()- Failed to resolve identity for entity " + pwToken.getUsername()); } } catch (NamingException e) { // Log the error - m_log.warn("PwdAuthenticate.invoke()- NamingException on Proxy User: " + e.toString()); + m_log.warn("invoke()- NamingException on Proxy User: " + e.toString()); } catch (Exception e) { - m_log.warn("PwdAuthenticate.invoke()- Exception: " + e.toString()); + m_log.warn("invoke()- Exception: " + e.toString()); } // Return the authentication result diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/RealmsInfo.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/RealmsInfo.java index 5d364036..29b14a43 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/RealmsInfo.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/RealmsInfo.java @@ -147,7 +147,7 @@ public class RealmsInfo else { // Ignore parameter - m_log.debug("RealmsInfo: Unknown directory type"); + m_log.debug("Constructor(): Unknown directory type"); } } else if (env[iii].getProp().equalsIgnoreCase("com.novell.casa.authtoksvc.contextless_search_string")) diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Rpc.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Rpc.java index 97e45f31..c558f082 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Rpc.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Rpc.java @@ -110,13 +110,13 @@ public final class Rpc extends javax.servlet.http.HttpServlet implements javax.s // Check if it is no longer necessary to re-configure the servlet if (m_rpc.m_reconfigureInterval == 0) { - m_log.info("ReconfigureTask.run()- Configuration changed to no longer perform timed re-configuration"); + m_log.info("ReconfigureThread.run()- Configuration changed to no longer perform timed re-configuration"); break; } } catch (Exception e) { - m_log.warn("ReconfigureTask.run()- Exception caught during re-configure process, " + e.toString()); + m_log.warn("ReconfigureThread.run()- Exception caught during re-configure process, " + e.toString()); } } } @@ -155,7 +155,7 @@ public final class Rpc extends javax.servlet.http.HttpServlet implements javax.s } catch (NumberFormatException e) { - m_log.warn("Rpc.configureServlet()- Invalid reconfigure interval value"); + m_log.warn("configureServlet()- Invalid reconfigure interval value"); m_reconfigureInterval = Integer.parseInt(SvcConfig.DefaultReconfigureIntervalValue); } @@ -192,7 +192,7 @@ public final class Rpc extends javax.servlet.http.HttpServlet implements javax.s { super.init(config); - m_log.debug("Rpc.init()"); + m_log.debug("init()"); try { @@ -233,13 +233,13 @@ public final class Rpc extends javax.servlet.http.HttpServlet implements javax.s } catch (Exception e) { - m_log.fatal("Rpc.init()- Exception caught: " + e.toString()); + m_log.fatal("init()- Exception caught: " + e.toString()); e.printStackTrace(); throw new ServletException("Exception caught while instantiating Rpc methods", e); } catch (Error e) { - m_log.fatal("Rpc.init()- Error caught: " + e.toString()); + m_log.fatal("init()- Error caught: " + e.toString()); e.printStackTrace(); throw new Error("Error caught while instantiating Rpc methods", e); } @@ -252,7 +252,7 @@ public final class Rpc extends javax.servlet.http.HttpServlet implements javax.s { super.destroy(); - m_log.debug("Rpc.destroy()"); + m_log.debug("destroy()"); // Stop our re-configure thread if (m_reconfigureThread != null) @@ -289,7 +289,7 @@ public final class Rpc extends javax.servlet.http.HttpServlet implements javax.s try { - m_log.debug("Rpc.doPost()"); + m_log.debug("doPost()"); // Get ready to send back a reply response.setContentType("text/html"); @@ -311,26 +311,26 @@ public final class Rpc extends javax.servlet.http.HttpServlet implements javax.s else { // Unsupported method - m_log.warn("Rpc.doPost()- Unsupported method"); + m_log.warn("doPost()- Unsupported method"); response.sendError(HttpServletResponse.SC_BAD_REQUEST); } } else { // Missing method parameter - m_log.warn("Rpc.doPost()- Missing method parameter"); + m_log.warn("doPost()- Missing method parameter"); response.sendError(HttpServletResponse.SC_BAD_REQUEST); } } catch (Exception e) { - m_log.error("Rpc.doPost()- Exception caught: " + e.toString()); + m_log.error("doPost()- Exception caught: " + e.toString()); e.printStackTrace(); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } catch (Error e) { - m_log.error("Rpc.doPost()- Error caught: " + e.toString()); + m_log.error("doPost()- Error caught: " + e.toString()); e.printStackTrace(); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SessionToken.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SessionToken.java index 814c1dc0..51897d6d 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SessionToken.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SessionToken.java @@ -170,14 +170,14 @@ public final class SessionToken if (m_realm == null || m_id == null) { - m_log.warn("SessionToken()- Required data missing from session token"); + m_log.warn("Constructor()- Required data missing from session token"); throw new Exception("Error: Required data missing from session Token"); } } else { // Message verification failed - m_log.warn("SessionToken()- Invalid Session Token"); + m_log.warn("Constructor()- Invalid Session Token"); throw new Exception("Invalid Session Token"); } } @@ -248,7 +248,7 @@ public final class SessionToken } catch (Exception e) { - m_log.error("SessionToken.getMessage() - Exception caught building message, error: " + e.getMessage()); + m_log.error("getMessage() - Exception caught building message, error: " + e.getMessage()); secureMessage = null; } finally diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SvcConfig.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SvcConfig.java index 9ba3b838..31d7dca5 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SvcConfig.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SvcConfig.java @@ -88,9 +88,8 @@ public final class SvcConfig */ public SvcConfig(String appRootPath, String svcConfigPath) throws Exception { - m_log.debug("SvcConfig()-"); - - m_log.debug("SvcConfig()- SvcConfigPath = " + svcConfigPath); + m_log.debug("Constructor()-"); + m_log.debug("Constructor()- SvcConfigPath = " + svcConfigPath); // Create a map to keep track of the service settings m_svcSettingsMap = new HashMap(); @@ -122,7 +121,7 @@ public final class SvcConfig tokenLifetime = Integer.valueOf(getSetting(SessionTokenLifetime)).intValue(); if (tokenLifetime < MinimumTokenLifetimeValue) { - m_log.debug("SvcConfig()- Configured token lifetime too small, defaulting to " + m_log.debug("Constructor()- Configured token lifetime too small, defaulting to " + Integer.toString(MinimumTokenLifetimeValue) + " seconds"); tokenLifetime = MinimumTokenLifetimeValue; @@ -132,7 +131,7 @@ public final class SvcConfig } catch (NumberFormatException e) { - m_log.debug("SvcConfig()- Invalid configured token lifetime value, defaulting to " + m_log.debug("Constructor()- Invalid configured token lifetime value, defaulting to " + Integer.toString(MinimumTokenLifetimeValue) + " seconds"); tokenLifetime = MinimumTokenLifetimeValue; @@ -146,7 +145,7 @@ public final class SvcConfig lifetimeShorter = Integer.valueOf(getSetting(LifetimeShorter)).intValue(); if (lifetimeShorter < MinimumLifetimeShorterValue) { - m_log.debug("SvcConfig()- Configured lifetime shorter too small, defaulting to " + m_log.debug("Constructor()- Configured lifetime shorter too small, defaulting to " + Integer.toString(MinimumLifetimeShorterValue) + " seconds"); lifetimeShorter = MinimumLifetimeShorterValue; @@ -156,7 +155,7 @@ public final class SvcConfig } catch (NumberFormatException e) { - m_log.debug("SvcConfig()- Invalid configured lifetime shorter value, defaulting to " + m_log.debug("Constructor()- Invalid configured lifetime shorter value, defaulting to " + Integer.toString(MinimumLifetimeShorterValue) + " seconds"); lifetimeShorter = MinimumLifetimeShorterValue; @@ -167,7 +166,7 @@ public final class SvcConfig if (lifetimeShorter > tokenLifetime || (tokenLifetime - lifetimeShorter) < MinimumLifetimeShorterDifferential) { - m_log.debug("SvcConfig()- Invalid lifetime shorter value, defaulting to " + m_log.debug("Constructor()- Invalid lifetime shorter value, defaulting to " + Integer.toString(MinimumLifetimeShorterValue) + " seconds"); // Update the map with the new value for the setting @@ -181,7 +180,7 @@ public final class SvcConfig if (reconfigureInterval != 0 && reconfigureInterval < MinimumReconfigureIntervalValue) { - m_log.debug("SvcConfig()- Configured reconfigure interval too small, defaulting to " + m_log.debug("Constructor()- Configured reconfigure interval too small, defaulting to " + Integer.toString(MinimumReconfigureIntervalValue) + " seconds"); // Update the map with the new value for the setting @@ -190,7 +189,7 @@ public final class SvcConfig } catch (NumberFormatException e) { - m_log.debug("SvcConfig()- Invalid configured reconfigured interval value, defaulting to " + m_log.debug("Constructor()- Invalid configured reconfigured interval value, defaulting to " + Integer.toString(MinimumReconfigureIntervalValue) + " seconds"); // Update the map with the new value for the setting @@ -202,22 +201,22 @@ public final class SvcConfig } catch (SAXException e) { - m_log.warn("SvcConfig()- Parse exception: " + e.toString()); + m_log.warn("Constructor()- Parse exception: " + e.toString()); throw new Exception("SvcConfig()- svc.settings format error", e); } catch (SecurityException e) { - m_log.warn("SvcConfig()- SecurityException caught while accessing " + svcConfigPath + File.separator + m_svcSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- SecurityException caught while accessing " + svcConfigPath + File.separator + m_svcSettingsFileName + " Exception=" + e.toString()); throw new Exception("SvcConfig()- Not able to access file", e); } catch (FileNotFoundException e) { - m_log.warn("SvcConfig()- File " + svcConfigPath + File.separator + m_svcSettingsFileName + " not found"); + m_log.warn("Constructor()- File " + svcConfigPath + File.separator + m_svcSettingsFileName + " not found"); throw new Exception("SvcConfig()- File not found", e); } catch (IOException e) { - m_log.warn("SvcConfig()- IOException caught while trying to read " + svcConfigPath + File.separator + m_svcSettingsFileName + " Exception=" + e.toString()); + m_log.warn("Constructor()- IOException caught while trying to read " + svcConfigPath + File.separator + m_svcSettingsFileName + " Exception=" + e.toString()); throw new Exception("SvcConfig()- Read error", e); } finally @@ -249,14 +248,14 @@ public final class SvcConfig String value = m_svcSettingsMap.get(settingName); if (value == null) { - m_log.debug("SvcConfig.getSetting()- Did not find setting " + settingName); + m_log.debug("getSetting()- Did not find setting " + settingName); // The setting is not in our map, check if it is one to // which we have defaults. if (settingName.equalsIgnoreCase(SessionTokenLifetime)) { value = DefaultSessionTokenLifetimeValue; - m_log.debug("SvcConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_svcSettingsMap.put(SessionTokenLifetime, DefaultSessionTokenLifetimeValue); @@ -264,7 +263,7 @@ public final class SvcConfig else if (settingName.equalsIgnoreCase(LifetimeShorter)) { value = DefaultLifetimeShorterValue; - m_log.debug("SvcConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_svcSettingsMap.put(LifetimeShorter, DefaultLifetimeShorterValue); @@ -272,7 +271,7 @@ public final class SvcConfig else if (settingName.equalsIgnoreCase(ReconfigureInterval)) { value = DefaultReconfigureIntervalValue; - m_log.debug("SvcConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_svcSettingsMap.put(ReconfigureInterval, DefaultReconfigureIntervalValue); @@ -280,7 +279,7 @@ public final class SvcConfig else if (settingName.equalsIgnoreCase(SigningKeyAliasName)) { value = DefaultSigningKeyAliasNameValue; - m_log.debug("SvcConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_svcSettingsMap.put(SigningKeyAliasName, DefaultSigningKeyAliasNameValue); @@ -288,21 +287,21 @@ public final class SvcConfig else if (settingName.equalsIgnoreCase(SigningKeyPassword)) { value = DefaultSigningKeyPasswordValue; - m_log.debug("SvcConfig.getSetting()- Assigning default value " + value); + m_log.debug("getSetting()- Assigning default value " + value); // Add the key to the map so that it can be found quicker next time m_svcSettingsMap.put(SigningKeyPassword, DefaultSigningKeyPasswordValue); } else if (settingName.equalsIgnoreCase(IdentityAbstractionConfigFile)) { - m_log.debug("SvcConfig.getSetting()- Mandatory setting " + IdentityAbstractionConfigFile + " not set"); + m_log.debug("getSetting()- Mandatory setting " + IdentityAbstractionConfigFile + " not set"); throw new Exception("Missing mandatory configuration setting"); } } else { - m_log.debug("SvcConfig.getSetting()- Found setting " + settingName); - m_log.debug("SvcConfig.getSetting()- Setting value = " + value); + m_log.debug("getSetting()- Found setting " + settingName); + m_log.debug("getSetting()- Setting value = " + value); } return value; diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/WSSecurity.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/WSSecurity.java index e686aa4e..88637492 100644 --- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/WSSecurity.java +++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/WSSecurity.java @@ -240,17 +240,17 @@ public final class WSSecurity if (timeStampProcessed && signatureProcessed) { - m_log.debug("WSSecurity.verifyMessage() - Validation succeded"); + m_log.debug("verifyMessage() - Validation succeded"); msgVerificationStatus = true; } else { - m_log.warn("WSSecurity.verifyMessage() - validation failed"); + m_log.warn("verifyMessage() - validation failed"); } } catch (WSSecurityException e) { - m_log.warn("WSSecurity.verifyMessage() - Verification failed with error:" + e.getMessage() + " code = " + e.getErrorCode()); + m_log.warn("verifyMessage() - Verification failed with error:" + e.getMessage() + " code = " + e.getErrorCode()); } return msgVerificationStatus;