Author: keith Date: Tue May 27 23:11:33 2008 New Revision: 17478 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17478
Log: Fixing Log levels. moving some log.debug to log.error and wrapping all log.debug statements with log.debugEnabled Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/dispatchers/MashupDispatcher.java trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAccessControlAdmin.java trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAuthorizer.java trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/i18n/ProjectResourceBundle.java trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/IdentityHandler.java trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ResetPasswordBean.java trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/session/SessionHostObject.java Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/dispatchers/MashupDispatcher.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/dispatchers/MashupDispatcher.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/dispatchers/MashupDispatcher.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/dispatchers/MashupDispatcher.java Tue May 27 23:11:33 2008 @@ -25,7 +25,6 @@ import org.apache.axis2.description.WSDL2Constants; import org.apache.axis2.engine.AbstractDispatcher; import org.apache.axis2.engine.AxisConfiguration; -import org.apache.axis2.util.LoggingControl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.mashup.MashupConstants; Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAccessControlAdmin.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAccessControlAdmin.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAccessControlAdmin.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAccessControlAdmin.java Tue May 27 23:11:33 2008 @@ -70,7 +70,7 @@ getPermission.close(); clearUPStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException(Messages .getMessage("errorModifyingUserStore"), e); } finally { @@ -140,7 +140,7 @@ getPermission.close(); deleteRolesStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException(Messages .getMessage("errorModifyingUserStore"), e); } finally { @@ -174,7 +174,7 @@ dbConnection.commit(); clearResourceAuthorizationsStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException(Messages .getMessage("errorModifyingUserStore"), e); } finally { @@ -289,7 +289,7 @@ dbConnection.commit(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorCopyingAuthorizations", e); } finally { try { @@ -350,7 +350,7 @@ } } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorModifyingUserStore", e); } return permissionId; @@ -390,7 +390,7 @@ addUserPermissionStmt.close(); clearUPStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorModifyingUserStore", e); } finally { try { @@ -440,7 +440,7 @@ addRolePermissionStmt.close(); deleteRolesStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorModifyingUserStore", e); } finally { try { Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAuthorizer.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAuthorizer.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAuthorizer.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASAuthorizer.java Tue May 27 23:11:33 2008 @@ -97,7 +97,7 @@ } getAuthorizedUsersForResourceStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorReadingFromUserStore", e); } finally { try { @@ -138,7 +138,7 @@ } getAuthorizedUsersForResourceStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorReadingFromUserStore", e); } finally { try { @@ -179,7 +179,7 @@ } getAuthorizedRolesForResourceStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorReadingFromUserStore", e); } finally { try { @@ -221,7 +221,7 @@ } getAuthorizedRolesForResourceStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorReadingFromUserStore", e); } finally { try { @@ -291,7 +291,7 @@ } isRoleAuthorizedStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorReadingFromUserStore", e); } finally { try { @@ -330,7 +330,7 @@ } isUserAuthorizedStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorReadingFromUserStore", e); } finally { try { Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/realm/wsas/WSASUserStoreAdmin.java Tue May 27 23:11:33 2008 @@ -120,7 +120,7 @@ setRolePropertiesStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorModifyingUserStore", e); } finally { try { @@ -171,7 +171,7 @@ deleteUserPropsStmt.close(); setUserPropertiesStmt.close(); } catch (SQLException e) { - log.debug(e); + log.error(e); throw new UserStoreException("errorModifyingUserStore", e); } finally { try { Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java Tue May 27 23:11:33 2008 @@ -103,7 +103,7 @@ outputStream.flush(); } } catch (OMException e) { - log.debug(e); + log.error(e); } catch (Exception e) { log.error(e); } Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java Tue May 27 23:11:33 2008 @@ -85,7 +85,7 @@ outputStream.flush(); } } catch (OMException e) { - log.debug(e); + log.error(e); } catch (Exception e) { log.error(e); } Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java Tue May 27 23:11:33 2008 @@ -142,7 +142,7 @@ outputStream.flush(); } } catch (OMException e) { - log.debug(e); + log.error(e); } catch (Exception e) { log.error(e); } Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java Tue May 27 23:11:33 2008 @@ -64,7 +64,7 @@ outputStream.flush(); } } catch (OMException e) { - log.debug(e); + log.error(e); } catch (Exception e) { log.error(e); } Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java Tue May 27 23:11:33 2008 @@ -200,7 +200,7 @@ return; } } catch (OMException e) { - log.debug(e); + log.error(e); } catch (Exception e) { log.error(e); } Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/i18n/ProjectResourceBundle.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/i18n/ProjectResourceBundle.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/i18n/ProjectResourceBundle.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/i18n/ProjectResourceBundle.java Tue May 27 23:11:33 2008 @@ -235,7 +235,7 @@ try { bundle = getBundle(context, packageName); } catch (RuntimeException e) { - log.debug("Exception: ", e); + log.error("Exception: ", e); throw e; } @@ -392,7 +392,7 @@ _loader); } catch (MissingResourceException e) { // Deliberately surpressing print stack.. just the string for info. - log.debug("loadBundle: Ignoring MissingResourceException: " + e.getMessage()); + log.error("loadBundle: Ignoring MissingResourceException: " + e.getMessage()); } return null; } @@ -411,13 +411,13 @@ String validate(String packageName) throws MissingResourceException { if (_projectName == null || _projectName.length() == 0) { - log.debug("Project name not specified"); + log.error("Project name not specified"); throw new MissingResourceException("Project name not specified", "", ""); } if (packageName == null || packageName.length() == 0) { - log.debug("Package name not specified"); + log.error("Package name not specified"); throw new MissingResourceException("Package not specified", packageName, ""); } @@ -427,7 +427,7 @@ * Terminate project name with '.' to ensure proper match. */ if (!packageName.equals(_projectName) && !packageName.startsWith(_projectName + '.')) { - log.debug("Project not a prefix of Package"); + log.error("Project not a prefix of Package"); throw new MissingResourceException("Project '" + _projectName + "' must be a prefix of Package '" + packageName + "'", Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/IdentityHandler.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/IdentityHandler.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/IdentityHandler.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/identity/IdentityHandler.java Tue May 27 23:11:33 2008 @@ -56,7 +56,9 @@ * @return true if values have been retrieved successfully. */ public static boolean signIn(HttpServletRequest request) { - log.debug("Signing in using InfoCard or OpenID."); + if (log.isDebugEnabled()) { + log.debug("Signing in using InfoCard or OpenID."); + } boolean success = false; // If the identity (InfoCard or OpenID) has been successfully used, proceed. Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ResetPasswordBean.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ResetPasswordBean.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ResetPasswordBean.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/webapp/userprofile/ResetPasswordBean.java Tue May 27 23:11:33 2008 @@ -176,10 +176,14 @@ msg.setSubject(subject); msg.setText(message + newPassword); - log.debug("Sending confirmation mail to " + emailId); + if (log.isDebugEnabled()) { + log.debug("Sending confirmation mail to " + emailId); + } // Send the message Transport.send(msg); - log.debug("Sending confirmation mail to " + emailId + "DONE"); + if (log.isDebugEnabled()) { + log.debug("Sending confirmation mail to " + emailId + "DONE"); + } } catch (AddressException e) { log.error("Error sending mail - check config", e); throw new MashupFault("Error sending mail - check config", e); Modified: trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/session/SessionHostObject.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/session/SessionHostObject.java?rev=17478&r1=17477&r2=17478&view=diff ============================================================================== --- trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/session/SessionHostObject.java (original) +++ trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/session/SessionHostObject.java Tue May 27 23:11:33 2008 @@ -81,10 +81,14 @@ } else { sessionHostObject = (SessionHostObject) mashupSessionObject; } - log.debug("Instantiated the Session Host Object"); + if (log.isDebugEnabled()) { + log.debug("Instantiated the Session Host Object"); + } return sessionHostObject; } - log.debug("Instantiated the Session Host Object without MessageContext."); + if (log.isDebugEnabled()) { + log.debug("Instantiated the Session Host Object without MessageContext."); + } // This is to make sure that the java script service deployer does not // fail due to the non-availability of the MessageContext. return new SessionHostObject(); _______________________________________________ Mashup-dev mailing list [email protected] http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
