[exo-jcr-commits] exo-jcr SVN: r5663 - in jcr/branches/1.15.x: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype and 15 other directories.

Author: andrew.plotnikov Date: 2012-02-17 07:34:21 -0500 (Fri, 17 Feb 2012) New Revision: 5663 Modified: jcr/branches/1.15.x/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/OnParentVersionActionConversion.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CaseTermQuery.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTraversingQueryHits.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WildcardTermEnum.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/synonym/WordNetSynonyms.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupChainImpl.java jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/AbstractDataDistributionType.java jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/JcrURLConnection.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServiceImpl.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRest.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnTo.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdSize.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/config/FtpConfigImpl.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataChannelManagerImpl.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataTransiverImpl.java jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowOutputStream.java jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/ext/FilterNodesByTypesCommand.java Log: EXOJCR-1760: Fixed the Blocker/Critical violations and the easiest Major ones raised by eXo Quality Level 1.2 Modified: jcr/branches/1.15.x/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java =================================================================== --- jcr/branches/1.15.x/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -302,7 +302,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get DetailedInfo from responce.", e); + throw new IllegalStateException("Can not get DetailedInfo from responce.", e); } if (info.getType() == DetailedInfo.COMPLETED) @@ -380,7 +380,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get ShortInfoList from responce.", e); + throw new IllegalStateException("Can not get ShortInfoList from responce.", e); } for (ShortInfo info : repositoryInfoList.getBackups()) @@ -418,7 +418,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get ShortInfoList from responce.", e); + throw new IllegalStateException("Can not get ShortInfoList from responce.", e); } for (ShortInfo info : workspaceInfoList.getBackups()) @@ -686,7 +686,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get BackupServiceInfoBean from responce.", e); + throw new IllegalStateException("Can not get BackupServiceInfoBean from responce.", e); } String result = @@ -728,7 +728,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get ShortInfoList from responce.", e); + throw new IllegalStateException("Can not get ShortInfoList from responce.", e); } ShortInfoList workspaceInfoList; @@ -738,7 +738,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get ShortInfoList from responce.", e); + throw new IllegalStateException("Can not get ShortInfoList from responce.", e); } StringBuilder result = new StringBuilder("\nThe current backups information : \n"); @@ -824,7 +824,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get ShortInfoList from responce.", e); + throw new IllegalStateException("Can not get ShortInfoList from responce.", e); } ShortInfoList workspaceInfoList; @@ -910,7 +910,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get DetailedInfo from responce.", e); + throw new IllegalStateException("Can not get DetailedInfo from responce.", e); } StringBuilder result = new StringBuilder("\nThe current restores information : \n"); @@ -956,7 +956,7 @@ } catch (Exception e) { - throw new RuntimeException("Can not get DetailedInfo from responce.", e); + throw new IllegalStateException("Can not get DetailedInfo from responce.", e); } StringBuilder result = new StringBuilder("\nThe current restores information : \n"); @@ -1215,7 +1215,9 @@ wsEntry = wEntry; if (wsEntry == null) - throw new RuntimeException("Can not find the workspace '" + workspaceName + "' in configuration."); + { + throw new IllegalStateException("Can not find the workspace '" + workspaceName + "' in configuration."); + } return wsEntry; } Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/OnParentVersionActionConversion.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/OnParentVersionActionConversion.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/OnParentVersionActionConversion.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -31,8 +31,7 @@ public class OnParentVersionActionConversion { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.jcr.core.nodetype.OnParentVersionActionConversion"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.OnParentVersionActionConversion"); public static String serializeType(int propertyType) { Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -42,7 +42,7 @@ public class TransactionChangesLog implements CompositeChangesLog, Externalizable { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.jcr.dataflow.TransactionChangesLog"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.TransactionChangesLog"); private static final long serialVersionUID = 4866736965040228027L; Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CaseTermQuery.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CaseTermQuery.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CaseTermQuery.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -37,8 +37,7 @@ */ abstract class CaseTermQuery extends MultiTermQuery implements TransformConstants { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.jcr.impl.core.query.lucene.CaseTermQuery"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.CaseTermQuery"); /** * Indicates whether terms from the index should be lower-cased or Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTraversingQueryHits.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTraversingQueryHits.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeTraversingQueryHits.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -38,8 +38,7 @@ public class NodeTraversingQueryHits extends AbstractQueryHits { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.jcr.impl.core.query.lucene.NodeTraversingQueryHits"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.NodeTraversingQueryHits"); /** * The nodes to traverse. Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WildcardTermEnum.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WildcardTermEnum.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WildcardTermEnum.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -38,8 +38,7 @@ class WildcardTermEnum extends FilteredTermEnum implements TransformConstants { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.jcr.impl.core.query.lucene.WildcardTermEnum"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WildcardTermEnum"); /** * The pattern matcher. Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/synonym/WordNetSynonyms.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/synonym/WordNetSynonyms.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/synonym/WordNetSynonyms.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -31,8 +31,7 @@ public class WordNetSynonyms implements SynonymProvider { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.jcr.impl.core.query.lucene.synonym.WordNetSynonyms"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.WordNetSynonyms"); /** * The synonym map or <code>null</code> if an error occurred while reading the prolog file. Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -37,8 +37,7 @@ public class SerializationSpoolFile extends SpoolFile { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.jcr.impl.dataflow.serialization.SerializationSpoolFile"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.SerializationSpoolFile"); /** * SpoolFileHolder. Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -43,8 +43,7 @@ public class DB2ConnectionFactory extends GenericCQConnectionFactory { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.db.DB2ConnectionFactory"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.DB2ConnectionFactory"); private Boolean isReindexingSupport; Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupChainImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupChainImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupChainImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -293,7 +293,9 @@ public int getIncrementalBackupState() { if (incrementalBackup == null) - throw new RuntimeException("The incremental bacup was not configured. Only full backup."); + { + throw new IllegalStateException("The incremental bacup was not configured. Only full backup."); + } return incrementalBackup.getState(); } Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -1081,7 +1081,7 @@ { if (backupDir == null) { - throw new RuntimeException(BACKUP_DIR + " not specified"); + throw new IllegalStateException(BACKUP_DIR + " not specified"); } logsDirectory = new File(backupDir); @@ -1092,19 +1092,19 @@ if (defIncrPeriod == null) { - throw new RuntimeException(DEFAULT_INCREMENTAL_JOB_PERIOD + " not specified"); + throw new IllegalStateException(DEFAULT_INCREMENTAL_JOB_PERIOD + " not specified"); } defaultIncrementalJobPeriod = Integer.valueOf(defIncrPeriod); if (fullBackupType == null) { - throw new RuntimeException(FULL_BACKUP_TYPE + " not specified"); + throw new IllegalStateException(FULL_BACKUP_TYPE + " not specified"); } if (incrementalBackupType == null) { - throw new RuntimeException(INCREMENTAL_BACKUP_TYPE + " not specified"); + throw new IllegalStateException(INCREMENTAL_BACKUP_TYPE + " not specified"); } } Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/AbstractDataDistributionType.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/AbstractDataDistributionType.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/impl/AbstractDataDistributionType.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -43,8 +43,7 @@ public abstract class AbstractDataDistributionType implements DataDistributionType { - private static final Log LOG = ExoLogger - .getLogger("org.exoplatform.services.jcr.ext.distribution.impl.AbstractDataDistributionType"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.AbstractDataDistributionType"); /** * The default node type to use when we create a new node Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/JcrURLConnection.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/JcrURLConnection.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/JcrURLConnection.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -38,7 +38,7 @@ public class JcrURLConnection extends URLConnection { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.jcr.ext.resource.JcrURLConnection"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ext.JcrURLConnection"); private SessionProvider sessionProvider; Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServiceImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServiceImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServiceImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -37,7 +37,7 @@ public class FtpServiceImpl implements FtpService, Startable { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpServiceImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.FtpServiceImpl"); private CommandService commandService = null; Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpTextUtils.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -30,7 +30,7 @@ public class FtpTextUtils { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpTextUtils"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.FtpTextUtils"); public static String getStrached(String strVal, int reqLen) { Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/client/FtpClientSessionImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -54,7 +54,7 @@ public class FtpClientSessionImpl implements FtpClientSession { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpClientSessionImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.FtpClientSessionImpl"); private FtpServer ftpServer; Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -40,7 +40,7 @@ public class CmdMkd extends FtpCommandImpl { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdMkd"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.CmdMkd"); public CmdMkd() { Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdPort.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -35,7 +35,7 @@ public class CmdPort extends FtpCommandImpl { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdPort"); + private static Log log = ExoLogger.getLogger("exo.jcr.component.ftp.CmdPort"); public CmdPort() { Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRest.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRest.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRest.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -33,7 +33,7 @@ public class CmdRest extends FtpCommandImpl { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.services.ftp.command.CmdRest"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.command.CmdRest"); public CmdRest() { Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnTo.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnTo.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdRnTo.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -39,7 +39,7 @@ public class CmdRnTo extends FtpCommandImpl { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdRnTo"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.CmdRnTo"); public CmdRnTo() { Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdSize.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdSize.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdSize.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -39,7 +39,7 @@ public class CmdSize extends FtpCommandImpl { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdSize"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.CmdSize"); public CmdSize() { Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -49,7 +49,7 @@ public class CmdStor extends FtpCommandImpl { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "CmdStor"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.CmdStor"); public CmdStor() { Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -48,7 +48,7 @@ public abstract class FtpCommandImpl implements FtpCommand { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpCommandImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.FtpCommandImpl"); protected boolean isNeedLogin = true; Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/config/FtpConfigImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/config/FtpConfigImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/config/FtpConfigImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -35,7 +35,7 @@ public class FtpConfigImpl implements FtpConfig { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpConfigImpl"); + private static Log log = ExoLogger.getLogger("exo.jcr.component.ftp.FtpConfigImpl"); /** * "command-port". Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataChannelManagerImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataChannelManagerImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataChannelManagerImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.ftp.data; -import org.exoplatform.services.ftp.FtpConst; import org.exoplatform.services.ftp.client.FtpClientSession; import org.exoplatform.services.ftp.config.FtpConfig; import org.exoplatform.services.log.ExoLogger; @@ -33,7 +32,7 @@ public class FtpDataChannelManagerImpl implements FtpDataChannelManager { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpDataChannelManagerImpl"); + private static Log log = ExoLogger.getLogger("exo.jcr.component.ftp.FtpDataChannelManagerImpl"); private FtpConfig configuration; Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataTransiverImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataTransiverImpl.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataTransiverImpl.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -19,7 +19,6 @@ package org.exoplatform.services.ftp.data; import org.exoplatform.commons.utils.SecurityHelper; -import org.exoplatform.services.ftp.FtpConst; import org.exoplatform.services.ftp.client.FtpClientSession; import org.exoplatform.services.ftp.config.FtpConfig; import org.exoplatform.services.log.ExoLogger; @@ -43,7 +42,7 @@ public class FtpDataTransiverImpl implements FtpDataTransiver { - private static Log log = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpDataTransiverImpl"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.FtpDataTransiverImpl"); private FtpClientSession clientSession; @@ -118,7 +117,7 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } } @@ -130,7 +129,7 @@ } catch (IOException ioexc) { - log.info("Closing socket failure."); + LOG.info("Closing socket failure."); } } @@ -148,7 +147,7 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } } @@ -216,7 +215,7 @@ + configuration.getPortalContainer().getName())); } - protected Log acceptLog = ExoLogger.getLogger("jcr.AcceptDataConnect"); + protected Log acceptLog = ExoLogger.getLogger("exo.jcr.component.ftp.AcceptDataConnect"); @Override public void run() @@ -235,7 +234,7 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } } @@ -251,7 +250,7 @@ + configuration.getPortalContainer().getName())); } - protected Log connectLog = ExoLogger.getLogger("jcr.ConnectDataPort"); + protected Log connectLog = ExoLogger.getLogger("exo.jcr.component.ftp.ConnectDataPort"); @Override public void run() @@ -264,7 +263,7 @@ } catch (Exception exc) { - log.info("Unhandled exception. " + exc.getMessage(), exc); + LOG.info("Unhandled exception. " + exc.getMessage(), exc); } } Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowOutputStream.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowOutputStream.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpSlowOutputStream.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.ftp.data; -import org.exoplatform.services.ftp.FtpConst; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -34,7 +33,7 @@ public class FtpSlowOutputStream extends OutputStream { - private static final Log LOG = ExoLogger.getLogger(FtpConst.FTP_PREFIX + "FtpSlowOutputStream"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.ftp.FtpSlowOutputStream"); private OutputStream nativeOutputStream; Modified: jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/HelpCommand.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -35,7 +35,7 @@ public class HelpCommand extends AbstractCliCommand { - private static final Log LOG = ExoLogger.getLogger("org.exoplatform.frameworks.jcr.cli.HelpCommand"); + private static final Log LOG = ExoLogger.getLogger("exo.jcr.framework.command.HelpCommand"); private TreeMap<String, String> map = new TreeMap<String, String>(); Modified: jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/ext/FilterNodesByTypesCommand.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/ext/FilterNodesByTypesCommand.java 2012-02-17 12:34:07 UTC (rev 5662) +++ jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/ext/FilterNodesByTypesCommand.java 2012-02-17 12:34:21 UTC (rev 5663) @@ -50,12 +50,16 @@ { Object obj = context.get(incomingNodesKey); if (obj == null || !(obj instanceof NodeIterator)) - throw new Exception("Invalid incoming nodes iterator " + obj); + { + throw new IllegalArgumentException("Invalid incoming nodes iterator " + obj); + } NodeIterator nodes = (NodeIterator)obj; obj = context.get(typesKey); if (obj == null || !(obj instanceof String[])) - throw new Exception("Invalid node types object, expected String[] " + obj); + { + throw new IllegalArgumentException("Invalid node types object, expected String[] " + obj); + } String[] nts = (String[])context.get(typesKey); List nodes1 = new ArrayList(); @@ -65,7 +69,9 @@ for (int i = 0; i < nts.length; i++) { if (n.isNodeType(nts[i])) + { nodes1.add(n); + } } } // context.put(resultKey, new EntityCollection(nodes1));