[exo-jcr-commits] exo-jcr SVN: r5494 - in core/branches/2.5.x: exo.core.component.database/src/main/java/org/exoplatform/services/database/impl and 22 other directories.

Author: andrew.plotnikov Date: 2012-01-23 10:22:03 -0500 (Mon, 23 Jan 2012) New Revision: 5494 Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLTableManager.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/ExoCacheProvider.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java core/branches/2.5.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestDocumentReadersIncomVals.java core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/CreateUserListener.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveGroupListener.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveUserProfileListener.java core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java core/branches/2.5.x/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptJarJarPlugin.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/MembershipEntry.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationJbossLoginModule.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationJettyLoginModule.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationTomcatLoginModule.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/JbossLoginModule.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereFilter.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereJAASLoginModule.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/SharedStateLoginModule.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/resolving/impl/XMLResolvingServiceImpl.java core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/EncodingMapImpl.java core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/TransformerBase.java core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/html/TidyTransformerImpl.java core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTemplatesServiceImpl.java core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTransformerImpl.java Log: EXOJCR-1725: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2 Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/ReflectionUtil.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -18,6 +18,9 @@ */ package org.exoplatform.services.database; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; @@ -30,6 +33,8 @@ public class ReflectionUtil { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.database.ReflectionUtil"); + public final static void setValue(Object bean, Field field, Object value) throws Exception { Class clazz = bean.getClass(); @@ -68,6 +73,10 @@ } catch (Exception e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return null; } Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLTableManager.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLTableManager.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/StandardSQLTableManager.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -37,7 +37,8 @@ /** * Logger. */ - private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.database.StandardSQLTableManager"); + private static final Log LOG = ExoLogger + .getLogger("exo.core.component.organization.database.StandardSQLTableManager"); private ExoDatasource exoDatasource; Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/ExoCacheProvider.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/ExoCacheProvider.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/ExoCacheProvider.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -41,7 +41,7 @@ public class ExoCacheProvider implements CacheProvider { - private static Log LOG = ExoLogger.getLogger("exo.core.component.database.HibernateServiceImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.database.HibernateServiceImpl"); private CacheService cacheService; Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -33,6 +33,7 @@ import org.exoplatform.services.database.ObjectQuery; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; @@ -70,7 +71,7 @@ private ThreadLocal<Session> threadLocal_; - private static Log log_ = ExoLogger.getLogger("exo.core.component.database.HibernateServiceImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.database.HibernateServiceImpl"); private HibernateConfigurationImpl conf_; @@ -107,7 +108,7 @@ String dialect = value.substring(22); value = pkg.getName() + "." + dialect; // 22 is the length of // "org.hibernate.dialect" - log_.info("Using dialect " + dialect); + LOG.info("Using dialect " + dialect); } else if (name.equals("hibernate.default_schema") && (value == null || value.isEmpty())) { @@ -149,7 +150,7 @@ dataSource = (DataSource)new InitialContext().lookup(dataSourceName); if (dataSource == null) { - log_.error("DataSource is configured but not finded.", new Exception()); + LOG.error("DataSource is configured but not finded.", new Exception()); } else { @@ -161,7 +162,7 @@ } catch (NamingException e) { - log_.error(e.getMessage(), e); + LOG.error(e.getMessage(), e); } } else @@ -177,15 +178,15 @@ } catch (InstantiationException e) { - log_.error(e.getMessage(), e); + LOG.error(e.getMessage(), e); } catch (IllegalAccessException e) { - log_.error(e.getMessage(), e); + LOG.error(e.getMessage(), e); } catch (ClassNotFoundException e) { - log_.error(e.getMessage(), e); + LOG.error(e.getMessage(), e); } String dbUserName = conf_.getProperty("hibernate.connection.username"); @@ -201,13 +202,13 @@ else { Exception e = new Exception("Any data source is not configured!"); - log_.error(e.getMessage(), e); + LOG.error(e.getMessage(), e); } } } catch (SQLException e) { - log_.error(e.getMessage(), e); + LOG.error(e.getMessage(), e); } finally { @@ -219,7 +220,7 @@ } catch (SQLException e) { - log_.error(e.getMessage(), e); + LOG.error(e.getMessage(), e); } } } @@ -246,7 +247,7 @@ { mappings_.add(relativePath); URL url = cl.getResource(relativePath); - log_.info("Adding Hibernate Mapping: " + relativePath); + LOG.info("Adding Hibernate Mapping: " + relativePath); conf_.addURL(url); } } @@ -268,7 +269,7 @@ } catch (Exception ex) { - log_.error(ex.getLocalizedMessage(), ex); + LOG.error(ex.getLocalizedMessage(), ex); } } } @@ -313,8 +314,8 @@ Session currentSession = threadLocal_.get(); if (currentSession == null) { - if (log_.isDebugEnabled()) - log_.debug("open new hibernate session in openSession()"); + if (LOG.isDebugEnabled()) + LOG.debug("open new hibernate session in openSession()"); currentSession = getSessionFactory().openSession(); threadLocal_.set(currentSession); } @@ -340,12 +341,14 @@ try { session.close(); - if (log_.isDebugEnabled()) - log_.debug("close hibernate session in openSession(Session session)"); + if (LOG.isDebugEnabled()) + { + LOG.debug("close hibernate session in openSession(Session session)"); + } } - catch (Throwable t) + catch (HibernateException t) { - log_.error("Error closing hibernate session : " + t.getMessage(), t); + LOG.error("Error closing hibernate session : " + t.getMessage(), t); } threadLocal_.set(null); } Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -40,7 +40,7 @@ public class CreateDBSchemaPlugin extends BaseComponentPlugin { - protected static Log log = ExoLogger.getLogger("exo.core.component.database.CreateDBSchemaPlugin"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.database.CreateDBSchemaPlugin"); private String dataSource; @@ -72,14 +72,14 @@ { try { - log.warn("Db script not found as system resource... Trying to search as file by path: " + LOG.warn("Db script not found as system resource... Trying to search as file by path: " + scriptFileParam.getValue()); is = new FileInputStream(scriptFileParam.getValue()); - log.info("Db script found as file by path: " + scriptFileParam.getValue()); + LOG.info("Db script found as file by path: " + scriptFileParam.getValue()); } catch (IOException e) { - log.warn("Db script not found as file by path: " + scriptFileParam.getValue() + ". " + e); + LOG.warn("Db script not found as file by path: " + scriptFileParam.getValue() + ". " + e.getMessage()); } } @@ -87,14 +87,14 @@ { try { - log.warn("Db script not found as system resource... Trying to search as file by url: " + LOG.warn("Db script not found as system resource... Trying to search as file by url: " + scriptFileParam.getValue()); is = new URL(scriptFileParam.getValue()).openStream(); - log.info("Db script found as file by url: " + scriptFileParam.getValue()); + LOG.info("Db script found as file by url: " + scriptFileParam.getValue()); } catch (IOException e) { - log.warn("Db script not found as file by url: " + scriptFileParam.getValue() + ". " + e); + LOG.warn("Db script not found as file by url: " + scriptFileParam.getValue() + ". " + e.getMessage()); } } @@ -112,7 +112,7 @@ } catch (IOException e) { - log.error(e.getLocalizedMessage(), e); + LOG.error(e.getLocalizedMessage(), e); } finally { @@ -122,9 +122,12 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } - } public String getDataSource() Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -50,7 +50,7 @@ private final Pattern pattern; - private static Log log = ExoLogger.getLogger("exo.core.component.database.DBSchemaCreator"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.database.DBSchemaCreator"); private List<CreateDBSchemaPlugin> createDBSchemaPlugins = new ArrayList<CreateDBSchemaPlugin>(); @@ -84,8 +84,8 @@ if (s.length() < 1) continue; sql = s; - if (log.isDebugEnabled()) - log.debug("Execute script: \n[" + sql + "]"); + if (LOG.isDebugEnabled()) + LOG.debug("Execute script: \n[" + sql + "]"); try { @@ -100,16 +100,16 @@ Matcher aeMatcher = pattern.matcher(e.getMessage().trim()); if (!aeMatcher.matches()) throw e; - if (log.isDebugEnabled()) - log.debug(e.getMessage()); + if (LOG.isDebugEnabled()) + LOG.debug(e.getMessage()); } } - log.info("DB schema of DataSource: '" + dsName + "' created succesfully. context " + context); + LOG.info("DB schema of DataSource: '" + dsName + "' created succesfully. context " + context); } catch (SQLException e) { - log.error("Could not create db schema of DataSource: '" + dsName + "'. Reason: " + e.getMessage() + "; " + LOG.error("Could not create db schema of DataSource: '" + dsName + "'. Reason: " + e.getMessage() + "; " + JDBCUtils.getFullMessage(e) + ". Last command: " + sql, e); } finally @@ -131,11 +131,11 @@ } catch (NamingException e) { - log.error(e.getLocalizedMessage(), e); + LOG.error(e.getLocalizedMessage(), e); } catch (SQLException e) { - log.error(e.getLocalizedMessage(), e); + LOG.error(e.getLocalizedMessage(), e); } } } Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/JDBCUtils.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -94,7 +94,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } if (stmt != null) @@ -105,7 +105,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/HTMLDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -20,6 +20,8 @@ import org.exoplatform.container.xml.InitParams; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import org.htmlparser.Parser; import org.htmlparser.beans.StringBean; import org.htmlparser.util.ParserException; @@ -38,6 +40,8 @@ public class HTMLDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.HTMLDocumentReader"); + /** * Initializes a newly created object for text/html files format parsing. * @deprecated Use the default constructor instead @@ -74,7 +78,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } String refined_text = new String(); @@ -118,6 +122,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -145,6 +153,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return new Properties(); } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -26,6 +26,8 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -44,6 +46,8 @@ public class MSExcelDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSExcelDocumentReader"); + private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSZ"; /** @@ -66,7 +70,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } final StringBuilder builder = new StringBuilder(""); @@ -182,6 +186,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSOutlookDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -21,6 +21,8 @@ import org.apache.poi.hsmf.MAPIMessage; import org.apache.poi.hsmf.exceptions.ChunkNotFoundException; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -35,6 +37,8 @@ public class MSOutlookDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSOutlookDocumentReader"); + /** * Get the application/msword mime type. * @@ -57,7 +61,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } try { @@ -83,6 +87,10 @@ catch (ChunkNotFoundException e) { // "from" is empty + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } try { @@ -91,6 +99,10 @@ catch (ChunkNotFoundException e) { // "to" is empty + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } try { @@ -99,6 +111,10 @@ catch (ChunkNotFoundException e) { // "subject" is empty + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } try { @@ -107,6 +123,10 @@ catch (ChunkNotFoundException e) { // "textBody" is empty + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return builder.toString(); @@ -121,6 +141,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -140,6 +164,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return new Properties(); } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -22,6 +22,8 @@ import org.apache.poi.hwpf.usermodel.Range; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -38,6 +40,8 @@ public class MSWordDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSWordDocumentReader"); + /** * Get the application/msword mime type. * @@ -58,7 +62,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } String text = ""; try @@ -97,6 +101,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -27,6 +27,8 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -46,6 +48,9 @@ */ public class MSXExcelDocumentReader extends BaseDocumentReader { + + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSXExcelDocumentReader"); + private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSZ"; /** @@ -75,7 +80,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } StringBuilder builder = new StringBuilder(""); @@ -172,6 +177,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -27,6 +27,8 @@ import org.apache.xmlbeans.XmlException; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -46,6 +48,8 @@ public class MSXPPTDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSXPPTDocumentReader"); + /** * @see org.exoplatform.services.document.DocumentReader#getMimeTypes() */ @@ -78,7 +82,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } try { @@ -144,6 +148,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -23,6 +23,8 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -42,6 +44,8 @@ public class MSXWordDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.MSXWordDocumentReader"); + /** * @see org.exoplatform.services.document.DocumentReader#getMimeTypes() */ @@ -68,7 +72,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } String text = ""; try @@ -117,6 +121,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -22,6 +22,8 @@ import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DCMetaData; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -49,6 +51,9 @@ public class OpenOfficeDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.document.impl.OpenOfficeDocumentReader"); + /* * (non-Javadoc) * @@ -71,7 +76,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } try { @@ -120,6 +125,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } @@ -145,11 +154,19 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } is.close(); } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -225,6 +242,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -53,7 +53,7 @@ public class PDFDocumentReader extends BaseDocumentReader { - protected static Log log = ExoLogger.getLogger("exo.core.component.document.PDFDocumentReader"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.document.PDFDocumentReader"); /** * Get the application/pdf mime type. @@ -82,7 +82,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } PDDocument pdDocument = null; StringWriter sw = new StringWriter(); @@ -114,6 +114,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } if (is != null) try @@ -122,6 +126,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } return sw.toString(); @@ -170,7 +178,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } PDDocument pdDocument = PDDocument.load(is); @@ -209,7 +217,7 @@ } catch (Exception e) { - log.warn("getTitle failed: " + e); + LOG.warn("getTitle failed: " + e.getMessage()); } try { @@ -218,7 +226,7 @@ } catch (Exception e) { - log.warn("getSubject failed: " + e); + LOG.warn("getSubject failed: " + e.getMessage()); } try @@ -233,7 +241,7 @@ } catch (Exception e) { - log.warn("getCreator failed: " + e); + LOG.warn("getCreator failed: " + e.getMessage()); } try @@ -248,7 +256,7 @@ } catch (Exception e) { - log.warn("getDate failed: " + e); + LOG.warn("getDate failed: " + e.getMessage()); } } @@ -262,7 +270,7 @@ } catch (Exception e) { - log.warn("getKeywords failed: " + e); + LOG.warn("getKeywords failed: " + e.getMessage()); } try @@ -272,7 +280,7 @@ } catch (Exception e) { - log.warn("getProducer failed: " + e); + LOG.warn("getProducer failed: " + e.getMessage()); } } @@ -286,7 +294,7 @@ } catch (Exception e) { - log.warn("getCreationDate failed: " + e); + LOG.warn("getCreationDate failed: " + e.getMessage()); } try { @@ -295,7 +303,7 @@ } catch (Exception e) { - log.warn("getModificationDate failed: " + e); + LOG.warn("getModificationDate failed: " + e.getMessage()); } // DCMetaData.PUBLISHER - basic.getCreatorTool() @@ -317,7 +325,7 @@ } catch (Exception e) { - log.warn("getAuthor failed: " + e); + LOG.warn("getAuthor failed: " + e.getMessage()); } try { @@ -326,7 +334,7 @@ } catch (Exception e) { - log.warn("getCreationDate failed: " + e); + LOG.warn("getCreationDate failed: " + e.getMessage()); } try { @@ -335,7 +343,7 @@ } catch (Exception e) { - log.warn("getCreator failed: " + e); + LOG.warn("getCreator failed: " + e.getMessage()); } try { @@ -345,7 +353,7 @@ } catch (Exception e) { - log.warn("getKeywords failed: " + e); + LOG.warn("getKeywords failed: " + e.getMessage()); } try { @@ -354,7 +362,7 @@ } catch (Exception e) { - log.warn("getModificationDate failed: " + e); + LOG.warn("getModificationDate failed: " + e.getMessage()); } try { @@ -363,7 +371,7 @@ } catch (Exception e) { - log.warn("getProducer failed: " + e); + LOG.warn("getProducer failed: " + e.getMessage()); } try { @@ -372,7 +380,7 @@ } catch (Exception e) { - log.warn("getSubject failed: " + e); + LOG.warn("getSubject failed: " + e.getMessage()); } try { @@ -381,7 +389,7 @@ } catch (Exception e) { - log.warn("getTitle failed: " + e); + LOG.warn("getTitle failed: " + e.getMessage()); } // docInfo.getTrapped(); @@ -403,6 +411,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -482,9 +494,9 @@ } catch (NumberFormatException e) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug( + LOG.debug( "PDF metadata exctraction warning: can not decode octal code - " + str.substring(i - 1, i + 3) + ".", e); } @@ -492,9 +504,9 @@ } else { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("PDF metadata exctraction warning: octal code is not complete - " + LOG.debug("PDF metadata exctraction warning: octal code is not complete - " + str.substring(i - 1, len)); } } @@ -508,7 +520,7 @@ } catch (UnsupportedEncodingException e) { - log.warn("PDF metadata exctraction warning: can not convert metadata string " + str, e); + LOG.warn("PDF metadata exctraction warning: can not convert metadata string " + str, e); return ""; } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/POIPropertiesReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -33,6 +33,8 @@ import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DCMetaData; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -50,6 +52,8 @@ public class POIPropertiesReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.POIPropertiesReader"); + private final Properties props = new Properties(); public Properties getProperties() @@ -69,7 +73,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } @SuppressWarnings("serial") @@ -193,6 +197,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -20,6 +20,8 @@ import org.apache.poi.hslf.extractor.PowerPointExtractor; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -36,6 +38,8 @@ public class PPTDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.PPTDocumentReader"); + /** * Get the application/powerpoint mime type. * @@ -56,7 +60,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } try { @@ -87,6 +91,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/TextPlainDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -21,6 +21,8 @@ import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValuesParam; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,6 +38,8 @@ public class TextPlainDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.TextPlainDocumentReader"); + public static final String DEFAULT_ENCODING = "defaultEncoding"; private String defaultEncoding; @@ -106,7 +110,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } try @@ -115,15 +119,23 @@ int len; ByteArrayOutputStream bos = new ByteArrayOutputStream(); while ((len = is.read(buffer)) > 0) + { bos.write(buffer, 0, len); + } bos.close(); if (bos.size() == 0) + { return ""; + } else if (encoding != null) + { return new String(bos.toByteArray(), encoding); + } else + { return new String(bos.toByteArray()); + } } finally { @@ -134,6 +146,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -146,13 +162,16 @@ */ public Properties getProperties(InputStream is) throws IOException, DocumentReadException { - try { is.close(); } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return new Properties(); } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/XMLDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -20,6 +20,8 @@ import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.document.DocumentReadException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; @@ -43,6 +45,8 @@ public class XMLDocumentReader extends BaseDocumentReader { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.XMLDocumentReader"); + /** * Get the text/xml, application/xml, application/x-google-gadget mime types. * @@ -63,7 +67,7 @@ { if (is == null) { - throw new NullPointerException("InputStream is null."); + throw new IllegalArgumentException("InputStream is null."); } try { @@ -86,6 +90,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -110,6 +118,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return new Properties(); } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/DeltaImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -21,6 +21,8 @@ import org.exoplatform.services.document.diff.Chunk; import org.exoplatform.services.document.diff.Delta; import org.exoplatform.services.document.diff.DiffService; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.util.List; @@ -39,6 +41,8 @@ public abstract class DeltaImpl implements Delta { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.diff.DeltaImpl"); + protected Chunk original; protected Chunk revised; @@ -48,17 +52,10 @@ static { DeltaClass = new Class[2][2]; - try - { - DeltaClass[0][0] = org.exoplatform.services.document.impl.diff.ChangeDeltaImpl.class; - DeltaClass[0][1] = org.exoplatform.services.document.impl.diff.AddDeltaImpl.class; - DeltaClass[1][0] = org.exoplatform.services.document.impl.diff.DeleteDeltaImpl.class; - DeltaClass[1][1] = org.exoplatform.services.document.impl.diff.ChangeDeltaImpl.class; - } - catch (Throwable o) - { - - } + DeltaClass[0][0] = org.exoplatform.services.document.impl.diff.ChangeDeltaImpl.class; + DeltaClass[0][1] = org.exoplatform.services.document.impl.diff.AddDeltaImpl.class; + DeltaClass[1][0] = org.exoplatform.services.document.impl.diff.DeleteDeltaImpl.class; + DeltaClass[1][1] = org.exoplatform.services.document.impl.diff.ChangeDeltaImpl.class; } /** @@ -76,10 +73,14 @@ { result = (DeltaImpl)c.newInstance(); } - catch (Throwable e) + catch (InstantiationException e) { return null; } + catch (IllegalAccessException e) + { + return null; + } result.init(orig, rev); return result; } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/diff/ToStringImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -20,6 +20,8 @@ import org.exoplatform.commons.utils.PrivilegedSystemHelper; import org.exoplatform.services.document.diff.ToString; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.BufferedReader; import java.io.StringReader; @@ -34,6 +36,9 @@ */ public class ToStringImpl implements ToString { + + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.diff.ToStringImpl"); + public ToStringImpl() { } @@ -80,6 +85,10 @@ } catch (java.io.IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return (String[])l.toArray(new String[l.size()]); } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/image/ImageProcessingServiceImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -19,6 +19,8 @@ package org.exoplatform.services.document.impl.image; import org.exoplatform.services.document.image.ImageProcessingService; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.awt.Color; import java.awt.Graphics2D; @@ -29,6 +31,9 @@ public class ImageProcessingServiceImpl implements ImageProcessingService { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.document.impl.image.ImageProcessingServiceImpl"); + public BufferedImage createCroppedImage(BufferedImage img, int chosenWidth, int chosenHeight) { int topX = 0; // X coordinate of the top left corner @@ -172,6 +177,10 @@ } catch (NumberFormatException nfe) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + nfe.getMessage()); + } } } Modified: core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -31,6 +31,8 @@ import org.exoplatform.services.document.DCMetaData; import org.exoplatform.services.document.DocumentReadException; import org.exoplatform.services.document.HandlerNotFoundException; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; @@ -50,6 +52,9 @@ */ public class TikaDocumentReader implements AdvancedDocumentReader { + + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.document.impl.tika.TikaDocumentReader"); + /** * Since Tika can not extract metadata without extracting document content, * so reed content is limited to 10 Kb. @@ -180,8 +185,12 @@ { is.close(); } - catch (Throwable e) + catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -247,8 +256,12 @@ { is.close(); } - catch (Throwable e) + catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -344,8 +357,12 @@ { is.close(); } - catch (Throwable e) + catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: core/branches/2.5.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestDocumentReadersIncomVals.java =================================================================== --- core/branches/2.5.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestDocumentReadersIncomVals.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestDocumentReadersIncomVals.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -80,7 +80,7 @@ sb.append(serviceList.get(i).toString() + "\n"); // fails.add(serviceList.get(i).toString()); } - catch (NullPointerException e) + catch (IllegalArgumentException e) { //ok } Modified: core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -22,6 +22,8 @@ import org.exoplatform.services.cache.CachedObjectSelector; import org.exoplatform.services.cache.ExoCache; import org.exoplatform.services.cache.ObjectCacheInfo; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.Serializable; import java.util.HashMap; @@ -55,6 +57,9 @@ */ public class CacheHandler { + + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.organization.CacheHandler"); + public static final String MEMBERSHIPTYPE_PREFIX = "mt="; public static final String GROUP_PREFIX = "g="; @@ -187,6 +192,10 @@ } catch (Exception e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } else @@ -245,6 +254,10 @@ } catch (Exception e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } else Modified: core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -31,7 +31,8 @@ ComponentPlugin { - protected static Log log = ExoLogger.getLogger("exo.core.component.organization.api.OrganizationDatabaseInitializer"); + protected static final Log LOG = ExoLogger + .getLogger("exo.core.component.organization.api.OrganizationDatabaseInitializer"); private OrganizationConfig config_; @@ -194,6 +195,6 @@ private void printInfo(String message) { if (printInfo_) - log.info(message); + LOG.info(message); } } Modified: core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -54,7 +54,7 @@ public class OrganizationAuthenticatorImpl implements Authenticator { - protected static Log log = + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.api.OrganizationUserRegistry"); private final OrganizationService orgService; Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -47,7 +47,7 @@ public class GroupDAOImpl extends StandardSQLDAO<GroupImpl> implements GroupHandler { - protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.GroupDAOImpl"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.jdbc.GroupDAOImpl"); protected ListenerService listenerService_; @@ -110,8 +110,8 @@ if (broadcast) listenerService_.broadcast("organization.group.preSave", this, childImpl); childImpl.setId(groupId); - if (log.isDebugEnabled()) - log.debug("----------ADD GROUP " + child.getId() + " into Group" + child.getParentId()); + if (LOG.isDebugEnabled()) + LOG.debug("----------ADD GROUP " + child.getId() + " into Group" + child.getParentId()); try { @@ -139,8 +139,8 @@ DBObjectQuery<GroupImpl> query = new DBObjectQuery<GroupImpl>(GroupImpl.class); query.addEQ("GROUP_ID", groupId); Group g = super.loadUnique(query.toQuery()); - if (log.isDebugEnabled()) - log.debug("----------FIND GROUP BY ID: " + groupId + " _ " + (g != null)); + if (LOG.isDebugEnabled()) + LOG.debug("----------FIND GROUP BY ID: " + groupId + " _ " + (g != null)); return g; } @@ -161,8 +161,8 @@ if (g != null) groups.add(g); } - if (log.isDebugEnabled()) - log.debug("----------FIND GROUP BY USERNAME AND TYPE: " + userName + " - " + membershipType + " - "); + if (LOG.isDebugEnabled()) + LOG.debug("----------FIND GROUP BY USERNAME AND TYPE: " + userName + " - " + membershipType + " - "); return groups; } @@ -174,10 +174,10 @@ DBObjectQuery<GroupImpl> query = new DBObjectQuery<GroupImpl>(GroupImpl.class); query.addEQ("PARENT_ID", parentId); DBPageList<GroupImpl> pageList = new DBPageList<GroupImpl>(20, this, query); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("----------FIND GROUP BY PARENT: " + parent); - log.debug(" Size = " + pageList.getAvailable()); + LOG.debug("----------FIND GROUP BY PARENT: " + parent); + LOG.debug(" Size = " + pageList.getAvailable()); } return pageList.getAll(); } @@ -194,8 +194,8 @@ if (g != null && !hasGroup(groups, g)) groups.add(g); } - if (log.isDebugEnabled()) - log.debug("----------FIND GROUP BY USER: " + user + " - " + (groups != null)); + if (LOG.isDebugEnabled()) + LOG.debug("----------FIND GROUP BY USER: " + user + " - " + (groups != null)); return groups; } Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -49,7 +49,7 @@ public class UserDAOImpl extends StandardSQLDAO<UserImpl> implements UserHandler, ExtendedUserHandler { - protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.UserDAOImpl"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.jdbc.UserDAOImpl"); protected ListenerService listenerService_; @@ -76,8 +76,8 @@ public void createUser(User user, boolean broadcast) throws Exception { - if (log.isDebugEnabled()) - log.debug("----------- CREATE USER " + user.getUserName()); + if (LOG.isDebugEnabled()) + LOG.debug("----------- CREATE USER " + user.getUserName()); UserImpl userImpl = (UserImpl)user; if (broadcast) listenerService_.broadcast(UserHandler.PRE_CREATE_USER_EVENT, this, userImpl); @@ -110,9 +110,9 @@ authenticated = encryptedPassword.equals(password); } - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("+++++++++++AUTHENTICATE USERNAME " + username + " AND PASS " + password + " - " + authenticated); + LOG.debug("+++++++++++AUTHENTICATE USERNAME " + username + " AND PASS " + password + " - " + authenticated); } if (authenticated) { @@ -128,9 +128,9 @@ DBObjectQuery<UserImpl> query = new DBObjectQuery<UserImpl>(UserImpl.class); query.addEQ("USER_NAME", userName); User user = loadUnique(query.toQuery());; - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("+++++++++++FIND USER BY USER NAME " + userName + " - " + (user != null)); + LOG.debug("+++++++++++FIND USER BY USER NAME " + userName + " - " + (user != null)); } return user; } @@ -172,8 +172,8 @@ public ListAccess<User> findUsersByGroupId(String groupId) throws Exception { - if (log.isDebugEnabled()) - log.debug("+++++++++++FIND USER BY GROUP_ID " + groupId); + if (LOG.isDebugEnabled()) + LOG.debug("+++++++++++FIND USER BY GROUP_ID " + groupId); MembershipHandler membershipHandler = orgService.getMembershipHandler(); GroupHandler groupHandler = orgService.getGroupHandler(); Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -39,7 +39,7 @@ public class UserProfileDAOImpl extends StandardSQLDAO<UserProfileData> implements UserProfileHandler { - protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.UserProfileDAOImpl"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.jdbc.UserProfileDAOImpl"); protected ListenerService listenerService_; @@ -57,8 +57,8 @@ public UserProfile createUserProfileInstance(String userName) { - if (log.isDebugEnabled()) - log.debug("----------------Create Profile with userName = " + userName); + if (LOG.isDebugEnabled()) + LOG.debug("----------------Create Profile with userName = " + userName); return new UserProfileData(userName).getUserProfile(); } Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/CreateUserListener.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/CreateUserListener.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/CreateUserListener.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -40,7 +40,7 @@ { private OrganizationService service_; - protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.CreateUserListener"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.jdbc.CreateUserListener"); public CreateUserListener(OrganizationService service) { @@ -49,7 +49,7 @@ public void onEvent(Event<UserDAOImpl, User> event) throws Exception { - log.info("Create User Profile: " + event.getData().getUserName()); + LOG.info("Create User Profile: " + event.getData().getUserName()); UserProfile profile = service_.getUserProfileHandler().createUserProfileInstance(event.getData().getUserName()); service_.getUserProfileHandler().saveUserProfile(profile, true); GroupHandler groupHandler = service_.getGroupHandler(); Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveGroupListener.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveGroupListener.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveGroupListener.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -36,7 +36,7 @@ public class RemoveGroupListener extends Listener<GroupDAOImpl, Group> { - protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.RemoveGroupListener"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.jdbc.RemoveGroupListener"); private OrganizationService service_; @@ -48,7 +48,7 @@ @SuppressWarnings("unchecked") public void onEvent(Event<GroupDAOImpl, Group> event) throws Exception { - log.info("Remove all Child of Group: " + event.getData().getId()); + LOG.info("Remove all Child of Group: " + event.getData().getId()); GroupHandler membershipHanler = service_.getGroupHandler(); List<Group> children = (List<Group>)membershipHanler.findGroups(event.getData()); for (Group child : children) Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -42,7 +42,8 @@ { private OrganizationService service_; - protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.RemoveMembershipListener"); + protected static final Log LOG = ExoLogger + .getLogger("exo.core.component.organization.jdbc.RemoveMembershipListener"); public RemoveMembershipListener(OrganizationService service) { @@ -58,13 +59,13 @@ if (target instanceof User) { User user = (User)target; - log.info("Remove all Membership by User: " + user.getUserName()); + LOG.info("Remove all Membership by User: " + user.getUserName()); membershipHanler.removeMembershipByUser(user.getUserName(), true); } else if (target instanceof Group) { Group group = (Group)target; - log.info("Remove all Membership by Group: " + group.getGroupName()); + LOG.info("Remove all Membership by Group: " + group.getGroupName()); List<Membership> members = (List<Membership>)membershipHanler.findMembershipsByGroup(group); for (Membership member : members) { @@ -83,7 +84,7 @@ } catch (Exception e) { - log.error("Error while removing a Membership", e); + LOG.error("Error while removing a Membership", e); } } } Modified: core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveUserProfileListener.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveUserProfileListener.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveUserProfileListener.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -34,7 +34,8 @@ { private OrganizationService service_; - protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.RemoveUserProfileListener"); + protected static final Log LOG = ExoLogger + .getLogger("exo.core.component.organization.jdbc.RemoveUserProfileListener"); public RemoveUserProfileListener(OrganizationService service) { @@ -43,7 +44,7 @@ public void onEvent(Event<UserDAOImpl, User> event) throws Exception { - log.info("Delete User Profile: " + event.getData().getUserName()); + LOG.info("Delete User Profile: " + event.getData().getUserName()); service_.getUserProfileHandler().removeUserProfile(event.getData().getUserName(), true); } } Modified: core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -55,7 +55,7 @@ private LDAPAttributeMapping ldapAttrMapping; - private static Log logger = ExoLogger.getLogger("exo.core.component.organization.ldap.LDAPUserPageList"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.ldap.LDAPUserPageList"); static boolean SEARCH_CONTROL = Control.NONCRITICAL; @@ -74,12 +74,12 @@ } catch (NameNotFoundException e) { - logger.warn("Cannot set the page size while creating a LDAPUserPageList, no page size will be used", e); + LOG.warn("Cannot set the page size while creating a LDAPUserPageList, no page size will be used", e); setAvailablePage(0); } catch (OperationNotSupportedException e) { - logger.warn("Cannot set the page size while creating a LDAPUserPageList, no page size will be used", e); + LOG.warn("Cannot set the page size while creating a LDAPUserPageList, no page size will be used", e); setAvailablePage(0); } } Modified: core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java =================================================================== --- core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationLdapInitializer.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -21,6 +21,8 @@ import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.component.ComponentPlugin; import org.exoplatform.services.ldap.ObjectClassAttribute; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.OrganizationServiceInitializer; @@ -41,6 +43,9 @@ ComponentPlugin { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.organization.ldap.OrganizationLdapInitializer"); + protected static Pattern COMPACT_DN = Pattern.compile("\\b\\p{Space}*=\\p{Space}*", Pattern.CASE_INSENSITIVE); /** @@ -112,6 +117,10 @@ } catch (Exception exp) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + exp.getMessage()); + } } finally { Modified: core/branches/2.5.x/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptJarJarPlugin.java =================================================================== --- core/branches/2.5.x/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptJarJarPlugin.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptJarJarPlugin.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -43,7 +43,7 @@ private final Map<String, String> mapping = new HashMap<String, String>(); /** Our logger. */ - private final Log log = ExoLogger.getLogger("exo.core.component.script.groovy.GroovyScriptJarJarPlugin"); + private final static Log LOG = ExoLogger.getLogger("exo.core.component.script.groovy.GroovyScriptJarJarPlugin"); @SuppressWarnings("unchecked") public GroovyScriptJarJarPlugin(InitParams params) @@ -53,7 +53,7 @@ if (mapping == null) { - log.warn("Was expecting a mapping init param"); + LOG.warn("Was expecting a mapping init param"); } else { @@ -67,11 +67,11 @@ String left = tmp[0].trim(); String right = tmp[1].trim(); mapping.put(left, right); - log.debug("Added mapping rule " + left + " -> " + right); + LOG.debug("Added mapping rule " + left + " -> " + right); } else { - log.warn("Malformed mapping rule:" + rule); + LOG.warn("Malformed mapping rule:" + rule); } } } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -19,6 +19,7 @@ package org.exoplatform.services.security; import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.ValueParam; import org.exoplatform.services.listener.ListenerService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -81,14 +82,16 @@ { try { - return Integer.valueOf(ip.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL).getValue()); + ValueParam concurrencyLevel = ip.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL); + if (concurrencyLevel != null) + { + return Integer.valueOf(concurrencyLevel.getValue()); + } + else + { + return DEFAULT_CONCURRENCY_LEVEL; + } } - catch (NullPointerException e) - { - LOG.info("Parameter " + INIT_PARAM_CONCURRENCY_LEVEL + " was not found in configuration, default " - + DEFAULT_CONCURRENCY_LEVEL + " will be used."); - return DEFAULT_CONCURRENCY_LEVEL; - } catch (Exception e) { LOG.error("Can't parse parameter " + INIT_PARAM_CONCURRENCY_LEVEL, e); Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/DigestPasswordEncrypter.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -19,6 +19,9 @@ package org.exoplatform.services.security; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Map; @@ -34,6 +37,9 @@ public class DigestPasswordEncrypter implements PasswordEncrypter { + + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.security.DigestPasswordEncrypter"); + final private int HASH_HEX_LENGTH = 32; final private Map<String, String> context; @@ -99,7 +105,10 @@ } catch (NoSuchAlgorithmException e) { - + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } // calculate MD5 hash of A1 string String a1 = username + ":" + realm + ":" + new String(plainPassword); Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -19,6 +19,7 @@ package org.exoplatform.services.security; import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.ValueParam; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -69,14 +70,16 @@ { try { - return Integer.valueOf(params.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL).getValue()); + ValueParam concurrencyLevel = params.getValueParam(INIT_PARAM_CONCURRENCY_LEVEL); + if (concurrencyLevel != null) + { + return Integer.valueOf(concurrencyLevel.getValue()); + } + else + { + return DEFAULT_CONCURRENCY_LEVEL; + } } - catch (NullPointerException e) - { - LOG.info("Parameter " + INIT_PARAM_CONCURRENCY_LEVEL + " was not found in configuration, default " - + DEFAULT_CONCURRENCY_LEVEL + "will be used."); - return DEFAULT_CONCURRENCY_LEVEL; - } catch (Exception e) { LOG.error("Can't parse parameter " + INIT_PARAM_CONCURRENCY_LEVEL, e); Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/MembershipEntry.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/MembershipEntry.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/MembershipEntry.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -52,7 +52,9 @@ { this.membershipType = membershipType != null ? membershipType : ANY_TYPE; if (group == null) - throw new NullPointerException("Group is null"); + { + throw new IllegalArgumentException("Group is null"); + } this.group = group; } @@ -79,12 +81,18 @@ public boolean equals(Object obj) { if (this == obj) + { return true; + } if (!(obj instanceof MembershipEntry)) + { return false; + } MembershipEntry me = (MembershipEntry)obj; if (membershipType.equals(ANY_TYPE) || me.membershipType.equals(ANY_TYPE)) + { return this.group.equals(me.group); + } return this.group.equals(me.group) && this.membershipType.equals(me.membershipType); } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationJbossLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationJbossLoginModule.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationJbossLoginModule.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -55,17 +55,17 @@ @Override public boolean login() throws LoginException { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("In login of JbossLoginModule."); + LOG.debug("In login of JbossLoginModule."); } try { if (sharedState.containsKey("exo.security.identity")) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Use Identity from previous LoginModule"); + LOG.debug("Use Identity from previous LoginModule"); } identity = (Identity)sharedState.get("exo.security.identity"); } @@ -76,9 +76,9 @@ return super.login(); } - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Try create identity"); + LOG.debug("Try create identity"); } Authenticator authenticator = (Authenticator)getContainer().getComponentInstanceOfType(Authenticator.class); @@ -98,11 +98,11 @@ return true; } - catch (final Throwable e) + catch (final Exception e) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug(e.getMessage(), e); + LOG.debug(e.getMessage(), e); } throw new LoginException(e.getMessage()); @@ -160,9 +160,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Error on retrieving username from callback handler! ", e); + LOG.error("Error on retrieving username from callback handler! ", e); } } @@ -175,9 +175,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Error on retrieving password from callback handler! ", e); + LOG.error("Error on retrieving password from callback handler! ", e); } } @@ -201,9 +201,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Error on retrieving username from callback handler! ", e); + LOG.error("Error on retrieving username from callback handler! ", e); } } @@ -223,9 +223,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Error on retrieving password from callback handler! ", e); + LOG.error("Error on retrieving password from callback handler! ", e); } } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationJettyLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationJettyLoginModule.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationJettyLoginModule.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -58,17 +58,17 @@ @Override public boolean login() throws LoginException { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("In login of JettyLoginModule."); + LOG.debug("In login of JettyLoginModule."); } try { if (sharedState.containsKey("exo.security.identity")) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Use Identity from previous LoginModule"); + LOG.debug("Use Identity from previous LoginModule"); } identity = (Identity)sharedState.get("exo.security.identity"); } @@ -79,9 +79,9 @@ return super.login(); } - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Try create identity"); + LOG.debug("Try create identity"); } Authenticator authenticator = (Authenticator)getContainer().getComponentInstanceOfType(Authenticator.class); @@ -102,11 +102,11 @@ return true; } - catch (final Throwable e) + catch (final Exception e) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug(e.getMessage(), e); + LOG.debug(e.getMessage(), e); } throw new LoginException(e.getMessage()); @@ -189,9 +189,9 @@ } catch (Exception e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Could not get credentials.", e); + LOG.error("Could not get credentials.", e); } } @@ -215,9 +215,9 @@ } catch (Exception e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Could not get username.", e); + LOG.error("Could not get username.", e); } } @@ -237,9 +237,9 @@ } catch (Exception e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Could not get password.", e); + LOG.error("Could not get password.", e); } } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationTomcatLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationTomcatLoginModule.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/DigestAuthenticationTomcatLoginModule.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -54,17 +54,17 @@ @Override public boolean login() throws LoginException { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("In login of ExtendedTomcatLoginModule."); + LOG.debug("In login of ExtendedTomcatLoginModule."); } try { if (sharedState.containsKey("exo.security.identity")) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Use Identity from previous LoginModule"); + LOG.debug("Use Identity from previous LoginModule"); } identity = (Identity)sharedState.get("exo.security.identity"); } @@ -75,9 +75,9 @@ return super.login(); } - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Try create identity"); + LOG.debug("Try create identity"); } Authenticator authenticator = (Authenticator)getContainer().getComponentInstanceOfType(Authenticator.class); @@ -97,11 +97,11 @@ return true; } - catch (final Throwable e) + catch (final Exception e) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug(e.getMessage(), e); + LOG.debug(e.getMessage(), e); } throw new LoginException(e.getMessage()); @@ -145,9 +145,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Unsupported callback type.", e); + LOG.debug("Unsupported callback type.", e); } } @@ -161,9 +161,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Error on retrieving username from callback handler! ", e); + LOG.error("Error on retrieving username from callback handler! ", e); } } @@ -176,9 +176,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Error on retrieving password from callback handler! ", e); + LOG.error("Error on retrieving password from callback handler! ", e); } } @@ -217,9 +217,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Error on retrieving username from callback handler! ", e); + LOG.error("Error on retrieving username from callback handler! ", e); } } @@ -239,9 +239,9 @@ } catch (UnsupportedCallbackException e) { - if (log.isErrorEnabled()) + if (LOG.isErrorEnabled()) { - log.error("Error on retrieving password from callback handler! ", e); + LOG.error("Error on retrieving password from callback handler! ", e); } } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/JbossLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/JbossLoginModule.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/JbossLoginModule.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -47,7 +47,7 @@ public class JbossLoginModule extends DefaultLoginModule { /** . */ - protected static Log log = ExoLogger.getLogger("exo.core.component.security.core.JbossLoginModule.class"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.JbossLoginModule.class"); /** * {@inheritDoc} @@ -98,7 +98,7 @@ try { - log.debug("Performing JBoss security manager cache eviction"); + LOG.debug("Performing JBoss security manager cache eviction"); ObjectName securityManagerName = new ObjectName("jboss.security:service=JaasSecurityManager"); @@ -114,7 +114,7 @@ // if (userName != null) { - log.debug("Going to perform JBoss security manager cache eviction for user " + userName); + LOG.debug("Going to perform JBoss security manager cache eviction for user " + userName); // List allPrincipals = @@ -141,28 +141,28 @@ { jbossServer.invoke(securityManagerName, "flushAuthenticationCache", new Object[]{realmName, key}, new String[]{String.class.getName(), Principal.class.getName()}); - log.debug("Performed JBoss security manager cache eviction for user " + userName + " with principal " + LOG.debug("Performed JBoss security manager cache eviction for user " + userName + " with principal " + key); } else { - log.debug("No principal found when performing JBoss security manager cache eviction for user " + LOG.debug("No principal found when performing JBoss security manager cache eviction for user " + userName); } } else { - log.warn("No user name found when performing JBoss security manager cache eviction"); + LOG.warn("No user name found when performing JBoss security manager cache eviction"); } } catch (Exception e) { - log.error("Could not perform JBoss security manager cache eviction", e); + LOG.error("Could not perform JBoss security manager cache eviction", e); } } else { - log.debug("Could not find mbean server for performing JBoss security manager cache eviction"); + LOG.debug("Could not find mbean server for performing JBoss security manager cache eviction"); } // Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereFilter.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereFilter.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereFilter.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -48,7 +48,7 @@ /** * Exo logger. */ - private Log log = ExoLogger.getLogger("exo.core.component.security.core.WebsphereFilter"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.WebsphereFilter"); /** * First ltpa cookie token name. @@ -108,16 +108,16 @@ { for (Cookie cook : cooks) { - if (log.isDebugEnabled()) - log.debug("WebsphereFilter.removeLtpaTokenCookie() cook.getName() = " + cook.getName()); + if (LOG.isDebugEnabled()) + LOG.debug("WebsphereFilter.removeLtpaTokenCookie() cook.getName() = " + cook.getName()); if (cook != null && (cookieName.equalsIgnoreCase(cook.getName()) || cookieName2.equalsIgnoreCase(cook.getName()))) { cook.setMaxAge(0); cook.setPath("/"); res.addCookie(cook); - if (log.isDebugEnabled()) - log.debug("WebsphereFilter.removeLtpaTokenCookie() REMOVED LtpaToken = "); + if (LOG.isDebugEnabled()) + LOG.debug("WebsphereFilter.removeLtpaTokenCookie() REMOVED LtpaToken = "); } } } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereJAASLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereJAASLoginModule.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereJAASLoginModule.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -47,7 +47,7 @@ /** * Exo logger. */ - private Log log = ExoLogger.getLogger("exo.core.component.security.core.ExoWebsphereJAASLoginModule"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.ExoWebsphereJAASLoginModule"); /** * Default constructor. @@ -62,8 +62,8 @@ @Override public boolean login() throws LoginException { - if (log.isDebugEnabled()) - log.debug("In login of WebsphereJAASLoginModule"); + if (LOG.isDebugEnabled()) + LOG.debug("In login of WebsphereJAASLoginModule"); if (super.login()) { ArrayList<String> roleGroupList = new ArrayList<String>(); @@ -116,8 +116,8 @@ @Override public boolean abort() throws LoginException { - if (log.isDebugEnabled()) - log.debug("In abort of WebsphereJAASLoginModule"); + if (LOG.isDebugEnabled()) + LOG.debug("In abort of WebsphereJAASLoginModule"); return super.abort(); } @@ -127,8 +127,8 @@ @Override public boolean logout() throws LoginException { - if (log.isDebugEnabled()) - log.debug("In logout of WebsphereJAASLoginModule"); + if (LOG.isDebugEnabled()) + LOG.debug("In logout of WebsphereJAASLoginModule"); // getSubject().getPrincipals().remove(usernamePrincipal); return super.logout(); } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -45,7 +45,7 @@ /** * Logger. */ - protected Log log = ExoLogger.getLogger("exo.core.component.security.core.DefaultLoginModule"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.DefaultLoginModule"); /** * encapsulates user's principals such as name, groups, etc . @@ -80,21 +80,21 @@ @SuppressWarnings("unchecked") public boolean login() throws LoginException { - if (log.isDebugEnabled()) - log.debug("In login of DefaultLoginModule."); + if (LOG.isDebugEnabled()) + LOG.debug("In login of DefaultLoginModule."); try { if (sharedState.containsKey("exo.security.identity")) { - if (log.isDebugEnabled()) - log.debug("Use Identity from previous LoginModule"); + if (LOG.isDebugEnabled()) + LOG.debug("Use Identity from previous LoginModule"); identity = (Identity)sharedState.get("exo.security.identity"); } else { - if (log.isDebugEnabled()) - log.debug("Try create identity"); + if (LOG.isDebugEnabled()) + LOG.debug("Try create identity"); Callback[] callbacks = new Callback[2]; callbacks[0] = new NameCallback("Username"); callbacks[1] = new PasswordCallback("Password", false); @@ -109,7 +109,9 @@ Authenticator authenticator = (Authenticator)getContainer().getComponentInstanceOfType(Authenticator.class); if (authenticator == null) + { throw new LoginException("No Authenticator component found, check your configuration"); + } Credential[] credentials = new Credential[]{new UsernameCredential(username), new PasswordCredential(password)}; @@ -124,11 +126,11 @@ return true; } - catch (final Throwable e) + catch (final Exception e) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug(e.getMessage()); + LOG.debug(e.getMessage()); } throw new LoginException(e.getMessage()); @@ -147,7 +149,9 @@ (IdentityRegistry)getContainer().getComponentInstanceOfType(IdentityRegistry.class); if (singleLogin && identityRegistry.getIdentity(identity.getUserId()) != null) + { throw new LoginException("User " + identity.getUserId() + " already logined."); + } // Do not need implement logout by self if use tomcat 6.0.21 and later. // See deprecation comments in @@ -156,9 +160,9 @@ identityRegistry.register(identity); } - catch (final Throwable e) + catch (final Exception e) { - log.error(e.getLocalizedMessage()); + LOG.error(e.getLocalizedMessage()); throw new LoginException(e.getMessage()); } return true; @@ -169,8 +173,8 @@ */ public boolean abort() throws LoginException { - if (log.isDebugEnabled()) - log.debug("In abort of DefaultLoginModule."); + if (LOG.isDebugEnabled()) + LOG.debug("In abort of DefaultLoginModule."); return true; } @@ -179,8 +183,8 @@ */ public boolean logout() throws LoginException { - if (log.isDebugEnabled()) - log.debug("In logout of DefaultLoginModule."); + if (LOG.isDebugEnabled()) + LOG.debug("In logout of DefaultLoginModule."); return true; } @@ -191,6 +195,6 @@ @Override protected Log getLogger() { - return log; + return LOG; } } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -44,7 +44,7 @@ /** * Login. */ - protected Log log = ExoLogger.getLogger("exo.core.component.security.core.IdentitySetLoginModule"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.IdentitySetLoginModule"); /** * Is allowed for one user login again if he already login. If must set in LM @@ -57,9 +57,9 @@ */ public boolean abort() throws LoginException { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("in abort"); + LOG.debug("in abort"); } return true; @@ -70,9 +70,9 @@ */ public boolean commit() throws LoginException { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("in commit"); + LOG.debug("in commit"); } String userId = (String)sharedState.get("javax.security.auth.login.name"); @@ -99,7 +99,7 @@ } catch (Exception e) { - log.error(e.getMessage()); + LOG.error(e.getMessage()); throw new LoginException(e.getMessage()); } return true; @@ -110,9 +110,9 @@ */ public void afterInitialize() { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("in initialize"); + LOG.debug("in initialize"); } String sl = (String)options.get("singleLogin"); this.singleLogin = (sl != null && (sl.equalsIgnoreCase("yes") || sl.equalsIgnoreCase("true"))); @@ -123,9 +123,9 @@ */ public boolean login() throws LoginException { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("in login"); + LOG.debug("in login"); } return true; } @@ -135,9 +135,9 @@ */ public boolean logout() throws LoginException { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("in logout"); + LOG.debug("in logout"); } return true; } @@ -148,6 +148,6 @@ @Override protected Log getLogger() { - return log; + return LOG; } } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/SharedStateLoginModule.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/SharedStateLoginModule.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/SharedStateLoginModule.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -60,7 +60,9 @@ Authenticator authenticator = (Authenticator)getContainer().getComponentInstanceOfType(Authenticator.class); if (authenticator == null) + { throw new LoginException("No Authenticator component found, check your configuration"); + } Credential[] credentials = new Credential[]{new UsernameCredential(username), new PasswordCredential(password)}; @@ -75,7 +77,7 @@ subject.getPublicCredentials().add(new UsernameCredential(username)); return true; } - catch (final Throwable e) + catch (final Exception e) { LoginException le = new LoginException(e.getMessage()); le.initCause(e); Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -41,7 +41,7 @@ /** * Logger. */ - protected Log log = ExoLogger.getLogger("exo.core.component.security.core.ConversationStateListener"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.ConversationStateListener"); /** * {@inheritDoc} @@ -66,8 +66,8 @@ ConversationState conversationState = conversationRegistry.unregister(stateKey); if (conversationState != null) - if (log.isDebugEnabled()) - log.debug("Remove conversation state " + httpSession.getId()); + if (LOG.isDebugEnabled()) + LOG.debug("Remove conversation state " + httpSession.getId()); } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/JAASConversationStateListener.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -61,8 +61,8 @@ if (conversationState != null) { - if (log.isDebugEnabled()) - log.debug("Remove conversation state " + httpSession.getId()); + if (LOG.isDebugEnabled()) + LOG.debug("Remove conversation state " + httpSession.getId()); if (conversationState.getAttribute(ConversationState.SUBJECT) != null) { Subject subject = (Subject)conversationState.getAttribute(ConversationState.SUBJECT); @@ -74,16 +74,16 @@ } else { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.warn("Subject was not found in ConversationState attributes."); + LOG.warn("Subject was not found in ConversationState attributes."); } } } } catch (Exception e) { - log.error("Can't remove conversation state " + httpSession.getId()); + LOG.error("Can't remove conversation state " + httpSession.getId()); } } Modified: core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java =================================================================== --- core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -57,7 +57,7 @@ /** * Logger. */ - private static Log log = ExoLogger.getLogger("exo.core.component.security.core.SetCurrentIdentityFilter"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.SetCurrentIdentityFilter"); /** * {@inheritDoc} @@ -95,7 +95,7 @@ } catch (Exception e) { - log.warn("An error occured while cleaning the ThreadLocal", e); + LOG.warn("An error occured while cleaning the ThreadLocal", e); } try { @@ -103,7 +103,7 @@ } catch (Exception e) { - log.warn("An error occured while cleaning the ThreadLocal", e); + LOG.warn("An error occured while cleaning the ThreadLocal", e); } } } @@ -128,18 +128,18 @@ HttpSession httpSession = httpRequest.getSession(); StateKey stateKey = new HttpSessionStateKey(httpSession); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Looking for Conversation State " + httpSession.getId()); + LOG.debug("Looking for Conversation State " + httpSession.getId()); } state = conversationRegistry.getState(stateKey); if (state == null) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Conversation State not found, try create new one."); + LOG.debug("Conversation State not found, try create new one."); } Identity identity = identityRegistry.getIdentity(userId); @@ -153,9 +153,9 @@ { if (restoreIdentity) { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Not found identity for " + userId + " try to restore it. "); + LOG.debug("Not found identity for " + userId + " try to restore it. "); } Authenticator authenticator = @@ -167,7 +167,7 @@ } catch (Exception e) { - log.error("Unable restore identity. " + e.getMessage(), e); + LOG.error("Unable restore identity. " + e.getMessage(), e); } if (identity != null) @@ -177,16 +177,16 @@ } else { - log.error("Not found identity in IdentityRegistry for user " + userId + ", check Login Module."); + LOG.error("Not found identity in IdentityRegistry for user " + userId + ", check Login Module."); } } if (state != null) { conversationRegistry.register(stateKey, state); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Register Conversation state " + httpSession.getId()); + LOG.debug("Register Conversation state " + httpSession.getId()); } } } Modified: core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/resolving/impl/XMLResolvingServiceImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/resolving/impl/XMLResolvingServiceImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/resolving/impl/XMLResolvingServiceImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -35,7 +35,7 @@ public class XMLResolvingServiceImpl implements XMLResolvingService { - private static final Log LOGGER = ExoLogger.getLogger("exo.core.component.xml-processing.XMLResolvingServiceImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.xml-processing.XMLResolvingServiceImpl"); private Map<String, String> publicIDs_ = new HashMap<String, String>(); @@ -55,7 +55,7 @@ if (publicIDs_.get(publicId) != null) throw new IllegalArgumentException("Entity whith publicId " + publicId + " already exists."); publicIDs_.put(publicId, uri); - LOGGER.info("New entries to ResolvingService added (public) : " + publicId + " : " + uri); + LOG.info("New entries to ResolvingService added (public) : " + publicId + " : " + uri); } private void addEntitySystemID(String systemId, String uri) @@ -63,7 +63,7 @@ if (systemIDs_.get(systemId) != null) throw new IllegalArgumentException("Entity whith systemId " + systemId + " already exists."); systemIDs_.put(systemId, uri); - LOGGER.info("New entries to ResolvingService added (system) : " + systemId + " : " + uri); + LOG.info("New entries to ResolvingService added (system) : " + systemId + " : " + uri); } public void addPlugin(ComponentPlugin plugin) Modified: core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/EncodingMapImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/EncodingMapImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/EncodingMapImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -35,7 +35,7 @@ public class EncodingMapImpl implements EncodingMap { - private static Log log = ExoLogger.getLogger("exo.core.component.xml-processing.EncodingMapImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.xml-processing.EncodingMapImpl"); protected final static Hashtable<String, String> IANA2JavaMap = new Hashtable<String, String>(); @@ -69,7 +69,7 @@ public String convertJava2IANA(String java) { - log.debug("convert [" + java + "] to iana coding [" + Java2IANAMap.get(java) + "]"); + LOG.debug("convert [" + java + "] to iana coding [" + Java2IANAMap.get(java) + "]"); return Java2IANAMap.get(java); } Modified: core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/TransformerBase.java =================================================================== --- core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/TransformerBase.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/TransformerBase.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -54,7 +54,7 @@ { private Result result = null; - protected Log log = ExoLogger.getLogger("exo.core.component.xml-processing.TransformerBase"); + protected static final Log LOG = ExoLogger.getLogger("exo.core.component.xml-processing.TransformerBase"); protected SAXTransformerFactory tSAXFactory; @@ -62,7 +62,7 @@ public TransformerBase() { - log.debug("Current javax.xml.parsers.SAXParserFactory sys property [ " + LOG.debug("Current javax.xml.parsers.SAXParserFactory sys property [ " + PrivilegedSystemHelper.getProperty("javax.xml.parsers.SAXParserFactory", "-Not set-") + "]"); tSAXFactory = (SAXTransformerFactory)SAXTransformerFactory.newInstance(); @@ -93,7 +93,7 @@ */ protected void afterInitResult() { - log.debug("Result is set"); + LOG.debug("Result is set"); } final public void initResult(Result result) throws NotSupportedIOTypeException @@ -130,13 +130,13 @@ if (!isSourceSupported(source)) { - log.error("source of type " + source.getClass().getName() + " not supported"); + LOG.error("source of type " + source.getClass().getName() + " not supported"); throw new NotSupportedIOTypeException(source); } if (this.result == null) { - log.error("Result not set"); + LOG.error("Result not set"); throw new IllegalStateException("Result not specified. See initResult(Result)"); } @@ -153,7 +153,7 @@ public void transformInputStream2Result(InputStream input, Result result) throws TransformerException { - log.debug("Transform InputStream to result of type " + result.getClass().getName()); + LOG.debug("Transform InputStream to result of type " + result.getClass().getName()); // StreamResult - write data from InputStream to OutputStream if (result instanceof StreamResult) @@ -169,11 +169,11 @@ counter += readBytes; outputStream.write(byteArray, 0, readBytes); } - log.debug("Write " + counter + " bytes to ouput stream"); + LOG.debug("Write " + counter + " bytes to ouput stream"); } catch (IOException ex) { - log.error("Error on read/write ", ex); + LOG.error("Error on read/write ", ex); throw new TransformerException(ex); } } @@ -184,13 +184,13 @@ try { xmlReader = getXMLReader(); - log.debug("xmlReader class is " + xmlReader.getClass().getName()); + LOG.debug("xmlReader class is " + xmlReader.getClass().getName()); // set default resolver if (resolvingService != null) { xmlReader.setEntityResolver(resolvingService.getEntityResolver()); - log.debug("Set entity resolver"); + LOG.debug("Set entity resolver"); } // SAXResult use XMLReader to parce InputStream to SAXEvents @@ -198,20 +198,20 @@ { SAXResult saxResult = (SAXResult)result; xmlReader.setContentHandler(saxResult.getHandler()); - log.debug("Parse direct to result"); + LOG.debug("Parse direct to result"); } // not StreamResult, not SAXResult - create empty transformation else { - log.debug("Create empty transformation"); + LOG.debug("Create empty transformation"); TransformerHandler transformerHandler = tSAXFactory.newTransformerHandler(); transformerHandler.setResult(result); xmlReader.setContentHandler(transformerHandler); - log.debug("Parse to result throw empty transformer"); + LOG.debug("Parse to result throw empty transformer"); } xmlReader.parse(new InputSource(input)); - log.debug("Parse complete"); + LOG.debug("Parse complete"); } catch (SAXException ex) { @@ -261,9 +261,17 @@ } catch (java.io.FileNotFoundException ex) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + ex.getMessage()); + } } catch (IOException ex) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + ex.getMessage()); + } } } Modified: core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/html/TidyTransformerImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/html/TidyTransformerImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/html/TidyTransformerImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -102,7 +102,7 @@ // new ByteArrayInputStream(output.toByteArray()); // transformInputStream2Result(byteInputStream, getResult()); - log.debug("Transform from temp output to " + getResult().getClass().getName() + " complete"); + LOG.debug("Transform from temp output to " + getResult().getClass().getName() + " complete"); } @Override @@ -113,13 +113,13 @@ try { - log.debug(" input available bytes " + input.available()); + LOG.debug(" input available bytes " + input.available()); if (input.available() == 0) return; } catch (IOException ex) { - log.error("Error on read Source", ex); + LOG.error("Error on read Source", ex); new TransformerException("Error on read source", ex); } @@ -129,16 +129,16 @@ if (getResult() instanceof StreamResult) { OutputStream output = ((StreamResult)getResult()).getOutputStream(); - log.debug("Prepare to write transform result direct to OutputStream"); + LOG.debug("Prepare to write transform result direct to OutputStream"); tidy.parse(input, output); - log.debug("Tidy parse is complete"); + LOG.debug("Tidy parse is complete"); } else { ByteArrayOutputStream output = new ByteArrayOutputStream(); - log.debug("Prepare to write transform result to temp output"); + LOG.debug("Prepare to write transform result to temp output"); tidy.parse(input, output); - log.debug("Tidy parse is complete"); + LOG.debug("Tidy parse is complete"); // sex with coding String outputString = output.toString(); try Modified: core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTemplatesServiceImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTemplatesServiceImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTemplatesServiceImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -43,7 +43,7 @@ public class TRAXTemplatesServiceImpl implements TRAXTemplatesService, Startable { - private static final Log LOGGER = ExoLogger.getLogger("exo.core.component.xml-processing.TRAXTemplatesServiceImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.core.component.xml-processing.TRAXTemplatesServiceImpl"); private Map<String, TRAXTemplates> templates_; @@ -119,16 +119,16 @@ { if (PrivilegedSystemHelper.getResource(xsltSchema) != null) { - LOGGER.info("XSLT schema found by relative path: " + xsltSchema); + LOG.info("XSLT schema found by relative path: " + xsltSchema); addTRAXTemplates(key, traxTransformerService_.getTemplates(new StreamSource(PrivilegedSystemHelper .getResourceAsStream(xsltSchema)))); } else - LOGGER.error("XSLT schema not found: " + xsltSchema); + LOG.error("XSLT schema not found: " + xsltSchema); } catch (Exception e) { - LOGGER.error("Add new TRAXTemplates failed : " + e); + LOG.error("Add new TRAXTemplates failed : " + e.getMessage()); } } } Modified: core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTransformerImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTransformerImpl.java 2012-01-23 14:58:14 UTC (rev 5493) +++ core/branches/2.5.x/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTransformerImpl.java 2012-01-23 15:22:03 UTC (rev 5494) @@ -126,7 +126,7 @@ if (resolvingService != null) { xmlReader.setEntityResolver(resolvingService.getEntityResolver()); - log.debug("Set entity resolver"); + LOG.debug("Set entity resolver"); } } catch (SAXException ex)