[exo-jcr-commits] exo-jcr SVN: r5636 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl and 52 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Feb 15 03:09:55 EST 2012
Author: andrew.plotnikov
Date: 2012-02-15 03:09:48 -0500 (Wed, 15 Feb 2012)
New Revision: 5636
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemState.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/Constants.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.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/JCRPath.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionReference.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheLockImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheableSessionLockManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/InmemoryNodeTypeRepository.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/VolatileNodeTypeDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeConverter.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/observation/ObservationManagerRegistry.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RepositoryIndexSearcherHolder.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneVirtualTableResolver.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SimpleExcerptProvider.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataCopyIgnoredVisitor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCopyVisitor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionInterceptor.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerThread.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableIOSupport.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/FileValueStorage.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/StringConverter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/SpoolFile.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/WorkspaceContentImporter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/WorkspaceDataImporter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportNodeData.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/PropertyInfo.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/observation/ExtendedEventType.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/ActionNonTxAware.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceSameConfigRestore.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobWorkspaceRestore.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/RepositoryBackupChainImpl.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/fs/FullBackupJob.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/fs/IncrementalBackupJob.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/FullBackupJob.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewGroupListener.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewUserListener.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RESTRegistryService.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryInitializationEntryPlugin.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentationFactory.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServerImpl.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServiceImpl.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdCdUp.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowInputStream.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowOutputStream.java
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/listcode/FtpFileInfoImpl.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/AclCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/HeadCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/OrderPatchCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropFindCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/SearchCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckOutCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/ReportCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/UnCheckOutCommand.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/lock/LockRequestEntity.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/order/OrderPatchResponseEntity.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/propfind/PropFindResponseEntity.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LnkProducer.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/ResourceUtil.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/MultipartByterangesEntity.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/xml/PropstatGroupedRepresentation.java
jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/CliAppContext.java
jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/BasicAppContext.java
jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/GenericWebAppContext.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/client/FtpClientSessionImpl.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdCdUp.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdCwd.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdList.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdMode.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNoop.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPass.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPasv.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPort.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRest.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRnFr.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRnTo.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStat.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStor.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStru.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdUser.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowInputStream1.java
jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowOutputStream.java
Log:
EXOJCR-1760: 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/dataflow/ItemState.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemState.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/ItemState.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -42,7 +42,7 @@
private static final long serialVersionUID = 7967457831325761318L;
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.ItemState");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ItemState");
public static final int ADDED = 1;
@@ -162,8 +162,8 @@
this.internallyCreated = isInternalCreated;
this.isPersisted = isPersisted;
- if (log.isDebugEnabled())
- log.debug(nameFromValue(state) + " " + data.getQPath().getAsString() + ", " + data.getIdentifier());
+ if (LOG.isDebugEnabled())
+ LOG.debug(nameFromValue(state) + " " + data.getQPath().getAsString() + ", " + data.getIdentifier());
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/Constants.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/Constants.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/Constants.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -33,7 +33,7 @@
public class Constants
{
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.Constants");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.Constants");
/**
* Default namespace prefix (empty uri).
@@ -712,7 +712,7 @@
}
catch (IllegalPathException e)
{
- log.error("ERROR: Can't parse JCR_SYSTEM_URI for constant JCR_SYSTEM (" + JCR_SYSTEM_URI + "): " + e, e);
+ LOG.error("ERROR: Can't parse JCR_SYSTEM_URI for constant JCR_SYSTEM (" + JCR_SYSTEM_URI + "): " + e, e);
}
try
@@ -721,7 +721,7 @@
}
catch (IllegalPathException e)
{
- log.error("ERROR: Can't parse JCR_VERSION_STORAGE_URI for constant JCR_VERSION_STORAGE_PATH ("
+ LOG.error("ERROR: Can't parse JCR_VERSION_STORAGE_URI for constant JCR_VERSION_STORAGE_PATH ("
+ JCR_VERSION_STORAGE_URI + "): " + e, e);
}
@@ -731,7 +731,7 @@
}
catch (IllegalPathException e)
{
- log.error("ERROR: Can't parse JCR_NODETYPES_URI for constant JCR_NODETYPES_PATH ("
+ LOG.error("ERROR: Can't parse JCR_NODETYPES_URI for constant JCR_NODETYPES_PATH ("
+ JCR_NODETYPES_URI + "): " + e, e);
}
@@ -742,7 +742,7 @@
}
catch (IllegalPathException e)
{
- log.error("ERROR: Can't parse EXO_NAMESPACES_URI for constant EXO_NAMESPACES (" + nsUri + "): " + e, e);
+ LOG.error("ERROR: Can't parse EXO_NAMESPACES_URI for constant EXO_NAMESPACES (" + nsUri + "): " + e, e);
}
try
@@ -751,7 +751,7 @@
}
catch (IllegalPathException e)
{
- log.error("ERROR: Can't parse ROOT_URI " + e, e);
+ LOG.error("ERROR: Can't parse ROOT_URI " + e, e);
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -50,7 +50,7 @@
public class WorkspaceContainer extends ExoContainer
{
- protected static Log log = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceContainer");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceContainer");
private final String name;
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-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -53,7 +53,7 @@
public class JDBCConfigurationPersister implements ConfigurationPersister
{
- protected static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.JDBCConfigurationPersister");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.JDBCConfigurationPersister");
public final static String PARAM_SOURCE_NAME = "source-name";
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPath.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPath.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPath.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -45,7 +45,7 @@
public final static String PARENT_RELPATH = "..";
- protected static Log log = ExoLogger.getLogger("exo.jcr.component.core.JCRPath");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.JCRPath");
public static JCRPath createJCRPath()
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -181,7 +181,7 @@
{
if (size <= 0)
{
- log.warn("Wrong relative path. Can't move up in path hierarhy.");
+ LOG.warn("Wrong relative path. Can't move up in path hierarhy.");
return 0;
}
return size - 1;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionReference.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionReference.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionReference.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -42,7 +42,7 @@
/**
* The logger instance for this class.
*/
- private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SessionReference");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SessionReference");
//
private static final int INITIAL_DELAY = 10;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -89,7 +89,7 @@
public static final String RESTORE_PATH_PARAMETER = "restore-path";
- protected static final Log log = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceInitializer");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceInitializer");
protected final String workspaceName;
@@ -535,7 +535,7 @@
final NodeData root = (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
- log.info("Workspace [" + workspaceName + "] restored from storage " + restorePath + " in "
+ LOG.info("Workspace [" + workspaceName + "] restored from storage " + restorePath + " in "
+ (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
return root;
@@ -675,7 +675,7 @@
true));
}
else
- log.warn("Node skipped name=" + svName + " id=" + exoId + ". Context node "
+ LOG.warn("Node skipped name=" + svName + " id=" + exoId + ". Context node "
+ (parents.size() > 0 ? parents.peek().getQPath().getAsString() : "/"));
}
@@ -709,12 +709,12 @@
("true".equals(exoMultivalued) ? true : false));
}
else
- log.warn("Property can'b be first name=" + svName + " type=" + svType + " id=" + exoId
+ LOG.warn("Property can'b be first name=" + svName + " type=" + svType + " id=" + exoId
+ ". Node should be prior. Context node "
+ (parents.size() > 0 ? parents.peek().getQPath().getAsString() : "/"));
}
else
- log.warn("Property skipped name=" + svName + " type=" + svType + " id=" + exoId
+ LOG.warn("Property skipped name=" + svName + " type=" + svType + " id=" + exoId
+ ". Context node "
+ (parents.size() > 0 ? parents.peek().getQPath().getAsString() : "/"));
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheLockImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheLockImpl.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheLockImpl.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -35,7 +35,7 @@
*/
public class CacheLockImpl extends LockImpl
{
- private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.CacheLockImpl");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.CacheLockImpl");
private boolean live;
@@ -117,7 +117,7 @@
}
catch (RepositoryException e)
{
- log.error(e.getLocalizedMessage(), e);
+ LOG.error(e.getLocalizedMessage(), e);
}
return null;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheableSessionLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheableSessionLockManager.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/CacheableSessionLockManager.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -51,7 +51,7 @@
/**
* Logger
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.CacheableSessionLockManager");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.CacheableSessionLockManager");
/**
* Session identifier.
@@ -242,19 +242,19 @@
}
catch (UnsupportedRepositoryOperationException e)
{
- log.error(e.getLocalizedMessage());
+ LOG.error(e.getLocalizedMessage());
}
catch (LockException e)
{
- log.error(e.getLocalizedMessage());
+ LOG.error(e.getLocalizedMessage());
}
catch (AccessDeniedException e)
{
- log.error(e.getLocalizedMessage());
+ LOG.error(e.getLocalizedMessage());
}
catch (RepositoryException e)
{
- log.error(e.getLocalizedMessage());
+ LOG.error(e.getLocalizedMessage());
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/InmemoryNodeTypeRepository.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/InmemoryNodeTypeRepository.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/InmemoryNodeTypeRepository.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -39,7 +39,7 @@
*/
public class InmemoryNodeTypeRepository extends AbstractNodeTypeRepository
{
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.InmemoryNodeTypeRepository");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.InmemoryNodeTypeRepository");
private final ItemDefinitionDataHolder defsHolder;
@@ -104,7 +104,7 @@
}
catch (RepositoryException e)
{
- log.error(e.getLocalizedMessage(), e);
+ LOG.error(e.getLocalizedMessage(), e);
}
return hierarchy.getAllNodeTypes();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -61,7 +61,7 @@
public class ItemAutocreator
{
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.ItemAutocreator");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ItemAutocreator");
private final NodeTypeDataManager nodeTypeDataManager;
@@ -132,9 +132,9 @@
}
else
{
- if (this.log.isDebugEnabled())
+ if (this.LOG.isDebugEnabled())
{
- this.log.debug("Skipping existed node " + ndef.getName() + " in " + parent.getQPath().getAsString()
+ this.LOG.debug("Skipping existed node " + ndef.getName() + " in " + parent.getQPath().getAsString()
+ " during the automatic creation of items for " + typeName.getAsString()
+ " nodetype or mixin type");
}
@@ -180,9 +180,9 @@
}
else
{
- if (this.log.isDebugEnabled())
+ if (this.LOG.isDebugEnabled())
{
- this.log.debug("Skipping existed property " + pdef.getName() + " in "
+ this.LOG.debug("Skipping existed property " + pdef.getName() + " in "
+ parent.getQPath().getAsString() + " during the automatic creation of items for "
+ typeName.getAsString() + " nodetype or mixin type");
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/VolatileNodeTypeDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/VolatileNodeTypeDataManager.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/VolatileNodeTypeDataManager.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -41,7 +41,7 @@
/**
* Class logger.
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.VolatileNodeTypeDataManager");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.VolatileNodeTypeDataManager");
public VolatileNodeTypeDataManager(final NodeTypeDataManagerImpl nodeTypeDataManagerImpl) throws RepositoryException
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -65,7 +65,7 @@
public class JCRNodeTypeDataPersister implements NodeTypeDataPersister
{
- protected final Log log = ExoLogger.getLogger("exo.jcr.component.core.JCRNodeTypeDataPersister");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.JCRNodeTypeDataPersister");
private final DataManager dataManager;
@@ -120,7 +120,7 @@
{
if (!started)
{
- log.warn("Unable save nodetype " + nodeType.getName().getAsString()
+ LOG.warn("Unable save nodetype " + nodeType.getName().getAsString()
+ " in to the storage. Storage not initialized");
return;
}
@@ -152,7 +152,7 @@
TransientNodeData jcrNodetypes;
long start = 0;
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
start = System.currentTimeMillis();
}
@@ -214,9 +214,9 @@
changesLog.add(ItemState.createAddedState(jcrNodetypes)).add(ItemState.createAddedState(primaryType));
}
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("/jcr:system/jcr:nodetypes is created, creation time: " + (System.currentTimeMillis() - start)
+ LOG.debug("/jcr:system/jcr:nodetypes is created, creation time: " + (System.currentTimeMillis() - start)
+ " ms");
}
@@ -233,7 +233,7 @@
{
if (nodeTypeStorageRoot == null)
{
- log.warn(" Storage not initialized");
+ LOG.warn(" Storage not initialized");
return false;
}
try
@@ -243,7 +243,7 @@
}
catch (RepositoryException e)
{
- log.error(e.getLocalizedMessage(), e);
+ LOG.error(e.getLocalizedMessage(), e);
}
return false;
@@ -335,7 +335,7 @@
{
if (nodeTypeStorageRoot == null)
{
- log.warn(" Storage not initialized");
+ LOG.warn(" Storage not initialized");
return null;
}
//Searching nodeType root
@@ -431,8 +431,8 @@
{
if (this.nodeTypeStorageRoot == null)
{
- if (log.isDebugEnabled())
- log.debug(" Storage not initialized");
+ if (LOG.isDebugEnabled())
+ LOG.debug(" Storage not initialized");
return false;
}
return true;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeConverter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeConverter.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeConverter.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -49,7 +49,7 @@
/**
* Class logger.
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.NodeTypeConverter");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.NodeTypeConverter");
private final LocationFactory locationFactory;
@@ -76,7 +76,7 @@
{
// skip this node, so it's not necessary at this runtime
// + "' -- it's not necessary at this runtime";
- log.warn("Node type " + ntvalue.getName() + " is not register due to DISABLE control policy");
+ LOG.warn("Node type " + ntvalue.getName() + " is not register due to DISABLE control policy");
break;
}
}
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-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -57,7 +57,7 @@
public final int SKIP_EVENT = Integer.MIN_VALUE;
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.ActionLauncher");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ActionLauncher");
private final ObservationManagerRegistry observationRegistry;
@@ -129,7 +129,7 @@
}
catch (RepositoryException e)
{
- log.error("Can not fire ActionLauncher.onSaveItems() for " + item.getQPath().getAsString()
+ LOG.error("Can not fire ActionLauncher.onSaveItems() for " + item.getQPath().getAsString()
+ " reason: " + e.getMessage());
}
}
@@ -228,7 +228,7 @@
if (node == null)
{
- log.warn("Item's " + item.getQPath().getAsString() + " associated parent (" + item.getParentIdentifier()
+ LOG.warn("Item's " + item.getQPath().getAsString() + " associated parent (" + item.getParentIdentifier()
+ ") can't be found nor in workspace nor in current changes. Nodetype filter is rejected.");
return false;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ObservationManagerRegistry.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ObservationManagerRegistry.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ObservationManagerRegistry.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -43,7 +43,7 @@
public class ObservationManagerRegistry
{
- protected static Log log = ExoLogger.getLogger("exo.jcr.component.core.ObservationManagerRegistry");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ObservationManagerRegistry");
protected Map<EventListener, ListenerCriteria> listenersMap;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -39,7 +39,7 @@
/**
* Logger instance for this class
*/
- private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.DefaultChangesFilter");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.DefaultChangesFilter");
/**
* @param searchManager
@@ -89,11 +89,11 @@
}
catch (RepositoryException e)
{
- log.error("Error indexing changes " + e, e);
+ LOG.error("Error indexing changes " + e, e);
}
catch (IOException e)
{
- log.error("Error indexing changes " + e, e);
+ LOG.error("Error indexing changes " + e, e);
logErrorChanges(handler, removedNodes, addedNodes);
}
@@ -103,17 +103,17 @@
}
catch (RepositoryException e)
{
- log.error("Error indexing changes " + e, e);
+ LOG.error("Error indexing changes " + e, e);
}
catch (IOException e)
{
- log.error("Error indexing changes " + e, e);
+ LOG.error("Error indexing changes " + e, e);
logErrorChanges(parentHandler, parentRemovedNodes, parentAddedNodes);
}
}
protected Log getLogger()
{
- return log;
+ return LOG;
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RepositoryIndexSearcherHolder.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RepositoryIndexSearcherHolder.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RepositoryIndexSearcherHolder.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -43,7 +43,7 @@
/**
* Class logger.
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.RepositoryIndexSearcherHolder");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.RepositoryIndexSearcherHolder");
/**
* @param indexSearchers
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -56,7 +56,7 @@
/**
* Class logger.
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.SystemSearchManager");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SystemSearchManager");
/**
* Is started flag.
@@ -103,14 +103,14 @@
}
catch (RepositoryException e)
{
- log.error(e.getLocalizedMessage());
+ LOG.error(e.getLocalizedMessage());
handler = null;
//freeBuffers();
throw new RuntimeException(e);
}
catch (RepositoryConfigurationException e)
{
- log.error(e.getLocalizedMessage());
+ LOG.error(e.getLocalizedMessage());
handler = null;
//freeBuffers();
throw new RuntimeException(e);
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -42,7 +42,7 @@
*/
public class IndexerCacheLoader extends AbstractWriteOnlyCacheLoader
{
- private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.IndexerCacheLoader");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.IndexerCacheLoader");
/**
* A map of all the indexers that has been registered
@@ -74,9 +74,9 @@
{
indexers.put(Fqn.fromElements(searchManager.getWsId()), new Indexer(searchManager, parentSearchManager, handler,
parentHandler));
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("Register " + searchManager.getWsId() + " " + this + " in " + indexers);
+ LOG.debug("Register " + searchManager.getWsId() + " " + this + " in " + indexers);
}
}
@@ -87,9 +87,9 @@
{
if (key.equals(JBossCacheIndexChangesFilter.LISTWRAPPER) && value instanceof ChangesFilterListsWrapper)
{
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.info("Received list wrapper, start indexing...");
+ LOG.info("Received list wrapper, start indexing...");
}
// updating index
ChangesFilterListsWrapper wrapper = (ChangesFilterListsWrapper)value;
@@ -98,10 +98,10 @@
Indexer indexer = indexers.get(name.getParent());
if (indexer == null)
{
- log.warn("No indexer could be found for the fqn " + name.getParent());
- if (log.isDebugEnabled())
+ LOG.warn("No indexer could be found for the fqn " + name.getParent());
+ if (LOG.isDebugEnabled())
{
- log.debug("The current content of the map of indexers is " + indexers);
+ LOG.debug("The current content of the map of indexers is " + indexers);
}
}
else if (wrapper.withChanges())
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -39,7 +39,7 @@
*/
public class IndexerSingletonStoreCacheLoader extends SingletonStoreCacheLoader
{
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.IndexerSingletonStoreCacheLoader");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.IndexerSingletonStoreCacheLoader");
/**
* @see org.jboss.cache.loader.SingletonStoreCacheLoader#activeStatusChanged(boolean)
@@ -63,7 +63,7 @@
}
catch (PushStateException e)
{
- log.error("Failed to initiate PushState.", e);
+ LOG.error("Failed to initiate PushState.", e);
}
}
}, "JCR Indexer ActiveStatusChanged-handler").start();
@@ -76,11 +76,11 @@
{
public Object call() throws Exception
{
- final boolean debugEnabled = log.isDebugEnabled();
+ final boolean debugEnabled = LOG.isDebugEnabled();
if (debugEnabled)
{
- log.debug("start pushing in-memory state to cache cacheLoader collection");
+ LOG.debug("start pushing in-memory state to cache cacheLoader collection");
}
// merging all lists stored in memory
@@ -139,7 +139,7 @@
}
if (debugEnabled)
{
- log.debug("in-memory state passed to cache cacheLoader successfully");
+ LOG.debug("in-memory state passed to cache cacheLoader successfully");
}
return null;
}
@@ -169,7 +169,7 @@
// if newActiveState is true IndexerCacheLoader is coordinator with write enabled;
((IndexerCacheLoader)getCacheLoader()).setMode(writeEnabled ? IndexerIoMode.READ_WRITE
: IndexerIoMode.READ_ONLY);
- log.info("Set indexer io mode to:" + (writeEnabled ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY));
+ LOG.info("Set indexer io mode to:" + (writeEnabled ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY));
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneVirtualTableResolver.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneVirtualTableResolver.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneVirtualTableResolver.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -19,9 +19,9 @@
package org.exoplatform.services.jcr.impl.core.query.lucene;
import org.apache.lucene.index.Term;
+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.services.jcr.core.NamespaceAccessor;
import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.datamodel.InternalQName;
@@ -51,7 +51,7 @@
/**
* Class logger.
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.LuceneVirtualTableResolver");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.LuceneVirtualTableResolver");
private final String mixinTypesField;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SimpleExcerptProvider.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SimpleExcerptProvider.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SimpleExcerptProvider.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -44,7 +44,7 @@
/**
* Logger instance for this class
*/
- private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.SimpleExcerptProvider");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SimpleExcerptProvider");
/**
* The item state manager.
@@ -88,7 +88,7 @@
catch (RepositoryException e)
{
// ignore
- log.warn(e.getLocalizedMessage());
+ LOG.warn(e.getLocalizedMessage());
}
if (text.length() > maxFragmentSize)
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/BaseValue.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -49,7 +49,7 @@
public abstract class BaseValue implements ExtendedValue, ReadableBinaryValue
{
- protected static Log log = ExoLogger.getLogger("exo.jcr.component.core.BaseValue");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.BaseValue");
protected final int type;
@@ -352,7 +352,7 @@
}
catch (IOException e)
{
- log.error("Read error", e);
+ LOG.error("Read error", e);
return false;
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataCopyIgnoredVisitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataCopyIgnoredVisitor.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataCopyIgnoredVisitor.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -46,7 +46,7 @@
public class ItemDataCopyIgnoredVisitor extends DefaultItemDataCopyVisitor
{
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.ItemDataCopyIgnoredVisitor");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ItemDataCopyIgnoredVisitor");
protected final SessionChangesLog restoredChanges;
@@ -88,8 +88,8 @@
{
// the node can be stored as IGNOREd in restore set, check an action
- if (log.isDebugEnabled())
- log.debug("A property " + property.getQPath().getAsString() + " is IGNOREd");
+ if (LOG.isDebugEnabled())
+ LOG.debug("A property " + property.getQPath().getAsString() + " is IGNOREd");
// set context current parent to existed in restore set
parents.push((NodeData)contextState.getData());
@@ -101,9 +101,9 @@
else
{
// copy as IGNOREd parent child, i.e. OnParentVersionAction is any
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("A property " + property.getQPath().getAsString() + " is IGNOREd node descendant");
+ LOG.debug("A property " + property.getQPath().getAsString() + " is IGNOREd node descendant");
}
super.entering(property, level);
}
@@ -137,8 +137,8 @@
ItemState contextState = restoredChanges.getItemState(node.getParentIdentifier());
if (contextState != null && !contextState.isDeleted())
{
- if (log.isDebugEnabled())
- log.debug("A node " + node.getQPath().getAsString() + " is IGNOREd");
+ if (LOG.isDebugEnabled())
+ LOG.debug("A node " + node.getQPath().getAsString() + " is IGNOREd");
// set context current parent to existed in restore set
parents.push((NodeData)contextState.getData());
@@ -153,9 +153,9 @@
else
{
// copy as IGNOREd parent child, i.e. OnParentVersionAction is any
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("A node " + node.getQPath().getAsString() + " is IGNOREd node descendant");
+ LOG.debug("A node " + node.getQPath().getAsString() + " is IGNOREd node descendant");
}
super.entering(node, level);
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCopyVisitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCopyVisitor.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCopyVisitor.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -41,7 +41,7 @@
public class ItemDataCopyVisitor extends DefaultItemDataCopyVisitor
{
- private Log log = ExoLogger.getLogger("exo.jcr.component.core.ItemDataCopyVisitor");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ItemDataCopyVisitor");
public ItemDataCopyVisitor(NodeData parent, InternalQName destNodeName, NodeTypeDataManager nodeTypeManager,
SessionDataManager srcDataManager, SessionDataManager dstDataManager, boolean keepIdentifiers)
@@ -151,9 +151,9 @@
.getIdentifier() : IdGenerator.generate(), -1, property.getType(), curParent().getIdentifier(), property
.isMultiValued(), values);
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("entering COPY " + newProperty.getQPath().getAsString() + "; pidentifier: "
+ LOG.debug("entering COPY " + newProperty.getQPath().getAsString() + "; pidentifier: "
+ newProperty.getParentIdentifier() + "; identifier: " + newProperty.getIdentifier());
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -56,7 +56,7 @@
public class VersionableWorkspaceDataManager extends ShareableSupportedWorkspaceDataManager
{
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.VersionableWorkspaceDataManager");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.VersionableWorkspaceDataManager");
private ShareableSupportedWorkspaceDataManager versionDataManager;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/ParentNodeEvictionActionPolicy.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -37,7 +37,7 @@
{
Cache<?, ?> cache;
- private static final Log log = LogFactory.getLog("exo.jcr.component.core.DefaultEvictionActionPolicy");
+ private static final Log LOG = LogFactory.getLog("exo.jcr.component.core.DefaultEvictionActionPolicy");
public void setCache(Cache<?, ?> cache)
{
@@ -50,18 +50,18 @@
boolean result;
try
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("Evicting Fqn " + fqn);
+ LOG.trace("Evicting Fqn " + fqn);
}
cache.evict(fqn);
result = true;
}
catch (Exception e)
{
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("Unable to evict " + fqn, e);
+ LOG.debug("Unable to evict " + fqn, e);
}
result = false;
}
@@ -84,9 +84,9 @@
// Check if not null, possibly this node was concurrently removed
if (node != null && !node.hasChildrenDirect())
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("Evicting Fqn " + fqn);
+ LOG.trace("Evicting Fqn " + fqn);
}
cache.evict(parentFqn);
}
@@ -94,9 +94,9 @@
}
catch (IllegalStateException e)
{
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("Unable to evict " + fqn, e);
+ LOG.debug("Unable to evict " + fqn, e);
}
}
return result;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionInterceptor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionInterceptor.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionActionInterceptor.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -51,7 +51,7 @@
/**
* Logger
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.SessionActionInterceptor");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SessionActionInterceptor");
private final ActionCatalog catalog;
@@ -498,7 +498,7 @@
}
catch (Exception e)
{
- log.error(e.getLocalizedMessage(), e);
+ LOG.error(e.getLocalizedMessage(), e);
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerThread.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerThread.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerThread.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -33,7 +33,7 @@
/**
* Logger.
*/
- private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WorkerThread");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WorkerThread");
protected boolean stopped = false;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableIOSupport.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableIOSupport.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableIOSupport.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -40,7 +40,7 @@
public class CASableIOSupport
{
- private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.CASeableIOSupport");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.CASeableIOSupport");
public static final int HASHFILE_ORDERNUMBER = 0;
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-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -49,7 +49,7 @@
/**
* Logger.
*/
- private static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.FileIOChannel");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.FileIOChannel");
/**
* Temporary directory. Used for I/O transaction operations and locks.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -40,7 +40,7 @@
public abstract class FileValueStorage extends ValueStoragePlugin
{
- private Log log = ExoLogger.getLogger("exo.jcr.component.core.FileValueStorage");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.FileValueStorage");
public final static String PATH = "path";
@@ -109,7 +109,7 @@
{
if (rootDir.mkdirs())
{
- log.info("Directory created: " + rootDir.getAbsolutePath());
+ LOG.info("Directory created: " + rootDir.getAbsolutePath());
// create internal temp dir
File tempDir = new File(rootDir, TEMP_DIR_NAME);
@@ -120,7 +120,7 @@
// care about storage temp dir cleanup
for (File tmpf : tempDir.listFiles())
if (!tmpf.delete())
- log.warn("Storage temporary directory contains un-deletable file " + tmpf.getAbsolutePath()
+ LOG.warn("Storage temporary directory contains un-deletable file " + tmpf.getAbsolutePath()
+ ". It's recommended to leave this directory for JCR External Values Storage private use.");
}
else
@@ -129,7 +129,7 @@
}
else
{
- log.warn("Directory IS NOT created: " + rootDir.getAbsolutePath());
+ LOG.warn("Directory IS NOT created: " + rootDir.getAbsolutePath());
}
}
else
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/StringConverter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/StringConverter.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/StringConverter.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -41,7 +41,7 @@
private static final int ENCODE_CHARS = 7;
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.StringConverter");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.StringConverter");
private static class DNChar
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/SpoolFile.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/SpoolFile.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/SpoolFile.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -54,7 +54,7 @@
public class SpoolFile extends File
{
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.SpoolFile");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SpoolFile");
protected Map<Object, Long> users = new WeakHashMap<Object, Long>();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/WorkspaceContentImporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/WorkspaceContentImporter.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/WorkspaceContentImporter.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -52,7 +52,7 @@
/**
* Class logger.
*/
- protected final Log log = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceContentImporter");
+ protected final static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceContentImporter");
/**
* The flag indicates whether a verified that the first element is the root.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/WorkspaceDataImporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/WorkspaceDataImporter.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/WorkspaceDataImporter.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -44,7 +44,7 @@
*/
public class WorkspaceDataImporter extends StreamImporter
{
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceDataImporter");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WorkspaceDataImporter");
public WorkspaceDataImporter(NodeData parent, int uuidBehavior, ItemDataKeeper dataKeeper,
ItemDataConsumer dataConsumer, NodeTypeDataManager ntManager, LocationFactory locationFactory,
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportNodeData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportNodeData.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/ImportNodeData.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -42,7 +42,7 @@
/**
*
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.core.ImportNodeData");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ImportNodeData");
/**
*
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/PropertyInfo.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/PropertyInfo.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/dataflow/PropertyInfo.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -37,7 +37,7 @@
/**
* Class logger.
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.PropertyInfo");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.PropertyInfo");
/**
*
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -97,7 +97,7 @@
private ConfigurationManager configurationManager;
- private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.ExoJBossCacheFactory");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ExoJBossCacheFactory");
/**
* Creates ExoJbossCacheFactory with provided configuration transaction managers.
@@ -142,7 +142,7 @@
{
// get JBossCache configuration file path
String jBossCacheConfigurationPath = parameterEntry.getParameterValue(JBOSSCACHE_CONFIG);
- log.info("JBoss Cache configuration used: " + jBossCacheConfigurationPath);
+ LOG.info("JBoss Cache configuration used: " + jBossCacheConfigurationPath);
// prepare configuration
InputStream configStream;
@@ -194,7 +194,7 @@
// Create and inject multiplexer factory
CHANNEL_FACTORY.setMultiplexerConfig(configurationManager.getResource(jgroupsConfigurationFilePath));
cache.getConfiguration().getRuntimeConfig().setMuxChannelFactory(CHANNEL_FACTORY);
- log.info("Multiplexer stack successfully enabled for the cache.");
+ LOG.info("Multiplexer stack successfully enabled for the cache.");
}
}
catch (Exception e)
@@ -213,7 +213,7 @@
{
cache.getConfiguration().setJgroupsConfigFile(
configurationManager.getResource(jgroupsConfigurationFilePath));
- log.info("Custom JGroups configuration set:"
+ LOG.info("Custom JGroups configuration set:"
+ configurationManager.getResource(jgroupsConfigurationFilePath));
}
catch (Exception e)
@@ -301,16 +301,16 @@
else
{
caches.put(key, cache);
- if (log.isInfoEnabled())
+ if (LOG.isInfoEnabled())
{
- log.info("A new JBoss Cache instance has been registered for the region " + rootFqn + ", a cache of type "
+ LOG.info("A new JBoss Cache instance has been registered for the region " + rootFqn + ", a cache of type "
+ cacheType + " and the container " + container.getContext().getName());
}
}
addEvictionRegion(rootFqn, cache, cfg);
- if (log.isInfoEnabled())
+ if (LOG.isInfoEnabled())
{
- log.info("The region " + rootFqn + " has been registered for a cache of type " + cacheType
+ LOG.info("The region " + rootFqn + " has been registered for a cache of type " + cacheType
+ " and the container " + container.getContext().getName());
}
return cache;
@@ -336,7 +336,7 @@
}
catch (IllegalArgumentException e)
{
- log.error("Could not create the JMX Manager", e);
+ LOG.error("Could not create the JMX Manager", e);
}
return null;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/observation/ExtendedEventType.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/observation/ExtendedEventType.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/observation/ExtendedEventType.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -34,7 +34,7 @@
/**
* Class logger.
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.core.ExtendedEventType");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ExtendedEventType");
public static final String NODE_ADDED = "Node is added";
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/ActionNonTxAware.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/ActionNonTxAware.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/ActionNonTxAware.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -38,7 +38,7 @@
/**
* The logger
*/
- protected Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ActionNonTxAware");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ActionNonTxAware");
/**
* Executes the action outside the context of the current tx
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceSameConfigRestore.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceSameConfigRestore.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceSameConfigRestore.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -53,7 +53,7 @@
/**
* The logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.ext.JobExistingWorkspaceSameConfigRestore");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.JobExistingWorkspaceSameConfigRestore");
/**
* JobExistingWorkspaceSameConfigRestore constructor.
@@ -159,7 +159,7 @@
}
catch (BackupException e)
{
- log.error("Can't rollback changes", e);
+ LOG.error("Can't rollback changes", e);
}
}
@@ -176,7 +176,7 @@
}
catch (BackupException e)
{
- log.error("Can't close restorer", e);
+ LOG.error("Can't close restorer", e);
}
}
@@ -189,7 +189,7 @@
}
catch (RepositoryException e)
{
- log.error("Can't resume component", e);
+ LOG.error("Can't resume component", e);
}
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobWorkspaceRestore.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobWorkspaceRestore.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobWorkspaceRestore.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -51,7 +51,7 @@
/**
* The apache logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.ext.JobWorkspaceRestore");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.JobWorkspaceRestore");
/**
* RESTORE_STARTED. The state of start restore.
@@ -156,7 +156,7 @@
}
catch (Throwable t)
{
- log.error("The restore was fail", t);
+ LOG.error("The restore was fail", t);
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/PendingChangesLog.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -57,7 +57,7 @@
/**
* The apache logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.ext.PendingChangesLog");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.PendingChangesLog");
/**
* The definition of ChangesLog types.
@@ -429,15 +429,15 @@
}
catch (InterruptedException ie)
{
- log.error("The interrupted exceptio : ", ie);
+ LOG.error("The interrupted exceptio : ", ie);
}
catch (IndexOutOfBoundsException ioobe)
{
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.info("listFixupStream.size() == " + listFixupStream.size());
- log.info("listRandomAccessFile.size() == " + listRandomAccessFile.size());
- log.info(" i == " + i);
+ LOG.info("listFixupStream.size() == " + listFixupStream.size());
+ LOG.info("listRandomAccessFile.size() == " + listRandomAccessFile.size());
+ LOG.info(" i == " + i);
}
synchronized (this)
{
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/RepositoryBackupChainImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/RepositoryBackupChainImpl.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/RepositoryBackupChainImpl.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -56,7 +56,7 @@
/**
* The apache logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.ext.RepositoryBackupChainImpl");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.RepositoryBackupChainImpl");
private final RepositoryBackupConfig config;
@@ -146,10 +146,11 @@
{
if (state != FINISHED)
{
- if (log.isDebugEnabled()) {
+ if (LOG.isDebugEnabled())
+ {
for (BackupChain bc : workspaceBackups)
{
- log.debug(repositoryBackupId + " : " + getState(bc.getFullBackupState()));
+ LOG.debug(repositoryBackupId + " : " + getState(bc.getFullBackupState()));
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/fs/FullBackupJob.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/fs/FullBackupJob.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/fs/FullBackupJob.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -42,7 +42,7 @@
public class FullBackupJob extends AbstractFullBackupJob
{
- protected static Log log = ExoLogger.getLogger("exo.jcr.component.ext.FullBackupJob");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.FullBackupJob");
private String pathBackupFile;
@@ -70,12 +70,12 @@
}
catch (FileNotFoundException e)
{
- log.error("Full backup initialization failed ", e);
+ LOG.error("Full backup initialization failed ", e);
notifyError("Full backup initialization failed ", e);
}
catch (IOException e)
{
- log.error("Full backup initialization failed ", e);
+ LOG.error("Full backup initialization failed ", e);
notifyError("Full backup initialization failed ", e);
}
}
@@ -102,12 +102,12 @@
}
catch (RepositoryException e)
{
- log.error("Full backup failed " + getStorageURL().getPath(), e);
+ LOG.error("Full backup failed " + getStorageURL().getPath(), e);
notifyError("Full backup failed", e);
}
catch (IOException e)
{
- log.error("Full backup failed " + getStorageURL().getPath(), e);
+ LOG.error("Full backup failed " + getStorageURL().getPath(), e);
notifyError("Full backup failed", e);
}
@@ -118,7 +118,7 @@
public void stop()
{
- log.info("Stop requested " + getStorageURL().getPath());
+ LOG.info("Stop requested " + getStorageURL().getPath());
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/fs/IncrementalBackupJob.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/fs/IncrementalBackupJob.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/fs/IncrementalBackupJob.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -51,7 +51,7 @@
public class IncrementalBackupJob extends AbstractIncrementalBackupJob
{
- protected static Log log = ExoLogger.getLogger("exo.jcr.component.ext.IncrementalBackupJob");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.IncrementalBackupJob");
private ObjectOutputStream oosFileData;
@@ -77,12 +77,12 @@
}
catch (FileNotFoundException e)
{
- log.error("Incremental backup initialization failed ", e);
+ LOG.error("Incremental backup initialization failed ", e);
notifyError("Incremental backup initialization failed ", e);
}
catch (IOException e)
{
- log.error("Incremental backup initialization failed ", e);
+ LOG.error("Incremental backup initialization failed ", e);
notifyError("Incremental backup initialization failed ", e);
}
}
@@ -90,7 +90,7 @@
public void stop()
{
state = FINISHED;
- log.info("Stop requested " + getStorageURL().getPath());
+ LOG.info("Stop requested " + getStorageURL().getPath());
notifyListeners();
}
@@ -123,8 +123,8 @@
long total = System.currentTimeMillis() - start;
- if (log.isDebugEnabled())
- log.debug("Time : " + total + " ms" + " Itemstates count : " + changesLog.getAllStates().size());
+ if (LOG.isDebugEnabled())
+ LOG.debug("Time : " + total + " ms" + " Itemstates count : " + changesLog.getAllStates().size());
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/FullBackupJob.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/FullBackupJob.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/FullBackupJob.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -46,7 +46,7 @@
/**
* Logger.
*/
- protected static Log log = ExoLogger.getLogger("exo.jcr.component.ext.FullBackupJob");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.FullBackupJob");
/**
* {@inheritDoc}
@@ -77,12 +77,12 @@
}
catch (FileNotFoundException e)
{
- log.error("Full backup initialization failed ", e);
+ LOG.error("Full backup initialization failed ", e);
notifyError("Full backup initialization failed ", e);
}
catch (IOException e)
{
- log.error("Full backup initialization failed ", e);
+ LOG.error("Full backup initialization failed ", e);
notifyError("Full backup initialization failed ", e);
}
}
@@ -109,12 +109,12 @@
}
catch (BackupException e)
{
- log.error("Full backup failed " + getStorageURL().getPath(), e);
+ LOG.error("Full backup failed " + getStorageURL().getPath(), e);
notifyError("Full backup failed", e);
}
catch (RepositoryException e)
{
- log.error("Full backup failed " + getStorageURL().getPath(), e);
+ LOG.error("Full backup failed " + getStorageURL().getPath(), e);
notifyError("Full backup failed", e);
}
finally
@@ -125,7 +125,7 @@
}
catch (RepositoryException e)
{
- log.error("Full backup failed " + getStorageURL().getPath(), e);
+ LOG.error("Full backup failed " + getStorageURL().getPath(), e);
notifyError("Full backup failed", e);
}
}
@@ -139,6 +139,6 @@
*/
public void stop()
{
- log.info("Stop requested " + getStorageURL().getPath());
+ LOG.info("Stop requested " + getStorageURL().getPath());
}
}
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -256,7 +256,7 @@
/**
* The apache logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.ext.HTTPBackupAgent");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.HTTPBackupAgent");
/**
* To disable cache control.
@@ -302,7 +302,7 @@
this.backupManager = (ExtendedBackupManager) backupManager;
this.sessionProviderService = sessionProviderService;
- log.info("HTTPBackupAgent inited");
+ LOG.info("HTTPBackupAgent inited");
}
/**
@@ -411,7 +411,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start backup", exception);
+ LOG.error("Can not start backup", exception);
return Response.status(status).entity("Can not start backup : " + failMessage).type(MediaType.TEXT_PLAIN)
.cacheControl(noCache).build();
@@ -505,7 +505,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start backup", exception);
+ LOG.error("Can not start backup", exception);
return Response.status(status).entity("Can not start backup : " + failMessage).type(MediaType.TEXT_PLAIN)
.cacheControl(noCache).build();
@@ -567,7 +567,7 @@
failMessage = e.getMessage();
}
- log.error("Can not drop the workspace '" + "/" + repository + "/" + workspace + "'", exception);
+ LOG.error("Can not drop the workspace '" + "/" + repository + "/" + workspace + "'", exception);
return Response.status(status).entity(
"Can not drop the workspace '" + "/" + repository + "/" + workspace + "' : " + failMessage).type(
@@ -680,7 +680,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ LOG.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ "' from backup log with id '" + backupId + "'", exception);
return Response.status(status).entity(
@@ -814,7 +814,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ LOG.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ "' from backup log with id '" + backupId + "'", exception);
return Response.status(status).entity(
@@ -856,7 +856,7 @@
}
catch (UnsupportedEncodingException e)
{
- log.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ LOG.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ "' from backup set '" + backupSetPath + "'", e);
return Response.status(Response.Status.BAD_REQUEST).entity(
@@ -983,7 +983,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ LOG.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ "' from backup set '" + backupSetPath + "'", exception);
return Response.status(status).entity(
@@ -1134,7 +1134,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the workspace '" + "/" + repository + "/" + workspace
+ LOG.error("Can not start restore the workspace '" + "/" + repository + "/" + workspace
+ "' from backup log with id '" + backupId + "'", exception);
return Response.status(status).entity(
@@ -1171,7 +1171,7 @@
}
catch (UnsupportedEncodingException e)
{
- log.error("Can not start restore from backup set '" + backupSetPathEncoded + "'", e);
+ LOG.error("Can not start restore from backup set '" + backupSetPathEncoded + "'", e);
return Response.status(Response.Status.BAD_REQUEST).entity(
"Can not start restore from backup set '" + backupSetPathEncoded + "' : " + e.getMessage()).type(
@@ -1235,7 +1235,7 @@
{
if (exception != null)
{
- log.error("Can not start restore from backup set '" + backupSetPath + "'", exception);
+ LOG.error("Can not start restore from backup set '" + backupSetPath + "'", exception);
return Response.status(status).entity(
"Can not start restore from backup set '" + backupSetPath + "' : " + failMessage).type(
@@ -1344,7 +1344,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the workspace '" + "/" + repository + "/" + workspace
+ LOG.error("Can not start restore the workspace '" + "/" + repository + "/" + workspace
+ "' from backup set \"" + backupSetPath + "\"", exception);
return Response.status(status).entity(
@@ -1419,7 +1419,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the repository '" + "/" + repository + "' from backup set '" + backupSetPath
+ LOG.error("Can not start restore the repository '" + "/" + repository + "' from backup set '" + backupSetPath
+ "'", exception);
return Response.status(status).entity(
@@ -1513,7 +1513,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup log with id '"
+ LOG.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup log with id '"
+ backupId + "'", exception);
return Response.status(status).entity(
@@ -1621,7 +1621,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup log with id '"
+ LOG.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup log with id '"
+ backupId + "'", exception);
return Response.status(status).entity(
@@ -1663,7 +1663,7 @@
}
catch (UnsupportedEncodingException e)
{
- log.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup set '"
+ LOG.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup set '"
+ backupSetPath + "'", e);
return Response.status(Response.Status.BAD_REQUEST).entity(
@@ -1759,7 +1759,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup set '"
+ LOG.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup set '"
+ backupSetPath + "'", exception);
return Response.status(status).entity(
@@ -1867,7 +1867,7 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the repository '" + "/" + repository + "' from backup log with id '"
+ LOG.error("Can not start restore the repository '" + "/" + repository + "' from backup log with id '"
+ backupId + "'", exception);
return Response.status(status).entity(
@@ -1927,7 +1927,7 @@
failMessage = e.getMessage();
}
- log.error("Can not stop backup", exception);
+ LOG.error("Can not stop backup", exception);
return Response.status(status).entity("Can not stop backup : " + failMessage).type(MediaType.TEXT_PLAIN)
.cacheControl(noCache).build();
@@ -1985,7 +1985,7 @@
failMessage = e.getMessage();
}
- log.error("Can not stop repository backup ", exception);
+ LOG.error("Can not stop repository backup ", exception);
return Response.status(status).entity("Can not stop repository backup : " + failMessage).type(
MediaType.TEXT_PLAIN).cacheControl(noCache).build();
@@ -2013,7 +2013,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about backup service", e);
+ LOG.error("Can not get information about backup service", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about backup service : " + e.getMessage()).type(MediaType.TEXT_PLAIN)
@@ -2049,7 +2049,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current or completed backups", e);
+ LOG.error("Can not get information about current or completed backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current or completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
@@ -2085,7 +2085,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current or completed reposioty backups", e);
+ LOG.error("Can not get information about current or completed reposioty backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current or completed repository backups" + e.getMessage()).type(
@@ -2133,7 +2133,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current or completed backup with 'id' " + id, e);
+ LOG.error("Can not get information about current or completed backup with 'id' " + id, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current or completed backup with 'id' " + id + " : " + e.getMessage()).type(
@@ -2182,7 +2182,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current or completed repository backup with 'id' " + id, e);
+ LOG.error("Can not get information about current or completed repository backup with 'id' " + id, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current or completed repository backup with 'id' " + id + " : "
@@ -2214,7 +2214,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current backups", e);
+ LOG.error("Can not get information about current backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current backups" + e.getMessage()).type(MediaType.TEXT_PLAIN).cacheControl(
@@ -2246,7 +2246,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current repositorty backups", e);
+ LOG.error("Can not get information about current repositorty backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current backups" + e.getMessage()).type(MediaType.TEXT_PLAIN).cacheControl(
@@ -2279,7 +2279,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about completed backups", e);
+ LOG.error("Can not get information about completed backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
@@ -2312,7 +2312,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about completed backups", e);
+ LOG.error("Can not get information about completed backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
@@ -2366,7 +2366,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current or completed backups", e);
+ LOG.error("Can not get information about current or completed backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current or completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
@@ -2416,7 +2416,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current or completed repository backups", e);
+ LOG.error("Can not get information about current or completed repository backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current or completed repository backups" + e.getMessage()).type(
@@ -2466,7 +2466,7 @@
}
catch (Throwable e)
{
- log.error(
+ LOG.error(
"Can not get information about current restore for workspace /" + repository + "/" + workspace + "'", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
@@ -2515,7 +2515,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current restore for repository /" + repository + "'", e);
+ LOG.error("Can not get information about current restore for repository /" + repository + "'", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current restore for repository /" + repository + "' : " + e.getMessage())
@@ -2571,7 +2571,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current restores.", e);
+ LOG.error("Can not get information about current restores.", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current restores : " + e.getMessage()).type(MediaType.TEXT_PLAIN)
@@ -2625,7 +2625,7 @@
}
catch (Throwable e)
{
- log.error("Can not get information about current repository restores.", e);
+ LOG.error("Can not get information about current repository restores.", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
"Can not get information about current repository restores : " + e.getMessage()).type(MediaType.TEXT_PLAIN)
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewGroupListener.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewGroupListener.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewGroupListener.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -44,7 +44,7 @@
*/
public class NewGroupListener extends GroupEventListener
{
- private static final Log log = ExoLogger.getLogger("exo.jcr.component.ext.NewGroupListener");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.NewGroupListener");
private static final String GROUPS_PATH = "groupsPath";
@@ -122,7 +122,7 @@
}
catch (RepositoryException e)
{
- log.error("An error occurs while removing the group directory of '" + groupId + "'", e);
+ LOG.error("An error occurs while removing the group directory of '" + groupId + "'", e);
}
finally
{
@@ -153,7 +153,7 @@
}
catch (Exception e)
{
- log.error("An error occurs while initializing the group directory of '" + groupId + "'", e);
+ LOG.error("An error occurs while initializing the group directory of '" + groupId + "'", e);
}
finally
{
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewUserListener.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewUserListener.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewUserListener.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -43,7 +43,7 @@
*/
public class NewUserListener extends UserEventListener
{
- private static final Log log = ExoLogger.getLogger("exo.jcr.component.ext.NewUserListener");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.NewUserListener");
private final HierarchyConfig config_;
@@ -86,7 +86,7 @@
}
catch (Exception e)
{
- log.error("An error occurs while initializing the user directory of '" + userName + "'", e);
+ LOG.error("An error occurs while initializing the user directory of '" + userName + "'", e);
}
finally
{
@@ -106,7 +106,7 @@
}
catch (Exception e)
{
- log.error("An error occurs while removing the user directory of '" + user.getUserName() + "'", e);
+ LOG.error("An error occurs while removing the user directory of '" + user.getUserName() + "'", e);
}
finally
{
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RESTRegistryService.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RESTRegistryService.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RESTRegistryService.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -68,7 +68,7 @@
/**
* Logger.
*/
- private static final Log log = ExoLogger.getLogger("exo.jcr.component.ext.RESTRegistryService");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.RESTRegistryService");
/**
*
@@ -137,7 +137,7 @@
}
catch (Exception e)
{
- log.error("Get registry failed", e);
+ LOG.error("Get registry failed", e);
throw new WebApplicationException(e);
}
}
@@ -161,7 +161,7 @@
}
catch (RepositoryException e)
{
- log.error("Get registry entry failed", e);
+ LOG.error("Get registry entry failed", e);
throw new WebApplicationException(e);
}
}
@@ -182,27 +182,27 @@
}
catch (IllegalArgumentException e)
{
- log.error("Create registry entry failed", e);
+ LOG.error("Create registry entry failed", e);
throw new WebApplicationException(e);
}
catch (IOException e)
{
- log.error("Create registry entry failed", e);
+ LOG.error("Create registry entry failed", e);
throw new WebApplicationException(e);
}
catch (SAXException e)
{
- log.error("Create registry entry failed", e);
+ LOG.error("Create registry entry failed", e);
throw new WebApplicationException(e);
}
catch (ParserConfigurationException e)
{
- log.error("Create registry entry failed", e);
+ LOG.error("Create registry entry failed", e);
throw new WebApplicationException(e);
}
catch (RepositoryException e)
{
- log.error("Create registry entry failed", e);
+ LOG.error("Create registry entry failed", e);
throw new WebApplicationException(e);
}
}
@@ -231,27 +231,27 @@
}
catch (IllegalArgumentException e)
{
- log.error("Re-create registry entry failed", e);
+ LOG.error("Re-create registry entry failed", e);
throw new WebApplicationException(e);
}
catch (IOException e)
{
- log.error("Re-create registry entry failed", e);
+ LOG.error("Re-create registry entry failed", e);
throw new WebApplicationException(e);
}
catch (SAXException e)
{
- log.error("Re-create registry entry failed", e);
+ LOG.error("Re-create registry entry failed", e);
throw new WebApplicationException(e);
}
catch (ParserConfigurationException e)
{
- log.error("Re-create registry entry failed", e);
+ LOG.error("Re-create registry entry failed", e);
throw new WebApplicationException(e);
}
catch (RepositoryException e)
{
- log.error("Re-create registry entry failed", e);
+ LOG.error("Re-create registry entry failed", e);
throw new WebApplicationException(e);
}
}
@@ -273,7 +273,7 @@
}
catch (Exception e)
{
- log.error("Remove registry entry failed", e);
+ LOG.error("Remove registry entry failed", e);
throw new WebApplicationException(e);
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryInitializationEntryPlugin.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryInitializationEntryPlugin.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryInitializationEntryPlugin.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -39,7 +39,7 @@
/**
* Class logger.
*/
- private final Log log = ExoLogger.getLogger("exo.jcr.component.ext.RegistryInitializationEntryPlugin");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.RegistryInitializationEntryPlugin");
private HashMap<String, String> appConfiguration = new HashMap<String, String>();
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentationFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentationFactory.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentationFactory.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -37,7 +37,7 @@
/**
* Logger.
*/
- private static Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.NtFileNodeRepresentationFactory");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.NtFileNodeRepresentationFactory");
protected NodeRepresentationService nodeRepresentationService;
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServerImpl.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServerImpl.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -54,7 +54,7 @@
public class FtpServerImpl implements FtpServer
{
- private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpServerImpl");
+ private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpServerImpl");
public static final String COMMAND_PATH = "/conf/ftp-commands.xml";
@@ -96,14 +96,14 @@
if (!PrivilegedFileHelper.exists(cacheFolder))
{
- log.info("Cache folder not exist. Try to create it...");
+ LOG.info("Cache folder not exist. Try to create it...");
PrivilegedFileHelper.mkdirs(cacheFolder);
}
String[] cacheFiles = PrivilegedFileHelper.list(cacheFolder);
if (cacheFiles == null)
{
- log.info("No cache file in cache folder!");
+ LOG.info("No cache file in cache folder!");
return;
}
@@ -132,11 +132,11 @@
try
{
serverSocket = new ServerSocket(port);
- log.info("FTPServer started on port '" + port + "'");
+ LOG.info("FTPServer started on port '" + port + "'");
}
catch (BindException e)
{
- log.warn("Cannot launch the FTPServer on '" + (port++) + "', we try the next port number");
+ LOG.warn("Cannot launch the FTPServer on '" + (port++) + "', we try the next port number");
}
}
@@ -149,7 +149,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
return false;
@@ -174,11 +174,11 @@
}
catch (RepositoryException e)
{
- log.info("Repository exception. " + e.getMessage(), e);
+ LOG.info("Repository exception. " + e.getMessage(), e);
}
catch (RepositoryConfigurationException e)
{
- log.info("Repository configuration exception. " + e.getMessage(), e);
+ LOG.info("Repository configuration exception. " + e.getMessage(), e);
}
return null;
@@ -197,7 +197,7 @@
public boolean unRegisterClient(FtpClientSession clientSession)
{
boolean result = clients.remove(clientSession);
- log.info(">>> Client disconnected. Clients: " + clients.size());
+ LOG.info(">>> Client disconnected. Clients: " + clients.size());
return result;
}
@@ -249,11 +249,11 @@
FtpClientSession clientSession = new FtpClientSessionImpl(ftpServer, incoming);
clients.add(clientSession);
- log.info(">>> New client connected. Clients: " + clients.size());
+ LOG.info(">>> New client connected. Clients: " + clients.size());
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
}
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServiceImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServiceImpl.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServiceImpl.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -37,7 +37,7 @@
public class FtpServiceImpl implements FtpService, Startable
{
- private Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpServiceImpl");
+ private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpServiceImpl");
private CommandService commandService = null;
@@ -58,7 +58,7 @@
public void start()
{
- log.info("Start service.");
+ LOG.info("Start service.");
try
{
ftpServer = new FtpServerImpl(config, commandService, repositoryService);
@@ -66,17 +66,17 @@
}
catch (Exception e)
{
- log.info("Unhandled exception. could not get repository!!!! " + e.getMessage(), e);
+ LOG.info("Unhandled exception. could not get repository!!!! " + e.getMessage(), e);
}
}
public void stop()
{
- log.info("Stopping...");
+ LOG.info("Stopping...");
if (ftpServer != null)
ftpServer.stop();
else
- log.warn("Service isn't started");
+ LOG.warn("Service isn't started");
}
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -30,7 +30,7 @@
public class FtpTextUtils
{
- private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpTextUtils");
+ private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpTextUtils");
public static String getStrached(String strVal, int reqLen)
{
@@ -52,7 +52,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
StringBuilder resStr = new StringBuilder();
for (int i = 0; i < reqLen; i++)
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientCommandThread.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -38,7 +38,7 @@
public class FtpClientCommandThread extends Thread
{
- private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpClientCommandThread");
+ private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpClientCommandThread");
protected FtpClientSession clientSession;
@@ -54,9 +54,9 @@
if (container == null)
{
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("No Portal Container found.");
+ LOG.debug("No Portal Container found.");
}
container = ExoContainerContext.getTopContainer();
}
@@ -116,7 +116,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
break;
}
}
@@ -127,7 +127,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
}
finally
@@ -171,16 +171,16 @@
String encoding = clientSession.getFtpServer().getConfiguration().getClientSideEncoding();
String readyCommand = new String(commandLine, encoding);
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("FTP_CMD:[" + readyCommand + "]");
+ LOG.debug("FTP_CMD:[" + readyCommand + "]");
}
return readyCommand;
}
catch (Exception exc)
{
- log.info("Unahdled exception. " + exc.getMessage(), exc);
+ LOG.info("Unahdled exception. " + exc.getMessage(), exc);
}
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -54,7 +54,7 @@
public class FtpClientSessionImpl implements FtpClientSession
{
- private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpClientSessionImpl");
+ private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpClientSessionImpl");
private FtpServer ftpServer;
@@ -131,7 +131,7 @@
}
catch (UnsupportedEncodingException eexc)
{
- log.info("Unsupported encoding exception. See for CLIENT-SIDE-ENCODING parameter. " + eexc.getMessage(), eexc);
+ LOG.info("Unsupported encoding exception. See for CLIENT-SIDE-ENCODING parameter. " + eexc.getMessage(), eexc);
byte[] data = replyString.getBytes();
clientSocket.getOutputStream().write(data);
// outPrintStream.println(replyString);
@@ -176,7 +176,7 @@
}
catch (IOException exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
getFtpServer().unRegisterClient(this);
@@ -370,7 +370,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
return FtpConst.Replyes.REPLY_550;
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdCdUp.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdCdUp.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdCdUp.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -33,7 +33,7 @@
public class CmdCdUp extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdCdUp");
+ private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdCdUp");
public CmdCdUp()
{
@@ -49,7 +49,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
reply(String.format(FtpConst.Replyes.REPLY_550, FtpConst.Commands.CMD_CDUP));
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowInputStream.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowInputStream.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowInputStream.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -34,7 +34,7 @@
public class FtpSlowInputStream extends InputStream
{
- private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpSlowInputStream");
+ private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpSlowInputStream");
private InputStream nativeInputStream;
@@ -58,7 +58,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception until Thread.sleep(...). " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception until Thread.sleep(...). " + exc.getMessage(), exc);
}
readed = 0;
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowOutputStream.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowOutputStream.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowOutputStream.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -34,7 +34,7 @@
public class FtpSlowOutputStream extends OutputStream
{
- private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpSlowOutputStream");
+ private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpSlowOutputStream");
private OutputStream nativeOutputStream;
@@ -58,7 +58,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
writed = 0;
}
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/listcode/FtpFileInfoImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/listcode/FtpFileInfoImpl.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/listcode/FtpFileInfoImpl.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -38,7 +38,7 @@
public class FtpFileInfoImpl implements FtpFileInfo
{
- protected static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpFileInfoImpl");
+ protected static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpFileInfoImpl");
protected String _name = "";
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/AclCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/AclCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/AclCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -58,7 +58,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger(AclCommand.class);
+ private static final Log LOG = ExoLogger.getLogger(AclCommand.class);
/**
* Applies changes for JCR node's {@link AccessControlList}
@@ -121,22 +121,22 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.status(HTTPStatus.INTERNAL_ERROR).entity(exc.getMessage()).build();
}
catch (AccessControlException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.status(HTTPStatus.FORBIDDEN).entity(exc.getMessage()).build();
}
catch (IllegalArgumentException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.status(HTTPStatus.BAD_REQUEST).entity(exc.getMessage()).build();
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.status(HTTPStatus.BAD_REQUEST).build();
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -73,7 +73,7 @@
/**
* Logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.GetCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.GetCommand");
private Map<String, String> xsltParams;
@@ -236,12 +236,12 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/HeadCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/HeadCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/HeadCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -49,7 +49,7 @@
/**
* Logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.HeadCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.HeadCommand");
/**
* Webdav Head method implementation.
@@ -88,7 +88,7 @@
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -61,7 +61,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.LockCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.LockCommand");
/**
* Resource locks holder.
@@ -157,7 +157,7 @@
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
@@ -248,7 +248,7 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ LOG.error(e.getMessage(), e);
throw new IOException(e.getMessage());
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/OrderPatchCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/OrderPatchCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/OrderPatchCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -53,7 +53,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.OrderPatchCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.OrderPatchCommand");
/**
* Constructor.
@@ -100,7 +100,7 @@
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
@@ -214,7 +214,7 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
status = HTTPStatus.INTERNAL_ERROR;
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropFindCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropFindCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropFindCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -64,7 +64,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.PropFindCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.PropFindCommand");
/**
* Webdav Propfind method implementation.
@@ -89,7 +89,7 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
@@ -136,17 +136,17 @@
}
catch (RepositoryException e1)
{
- log.error(e1.getMessage(), e1);
+ LOG.error(e1.getMessage(), e1);
return Response.serverError().build();
}
catch (URISyntaxException e1)
{
- log.error(e1.getMessage(), e1);
+ LOG.error(e1.getMessage(), e1);
return Response.serverError().build();
}
catch (IllegalResourceTypeException e1)
{
- log.error(e1.getMessage(), e1);
+ LOG.error(e1.getMessage(), e1);
return Response.serverError().build();
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/SearchCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/SearchCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/SearchCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -46,7 +46,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.SearchCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.SearchCommand");
/**
* Webdav search method implementation.
@@ -84,7 +84,7 @@
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -60,7 +60,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.SearchResultResponseEntity");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.SearchResultResponseEntity");
/**
* Namespace conetext.
@@ -192,7 +192,7 @@
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new IOException(exc.getMessage());
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckOutCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckOutCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckOutCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -45,7 +45,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.CheckOutCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.CheckOutCommand");
/**
* Webdav CheckOut comand implementation.
@@ -79,7 +79,7 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/ReportCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/ReportCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/ReportCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -55,7 +55,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.ReportCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.ReportCommand");
/**
* Webdav Report method implementation.
@@ -104,12 +104,12 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/UnCheckOutCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/UnCheckOutCommand.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/UnCheckOutCommand.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -46,7 +46,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.UnCheckOutCommand");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.UnCheckOutCommand");
/**
* Webdav Uncheckout method implementation.
@@ -85,7 +85,7 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/lock/LockRequestEntity.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/lock/LockRequestEntity.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/lock/LockRequestEntity.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -38,7 +38,7 @@
/**
* logger.
*/
- private Log log = ExoLogger.getLogger("exo.jcr.component.webdav.LockRequestEntity");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.LockRequestEntity");
/**
* Lock scope.
@@ -77,7 +77,7 @@
if (!scope.equals(PropertyConstants.EXCLUSIVE))
{
// should we throw PreconditionException here?
- log.warn("Lock is converted to exclusive scope, requested " + scope.getLocalPart());
+ LOG.warn("Lock is converted to exclusive scope, requested " + scope.getLocalPart());
}
lockScope = PropertyConstants.EXCLUSIVE;
}
@@ -87,7 +87,7 @@
if (!type.equals(PropertyConstants.WRITE))
{
// should we throw PreconditionException here?
- log.warn("Lock is converted to exclusive scope, requested " + type.getLocalPart());
+ LOG.warn("Lock is converted to exclusive scope, requested " + type.getLocalPart());
}
lockScope = PropertyConstants.WRITE;
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/order/OrderPatchResponseEntity.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/order/OrderPatchResponseEntity.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/order/OrderPatchResponseEntity.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -48,7 +48,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.OrderPatchResponseEntity");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.OrderPatchResponseEntity");
/**
* Namespace context.
@@ -127,7 +127,7 @@
}
catch (Exception exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new IOException();
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/propfind/PropFindResponseEntity.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/propfind/PropFindResponseEntity.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/propfind/PropFindResponseEntity.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -55,7 +55,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.PropFindResponseEntity");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.PropFindResponseEntity");
/**
* XML writer.
@@ -149,22 +149,22 @@
}
catch (XMLStreamException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new IOException(exc.getMessage());
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new IOException(exc.getMessage());
}
catch (IllegalResourceTypeException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new IOException(exc.getMessage());
}
catch (URISyntaxException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new IOException(exc.getMessage());
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LnkProducer.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LnkProducer.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/lnkproducer/LnkProducer.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -50,7 +50,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.LnkProducer");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.LnkProducer");
/**
* Default constructor.
@@ -88,7 +88,7 @@
}
catch (IOException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new WebApplicationException(exc);
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/ResourceUtil.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/ResourceUtil.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/ResourceUtil.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -44,7 +44,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.ResourceUtil");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.ResourceUtil");
/**
* If the node is file.
@@ -64,7 +64,7 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return false;
}
}
@@ -85,7 +85,7 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return false;
}
}
@@ -106,7 +106,7 @@
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
return false;
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/MultipartByterangesEntity.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/MultipartByterangesEntity.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/MultipartByterangesEntity.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -45,7 +45,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.MultipartByterangesEntity");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.MultipartByterangesEntity");
/**
* resource.
@@ -123,12 +123,12 @@
}
catch (IOException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new IOException("Can't write to stream, caused " + exc);
}
catch (RepositoryException exc)
{
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
throw new IOException("Can't write to stream, caused " + exc);
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/xml/PropstatGroupedRepresentation.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/xml/PropstatGroupedRepresentation.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/xml/PropstatGroupedRepresentation.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -54,7 +54,7 @@
/**
* logger.
*/
- private static Log log = ExoLogger.getLogger("exo.jcr.component.webdav.PropstatGroupedRepresentation");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.webdav.PropstatGroupedRepresentation");
/**
* properties statuses.
@@ -163,7 +163,7 @@
catch (AccessDeniedException exc)
{
statname = WebDavConst.getStatusDescription(HTTPStatus.FORBIDDEN);
- log.error(exc.getMessage(), exc);
+ LOG.error(exc.getMessage(), exc);
}
catch (ItemNotFoundException exc)
{
Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/CliAppContext.java
===================================================================
--- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/CliAppContext.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/CliAppContext.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -64,7 +64,7 @@
}
catch (Exception e)
{
- log.error("GetUserName error: " + e);
+ LOG.error("GetUserName error: " + e);
return "Undefined";
}
}
Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/BasicAppContext.java
===================================================================
--- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/BasicAppContext.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/BasicAppContext.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -41,7 +41,7 @@
public class BasicAppContext extends ContextBase implements JCRAppContext
{
- protected static Log log = ExoLogger.getLogger("exo.jcr.framework.command.BasicAppContext");
+ protected static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.BasicAppContext");
protected final SessionProvider sessionProvider;
Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/GenericWebAppContext.java
===================================================================
--- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/GenericWebAppContext.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/GenericWebAppContext.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -48,7 +48,7 @@
public static final String JCR_CONTENT_MAPPING = "org.exoplatform.frameworks.web.repositoryMapping";
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.JCRWebAppContext");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.JCRWebAppContext");
protected final SessionProvider sessionProvider;
@@ -72,7 +72,7 @@
{
String name = (String)en.nextElement();
put(name, servletContext.getInitParameter(name));
- log.debug("ServletContext init param: " + name + "=" + servletContext.getInitParameter(name));
+ LOG.debug("ServletContext init param: " + name + "=" + servletContext.getInitParameter(name));
}
en = servletContext.getAttributeNames();
@@ -80,7 +80,7 @@
{
String name = (String)en.nextElement();
put(name, servletContext.getAttribute(name));
- log.debug("ServletContext: " + name + "=" + servletContext.getAttribute(name));
+ LOG.debug("ServletContext: " + name + "=" + servletContext.getAttribute(name));
}
HttpSession session = request.getSession(false);
@@ -91,7 +91,7 @@
{
String name = (String)en.nextElement();
put(name, session.getAttribute(name));
- log.debug("Session: " + name + "=" + session.getAttribute(name));
+ LOG.debug("Session: " + name + "=" + session.getAttribute(name));
}
}
@@ -107,7 +107,7 @@
{
String name = (String)en.nextElement();
put(name, request.getParameter(name));
- log.debug("Request: " + name + "=" + request.getParameter(name));
+ LOG.debug("Request: " + name + "=" + request.getParameter(name));
}
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/client/FtpClientSessionImpl.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/client/FtpClientSessionImpl.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/client/FtpClientSessionImpl.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -41,7 +41,7 @@
public class FtpClientSessionImpl implements FtpClientSession
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.FtpClientSessionImpl");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.FtpClientSessionImpl");
protected String host;
@@ -112,7 +112,7 @@
// log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> sleeping.........");
}
- log.info("unhandled exception. " + prevExc.getMessage(), prevExc);
+ LOG.info("unhandled exception. " + prevExc.getMessage(), prevExc);
return false;
}
@@ -137,7 +137,7 @@
}
catch (IOException exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdCdUp.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdCdUp.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdCdUp.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdCdUp extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdCdUp");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdCdUp");
public int execute()
{
@@ -43,7 +43,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdCwd.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdCwd.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdCwd.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdCwd extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdCwd");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdCwd");
protected String path;
@@ -50,7 +50,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdList.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdList.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdList.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -37,7 +37,7 @@
public class CmdList extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdList");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdList");
protected String path = "";
@@ -115,7 +115,7 @@
}
catch (Exception exc)
{
- log.info("CAN'T PARSE FILE LINE: [" + lines[i] + "]");
+ LOG.info("CAN'T PARSE FILE LINE: [" + lines[i] + "]");
}
}
reply = getReply();
@@ -124,7 +124,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdMode.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdMode.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdMode.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -31,7 +31,7 @@
public class CmdMode extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdMode");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdMode");
private String mode;
@@ -49,7 +49,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNlst.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -35,7 +35,7 @@
public class CmdNlst extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdNlst");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdNlst");
protected String path = "";
@@ -106,7 +106,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNoop.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNoop.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdNoop.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdNoop extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdNoop");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdNoop");
public int execute()
{
@@ -43,7 +43,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPass.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPass.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPass.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdPass extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdPass");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdPass");
protected String pass;
@@ -50,7 +50,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPasv.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPasv.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPasv.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -34,7 +34,7 @@
public class CmdPasv extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdPasv");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdPasv");
protected String host = "";
@@ -78,9 +78,9 @@
}
catch (Exception exc)
{
- log.info("unhandled ecxeption. " + exc.getMessage(), exc);
+ LOG.info("unhandled ecxeption. " + exc.getMessage(), exc);
}
- log.info("SOME ERRORS");
+ LOG.info("SOME ERRORS");
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPort.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPort.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdPort.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdPort extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdPort");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdPort");
protected String host;
@@ -62,7 +62,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRest.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRest.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRest.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdRest extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdRest");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdRest");
protected String offset;
@@ -62,7 +62,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRnFr.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRnFr.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRnFr.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdRnFr extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdRnFr");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdRnFr");
protected String path;
@@ -57,7 +57,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRnTo.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRnTo.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdRnTo.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdRnTo extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdRnTo");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdRnTo");
protected String path;
@@ -57,7 +57,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStat.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStat.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStat.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -31,7 +31,7 @@
public class CmdStat extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdStat");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdStat");
public int execute()
{
@@ -42,7 +42,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStor.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStor.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStor.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -33,7 +33,7 @@
public class CmdStor extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdStor");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdStor");
protected String path;
@@ -89,7 +89,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStru.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStru.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdStru.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -31,7 +31,7 @@
public class CmdStru extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdStru");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdStru");
private String structureType;
@@ -49,7 +49,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdUser.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdUser.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdUser.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -32,7 +32,7 @@
public class CmdUser extends FtpCommandImpl
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdUser");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.CmdUser");
protected String userName;
@@ -50,7 +50,7 @@
}
catch (Exception exc)
{
- log.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
+ LOG.info(FtpConst.EXC_MSG + exc.getMessage(), exc);
}
return -1;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/FtpCommandImpl.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -36,7 +36,7 @@
public abstract class FtpCommandImpl implements FtpCommand
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.FtpCommandImpl");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.FtpCommandImpl");
protected FtpClientSession clientSession;
@@ -59,7 +59,7 @@
public void sendCommand(String command)
{
- log.info(">>> " + command);
+ LOG.info(">>> " + command);
try
{
@@ -70,7 +70,7 @@
}
catch (IOException exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
}
@@ -92,7 +92,7 @@
public int getReply() throws Exception
{
- log.info("try get reply..........");
+ LOG.info("try get reply..........");
StringBuilder reply = new StringBuilder();
String curReply = "";
@@ -122,7 +122,7 @@
descript = reply.toString();
replyCode = FtpUtils.getReplyCode(curReply);
- log.info("<<< " + descript);
+ LOG.info("<<< " + descript);
return replyCode;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowInputStream1.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowInputStream1.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowInputStream1.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -27,7 +27,7 @@
public class FtpSlowInputStream1 extends InputStream
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.FtpSlowInputStream");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.FtpSlowInputStream");
protected InputStream nativeInputStream;
@@ -54,7 +54,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception until Thread.sleep(...). " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception until Thread.sleep(...). " + exc.getMessage(), exc);
}
readed = 0;
}
Modified: jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowOutputStream.java
===================================================================
--- jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowOutputStream.java 2012-02-15 02:16:26 UTC (rev 5635)
+++ jcr/trunk/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/data/FtpSlowOutputStream.java 2012-02-15 08:09:48 UTC (rev 5636)
@@ -27,7 +27,7 @@
public class FtpSlowOutputStream extends OutputStream
{
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.FtpSlowOutputStream");
+ private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.FtpSlowOutputStream");
private OutputStream nativeOutputStream;
@@ -55,7 +55,7 @@
}
catch (Exception exc)
{
- log.info("Unhandled exception. " + exc.getMessage(), exc);
+ LOG.info("Unhandled exception. " + exc.getMessage(), exc);
}
writed = 0;
}
More information about the exo-jcr-commits
mailing list