[exo-jcr-commits] exo-jcr SVN: r5537 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype and 35 other directories.

Author: andrew.plotnikov Date: 2012-01-27 09:09:27 -0500 (Fri, 27 Jan 2012) New Revision: 5537 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/MappedParametrizedObjectEntry.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/OnParentVersionActionConversion.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/PropertyTypeConversion.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositorySuspendController.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ExactQueryNode.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/AbstractExcerpt.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CaseTermQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DocOrderScoreNodeIterator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MatchAllQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTraversingQueryHits.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WildcardTermEnum.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/synonym/WordNetSynonyms.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/DateValue.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleaner.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/app/MapStoredSessionProviderService.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceRestore.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/AbstractDataDistributionType.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/JcrURLConnection.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentation.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRest.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRetr.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnFr.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnTo.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdSize.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpDataTransiverImpl.java Log: EXOJCR-1725: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/MappedParametrizedObjectEntry.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/MappedParametrizedObjectEntry.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/MappedParametrizedObjectEntry.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -19,6 +19,8 @@ package org.exoplatform.services.jcr.config; import org.exoplatform.services.jcr.util.StringNumberParser; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.util.ArrayList; import java.util.List; @@ -33,6 +35,9 @@ public abstract class MappedParametrizedObjectEntry { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.config.MappedParametrizedObjectEntry"); + protected String type; protected List<SimpleParameterEntry> parameters = new ArrayList<SimpleParameterEntry>(); @@ -129,7 +134,10 @@ } catch (NumberFormatException e) { - //LOG.warn(name + ": unparseable Integer. " + e); + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -199,7 +207,10 @@ } catch (NumberFormatException e) { - //LOG.warn(name + ": unparseable Long. " + e); + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -248,7 +259,10 @@ } catch (NumberFormatException e) { - //LOG.warn(name + ": unparseable Long. " + e); + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -298,7 +312,10 @@ } catch (NumberFormatException e) { - //LOG.warn(name + ": unparseable time (as Long). " + e); + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/OnParentVersionActionConversion.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/OnParentVersionActionConversion.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/OnParentVersionActionConversion.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -18,6 +18,9 @@ */ package org.exoplatform.services.jcr.core.nodetype; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import javax.jcr.version.OnParentVersionAction; /** @@ -28,6 +31,9 @@ public class OnParentVersionActionConversion { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.core.nodetype.OnParentVersionActionConversion"); + public static String serializeType(int propertyType) { @@ -39,10 +45,18 @@ catch (IllegalArgumentException e) { // r = PropertyType.TYPENAME_UNDEFINED; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } catch (Exception e) { // r = PropertyType.TYPENAME_UNDEFINED; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return r; } @@ -58,10 +72,18 @@ catch (IllegalArgumentException e) { // r = PropertyType.TYPENAME_UNDEFINED; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } catch (Exception e) { // r = PropertyType.TYPENAME_UNDEFINED; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return r; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/PropertyTypeConversion.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/PropertyTypeConversion.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/PropertyTypeConversion.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -19,6 +19,8 @@ package org.exoplatform.services.jcr.core.nodetype; import org.exoplatform.services.jcr.core.ExtendedPropertyType; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import javax.jcr.PropertyType; @@ -30,6 +32,9 @@ public class PropertyTypeConversion { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.core.nodetype.PropertyTypeConversion"); + public static String serializeType(int propertyType) { @@ -41,10 +46,18 @@ catch (IllegalArgumentException e) { // r = PropertyType.TYPENAME_UNDEFINED; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } catch (Exception e) { // r = PropertyType.TYPENAME_UNDEFINED; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return r; } @@ -60,10 +73,18 @@ catch (IllegalArgumentException e) { // r = PropertyType.TYPENAME_UNDEFINED; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } catch (Exception e) { // r = PropertyType.TYPENAME_UNDEFINED; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return r; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -23,6 +23,8 @@ import org.exoplatform.services.jcr.datamodel.NodeData; import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.impl.Constants; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.Externalizable; import java.io.IOException; @@ -41,6 +43,8 @@ public class TransactionChangesLog implements CompositeChangesLog, Externalizable { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.jcr.dataflow.TransactionChangesLog"); + private static final long serialVersionUID = 4866736965040228027L; protected String systemId; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositorySuspendController.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositorySuspendController.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositorySuspendController.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -69,7 +69,7 @@ } catch (RepositoryException e) { - log.error(e); + log.error("An exception occured: " + e.getMessage()); } return getRepositoryStateTitle(); } @@ -89,7 +89,7 @@ } catch (RepositoryException e) { - log.error(e); + log.error("An exception occured: " + e.getMessage()); } return getRepositoryStateTitle(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -36,6 +36,8 @@ import org.exoplatform.services.jcr.impl.util.io.FileCleaner; import org.exoplatform.services.jcr.impl.util.io.SpoolFile; import org.exoplatform.services.jcr.observation.ExtendedEvent; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.EOFException; import java.io.Externalizable; @@ -70,6 +72,8 @@ public class JCRRestore { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.jcr.impl.backup.JCRRestore"); + private final DataManager dataManager; private final FileCleaner fileCleaner; @@ -181,7 +185,10 @@ } catch (EOFException ioe) { - // ok - reading all data from backup file; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + ioe.getMessage()); + } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -271,7 +271,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } @@ -283,7 +283,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } @@ -347,7 +347,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } @@ -359,7 +359,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } @@ -449,7 +449,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } con.close(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -83,7 +83,7 @@ /** * Logger. */ - private static Log log = ExoLogger.getLogger("exo.jcr.component.core.ItemImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ItemImpl"); /** * Session object. @@ -284,7 +284,7 @@ } catch (Exception e) { - log.debug("Item.isSame() failed " + e); + LOG.debug("Item.isSame() failed " + e.getMessage()); return false; } } @@ -573,9 +573,9 @@ } else { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Set null value (" + getPath() + ", multivalued: " + multiValue + ")"); + LOG.debug("Set null value (" + getPath() + ", multivalued: " + multiValue + ")"); } } } @@ -1008,9 +1008,9 @@ strVal = "PropertyType.BINARY"; } } - catch (Throwable e) + catch (IOException e) { - log.error("Error of value read: " + e.getMessage(), e); + LOG.error("Error of value read: " + e.getMessage(), e); } throw new ConstraintViolationException("Can not set value '" + strVal + "' to " + getPath() + " due to value constraints "); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -43,7 +43,7 @@ public class SessionFactory { - private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SessionFactory"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SessionFactory"); private final ExoContainer container; @@ -76,7 +76,10 @@ } catch (NumberFormatException e) { - // + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } if (maxAgeMillis <= 0) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -39,6 +39,7 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -334,10 +335,14 @@ strVal = "PropertyType.BINARY"; } } - catch (Throwable e) + catch (IllegalStateException e) { LOG.error("Error of value read: " + e.getMessage(), e); } + catch (IOException e) + { + LOG.error("Error of value read: " + e.getMessage(), e); + } throw new ConstraintViolationException("Value " + strVal + " for property " + propertyData.getQPath().getAsString() + " doesn't match new constraint "); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -130,7 +130,7 @@ catch (RepositoryException e) { log.error("Can not fire ActionLauncher.onSaveItems() for " + item.getQPath().getAsString() - + " reason: " + e); + + " reason: " + e.getMessage()); } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ExactQueryNode.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ExactQueryNode.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ExactQueryNode.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -46,7 +46,7 @@ public ExactQueryNode(QueryNode parent, InternalQName property, InternalQName value) { super(parent); if (parent == null) { - throw new NullPointerException("parent"); + throw new IllegalArgumentException("parameter parent cannot be null"); } this.property = property; this.value = value; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/AbstractExcerpt.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/AbstractExcerpt.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/AbstractExcerpt.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -50,7 +50,7 @@ /** * Logger instance for this class. */ - private static final Logger log = LoggerFactory.getLogger("exo.jcr.component.core.AbstractExcerpt"); + private static final Logger LOG = LoggerFactory.getLogger("exo.jcr.component.core.AbstractExcerpt"); /** * The search index. @@ -110,7 +110,7 @@ if (fields == null) { - log.debug("Fulltext field not stored, using {}", SimpleExcerptProvider.class.getName()); + LOG.debug("Fulltext field not stored, using {}", SimpleExcerptProvider.class.getName()); SimpleExcerptProvider exProvider = new SimpleExcerptProvider(); exProvider.init(query, index); return exProvider.getExcerpt(id, maxFragments, maxFragmentSize); @@ -157,7 +157,7 @@ } else { - log.debug("No TermPositionVector on Fulltext field."); + LOG.debug("No TermPositionVector on Fulltext field."); return null; } } @@ -286,7 +286,10 @@ } catch (IOException e) { - // should never happen, we are reading from a string + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return new TermPositionVector() Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CaseTermQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CaseTermQuery.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CaseTermQuery.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -16,6 +16,14 @@ */ package org.exoplatform.services.jcr.impl.core.query.lucene; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.TermEnum; +import org.apache.lucene.search.FilteredTermEnum; +import org.apache.lucene.search.MultiTermQuery; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; @@ -23,17 +31,14 @@ import java.util.List; import java.util.Map; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermEnum; -import org.apache.lucene.search.FilteredTermEnum; -import org.apache.lucene.search.MultiTermQuery; - /** * <code>CaseTermQuery</code> implements a term query which convert the term * from the index either to upper or lower case before it is matched. */ -abstract class CaseTermQuery extends MultiTermQuery implements TransformConstants { +abstract class CaseTermQuery extends MultiTermQuery implements TransformConstants +{ + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.impl.core.query.lucene.CaseTermQuery"); /** * Indicates whether terms from the index should be lower-cased or @@ -68,7 +73,8 @@ } - private final class CaseTermEnum extends FilteredTermEnum { + private final class CaseTermEnum extends FilteredTermEnum + { private final int nameLength; @@ -152,7 +158,10 @@ try { terms.close(); } catch (IOException e) { - // ignore + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -60,7 +60,7 @@ /** * The logger instance for this class. */ - private static final Logger log = LoggerFactory.getLogger("exo.jcr.component.core.ChildAxisQuery"); + private static final Logger LOG = LoggerFactory.getLogger("exo.jcr.component.core.ChildAxisQuery"); /** * Threshold when children calculation is switched to @@ -743,7 +743,7 @@ long time = System.currentTimeMillis(); NodeData state = (NodeData)itemMgr.getItemData(uuid); time = System.currentTimeMillis() - time; - log.debug("got NodeState with id {} in {} ms.", uuid, new Long(time)); + LOG.debug("got NodeState with id {} in {} ms.", uuid, new Long(time)); Iterator<NodeData> entries; if (nameTest != null) { @@ -786,7 +786,10 @@ } catch (RepositoryException e) { - // does not exist anymore -> ignore + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } return childrenHits; @@ -833,7 +836,7 @@ public Hits getHits() throws IOException { long time = 0; - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { time = System.currentTimeMillis(); } @@ -862,10 +865,10 @@ } } } - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { time = System.currentTimeMillis() - time; - log.debug("Filtered hits in {} ms.", new Long(time)); + LOG.debug("Filtered hits in {} ms.", new Long(time)); } return childrenHits; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DocOrderScoreNodeIterator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DocOrderScoreNodeIterator.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DocOrderScoreNodeIterator.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -41,7 +41,7 @@ { /** Logger instance for this class */ - private static final Logger log = LoggerFactory.getLogger("exo.jcr.component.core.DocOrderScoreNodeIterator"); + private static final Logger LOG = LoggerFactory.getLogger("exo.jcr.component.core.DocOrderScoreNodeIterator"); /** A node iterator with ordered nodes */ private ScoreNodeIterator orderedNodes; @@ -173,7 +173,7 @@ return; } long time = 0; - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { time = System.currentTimeMillis(); } @@ -207,15 +207,18 @@ } catch (SortFailedException e) { - // retry + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } while (invalidIDs.size() > 0); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("" + nodes.length + " node(s) ordered in " + (System.currentTimeMillis() - time) + " ms"); + LOG.debug("" + nodes.length + " node(s) ordered in " + (System.currentTimeMillis() - time) + " ms"); } orderedNodes = new ScoreNodeIteratorImpl(nodes); @@ -329,7 +332,7 @@ } catch (Exception e) { - log.error("Exception while sorting nodes in document order: " + e.toString(), e); + LOG.error("Exception while sorting nodes in document order: " + e.toString(), e); } // if we get here something went wrong @@ -337,11 +340,11 @@ if (n1 != null) invalidIDs.add(n1.getNodeId()); else - log.warn("Null ScoreNode n1 will not be added into invalid identifiers set"); + LOG.warn("Null ScoreNode n1 will not be added into invalid identifiers set"); if (n2 != null) invalidIDs.add(n2.getNodeId()); else - log.warn("Null ScoreNode n2 will not be added into invalid identifiers set"); + LOG.warn("Null ScoreNode n2 will not be added into invalid identifiers set"); // terminate sorting throw new SortFailedException(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -20,9 +20,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.QueryParser; +import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.BooleanClause.Occur; import org.exoplatform.commons.utils.ISO8601; import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager; import org.exoplatform.services.jcr.dataflow.ItemDataConsumer; @@ -102,7 +102,7 @@ /** * Logger for this class */ - private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.LuceneQueryBuilder"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.LuceneQueryBuilder"); /** * Root node of the abstract query tree @@ -340,7 +340,10 @@ } catch (RepositoryException e) { - // will never happen, prefixes are created when unknown + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return new JcrTermQuery(new Term(FieldNames.PROPERTIES, FieldNames.createNamedValue(field, value))); } @@ -495,7 +498,7 @@ } catch (RepositoryException e) { - log.error(e.getLocalizedMessage(), e); + LOG.error(e.getLocalizedMessage(), e); } return null; } @@ -1173,20 +1176,20 @@ { InternalQName n = session.getLocationFactory().parseJCRName(literal).getInternalName(); values.add(nsMappings.translateName(n)); - log.debug("Coerced " + literal + " into NAME."); + LOG.debug("Coerced " + literal + " into NAME."); } catch (RepositoryException e) { if (types.length == 1) { - log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString()); + LOG.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString()); } } catch (IllegalNameException e) { if (types.length == 1) { - log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString()); + LOG.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString()); } } break; @@ -1196,13 +1199,13 @@ { QPath p = session.getLocationFactory().parseJCRPath(literal).getInternalPath(); values.add(resolver.createJCRPath(p).getAsString(true)); - log.debug("Coerced " + literal + " into PATH."); + LOG.debug("Coerced " + literal + " into PATH."); } catch (RepositoryException e) { if (types.length == 1) { - log.warn("Unable to coerce '" + literal + "' into a PATH: " + e.toString()); + LOG.warn("Unable to coerce '" + literal + "' into a PATH: " + e.toString()); } } break; @@ -1212,13 +1215,13 @@ if (c != null) { values.add(DateField.timeToString(c.getTimeInMillis())); - log.debug("Coerced " + literal + " into DATE."); + LOG.debug("Coerced " + literal + " into DATE."); } else { if (types.length == 1) { - log.warn("Unable to coerce '" + literal + "' into a DATE."); + LOG.warn("Unable to coerce '" + literal + "' into a DATE."); } } break; @@ -1228,13 +1231,13 @@ { double d = Double.parseDouble(literal); values.add(DoubleField.doubleToString(d)); - log.debug("Coerced " + literal + " into DOUBLE."); + LOG.debug("Coerced " + literal + " into DOUBLE."); } catch (NumberFormatException e) { if (types.length == 1) { - log.warn("Unable to coerce '" + literal + "' into a DOUBLE: " + e.toString()); + LOG.warn("Unable to coerce '" + literal + "' into a DOUBLE: " + e.toString()); } } break; @@ -1244,19 +1247,19 @@ { long l = Long.parseLong(literal); values.add(LongField.longToString(l)); - log.debug("Coerced " + literal + " into LONG."); + LOG.debug("Coerced " + literal + " into LONG."); } catch (NumberFormatException e) { if (types.length == 1) { - log.warn("Unable to coerce '" + literal + "' into a LONG: " + e.toString()); + LOG.warn("Unable to coerce '" + literal + "' into a LONG: " + e.toString()); } } break; case PropertyType.STRING : values.add(literal); - log.debug("Using literal " + literal + " as is."); + LOG.debug("Using literal " + literal + " as is."); break; } } @@ -1274,11 +1277,14 @@ { QPath p = session.getLocationFactory().parseJCRPath(literal).getInternalPath(); values.add(resolver.createJCRPath(p).getAsString(true)); - log.debug("Coerced " + literal + " into PATH."); + LOG.debug("Coerced " + literal + " into PATH."); } catch (Exception e) { - // not a path + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } if (XMLChar.isValidName(literal)) @@ -1288,11 +1294,14 @@ { InternalQName n = session.getLocationFactory().parseJCRName(literal).getInternalName(); values.add(nsMappings.translateName(n)); - log.debug("Coerced " + literal + " into NAME."); + LOG.debug("Coerced " + literal + " into NAME."); } catch (Exception e) { - // not a name + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } if (literal.indexOf(':') > -1) @@ -1302,7 +1311,7 @@ if (c != null) { values.add(DateField.timeToString(c.getTimeInMillis())); - log.debug("Coerced " + literal + " into DATE."); + LOG.debug("Coerced " + literal + " into DATE."); } } else @@ -1311,7 +1320,7 @@ try { values.add(LongField.longToString(Long.parseLong(literal))); - log.debug("Coerced " + literal + " into LONG."); + LOG.debug("Coerced " + literal + " into LONG."); } catch (NumberFormatException e) { @@ -1320,11 +1329,14 @@ try { values.add(DoubleField.doubleToString(Double.parseDouble(literal))); - log.debug("Coerced " + literal + " into DOUBLE."); + LOG.debug("Coerced " + literal + " into DOUBLE."); } catch (NumberFormatException e1) { - // not a double + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -1333,7 +1345,7 @@ if (values.size() == 0) { values.add(literal); - log.debug("Using literal " + literal + " as is."); + LOG.debug("Using literal " + literal + " as is."); } return values.toArray(new String[values.size()]); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MatchAllQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MatchAllQuery.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MatchAllQuery.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -30,16 +30,16 @@ private final String field; - /** - * Creates a new <code>MatchAllQuery</code> . - * <p/> - * - * @param field the field name. - * @throws NullPointerException if <code>field</code> is null. - */ - MatchAllQuery(String field) throws NullPointerException { + /** + * Creates a new <code>MatchAllQuery</code> . + * <p/> + * + * @param field the field name. + * @throws IllegalArgumentException if <code>field</code> is null. + */ + MatchAllQuery(String field) throws IllegalArgumentException { if (field == null) { - throw new NullPointerException("field"); + throw new IllegalArgumentException("parameter field cannot be null"); } this.field = field.intern(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -63,7 +63,7 @@ /** * The logger instance for this class. */ - private static final Logger log = LoggerFactory.getLogger("exo.jcr.component.core.NodeIndexer"); + private static final Logger LOG = LoggerFactory.getLogger("exo.jcr.component.core.NodeIndexer"); /** * The default boost for a lucene field: 1.0f. @@ -215,6 +215,10 @@ { // will never happen, because this.mappings will dynamically add // unknown uri<->prefix mappings + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } if (indexFormatVersion.getVersion() >= IndexFormatVersion.V4.getVersion()) @@ -273,6 +277,10 @@ catch (NamespaceException e) { // will never happen, prefixes are created dynamically + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } @@ -323,7 +331,7 @@ if (data == null) { - log.warn("null value found at property " + prop.getQPath().getAsString()); + LOG.warn("null value found at property " + prop.getQPath().getAsString()); } // check the jcr:encoding property @@ -392,6 +400,10 @@ } catch (Throwable e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } @@ -406,30 +418,30 @@ } catch (DocumentReadException e) { - log.error("Can not indexing the document by path " + propData.getQPath().getAsString() + LOG.error("Can not indexing the document by path " + propData.getQPath().getAsString() + ", propery id '" + propData.getIdentifier() + "' : " + e, e); } catch (HandlerNotFoundException e) { // no handler - no index - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("Can not indexing the document by path " + propData.getQPath().getAsString() + LOG.debug("Can not indexing the document by path " + propData.getQPath().getAsString() + ", propery id '" + propData.getIdentifier() + "' : " + e, e); } } catch (IOException e) { // no data - no index - if (log.isWarnEnabled()) + if (LOG.isWarnEnabled()) { - log.warn("Binary value indexer IO error, document by path " + propData.getQPath().getAsString() + LOG.warn("Binary value indexer IO error, document by path " + propData.getQPath().getAsString() + ", propery id '" + propData.getIdentifier() + "' : " + e, e); } } catch (Exception e) { - log.error("Binary value indexer error, document by path " + propData.getQPath().getAsString() + LOG.error("Binary value indexer error, document by path " + propData.getQPath().getAsString() + ", propery id '" + propData.getIdentifier() + "' : " + e, e); } } @@ -450,7 +462,7 @@ if (data == null) { - log.warn("null value found at property " + prop.getQPath().getAsString()); + LOG.warn("null value found at property " + prop.getQPath().getAsString()); } ExtendedValue val = null; @@ -542,7 +554,7 @@ } catch (RepositoryException e) { - log.error("Index of property value error. " + prop.getQPath().getAsString() + ".", e); + LOG.error("Index of property value error. " + prop.getQPath().getAsString() + ".", e); throw new RepositoryException("Index of property value error. " + prop.getQPath().getAsString() + ". " + e, e); } @@ -566,6 +578,10 @@ catch (NamespaceException e) { // will never happen + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } doc.add(new Field(FieldNames.PROPERTIES_SET, fieldName, Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS)); } @@ -630,7 +646,7 @@ } catch (IllegalArgumentException e) { - log.warn("'{}' is outside of supported date value range.", new Date(value.getTimeInMillis())); + LOG.warn("'{}' is outside of supported date value range.", new Date(value.getTimeInMillis())); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTraversingQueryHits.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTraversingQueryHits.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTraversingQueryHits.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -16,6 +16,11 @@ */ package org.exoplatform.services.jcr.impl.core.query.lucene; +import org.apache.commons.collections.iterators.IteratorChain; +import org.exoplatform.services.jcr.impl.core.NodeImpl; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -26,16 +31,17 @@ import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; -import org.apache.commons.collections.iterators.IteratorChain; -import org.exoplatform.services.jcr.impl.core.NodeImpl; - /** * <code>NodeTraversingQueryHits</code> implements query hits that traverse * a node hierarchy. */ -public class NodeTraversingQueryHits extends AbstractQueryHits { +public class NodeTraversingQueryHits extends AbstractQueryHits +{ - /** + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.impl.core.query.lucene.NodeTraversingQueryHits"); + + /** * The nodes to traverse. */ private final Iterator nodes; @@ -144,32 +150,52 @@ /** * Initializes the iterator chain once. */ - private void init() { - if (selfAndChildren == null) { - List allIterators = new ArrayList(); - Iterator current = Collections.singletonList(currentNode).iterator(); - allIterators.add(current); - if (maxDepth == 0) { - // only current node - } else if (maxDepth == 1) { - try { - allIterators.add(currentNode.getNodes()); - } catch (RepositoryException e) { - // currentNode is probably stale - } - } else { - // create new TraversingNodeIterator for each child - try { - NodeIterator children = currentNode.getNodes(); - while (children.hasNext()) { - allIterators.add(new TraversingNodeIterator(children.nextNode(), maxDepth - 1)); - } - } catch (RepositoryException e) { - // currentNode is probably stale - } - } - selfAndChildren = new IteratorChain(allIterators); + private void init() + { + if (selfAndChildren == null) + { + List allIterators = new ArrayList(); + Iterator current = Collections.singletonList(currentNode).iterator(); + allIterators.add(current); + if (maxDepth == 0) + { + // only current node } - } + else if (maxDepth == 1) + { + try + { + allIterators.add(currentNode.getNodes()); + } + catch (RepositoryException e) + { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } + } + } + else + { + // create new TraversingNodeIterator for each child + try + { + NodeIterator children = currentNode.getNodes(); + while (children.hasNext()) + { + allIterators.add(new TraversingNodeIterator(children.nextNode(), maxDepth - 1)); + } + } + catch (RepositoryException e) + { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } + } + } + selfAndChildren = new IteratorChain(allIterators); + } + } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -48,7 +48,7 @@ /** * The logger instance for this class */ - private static final Logger log = LoggerFactory.getLogger("exo.jcr.component.core.QueryResultImpl"); + private static final Logger LOG = LoggerFactory.getLogger("exo.jcr.component.core.QueryResultImpl"); /** * The search index to execute the query. @@ -209,7 +209,7 @@ catch (NamespaceException npde) { String msg = "encountered invalid property name"; - log.debug(msg); + LOG.debug(msg); throw new RepositoryException(msg, npde); } } @@ -292,9 +292,9 @@ */ protected void getResults(long size) throws RepositoryException { - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("getResults({}) limit={}", new Long(size), new Long(limit)); + LOG.debug("getResults({}) limit={}", new Long(size), new Long(limit)); } long maxResultSize = size; @@ -316,14 +316,14 @@ try { long time = 0; - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { time = System.currentTimeMillis(); } result = executeQuery(maxResultSize); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("query executed in {} ms", new Long(System.currentTimeMillis() - time)); + LOG.debug("query executed in {} ms", new Long(System.currentTimeMillis() - time)); } // set selector names selectorNames = result.getSelectorNames(); @@ -339,14 +339,14 @@ result.skip(start); } - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { time = System.currentTimeMillis(); } collectScoreNodes(result, resultNodes, maxResultSize); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("retrieved ScoreNodes in {} ms", new Long(System.currentTimeMillis() - time)); + LOG.debug("retrieved ScoreNodes in {} ms", new Long(System.currentTimeMillis() - time)); } // update numResults @@ -358,7 +358,7 @@ } catch (IOException e) { - log.error("Exception while executing query: ", e); + LOG.error("Exception while executing query: ", e); // todo throw? } finally @@ -371,7 +371,7 @@ } catch (IOException e) { - log.warn("Unable to close query result: " + e); + LOG.warn("Unable to close query result: " + e); } } } @@ -445,7 +445,10 @@ } catch (ItemNotFoundException e) { - // node deleted while query was executed + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } return true; @@ -656,7 +659,7 @@ } catch (RepositoryException e) { - log.warn("Exception getting more results: " + e); + LOG.warn("Exception getting more results: " + e); } // check again if (nextPos >= resultNodes.size()) @@ -673,16 +676,16 @@ next = null; invalid++; resultNodes.remove(nextPos); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("The node is invalid since we don't have sufficient rights to access it, " + LOG.debug("The node is invalid since we don't have sufficient rights to access it, " + "it will be removed from the results set"); } } } catch (RepositoryException e) { - log.error("Could not check access permission", e); + LOG.error("Could not check access permission", e); break; } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WildcardTermEnum.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WildcardTermEnum.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WildcardTermEnum.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -16,6 +16,13 @@ */ package org.exoplatform.services.jcr.impl.core.query.lucene; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; +import org.apache.lucene.index.TermEnum; +import org.apache.lucene.search.FilteredTermEnum; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; @@ -24,18 +31,17 @@ import java.util.Map; import java.util.regex.Matcher; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermEnum; -import org.apache.lucene.search.FilteredTermEnum; - /** * Implements a wildcard term enum that optionally supports embedded property * names in lucene term texts. */ -class WildcardTermEnum extends FilteredTermEnum implements TransformConstants { +class WildcardTermEnum extends FilteredTermEnum implements TransformConstants +{ - /** + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.impl.core.query.lucene.WildcardTermEnum"); + + /** * The pattern matcher. */ private final Matcher pattern; @@ -246,10 +252,16 @@ Iterator it = rangeScans.iterator(); while (it.hasNext()) { RangeScan scan = (RangeScan) it.next(); - try { + try + { scan.close(); - } catch (IOException e) { - // ignore + } + catch (IOException e) + { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -53,7 +53,7 @@ /** * Logger instance for this class. */ - private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.LuceneSpellChecker"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.LuceneSpellChecker"); public static final class FiveSecondsRefreshInterval extends LuceneSpellChecker { @@ -333,7 +333,10 @@ } catch (IOException e) { - // ignore + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } // urgh, the lucene spell checker cannot be closed explicitly. // finalize will close the reader... @@ -438,7 +441,7 @@ } if (hasSuggestion) { - log.debug("Successful after " + new Integer(retries) + " retries"); + LOG.debug("Successful after " + new Integer(retries) + " retries"); return suggestion; } else @@ -452,6 +455,10 @@ // spell checker is closed while searching for // suggestions. this is actually a design flaw in the // lucene spell checker, but for now we simply retry + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } // unsuccessful after retries @@ -505,11 +512,11 @@ { long time = System.currentTimeMillis(); Dictionary dict = new LuceneDictionary(reader, FieldNames.FULLTEXT); - log.debug("Starting spell checker index refresh"); + LOG.debug("Starting spell checker index refresh"); spellChecker.indexDictionary(dict); time = System.currentTimeMillis() - time; time = time / 1000; - log.info("Spell checker index refreshed in: " + new Long(time) + " s."); + LOG.info("Spell checker index refreshed in: " + new Long(time) + " s."); } finally { @@ -525,7 +532,10 @@ } catch (IOException e) { - // ignore + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } }; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/synonym/WordNetSynonyms.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/synonym/WordNetSynonyms.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/synonym/WordNetSynonyms.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -16,13 +16,14 @@ */ package org.exoplatform.services.jcr.impl.core.query.lucene.synonym; +import org.apache.lucene.index.memory.SynonymMap; +import org.exoplatform.services.jcr.impl.core.query.lucene.SynonymProvider; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.io.IOException; import java.io.InputStream; -import org.apache.lucene.index.memory.SynonymMap; - -import org.exoplatform.services.jcr.impl.core.query.lucene.SynonymProvider; - /** * <code>WordNetSynonyms</code> implements a {@link SynonymProvider} that is backed by the WordNet * prolog file <a href="http://www.cogsci.princeton.edu/2.0/WNprolog-2.0.tar.gz"&...;. @@ -30,6 +31,9 @@ public class WordNetSynonyms implements SynonymProvider { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.impl.core.query.lucene.synonym.WordNetSynonyms"); + /** * The synonym map or <code>null</code> if an error occurred while reading the prolog file. */ @@ -48,7 +52,10 @@ } catch (IOException e) { - // ignore + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } SYNONYM_MAP = sm; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/DateValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/DateValue.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/DateValue.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -130,10 +130,14 @@ { return getInternalString().length(); } - catch (Throwable e) + catch (ValueFormatException e) { return super.getLength(); } + catch (RepositoryException e) + { + return super.getLength(); + } } @Override Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -94,6 +94,10 @@ } catch (Exception e1) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e1.getMessage()); + } } throw new IOException("init error " + e.getMessage()) { @@ -145,6 +149,10 @@ } catch (Exception e1) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e1.getMessage()); + } } throw new IOException("init error " + e.getMessage()) { @@ -299,6 +307,10 @@ } catch (Exception e1) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e1.getMessage()); + } } throw new IOException("update error " + e.getMessage()) { @@ -384,6 +396,10 @@ } catch (Exception e1) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e1.getMessage()); + } } throw new IOException("setLength(" + size + ") error. " + e.getMessage()) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -214,7 +214,7 @@ } else { - throw new NullPointerException("Stream already consumed"); + throw new IllegalArgumentException("Stream already consumed"); } } } @@ -234,7 +234,7 @@ } else { - throw new NullPointerException("Null Stream data "); + throw new IllegalArgumentException("Null Stream data "); } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -20,6 +20,8 @@ import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.services.jcr.impl.util.io.SpoolFile; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.File; import java.io.FileNotFoundException; @@ -35,6 +37,9 @@ public class SerializationSpoolFile extends SpoolFile { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.impl.dataflow.serialization.SerializationSpoolFile"); + /** * SpoolFileHolder. */ @@ -100,7 +105,10 @@ } catch (FileNotFoundException e) { - // haven't file - haven't problem + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return false; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -238,7 +238,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -305,7 +305,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -378,7 +378,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -446,7 +446,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -540,7 +540,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -743,7 +743,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -844,7 +844,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -943,7 +943,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -1188,7 +1188,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } } @@ -1280,7 +1280,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -21,6 +21,8 @@ import org.exoplatform.services.jcr.impl.util.io.FileCleaner; import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.File; import java.sql.Connection; @@ -41,6 +43,9 @@ public class DB2ConnectionFactory extends GenericCQConnectionFactory { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.db.DB2ConnectionFactory"); + private Boolean isReindexingSupport; /** @@ -217,7 +222,10 @@ } catch (SQLException e) { - // ignore me + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -260,7 +260,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } @@ -475,7 +475,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } @@ -487,7 +487,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } @@ -565,7 +565,7 @@ } catch (SQLException e) { - LOG.error("Can't close the ResultSet: " + e); + LOG.error("Can't close the ResultSet: " + e.getMessage()); } } @@ -577,7 +577,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } @@ -615,7 +615,7 @@ } catch (SQLException e) { - LOG.error("Can't close the Statement: " + e); + LOG.error("Can't close the Statement: " + e.getMessage()); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -198,6 +198,10 @@ } catch (IOException e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -72,7 +72,7 @@ } catch (UnknownHostException e) { - LOG.warn("Cannot read host address " + e); + LOG.warn("Cannot read host address " + e.getMessage()); LOCAL_ADDRESS = "no address, " + e; } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleaner.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleaner.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleaner.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -42,7 +42,7 @@ protected static final long DEFAULT_TIMEOUT = 30000; - protected static Log log = ExoLogger.getLogger("exo.jcr.component.core.FileCleaner"); + protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.FileCleaner"); protected final ConcurrentLinkedQueue<File> files = new ConcurrentLinkedQueue<File>(); @@ -112,9 +112,9 @@ }; SecurityHelper.doPrivilegedAction(action); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { - log.debug("FileCleaner instantiated name= " + getName() + " timeout= " + timeout); + LOG.debug("FileCleaner instantiated name= " + getName() + " timeout= " + timeout); } } @@ -138,6 +138,10 @@ } catch (Exception e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } // Remove the hook for final cleaning up SecurityHelper.doPrivilegedAction(new PrivilegedAction<Object>() @@ -150,15 +154,16 @@ } catch (IllegalStateException e) { - // can't register shutdown hook because - // jvm shutdown sequence has already begun, - // silently ignore... + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return null; } }); if (files != null && files.size() > 0) - log.warn("There are uncleared files: " + files.size()); + LOG.warn("There are uncleared files: " + files.size()); super.halt(); } @@ -179,13 +184,13 @@ { notRemovedFiles.add(file); - if (log.isDebugEnabled()) - log.debug("Could not delete " + (file.isDirectory() ? "directory" : "file") + if (LOG.isDebugEnabled()) + LOG.debug("Could not delete " + (file.isDirectory() ? "directory" : "file") + ". Will try next time: " + PrivilegedFileHelper.getAbsolutePath(file)); } - else if (log.isDebugEnabled()) + else if (LOG.isDebugEnabled()) { - log.debug((file.isDirectory() ? "Directory" : "File") + " deleted : " + LOG.debug((file.isDirectory() ? "Directory" : "File") + " deleted : " + PrivilegedFileHelper.getAbsolutePath(file)); } } @@ -207,9 +212,10 @@ } catch (IllegalStateException e) { - // can't register shutdown hook because - // jvm shutdown sequence has already begun, - // silently ignore... + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -106,7 +106,7 @@ protected final ValueFactoryImpl valueFactory; - private final Log log = ExoLogger.getLogger("exo.jcr.component.core.ImporterBase"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ImporterBase"); public BaseXmlImporter(NodeData parent, QPath ancestorToSave, int uuidBehavior, ItemDataConsumer dataConsumer, NodeTypeDataManager ntManager, LocationFactory locationFactory, ValueFactoryImpl valueFactory, @@ -153,7 +153,7 @@ Collections.sort(changesLog.getAllStates(), new PathSorter()); - if (log.isDebugEnabled()) + if (LOG.isDebugEnabled()) { StringBuilder str = new StringBuilder(); for (int i = 0; i < changesLog.getAllStates().size(); i++) @@ -165,7 +165,7 @@ str.append(changesLog.getAllStates().get(i).isInternallyCreated()).append("\t"); str.append(changesLog.getAllStates().get(i).getData().getQPath().getAsString()).append("\n"); } - log.debug(str); + LOG.debug(str); } if (isNeedReloadAncestorToSave) { @@ -523,7 +523,10 @@ } catch (ItemNotFoundException e) { - // node not found, it's ok - willing create one new + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/app/MapStoredSessionProviderService.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/app/MapStoredSessionProviderService.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/app/MapStoredSessionProviderService.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -53,9 +53,13 @@ public SessionProvider getSessionProvider(Object key) { if (providers.containsKey(key)) + { return providers.get(key); + } else - throw new NullPointerException("SessionProvider is not initialized"); + { + throw new IllegalArgumentException("SessionProvider is not initialized"); + } } /* Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceRestore.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceRestore.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -46,7 +46,7 @@ /** * The logger. */ - private static Log log = ExoLogger.getLogger("exo.jcr.component.ext.JobExistedWorkspaceRestore"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.JobExistedWorkspaceRestore"); /** * JobExistingWorkspaceRestore constructor. Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -55,7 +55,7 @@ /** * Logger. */ - protected static final Log log = ExoLogger.getLogger("exo.jcr.component.core.RdbmsWorkspaceInitializer"); + protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.RdbmsWorkspaceInitializer"); /** * The repository service. @@ -155,7 +155,7 @@ } catch (BackupException e1) { - log.error("Can't rollback restorer", e1); + LOG.error("Can't rollback restorer", e1); } } @@ -171,7 +171,7 @@ } catch (BackupException e) { - log.error("Can't close restorer", e); + LOG.error("Can't close restorer", e); } } @@ -186,7 +186,7 @@ { if (throwable == null) { - log.error("Con not set ONLYNE state for repository " + repository.getConfiguration().getName(), e); + LOG.error("Con not set ONLYNE state for repository " + repository.getConfiguration().getName(), e); } else { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -170,7 +170,7 @@ if (workspaceName == null) { - throw new NullPointerException("Workspace Name is null"); + throw new IllegalArgumentException("Workspace Name is null"); } ExtendedSession session = cache.get(key(repository, workspaceName)); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/AbstractDataDistributionType.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/AbstractDataDistributionType.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/AbstractDataDistributionType.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -21,6 +21,8 @@ import org.exoplatform.services.jcr.core.ExtendedNode; import org.exoplatform.services.jcr.ext.distribution.DataDistributionType; import org.exoplatform.services.jcr.impl.core.RepositoryImpl; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.util.List; import java.util.Map; @@ -40,6 +42,10 @@ */ public abstract class AbstractDataDistributionType implements DataDistributionType { + + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.ext.distribution.impl.AbstractDataDistributionType"); + /** * The default node type to use when we create a new node */ @@ -95,7 +101,11 @@ } catch (PathNotFoundException e) { - // ignore me + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } + } // The node could not be found so we need to create it Node node = rootNode; @@ -110,7 +120,11 @@ } catch (PathNotFoundException e) { - // ignore me + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } + } // The node doesn't exist we need to create it node = createNode(node, nodeName, nodeType, mixinTypes, permissions, i == length - 1, true); @@ -134,7 +148,11 @@ } catch (PathNotFoundException e) { - // ignore me + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } + } finally { @@ -186,7 +204,11 @@ } catch (PathNotFoundException e) { - // ignore me + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } + } boolean useParameters = !useParametersOnLeafOnly() || (useParametersOnLeafOnly() && isLeaf); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -53,7 +53,7 @@ public class NodeHierarchyCreatorImpl implements NodeHierarchyCreator, Startable { - private static final Log log = ExoLogger.getLogger("exo.jcr.component.ext.NodeHierarchyCreatorImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.NodeHierarchyCreatorImpl"); private static final String USERS_PATH = "usersPath"; @@ -102,7 +102,7 @@ if (PropertyManager.isDevelopping() && !oldDistribution) { - log.info("The NodeHierarchyCreator is configured to use the new distribution mechanism for the" + LOG.info("The NodeHierarchyCreator is configured to use the new distribution mechanism for the" + " users directories, if you prefer to use the old mechanism set the value parameter " + "'old-user-distribution' to 'true'."); } @@ -119,7 +119,7 @@ } catch (Exception e) { - log.error("An error occurs while processing the plugins", e); + LOG.error("An error occurs while processing the plugins", e); } if (isNeededToMigrate()) @@ -130,7 +130,7 @@ } catch (RepositoryException e) { - log.error("An error occurs while upgrading JCR structure", e); + LOG.error("An error occurs while upgrading JCR structure", e); } } } @@ -210,7 +210,7 @@ } catch (Exception e) { - log.error("An error occurs while processing the JCR path which alias is " + LOG.error("An error occurs while processing the JCR path which alias is " + (currentjcrPath == null ? null : currentjcrPath.getAlias()) + " with the workspace " + workspaceName, e); } @@ -270,7 +270,7 @@ } catch (Exception e) { - log.error("An error occurs while processing the JCR path which alias is " + LOG.error("An error occurs while processing the JCR path which alias is " + (currentjcrPath == null ? null : currentjcrPath.getAlias()) + " with the workspace " + workspaceName, e); } @@ -339,7 +339,10 @@ } catch (PathNotFoundException e) { - // ignore me + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -114,7 +114,9 @@ (DocumentReaderService)((ExoContainer)ctx.get("exocontainer")) .getComponentInstanceOfType(DocumentReaderService.class); if (readerService == null) - throw new NullPointerException("No DocumentReaderService configured for current container"); + { + throw new IllegalArgumentException("No DocumentReaderService configured for current container"); + } Properties props = new Properties(); try Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -500,7 +500,10 @@ } catch (RepositoryException e) { - //ok - repository does not exists + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } // check does this repository name already reserved, otherwise generate and return token @@ -717,7 +720,10 @@ } catch (NameNotFoundException e) { - // skip this exception + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } catch (NamingException e) { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -152,17 +152,20 @@ try { if (isSystem) + { node.getSession().exportSystemView(node.getPath(), pout, false, false); + } else + { node.getSession().exportDocumentView(node.getPath(), pout, false, false); + } } catch (Exception e) { - /* - * Nothing to do. Can give exception if nothing read from stream, - * this exception generated by - * XMLStreamWriterImpl#writeStartDocument. - */ + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } finally { @@ -173,6 +176,10 @@ } catch (Exception e) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } } } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/JcrURLConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/JcrURLConnection.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/JcrURLConnection.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -19,6 +19,8 @@ package org.exoplatform.services.jcr.ext.resource; import org.exoplatform.services.jcr.ext.common.SessionProvider; +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 JcrURLConnection extends URLConnection { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.jcr.ext.resource.JcrURLConnection"); + private SessionProvider sessionProvider; private NodeRepresentationService nodeRepresentationService; @@ -183,13 +187,18 @@ try { if (!connected) + { connect(); + } return nodeRepresentation.getMediaType(); } catch (Exception e) { - //e.printStackTrace(); + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return null; } @@ -204,13 +213,18 @@ try { if (!connected) + { connect(); + } return (int)nodeRepresentation.getContentLenght(); } catch (Exception e) { - //e.printStackTrace(); + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return -1; } @@ -237,13 +251,18 @@ try { if (!connected) + { connect(); + } return nodeRepresentation.getContentEncoding(); } catch (Exception e) { - //e.printStackTrace(); + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return null; } @@ -258,13 +277,18 @@ try { if (!connected) + { connect(); + } return nodeRepresentation.getLastModified(); } catch (Exception e) { - //e.printStackTrace(); + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return 0; } @@ -335,9 +359,12 @@ sessionProvider.close(); } } - catch (Throwable t) + catch (Exception t) { - ; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + t.getMessage()); + } } finally { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentation.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentation.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentation.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -21,6 +21,8 @@ import org.exoplatform.common.util.HierarchicalProperty; import org.exoplatform.services.jcr.core.ExtendedSession; import org.exoplatform.services.jcr.ext.resource.NodeRepresentation; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; import java.io.InputStream; @@ -42,6 +44,9 @@ public class NtFileNodeRepresentation implements NodeRepresentation { + private static final Log LOG = ExoLogger + .getLogger("org.exoplatform.services.jcr.ext.resource.representation.NtFileNodeRepresentation"); + private Node node; private NodeRepresentation content; @@ -191,8 +196,10 @@ } catch (PathNotFoundException e) { - //e.printStackTrace(); - //return null; + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } return props; } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -40,7 +40,7 @@ public class CmdMkd extends FtpCommandImpl { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdMkd"); + private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdMkd"); public CmdMkd() { @@ -103,10 +103,14 @@ } catch (RepositoryException rexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + rexc.getMessage()); + } } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } reply(String.format(FtpConst.Replyes.REPLY_550, srcPath)); Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRest.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRest.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRest.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -19,6 +19,8 @@ package org.exoplatform.services.ftp.command; import org.exoplatform.services.ftp.FtpConst; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.io.IOException; @@ -31,6 +33,8 @@ public class CmdRest extends FtpCommandImpl { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.ftp.command.CmdRest"); + public CmdRest() { commandName = FtpConst.Commands.CMD_REST; @@ -53,6 +57,10 @@ } catch (Exception exc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + exc.getMessage()); + } } reply(String.format(FtpConst.Replyes.REPLY_500, FtpConst.Commands.CMD_REST)); } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRetr.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRetr.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRetr.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -42,7 +42,7 @@ public class CmdRetr extends FtpCommandImpl { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdRetr"); + private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdRetr"); public CmdRetr() { @@ -142,7 +142,7 @@ } catch (Throwable exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } clientSession().closeDataTransiver(); @@ -172,13 +172,21 @@ } catch (PathNotFoundException exc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + exc.getMessage()); + } } catch (NoSuchWorkspaceException wexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + wexc.getMessage()); + } } catch (Throwable exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } return false; } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnFr.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnFr.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnFr.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -37,7 +37,7 @@ public class CmdRnFr extends FtpCommandImpl { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdRnFr"); + private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdRnFr"); public CmdRnFr() { @@ -72,10 +72,14 @@ } catch (RepositoryException rexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + rexc.getMessage()); + } } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } reply(String.format(FtpConst.Replyes.REPLY_550, resName)); } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnTo.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnTo.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnTo.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -39,7 +39,7 @@ public class CmdRnTo extends FtpCommandImpl { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdRnTo"); + private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdRnTo"); public CmdRnTo() { @@ -101,13 +101,21 @@ } catch (PathNotFoundException pexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + pexc.getMessage()); + } } catch (NoSuchWorkspaceException wexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + wexc.getMessage()); + } } catch (Exception exc) { - log.info("Unhandled exceprion. " + exc.getMessage(), exc); + LOG.info("Unhandled exceprion. " + exc.getMessage(), exc); } reply(String.format(FtpConst.Replyes.REPLY_550, pathName)); Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdSize.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdSize.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdSize.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -39,7 +39,7 @@ public class CmdSize extends FtpCommandImpl { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdSize"); + private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdSize"); public CmdSize() { @@ -79,13 +79,21 @@ } catch (PathNotFoundException pexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + pexc.getMessage()); + } } catch (NoSuchWorkspaceException wexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + wexc.getMessage()); + } } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } reply(String.format(FtpConst.Replyes.REPLY_550_SIZE, resName)); } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -49,7 +49,7 @@ public class CmdStor extends FtpCommandImpl { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdStor"); + private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdStor"); public CmdStor() { @@ -74,7 +74,7 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } if (params.length < 2) @@ -219,7 +219,7 @@ } catch (Exception exc) { - log.info("Failurinc closing input stream"); + LOG.info("Failurinc closing input stream"); } if (cacheFileName != null) @@ -238,10 +238,14 @@ } catch (RepositoryException rexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + rexc.getMessage()); + } } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } clientSession().closeDataTransiver(); @@ -261,10 +265,14 @@ } catch (RepositoryException rexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + rexc.getMessage()); + } } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } return null; } @@ -308,10 +316,14 @@ } catch (PathNotFoundException pexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + pexc.getMessage()); + } } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } return null; } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -48,7 +48,7 @@ public abstract class FtpCommandImpl implements FtpCommand { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpCommandImpl"); + private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpCommandImpl"); protected boolean isNeedLogin = true; @@ -154,7 +154,7 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); return null; } return files; @@ -178,13 +178,21 @@ } catch (PathNotFoundException pexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + pexc.getMessage()); + } } catch (NoSuchWorkspaceException wexc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + wexc.getMessage()); + } } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } reply(String.format(FtpConst.Replyes.REPLY_550, resName)); } @@ -235,7 +243,7 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } FtpSystemCoder systemCoder = @@ -273,8 +281,8 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage()); - log.info("Data transmit failed."); + LOG.info("Unhandled exception. " + exc.getMessage()); + LOG.info("Data transmit failed."); } reply(FtpConst.Replyes.REPLY_226); Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/GenericResource.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -20,6 +20,8 @@ import org.exoplatform.common.util.HierarchicalProperty; import org.exoplatform.services.jcr.webdav.xml.WebDavNamespaceContext; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.net.URI; import java.util.HashSet; @@ -41,6 +43,8 @@ public abstract class GenericResource implements Resource { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.jcr.webdav.resource.GenericResource"); + /** * Resource identifier. */ @@ -113,6 +117,10 @@ } catch (Exception exc) { + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + exc.getMessage()); + } } } Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -18,6 +18,9 @@ */ package org.exoplatform.frameworks.jcr.cli; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + import java.util.Iterator; import java.util.Set; import java.util.TreeMap; @@ -32,6 +35,8 @@ public class HelpCommand extends AbstractCliCommand { + private static final Log LOG = ExoLogger.getLogger("org.exoplatform.frameworks.jcr.cli.HelpCommand"); + private TreeMap<String, String> map = new TreeMap<String, String>(); private final int WORD_LENGTH = 15; @@ -79,7 +84,10 @@ } catch (Exception e) { - // no parameters found + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + e.getMessage()); + } } if (findHelpCommand != null) { Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpDataTransiverImpl.java =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpDataTransiverImpl.java 2012-01-27 11:49:43 UTC (rev 5536) +++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpDataTransiverImpl.java 2012-01-27 14:09:27 UTC (rev 5537) @@ -39,7 +39,7 @@ public class FtpDataTransiverImpl implements FtpDataTransiver { - private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.FtpDataTransiverImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.FtpDataTransiverImpl"); protected Socket dataSocket = null; @@ -65,7 +65,7 @@ } catch (Exception exc) { - log.info("Can't open active mode. PORT is busy. " + exc.getMessage(), exc); + LOG.info("Can't open active mode. PORT is busy. " + exc.getMessage(), exc); } return false; } @@ -94,7 +94,7 @@ } catch (Exception exc) { - log.info(FtpConst.EXC_MSG + exc.getMessage(), exc); + LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc); } } @@ -123,11 +123,14 @@ } catch (SocketException exc) { - // .. + if (LOG.isTraceEnabled()) + { + LOG.trace("An exception occurred: " + exc.getMessage()); + } } catch (Exception exc) { - log.error(exc.getLocalizedMessage(), exc); + LOG.error(exc.getLocalizedMessage(), exc); } try @@ -139,7 +142,7 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } return outStream.toByteArray(); @@ -157,7 +160,7 @@ } catch (Exception exc) { - log.info(FtpConst.EXC_MSG + exc.getMessage(), exc); + LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc); } } return false;