Author: areshetnyak Date: 2011-04-29 11:09:58 -0400 (Fri, 29 Apr 2011) New Revision: 4336 Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositorySuspendController.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.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/JCRPathExt.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/LocationFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.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/XASessionImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockRemoverHolder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.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/ItemDefinitionImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.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/XmlNodeTypeDataPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/PropertyFunctionQueryNode.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.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/JBossCacheIndexChangesFilter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexUpdateMonitor.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/LocalIndexCacheLoader.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/LocalIndexChangesFilter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChangesHolder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultHTMLExcerpt.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultIndexUpdateMonitor.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultXMLExcerpt.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SharedFieldCache.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WeightedHTMLExcerpt.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WeightedXMLExcerpt.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/sql/JCRSQLQueryBuilder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.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/infinispan/ISPNCacheWorkspaceStorageCache.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerService.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractWriteOnlyCacheLoader.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DialectDetecter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/DocumentViewImporter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/statistics/JCRStatisticsManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/Text.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/GenericTransactionService.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/ExtendedBackupManager.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/IndexCleanHelper.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/DataDistributionType.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/repository/creation/RepositoryCreationService.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/DocumentViewNodeRepresentationFactory.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/SystemViewNodeRepresentationFactory.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentation.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtResourceNodeRepresentation.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyClassLoaderProvider.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/command/CmdMkd.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataTransiverImpl.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/propfind/PropFindResponseEntity.java Log: EXOJCR-1221 : The same violations was fixed in JCR. Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/java/org/exoplatform/jcr/backupconsole/BackupClientImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -771,9 +771,9 @@ + shortInfo.getRepositoryName() + "\n" + "\t\tbackup type : " - + (shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" - : "full only") + "\n" + "\t\tfull backups state : " + getRepositoryBackupToFullState(shortInfo - .getState())) + + (shortInfo.getBackupType() == BackupManager.FULL_AND_INCREMENTAL ? "full + incremental" + : "full only") + "\n" + "\t\tfull backups state : " + + getRepositoryBackupToFullState(shortInfo.getState())) + "\n" + (shortInfo.getBackupType() == BackupManager.FULL_BACKUP_ONLY ? "" : "\t\tincremental backups state : " + "working" + "\n") Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -46,8 +46,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.StringTokenizer; import java.util.Map.Entry; -import java.util.StringTokenizer; import javax.jcr.RepositoryException; @@ -95,7 +95,8 @@ * be started before the {@link RepositoryServiceImpl} so we have to enforce the dependency * with this component by adding it to the constructor */ - public RepositoryServiceImpl(RepositoryServiceConfiguration configuration, ExoContainerContext context, RepositoryCreationSynchronizer synchronizer) + public RepositoryServiceImpl(RepositoryServiceConfiguration configuration, ExoContainerContext context, + RepositoryCreationSynchronizer synchronizer) { this.config = configuration; addNodeTypePlugins = new ArrayList<ComponentPlugin>(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositorySuspendController.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositorySuspendController.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositorySuspendController.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -59,12 +59,14 @@ } /** - * Suspend repository which means that allow only read operations. All writing threads will wait until resume operations invoked. + * Suspend repository which means that allow only read operations. + * All writing threads will wait until resume operations invoked. * * @return repository state */ @Managed - @ManagedDescription("Suspend repository which means that allow only read operations. All writing threads will wait until resume operations invoked.") + @ManagedDescription("Suspend repository which means that allow only read operations. " + + "All writing threads will wait until resume operations invoked.") public String suspend() { // Need privileges to manage repository. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -175,10 +175,10 @@ else { cleanScripts - .add("delete from JCR_SVALUE where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='" + .add("delete from JCR_SVALUE where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='" + containerName + "')"); cleanScripts - .add("delete from JCR_SREF where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SREF.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='" + .add("delete from JCR_SREF where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SREF.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='" + containerName + "')"); if (cleanWithHelper) 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/JDBCConfigurationPersister.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -444,9 +444,8 @@ if (ps.executeUpdate() <= 0) { - LOG - .warn("Repository service configuration doesn't stored ok. No rows was affected in JDBC operation. Datasource " - + sourceName + ". SQL: " + sql); + LOG.warn("Repository service configuration doesn't stored ok. " + + "No rows was affected in JDBC operation. Datasource " + sourceName + ". SQL: " + sql); } } else 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/JCRPathExt.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.impl.core; import org.exoplatform.services.jcr.core.NamespaceAccessor; -import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.impl.Constants; @@ -38,9 +37,11 @@ private static PathElement[] EMPTY_PATH = new PathElement[0]; - private static final PathElement THIS_ELEMENT = new PathElement(Constants.NS_DEFAULT_URI, THIS_RELPATH, Constants.NS_EMPTY_PREFIX, -1); + private static final PathElement THIS_ELEMENT = + new PathElement(Constants.NS_DEFAULT_URI, THIS_RELPATH, Constants.NS_EMPTY_PREFIX, -1); - private static final PathElement MOVE_UP_ELEMENT = new PathElement(Constants.NS_DEFAULT_URI, PARENT_RELPATH, Constants.NS_EMPTY_PREFIX, -1); + private static final PathElement MOVE_UP_ELEMENT = + new PathElement(Constants.NS_DEFAULT_URI, PARENT_RELPATH, Constants.NS_EMPTY_PREFIX, -1); protected final PathElement[] names; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/LocationFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/LocationFactory.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/LocationFactory.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -314,8 +314,8 @@ char ch0 = str.charAt(0); char ch1 = str.charAt(1); return (((ch0 == '.') && (isNonspace(str, ch1) && (ch1 != '.'))) - || ((isNonspace(str, ch0) && (ch0 != '.')) && (ch1 == '.')) || ((isNonspace(str, ch0) && (ch0 != '.')) && (isNonspace( - str, ch1) && (ch1 != '.')))); + || ((isNonspace(str, ch0) && (ch0 != '.')) && (ch1 == '.')) || ((isNonspace(str, ch0) && (ch0 != '.')) + && (isNonspace(str, ch1) && (ch1 != '.')))); default : return isNonspace(str, str.charAt(0)) && isSimpleString(str.substring(1, strLen - 1)) && isNonspace(str, str.charAt(strLen - 1)); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -904,10 +904,9 @@ // warn in debug mode only else if (PropertyManager.isDevelopping()) { - log - .warn( - "This kind of operation is forbidden after a session.logout(), please note that an exception will be raised in the next jcr version.", - new Exception(closedByCallStack)); + log.warn("This kind of operation is forbidden after a session.logout(), " + + "please note that an exception will be raised in the next jcr version.", new Exception( + closedByCallStack)); } } } 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -799,7 +799,8 @@ } else { - vdata = new TransientValueData(currentProperty.getValues().size(), propertyValue.getText()); // other like String + // other like String + vdata = new TransientValueData(currentProperty.getValues().size(), propertyValue.getText()); } currentProperty.getValues().add(vdata); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -75,7 +75,8 @@ private Object payload; /** - * TransactionException of a last commit in context of a transaction. Can be set on commit and will be restet on enlist/delist resource or rollback. + * TransactionException of a last commit in context of a transaction. + * Can be set on commit and will be restet on enlist/delist resource or rollback. */ private TransactionException commitException = null; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -290,7 +290,8 @@ // at // org.exoplatform.services.jcr.impl.core.XASessionImpl.logout(XASessionImpl.java:254) // at - // org.exoplatform.services.jcr.impl.core.SessionRegistry$SessionCleaner.callPeriodically(SessionRegistry.java:165) + // org.exoplatform.services.jcr.impl.core.SessionRegistry + // $SessionCleaner.callPeriodically(SessionRegistry.java:165) // at // org.exoplatform.services.jcr.impl.proccess.WorkerThread.run(WorkerThread.java:46) ((NodeImpl)sessionImpl.getTransientNodesManager().getItemByIdentifier( Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockRemoverHolder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockRemoverHolder.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockRemoverHolder.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -63,7 +63,9 @@ { threadCount = entry.getLockRemoverThreadsCount(); } - workerService = new WorkerService(threadCount, "Lock Remover " + (ctx != null ? ctx.getName() : (entry == null ? "" : entry.getName()))); + workerService = + new WorkerService(threadCount, "Lock Remover " + + (ctx != null ? ctx.getName() : (entry == null ? "" : entry.getName()))); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -757,7 +757,8 @@ } /** - * Execute the given action outside a transaction. This is needed since the {@link Cache} used by implementation of {@link CacheableLockManager} + * Execute the given action outside a transaction. This is needed since the {@link Cache} used by implementation + * of {@link CacheableLockManager} * to manage the persistence of its locks thanks to a {@link CacheLoader} and a {@link CacheLoader} lock the cache {@link Node} * even for read operations which cause deadlock issue when a XA {@link Transaction} is already opened * @throws LockException when a exception occurs Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -207,7 +207,8 @@ { String dataSourceName = parameterEntry.getParameterValue(INFINISPAN_JDBC_CL_DATASOURCE, null); // if data source is defined, then inject correct data-types. - // Also it cans be not defined and nothing should be injected (i.e. no cache loader is used (possibly pattern is changed, to used another cache loader)) + // Also it cans be not defined and nothing should be injected + //(i.e. no cache loader is used (possibly pattern is changed, to used another cache loader)) if (dataSourceName != null) { String dialect; @@ -317,8 +318,10 @@ // else GENERIC, DB2 etc // set parameters if not defined - // if parameter is missing in configuration, then getParameterValue(INFINISPAN_JDBC_CL_DATA_COLUMN, INFINISPAN_JDBC_CL_AUTO) - // will return INFINISPAN_JDBC_CL_AUTO. If parameter is present in configuration and equals to "auto", then it should be replaced + // if parameter is missing in configuration, then + // getParameterValue(INFINISPAN_JDBC_CL_DATA_COLUMN, INFINISPAN_JDBC_CL_AUTO) + // will return INFINISPAN_JDBC_CL_AUTO. If parameter is present in configuration and + //equals to "auto", then it should be replaced // with correct value for given database if (parameterEntry.getParameterValue(INFINISPAN_JDBC_CL_DATA_COLUMN, INFINISPAN_JDBC_CL_AUTO) .equalsIgnoreCase(INFINISPAN_JDBC_CL_AUTO)) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -31,8 +31,8 @@ import org.exoplatform.services.jcr.impl.storage.jdbc.DBConstants; import org.exoplatform.services.jcr.impl.storage.jdbc.DialectDetecter; import org.exoplatform.services.jcr.jbosscache.ExoJBossCacheFactory; +import org.exoplatform.services.jcr.jbosscache.PrivilegedJBossCacheHelper; import org.exoplatform.services.jcr.jbosscache.ExoJBossCacheFactory.CacheType; -import org.exoplatform.services.jcr.jbosscache.PrivilegedJBossCacheHelper; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.naming.InitialContextInitializer; @@ -291,7 +291,8 @@ { String dataSourceName = parameterEntry.getParameterValue(JBOSSCACHE_JDBC_CL_DATASOURCE, null); // if data source is defined, then inject correct data-types. - // Also it cans be not defined and nothing should be injected (i.e. no cache loader is used (possibly pattern is changed, to used another cache loader)) + // Also it cans be not defined and nothing should be injected + // (i.e. no cache loader is used (possibly pattern is changed, to used another cache loader)) if (dataSourceName != null) { String dialect; @@ -399,8 +400,10 @@ // else GENERIC, DB2 etc // set parameters if not defined - // if parameter is missing in configuration, then getParameterValue(JBOSSCACHE_JDBC_CL_NODE_COLUMN, JBOSSCACHE_JDBC_CL_AUTO) - // will return JBOSSCACHE_JDBC_CL_AUTO. If parameter is present in configuration and equals to "auto", then it should be replaced + // if parameter is missing in configuration, then + // getParameterValue(JBOSSCACHE_JDBC_CL_NODE_COLUMN, JBOSSCACHE_JDBC_CL_AUTO) + // will return JBOSSCACHE_JDBC_CL_AUTO. If parameter is present in configuration and + // equals to "auto", then it should be replaced // with correct value for given database if (parameterEntry.getParameterValue(JBOSSCACHE_JDBC_CL_NODE_COLUMN, JBOSSCACHE_JDBC_CL_AUTO) .equalsIgnoreCase(JBOSSCACHE_JDBC_CL_AUTO)) 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/InmemoryNodeTypeRepository.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -220,7 +220,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeRepository#removeNodeType(org.exoplatform.services.jcr.datamodel.InternalQName, org.exoplatform.services.jcr.core.nodetype.NodeTypeData) + * {@inheritDoc} */ public void removeNodeType(NodeTypeData nodeType) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemDefinitionImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemDefinitionImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemDefinitionImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -66,7 +66,8 @@ * @param protectedItem */ public ItemDefinitionImpl(ItemDefinitionData itemDefinitionData, NodeTypeDataManager nodeTypeDataManager, - ExtendedNodeTypeManager nodeTypeManager, LocationFactory locationFactory, ValueFactory valueFactory, ItemDataConsumer dataManager) + ExtendedNodeTypeManager nodeTypeManager, LocationFactory locationFactory, ValueFactory valueFactory, + ItemDataConsumer dataManager) { this.itemDefinitionData = itemDefinitionData; this.nodeTypeDataManager = nodeTypeDataManager; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -87,7 +87,7 @@ private static final String NODETYPES_FILE = "nodetypes.xml"; - private final Log log = ExoLogger.getLogger("exo.jcr.component.core.NodeTypeDataManagerImpl"); + private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.NodeTypeDataManagerImpl"); protected final String accessControlPolicy; @@ -465,10 +465,9 @@ { final InternalQName[] nts = new InternalQName[mixinTypes.length + 1]; nts[0] = primaryNodeType; - for (int i = 0; i < mixinTypes.length; i++) - { - nts[i + 1] = mixinTypes[i]; - } + + System.arraycopy(mixinTypes, 0, nts, 1, mixinTypes.length); + return getPropertyDefinitions(propertyName, nts); } @@ -889,9 +888,7 @@ } /** - * @throws RepositoryException - * @throws ConstraintViolationException - * @see org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager#updateNodeType(org.exoplatform.services.jcr.core.nodetype.NodeTypeData, org.exoplatform.services.jcr.core.nodetype.NodeTypeData, java.util.Map) + * {@inheritDoc} */ public PlainChangesLog updateNodeType(NodeTypeData ancestorDefinition, NodeTypeData recipientDefinition, Map<InternalQName, NodeTypeData> volatileNodeTypes) throws ConstraintViolationException, RepositoryException Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -453,9 +453,10 @@ return checkValueConstraints(requiredType, constraints, value); } else if (requiredType == PropertyType.BINARY - && (value.getType() == PropertyType.STRING || value.getType() == PropertyType.DATE - || value.getType() == PropertyType.LONG || value.getType() == PropertyType.DOUBLE - || value.getType() == PropertyType.NAME || value.getType() == PropertyType.PATH || value.getType() == PropertyType.BOOLEAN)) + && (value.getType() == PropertyType.STRING || value.getType() == PropertyType.DATE + || value.getType() == PropertyType.LONG || value.getType() == PropertyType.DOUBLE + || value.getType() == PropertyType.NAME || value.getType() == PropertyType.PATH || value + .getType() == PropertyType.BOOLEAN)) { return checkValueConstraints(requiredType, constraints, value); } 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -325,7 +325,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeTypeDataPersister#unmarshall(org.exoplatform.services.jcr.datamodel.InternalQName, java.util.Set) + * {@inheritDoc} */ public NodeTypeData getNodeType(InternalQName nodeTypeName) throws RepositoryException, NoSuchNodeTypeException { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/XmlNodeTypeDataPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/XmlNodeTypeDataPersister.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/XmlNodeTypeDataPersister.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -184,7 +184,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeTypeDataPersister#getNodeType(org.exoplatform.services.jcr.datamodel.InternalQName) + * {@inheritDoc} */ public NodeTypeData getNodeType(InternalQName nodeTypeName) throws RepositoryException { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -105,7 +105,7 @@ } /** - * @see org.exoplatform.services.jcr.dataflow.persistent.ItemsPersistenceListener#onSaveItems(org.exoplatform.services.jcr.dataflow.ItemStateChangesLog) + * {@inheritDoc} */ public void onSaveItems(ItemStateChangesLog itemStates) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/PropertyFunctionQueryNode.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/PropertyFunctionQueryNode.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/PropertyFunctionQueryNode.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -26,8 +26,10 @@ * <code>PropertyFunctionQueryNode</code> allows to place function calls on properties * in a query. Supported function names are: * <ul> - * <li><code>upper-case</code> as specified in <a href="http://www.w3.org/TR/xquery-operators/#func-upper-case"&g... - * <li><code>lower-case</code> as specified in <a href="http://www.w3.org/TR/xquery-operators/#func-lower-case"&g... + * <li><code>upper-case</code> as specified in + * <a href="http://www.w3.org/TR/xquery-operators/#func-upper-case"&g... + * <li><code>lower-case</code> as specified in + * <a href="http://www.w3.org/TR/xquery-operators/#func-lower-case"&g... * </ul> */ public class PropertyFunctionQueryNode extends QueryNode { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -509,7 +509,7 @@ } /** - * @see org.exoplatform.services.jcr.dataflow.persistent.ItemsPersistenceListener#onSaveItems(org.exoplatform.services.jcr.dataflow.ItemStateChangesLog) + * {@inheritDoc} */ public void onSaveItems(ItemStateChangesLog itemStates) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -175,7 +175,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitor#removeIndexUpdateMonitorListener(org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitorListener) + * {@inheritDoc} */ public void removeIndexUpdateMonitorListener(IndexUpdateMonitorListener listener) { 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -126,7 +126,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.storage.jbosscache.AbstractWriteOnlyCacheLoader#put(org.jboss.cache.Fqn, java.util.Map) + * {@inheritDoc} */ public void put(Fqn arg0, Map<Object, Object> arg1) throws Exception { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -41,8 +41,6 @@ import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; -import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.loader.SingletonStoreCacheLoader.PushStateException; import java.io.IOException; import java.io.Serializable; @@ -170,9 +168,8 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.IndexerChangesFilter#doUpdateIndex(java.util.Set, java.util.Set, java.util.Set, java.util.Set) + * {@inheritDoc} */ - @Override protected void doUpdateIndex(Set<String> removedNodes, Set<String> addedNodes, Set<String> parentRemovedNodes, Set<String> parentAddedNodes) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexInfos.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -124,7 +124,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.IndexerIoModeListener#onChangeMode(org.exoplatform.services.jcr.impl.core.query.IndexerIoMode) + * {@inheritDoc} */ public void onChangeMode(IndexerIoMode mode) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexUpdateMonitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexUpdateMonitor.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexUpdateMonitor.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -115,7 +115,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.IndexerIoModeListener#onChangeMode(org.exoplatform.services.jcr.impl.core.query.IndexerIoMode) + * {@inheritDoc} */ public void onChangeMode(IndexerIoMode mode) { @@ -172,7 +172,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitor#addIndexUpdateMonitorListener(org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitorListener) + * {@inheritDoc} */ public void addIndexUpdateMonitorListener(IndexUpdateMonitorListener listener) { @@ -180,7 +180,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitor#removeIndexUpdateMonitorListener(org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitorListener) + * {@inheritDoc} */ public void removeIndexUpdateMonitorListener(IndexUpdateMonitorListener listener) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/LocalIndexCacheLoader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/LocalIndexCacheLoader.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/LocalIndexCacheLoader.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -51,7 +51,8 @@ if (ioMode == IndexerIoMode.READ_ONLY) { throw new UnsupportedOperationException( - "Can't set ReadOnly on this type of CacheLoader. It is designed to provide local index for each cluster instance. Make sure you are using Index properly."); + "Can't set ReadOnly on this type of CacheLoader. It is designed to provide local index " + + "for each cluster instance. Make sure you are using Index properly."); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/LocalIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/LocalIndexChangesFilter.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/LocalIndexChangesFilter.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -148,9 +148,8 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.IndexerChangesFilter#doUpdateIndex(java.util.Set, java.util.Set, java.util.Set, java.util.Set) + * {@inheritDoc} */ - @Override protected void doUpdateIndex(Set<String> removedNodes, Set<String> addedNodes, Set<String> parentRemovedNodes, Set<String> parentAddedNodes) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChangesHolder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChangesHolder.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChangesHolder.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -175,7 +175,9 @@ else { // The value is a String - field = new Field(name, (String)value, getStoreParameter(flags), getIndexParameter(flags), getTermVectorParameter(flags)); + field = + new Field(name, (String) value, getStoreParameter(flags), getIndexParameter(flags), + getTermVectorParameter(flags)); } field.setBoost(boost); field.setOmitNorms((flags & OMIT_NORMS_FLAG) > 0); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/ChildAxisQuery.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -21,7 +21,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.index.TermDocs; import org.apache.lucene.search.Explanation; -import org.apache.lucene.search.HitCollector; import org.apache.lucene.search.Query; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Searcher; @@ -724,7 +723,8 @@ Iterator<NodeData> entries; if (nameTest != null) { - //NodeData childNodeData = (NodeData)itemMgr.getItemData(state, new QPathEntry(nameTest, 1));//state.getChildNodeEntries(nameTest).iterator(); + //NodeData childNodeData = (NodeData)itemMgr.getItemData(state, new QPathEntry(nameTest, 1)); + // //state.getChildNodeEntries(nameTest).iterator(); List<NodeData> childs = itemMgr.getChildNodesData(state); List<NodeData> datas = new ArrayList<NodeData>(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultHTMLExcerpt.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultHTMLExcerpt.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultHTMLExcerpt.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -16,17 +16,19 @@ */ package org.exoplatform.services.jcr.impl.core.query.lucene; +import org.apache.lucene.index.TermPositionVector; + import java.io.IOException; -import org.apache.lucene.index.TermPositionVector; - /** * <code>DefaultHTMLExcerpt</code> creates a HTML excerpt with the following * format: * <pre> * &lt;div> - * &lt;span>&lt;strong>Jackrabbit&lt;/strong> implements both the mandatory XPath and optional SQL &lt;strong>query&lt;/strong> syntax.&lt;/span> - * &lt;span>Before parsing the XPath &lt;strong>query&lt;/strong> in &lt;strong>Jackrabbit&lt;/strong>, the statement is surrounded&lt;/span> + * &lt;span>&lt;strong>Jackrabbit&lt;/strong> implements both the mandatory XPath and optional SQL + * &lt;strong>query&lt;/strong> syntax.&lt;/span> + * &lt;span>Before parsing the XPath &lt;strong>query&lt;/strong> in &lt;strong>Jackrabbit&lt;/strong>, + * the statement is surrounded&lt;/span> * &lt;/div> * </pre> */ Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultIndexUpdateMonitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultIndexUpdateMonitor.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultIndexUpdateMonitor.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -69,7 +69,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitor#addIndexUpdateMonitorListener(org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitorListener) + * {@inheritDoc} */ public void addIndexUpdateMonitorListener(IndexUpdateMonitorListener listener) { @@ -77,7 +77,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitor#removeIndexUpdateMonitorListener(org.exoplatform.services.jcr.impl.core.query.lucene.IndexUpdateMonitorListener) + * {@inheritDoc} */ public void removeIndexUpdateMonitorListener(IndexUpdateMonitorListener listener) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultXMLExcerpt.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultXMLExcerpt.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DefaultXMLExcerpt.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -27,8 +27,10 @@ * result for a node: * <pre> * &lt;excerpt> - * &lt;fragment>&lt;highlight>Jackrabbit&lt;/highlight> implements both the mandatory XPath and optional SQL &lt;highlight>query&lt;/highlight> syntax.&lt;/fragment> - * &lt;fragment>Before parsing the XPath &lt;highlight>query&lt;/highlight> in &lt;highlight>Jackrabbit&lt;/highlight>, the statement is surrounded&lt;/fragment> + * &lt;fragment>&lt;highlight>Jackrabbit&lt;/highlight> implements both the mandatory XPath and optional SQL + * &lt;highlight>query&lt;/highlight> syntax.&lt;/fragment> + * &lt;fragment>Before parsing the XPath &lt;highlight>query&lt;/highlight> in &lt;highlight>Jackrabbit&lt;/highlight>, + * the statement is surrounded&lt;/fragment> * &lt;/excerpt> * </pre> */ Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -20,9 +20,9 @@ import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; +import org.apache.lucene.search.BooleanClause.Occur; import org.exoplatform.commons.utils.ISO8601; import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager; import org.exoplatform.services.jcr.dataflow.ItemDataConsumer; @@ -57,8 +57,8 @@ import org.exoplatform.services.jcr.impl.core.query.TextsearchQueryNode; import org.exoplatform.services.jcr.impl.util.ISO9075; import org.exoplatform.services.jcr.impl.xml.XMLChar; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; import java.util.ArrayList; import java.util.Calendar; @@ -102,7 +102,7 @@ /** * Logger for this class */ - private static final Logger log = LoggerFactory.getLogger("exo.jcr.component.core.LuceneQueryBuilder"); + private static final Log log = ExoLogger.getLogger("exo.jcr.component.core.LuceneQueryBuilder"); /** * Root node of the abstract query tree @@ -464,7 +464,8 @@ // if path references property that's elements.length - 2 // if path references node that's elements.length - 1 if (name != null - && ((node.getReferencesProperty() && i == elements.length - 2) || (!node.getReferencesProperty() && i == elements.length - 1))) + && ((node.getReferencesProperty() && i == elements.length - 2) || (!node + .getReferencesProperty() && i == elements.length - 1))) { Query q = new NameQuery(name, indexFormatVersion, nsMappings); BooleanQuery and = new BooleanQuery(); @@ -494,8 +495,7 @@ } catch (RepositoryException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error(e.getLocalizedMessage(), e); } return null; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MoreLikeThis.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -811,7 +811,8 @@ ArrayList al = new ArrayList(maxQueryTerms); PriorityQueue pq = retrieveTerms(docNum); Object cur; - int lim = maxQueryTerms; // have to be careful, retrieveTerms returns all words but that's probably not useful to our caller... + // have to be careful, retrieveTerms returns all words but that's probably not useful to our caller... + int lim = maxQueryTerms; // we just want to return the top words while (((cur = pq.pop()) != null) && lim-- > 0) { Object[] ar = (Object[]) cur; @@ -834,7 +835,8 @@ ArrayList al = new ArrayList(maxQueryTerms); PriorityQueue pq = retrieveTerms(r); Object cur; - int lim = maxQueryTerms; // have to be careful, retrieveTerms returns all words but that's probably not useful to our caller... + // have to be careful, retrieveTerms returns all words but that's probably not useful to our caller... + int lim = maxQueryTerms; // we just want to return the top words while (((cur = pq.pop()) != null) && lim-- > 0) { Object[] ar = (Object[]) cur; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -473,8 +473,8 @@ } else { - log - .info("Index can'b be retrieved from coordinator now, because it is offline. Possibly coordinator node performs reindexing now. Switching to local re-indexing."); + log.info("Index can'b be retrieved from coordinator now, because it is offline. " + + "Possibly coordinator node performs reindexing now. Switching to local re-indexing."); } } @@ -484,13 +484,13 @@ { if (handler.getContext().getRPCService() == null) { - log - .error("RPC Service is not configured but required for copying the index from coordinator node. Index will be created by re-indexing."); + log.error("RPC Service is not configured but required for copying the index " + + "from coordinator node. Index will be created by re-indexing."); } else if (handler.getContext().getRPCService().isCoordinator() == true) { - log - .info("Copying the index from coordinator configured, but this node is the only one in a cluster. Index will be created by re-indexing."); + log.info("Copying the index from coordinator configured, but this node is the " + + "only one in a cluster. Index will be created by re-indexing."); } } @@ -661,7 +661,8 @@ } catch (Throwable e) { - // this is safe index reader retrieval. The last index already closed, possibly merged or any other exception that occurs here + // this is safe index reader retrieval. The last index already closed, possibly merged or + // any other exception that occurs here } for (Iterator<Document> it = add.iterator(); it.hasNext();) @@ -696,7 +697,8 @@ } catch (Throwable e) { - // this is safe index reader retrieval. The last index already closed, possibly merged or any other exception that occurs here + // this is safe index reader retrieval. The last index already closed, + // possibly merged or any other exception that occurs here lastIndexReader = null; lastIndexReaderId = -1; } @@ -3211,7 +3213,7 @@ } /** - * @see org.exoplatform.services.jcr.impl.core.query.IndexerIoModeListener#onChangeMode(org.exoplatform.services.jcr.impl.core.query.IndexerIoMode) + * {@inheritDoc} */ public void onChangeMode(IndexerIoMode mode) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -575,7 +575,7 @@ } catch (RepositoryException e) { - e.printStackTrace(); + log.error("Index of property value error. " + prop.getQPath().getAsString() + ".", e); throw new RepositoryException("Index of property value error. " + prop.getQPath().getAsString() + ". " + e, e); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SharedFieldCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SharedFieldCache.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SharedFieldCache.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -104,7 +104,8 @@ } private boolean isSparse(Comparable[] values, int setValues) { - // some really simple test to test whether the array is sparse. Currently, when less then 1% is set, the array is already sparse + // some really simple test to test whether the array is sparse. + // Currently, when less then 1% is set, the array is already sparse // for this typical cache to avoid memory issues if (setValues * SPARSE_FACTOR < values.length) { return true; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WeightedHTMLExcerpt.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WeightedHTMLExcerpt.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WeightedHTMLExcerpt.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -16,17 +16,19 @@ */ package org.exoplatform.services.jcr.impl.core.query.lucene; +import org.apache.lucene.index.TermPositionVector; + import java.io.IOException; -import org.apache.lucene.index.TermPositionVector; - /** * <code>WeightedHTMLExcerpt</code> creates a HTML excerpt with the following * format: * <pre> * &lt;div> - * &lt;span>&lt;strong>Jackrabbit&lt;/strong> implements both the mandatory XPath and optional SQL &lt;strong>query&lt;/strong> syntax.&lt;/span> - * &lt;span>Before parsing the XPath &lt;strong>query&lt;/strong> in &lt;strong>Jackrabbit&lt;/strong>, the statement is surrounded&lt;/span> + * &lt;span>&lt;strong>Jackrabbit&lt;/strong> implements both the mandatory XPath and optional SQL &lt; + * strong>query&lt;/strong> syntax.&lt;/span> + * &lt;span>Before parsing the XPath &lt;strong>query&lt;/strong> in &lt;strong>Jackrabbit&lt;/strong>, + * the statement is surrounded&lt;/span> * &lt;/div> * </pre> * In contrast to {@link DefaultHTMLExcerpt} this implementation weights Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WeightedXMLExcerpt.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WeightedXMLExcerpt.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/WeightedXMLExcerpt.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -16,10 +16,10 @@ */ package org.exoplatform.services.jcr.impl.core.query.lucene; +import org.apache.lucene.index.TermPositionVector; + import java.io.IOException; -import org.apache.lucene.index.TermPositionVector; - /** * <code>WeightedXMLExcerpt</code> creates an XML excerpt of a matching node. In * contrast to {@link DefaultXMLExcerpt} this implementation weights fragments @@ -31,8 +31,10 @@ * result for a node: * <pre> * &lt;excerpt> - * &lt;fragment>&lt;highlight>Jackrabbit&lt;/highlight> implements both the mandatory XPath and optional SQL &lt;highlight>query&lt;/highlight> syntax.&lt;/fragment> - * &lt;fragment>Before parsing the XPath &lt;highlight>query&lt;/highlight> in &lt;highlight>Jackrabbit&lt;/highlight>, the statement is surrounded&lt;/fragment> + * &lt;fragment>&lt;highlight>Jackrabbit&lt;/highlight> implements both the mandatory XPath and optional SQL + * &lt;highlight>query&lt;/highlight> syntax.&lt;/fragment> + * &lt;fragment>Before parsing the XPath &lt;highlight>query&lt;/highlight> in &lt;highlight>Jackrabbit&lt;/highlight>, + * the statement is surrounded&lt;/fragment> * &lt;/excerpt> * </pre> * Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/sql/JCRSQLQueryBuilder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/sql/JCRSQLQueryBuilder.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/sql/JCRSQLQueryBuilder.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -177,7 +177,7 @@ } catch (Throwable t) { - t.printStackTrace(); + log.error(t.getLocalizedMessage(), t); // javacc parser may also throw an error in some cases throw new InvalidQueryException(t.getMessage(), t); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/xpath/XPathQueryBuilder.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -376,7 +376,8 @@ case JJTSTEPEXPR: if (isAttributeAxis(node)) { if (queryNode.getType() == QueryNode.TYPE_RELATION - || (queryNode.getType() == QueryNode.TYPE_DEREF && ((DerefQueryNode) queryNode).getRefProperty() == null) + || (queryNode.getType() == QueryNode.TYPE_DEREF + && ((DerefQueryNode) queryNode).getRefProperty() == null) || queryNode.getType() == QueryNode.TYPE_ORDER || queryNode.getType() == QueryNode.TYPE_PATH || queryNode.getType() == QueryNode.TYPE_TEXTSEARCH) { @@ -823,7 +824,8 @@ value = value.substring(1, value.length() - 1); Calendar c = ISO8601.parse(value); if (c == null) { - exceptions.add(new InvalidQueryException("Unable to parse string literal for xs:dateTime: " + value)); + exceptions.add(new InvalidQueryException("Unable to parse string literal for xs:dateTime: " + + value)); } else { rel.setDateValue(c.getTime()); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -1035,7 +1035,8 @@ } /** - * Fix Property BLOB Values if someone has null file (swap actually) by reading the content from the storage (VS or JDBC no matter). + * Fix Property BLOB Values if someone has null file (swap actually) + * by reading the content from the storage (VS or JDBC no matter). * * @param prop PropertyData * @throws RepositoryException @@ -1282,8 +1283,8 @@ public String getId() { - return "org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager-requestForResponsibilityForResuming-" - + dataContainer.getUniqueName(); + return "org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager" + + "-requestForResponsibilityForResuming-" + dataContainer.getUniqueName(); } public Serializable execute(Serializable[] args) throws Throwable 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -49,7 +49,7 @@ * mix:versionable * * @author <a href="mailto:gennady.azarenkov@exoplatform.com">Gennady Azarenkov</a> - * @version $Id$ * @version $Id: VersionableWorkspaceDataManager.java 1518 2010-01-20 23:33:30Z + * @version $Id$ */ public class VersionableWorkspaceDataManager extends ACLInheritanceSupportedWorkspaceDataManager Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -664,11 +664,12 @@ { if (modifyListsOfChild == ModifyChildOption.NOT_MODIFY) { - cache.putIfAbsent(new CacheQPath(node.getParentIdentifier(), node.getQPath(), ItemType.NODE), node.getIdentifier()); + cache.putIfAbsent(new CacheQPath(node.getParentIdentifier(), node.getQPath(), ItemType.NODE), node + .getIdentifier()); } else { - cache.put(new CacheQPath(node.getParentIdentifier(), node.getQPath(), ItemType.NODE), node.getIdentifier()); + cache.put(new CacheQPath(node.getParentIdentifier(), node.getQPath(), ItemType.NODE), node.getIdentifier()); } // if MODIFY and List present OR FORCE_MODIFY, then write @@ -1020,8 +1021,10 @@ } /** - * <li>NOT_MODIFY - node(property) is not added to the parent's list (no persistent changes performed, cache used as cache)</li> - * <li>MODIFY - node(property) is added to the parent's list if parent in the cache (new item is added to persistent, add to list if it is present)</li> + * <li>NOT_MODIFY - node(property) is not added to the parent's list + * (no persistent changes performed, cache used as cache)</li> + * <li>MODIFY - node(property) is added to the parent's list if parent in the cache + * (new item is added to persistent, add to list if it is present)</li> * <li>FORCE_MODIFY - node(property) is added to the parent's list anyway (when list is read from DB, forcing write)</li> */ private enum ModifyChildOption { @@ -1084,7 +1087,7 @@ } /** - * @see org.exoplatform.services.jcr.dataflow.persistent.WorkspaceStorageCache#addReferencedProperties(java.lang.String, java.util.List) + * {@inheritDoc} */ public void addReferencedProperties(String identifier, List<PropertyData> refProperties) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/BufferedJBossCache.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -539,10 +539,11 @@ return parentCache.get(fqn, key); } - + /** - * in case putIfAbsent is set to <code>true</code> this method will call cache.putIfAbsent(Fqn fqn, Serializable key, Object value) - * otherwise it will call cache.put(Fqn fqn, Serializable key, Object value) + * in case putIfAbsent is set to <code>true</code> this method will + * call cache.putIfAbsent(Fqn fqn, Serializable key, Object value) + * otherwise it will call cache.put(Fqn fqn, Serializable key, Object value) */ protected Object put(Fqn fqn, Serializable key, Object value, boolean putIfAbsent) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -52,8 +52,8 @@ import org.jboss.cache.CacheStatus; import org.jboss.cache.Fqn; import org.jboss.cache.Node; +import org.jboss.cache.config.EvictionRegionConfig; import org.jboss.cache.config.Configuration.CacheMode; -import org.jboss.cache.config.EvictionRegionConfig; import org.jboss.cache.eviction.ExpirationAlgorithmConfig; import org.picocontainer.Startable; @@ -1080,7 +1080,8 @@ } // add in ITEMS - return (ItemData)cache.put(makeItemFqn(node.getIdentifier()), ITEM_DATA, node, modifyListsOfChild == ModifyChildOption.NOT_MODIFY); + return (ItemData) cache.put(makeItemFqn(node.getIdentifier()), ITEM_DATA, node, + modifyListsOfChild == ModifyChildOption.NOT_MODIFY); } /** @@ -1198,8 +1199,10 @@ // add in ITEMS // NullItemData must never be returned inside internal cache operations. - ItemData returnedData = (ItemData)cache.put(makeItemFqn(prop.getIdentifier()), ITEM_DATA, prop, modifyListsOfChild == ModifyChildOption.NOT_MODIFY); - return (returnedData instanceof NullItemData) ? null : (PropertyData)returnedData; + ItemData returnedData = + (ItemData) cache.put(makeItemFqn(prop.getIdentifier()), ITEM_DATA, prop, + modifyListsOfChild == ModifyChildOption.NOT_MODIFY); + return (returnedData instanceof NullItemData) ? null : (PropertyData) returnedData; } protected void removeItem(ItemData item) @@ -1516,9 +1519,12 @@ } /** - * <li>NOT_MODIFY - node(property) is not added to the parent's list (no persistent changes performed, cache used as cache)</li> - * <li>MODIFY - node(property) is added to the parent's list if parent in the cache (new item is added to persistent, add to list if it is present)</li> - * <li>FORCE_MODIFY - node(property) is added to the parent's list anyway (when list is read from DB, forcing write)</li> + * <li>NOT_MODIFY - node(property) is not added to the parent's list + * (no persistent changes performed, cache used as cache)</li> + * <li>MODIFY - node(property) is added to the parent's list if parent in the cache + * (new item is added to persistent, add to list if it is present)</li> + * <li>FORCE_MODIFY - node(property) is added to the parent's list anyway + * (when list is read from DB, forcing write)</li> */ private enum ModifyChildOption { NOT_MODIFY, MODIFY, FORCE_MODIFY Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -230,7 +230,8 @@ children = lastChildNodeStates.get(identifier); if (children != null) { - // Recursively call the method traverseChangesByIdentifier(String identifier, List<ItemState> changesList) for each sub node + // Recursively call the method traverseChangesByIdentifier(String identifier, List<ItemState> changesList) + // for each sub node for (ItemState child : children.values()) { traverseChangesByIdentifier(child.getData().getIdentifier(), changesList); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerService.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerService.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/proccess/WorkerService.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -59,7 +59,9 @@ this.isDaemon = isDaemon; SecurityManager s = System.getSecurityManager(); group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); - this.namePrefix = (namePrefix == null || namePrefix.isEmpty()) ? "pool-" + poolNumber.getAndIncrement() + "-thread-" : namePrefix + " "; + this.namePrefix = + (namePrefix == null || namePrefix.isEmpty()) ? "pool-" + poolNumber.getAndIncrement() + "-thread-" + : namePrefix + " "; } public Thread newThread(Runnable r) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractWriteOnlyCacheLoader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractWriteOnlyCacheLoader.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractWriteOnlyCacheLoader.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -76,7 +76,8 @@ */ public void prepare(Object tx, List<Modification> modifications, boolean onePhase) throws Exception { - throw new WriteOnlyCacheLoaderException("The method 'prepare(Object tx, List<Modification> modifications, boolean onePhase)' should not be called."); + throw new WriteOnlyCacheLoaderException( + "The method 'prepare(Object tx, List<Modification> modifications, boolean onePhase)' should not be called."); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DialectDetecter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DialectDetecter.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/DialectDetecter.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -36,7 +36,8 @@ /** * Detect databse dialect using JDBC metadata. Based on code of - * http://svn.jboss.org/repos/hibernate/core/trunk/core/src/main/java/org/hi... + * http://svn.jboss.org/repos/hibernate/core/trunk/core/src/main/java/org/hi... + * dialect/resolver/StandardDialectResolver.java * * @param jdbcConn Connection * @return String Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -1396,7 +1396,9 @@ { return new JdbcNodeDataIndexingIterator(connFactory, pageSize); } - throw new UnsupportedOperationException("The method getNodeDataIndexingIterator is not supported for this type of connection use the complex queries instead"); + throw new UnsupportedOperationException( + "The method getNodeDataIndexingIterator is not supported for this type of connection " + + "use the complex queries instead"); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -185,11 +185,9 @@ // not succeeded - copy bytes, temp file will be deleted by transient ValueData if (LOG.isDebugEnabled()) { - LOG - .debug("Value spool file move (rename) to Values Storage is not succeeded. Trying bytes copy. Spool file: " - + PrivilegedFileHelper.getAbsolutePath(tempFile) - + ". Destination: " - + PrivilegedFileHelper.getAbsolutePath(file)); + LOG.debug("Value spool file move (rename) to Values Storage is not succeeded. " + + "Trying bytes copy. Spool file: " + PrivilegedFileHelper.getAbsolutePath(tempFile) + + ". Destination: " + PrivilegedFileHelper.getAbsolutePath(file)); } copyClose(PrivilegedFileHelper.fileInputStream(tempFile), PrivilegedFileHelper.fileOutputStream(file)); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/DocumentViewImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/DocumentViewImporter.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/DocumentViewImporter.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -310,7 +310,8 @@ if (ptVhdefs != null) { - pType = (ptVhdefs.getAnyDefinition().getRequiredType() > 0 ? ptVhdefs.getAnyDefinition().getRequiredType() : PropertyType.STRING); + pType = (ptVhdefs.getAnyDefinition().getRequiredType() > 0 ? ptVhdefs.getAnyDefinition() + .getRequiredType() : PropertyType.STRING); } } } @@ -384,7 +385,8 @@ if (nodeData.getPrimaryTypeName().equals(Constants.NT_FROZENNODE)) { // get primaryType - InternalQName fptName = locationFactory.parseJCRName(atts.get("jcr:frozenPrimaryType")).getInternalName(); + InternalQName fptName = + locationFactory.parseJCRName(atts.get("jcr:frozenPrimaryType")).getInternalName(); // get mixin types List<JCRName> mtNames = getJCRNames(atts.get("jcr:frozenMixinTypes")); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -390,7 +390,9 @@ { if (propertyData.getQName().equals(Constants.JCR_FROZENPRIMARYTYPE)) { - fptName = InternalQName.parse(new String(propertyData.getValues().get(0).getAsByteArray(), Constants.DEFAULT_ENCODING)); + fptName = + InternalQName.parse(new String(propertyData.getValues().get(0).getAsByteArray(), + Constants.DEFAULT_ENCODING)); } else if (propertyData.getQName().equals(Constants.JCR_FROZENMIXINTYPES)) { @@ -419,7 +421,9 @@ for (ImportPropertyData propertyData : currentNodePropertiesInfo.getProperties()) { - PropertyDefinitionDatas defs = nodeTypeDataManager.getPropertyDefinitions(propertyData.getQName(), nodePrimaryTypeName, nodeMixinTypeName); + PropertyDefinitionDatas defs = + nodeTypeDataManager.getPropertyDefinitions(propertyData.getQName(), nodePrimaryTypeName, + nodeMixinTypeName); if (defs == null || (defs != null && defs.getAnyDefinition().isResidualSet())) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/statistics/JCRStatisticsManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/statistics/JCRStatisticsManager.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/statistics/JCRStatisticsManager.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -382,8 +382,10 @@ @Managed @ManagedDescription("The minimum value of the time spent for one call.") public static long getMin( - @ManagedDescription("The name of the category of the statistics") @ManagedName("categoryName") String category, - @ManagedDescription("The name of the expected method or global for the global value") @ManagedName("statisticsName") String name) + @ManagedDescription("The name of the category of the statistics") + @ManagedName("categoryName") String category, + @ManagedDescription("The name of the expected method or global for the global value") + @ManagedName("statisticsName") String name) { Statistics statistics = getStatistics(category, name); return statistics == null ? 0l : statistics.getMin(); @@ -396,8 +398,10 @@ @Managed @ManagedDescription("The maximum value of the time spent for one call.") public static long getMax( - @ManagedDescription("The name of the category of the statistics") @ManagedName("categoryName") String category, - @ManagedDescription("The name of the expected method or global for the global value") @ManagedName("statisticsName") String name) + @ManagedDescription("The name of the category of the statistics") + @ManagedName("categoryName") String category, + @ManagedDescription("The name of the expected method or global for the global value") + @ManagedName("statisticsName") String name) { Statistics statistics = getStatistics(category, name); return statistics == null ? 0l : statistics.getMax(); @@ -410,8 +414,10 @@ @Managed @ManagedDescription("The total time spent for all the calls.") public static long getTotal( - @ManagedDescription("The name of the category of the statistics") @ManagedName("categoryName") String category, - @ManagedDescription("The name of the expected method or global for the global value") @ManagedName("statisticsName") String name) + @ManagedDescription("The name of the category of the statistics") + @ManagedName("categoryName") String category, + @ManagedDescription("The name of the expected method or global for the global value") + @ManagedName("statisticsName") String name) { Statistics statistics = getStatistics(category, name); return statistics == null ? 0l : statistics.getTotal(); @@ -424,8 +430,10 @@ @Managed @ManagedDescription("The total amount of calls.") public static long getTimes( - @ManagedDescription("The name of the category of the statistics") @ManagedName("categoryName") String category, - @ManagedDescription("The name of the expected method or global for the global value") @ManagedName("statisticsName") String name) + @ManagedDescription("The name of the category of the statistics") + @ManagedName("categoryName") String category, + @ManagedDescription("The name of the expected method or global for the global value") + @ManagedName("statisticsName") String name) { Statistics statistics = getStatistics(category, name); return statistics == null ? 0l : statistics.getTimes(); @@ -438,8 +446,10 @@ @Managed @ManagedDescription("The average value of the time spent for one call.") public static float getAvg( - @ManagedDescription("The name of the category of the statistics") @ManagedName("categoryName") String category, - @ManagedDescription("The name of the expected method or global for the global value") @ManagedName("statisticsName") String name) + @ManagedDescription("The name of the category of the statistics") + @ManagedName("categoryName") String category, + @ManagedDescription("The name of the expected method or global for the global value") + @ManagedName("statisticsName") String name) { Statistics statistics = getStatistics(category, name); return statistics == null ? 0l : statistics.getAvg(); @@ -453,8 +463,10 @@ @Managed @ManagedDescription("Reset the statistics.") public static void reset( - @ManagedDescription("The name of the category of the statistics") @ManagedName("categoryName") String category, - @ManagedDescription("The name of the expected method or global for the global value") @ManagedName("statisticsName") String name) + @ManagedDescription("The name of the category of the statistics") + @ManagedName("categoryName") String category, + @ManagedDescription("The name of the expected method or global for the global value") + @ManagedName("statisticsName") String name) { Statistics statistics = getStatistics(category, name); if (statistics != null) @@ -470,7 +482,8 @@ @Managed @ManagedDescription("Reset all the statistics.") public static void resetAll( - @ManagedDescription("The name of the category of the statistics") @ManagedName("categoryName") String category) + @ManagedDescription("The name of the category of the statistics") + @ManagedName("categoryName") String category) { StatisticsContext context = getContext(category); if (context != null) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/Text.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/Text.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/Text.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -337,7 +337,8 @@ * * <pre> * unreserved = alphanum | mark - * mark = &quot;-&quot; | &quot;_&quot; | &quot;.&quot; | &quot;!&quot; | &quot;&tilde;&quot; | &quot;*&quot; | &quot;'&quot; | &quot;(&quot; | &quot;)&quot; + * mark = &quot;-&quot; | &quot;_&quot; | &quot;.&quot; | &quot;!&quot; | &quot;&tilde;&quot; | &quot;*&quot; | + * &quot;'&quot; | &quot;(&quot; | &quot;)&quot; * </pre> */ public static BitSet URISave; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/GenericTransactionService.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/GenericTransactionService.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/transaction/jbosscache/GenericTransactionService.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -301,7 +301,8 @@ } /** - * This class is used to enforce the {@link Transaction} timeout when a new transaction is created through the nested {@link TransactionManager} + * This class is used to enforce the {@link Transaction} timeout when a new transaction + * is created through the nested {@link TransactionManager} * * Created by The eXo Platform SAS * Author : Nicolas Filotto Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/ExtendedBackupManager.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/ExtendedBackupManager.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/ExtendedBackupManager.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -66,7 +66,8 @@ * @throws BackupConfigurationException * if configuration exception occurred */ - void restoreExistingWorkspace(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry, boolean asynchronous) throws BackupOperationException, BackupConfigurationException; + void restoreExistingWorkspace(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry, + boolean asynchronous) throws BackupOperationException, BackupConfigurationException; /** * Restore existing repository. Previous data will be deleted. @@ -84,7 +85,8 @@ * @throws BackupConfigurationException * if configuration exception occurred */ - void restoreExistingRepository(String repositoryBackupIdentifier, RepositoryEntry repositoryEntry, boolean asynchronous) throws BackupOperationException, BackupConfigurationException; + void restoreExistingRepository(String repositoryBackupIdentifier, RepositoryEntry repositoryEntry, + boolean asynchronous) throws BackupOperationException, BackupConfigurationException; /** * Restore existing repository. Previous data will be deleted. Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -288,7 +288,9 @@ public LogReader(File logFile) throws FileNotFoundException, XMLStreamException, FactoryConfigurationError { this.logFile = logFile; - reader = XMLInputFactory.newInstance().createXMLStreamReader(PrivilegedFileHelper.fileInputStream(logFile), Constants.DEFAULT_ENCODING); + reader = + XMLInputFactory.newInstance().createXMLStreamReader(PrivilegedFileHelper.fileInputStream(logFile), + Constants.DEFAULT_ENCODING); } public void readLogFile() throws UnsupportedEncodingException, Exception @@ -367,7 +369,8 @@ + PrivilegedFileHelper.getCanonicalPath(configFile)); } - if (!conf.getRepositoryConfiguration(getBackupConfig().getRepository()).getName().equals(getBackupConfig().getRepository())) + if (!conf.getRepositoryConfiguration(getBackupConfig().getRepository()).getName().equals( + getBackupConfig().getRepository())) { throw new RepositoryRestoreExeption( "The oririginal configuration should be contains only one repository entry with name \"" @@ -585,8 +588,9 @@ * @throws BackupOperationException */ public RepositoryBackupChainLog(File logDirectory, RepositoryBackupConfig config, String fullBackupType, - String incrementalBackupType, String systemWorkspace, List<String> wsLogFilePathList, String backupId, - Calendar startTime, RepositoryEntry rEntry, RepositoryServiceConfiguration repositoryServiceConfiguration) throws BackupOperationException + String incrementalBackupType, String systemWorkspace, List<String> wsLogFilePathList, String backupId, + Calendar startTime, RepositoryEntry rEntry, RepositoryServiceConfiguration repositoryServiceConfiguration) + throws BackupOperationException { try { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -460,7 +460,8 @@ * @param registryService * RegistryService, the registry service */ - public BackupManagerImpl(ExoContainerContext ctx, InitParams initParams, RepositoryService repoService, RegistryService registryService) + public BackupManagerImpl(ExoContainerContext ctx, InitParams initParams, RepositoryService repoService, + RegistryService registryService) { this.messagesListener = new MessagesListener(); this.repoService = repoService; @@ -1297,7 +1298,8 @@ if (log.getOriginalWorkspaceEntry() == null) { - throw new RepositoryRestoreExeption("The backup log is not contains original repository log : " + log.getLogFilePath()); + throw new RepositoryRestoreExeption("The backup log is not contains original repository log : " + + log.getLogFilePath()); } @@ -1685,7 +1687,8 @@ // workspace should be existed if (!workspaceAlreadyExist(repositoryName, workspaceEntry.getName())) { - throw new WorkspaceRestoreException("Workspace \"" + workspaceEntry.getName() + "\" should be existed in repository \"" + repositoryName + "\"."); + throw new WorkspaceRestoreException("Workspace \"" + workspaceEntry.getName() + + "\" should be existed in repository \"" + repositoryName + "\"."); } } catch (RepositoryException e) Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/IndexCleanHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/IndexCleanHelper.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/IndexCleanHelper.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -45,7 +45,8 @@ * @throws RepositoryConfigurationException - exception on parsing workspace configuration * @throws IOException - exception on remove index folder */ - public void removeWorkspaceIndex(WorkspaceEntry wsConfig, boolean isSystem) throws RepositoryConfigurationException, IOException + public void removeWorkspaceIndex(WorkspaceEntry wsConfig, boolean isSystem) throws RepositoryConfigurationException, + IOException { String indexDirName = wsConfig.getQueryHandler().getParameterValue(QueryHandlerParams.PARAM_INDEX_DIR); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/common/SessionProvider.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -171,7 +171,9 @@ ConversationState conversationState = ConversationState.getCurrent(); if (conversationState != null && conversationState.getIdentity().getUserId().equals(DynamicIdentity.DYNAMIC)) { - session = (ExtendedSession) repository.getDynamicSession(workspaceName, conversationState.getIdentity().getMemberships()); + session = + (ExtendedSession) repository.getDynamicSession(workspaceName, conversationState.getIdentity() + .getMemberships()); } else if (!isSystem) { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/DataDistributionType.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/DataDistributionType.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/distribution/DataDistributionType.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -90,7 +90,8 @@ * @return the Node corresponding to the data to find * @throws RepositoryException if an error occurred while trying to get or create the expected data */ - Node getOrCreateDataNode(Node rootNode, String dataId, String nodeType, List<String> mixinTypes, Map<String, String[]> permissions) throws RepositoryException; + Node getOrCreateDataNode(Node rootNode, String dataId, String nodeType, List<String> mixinTypes, + Map<String, String[]> permissions) throws RepositoryException; /** * Remove the node from the JCR if it exists 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewGroupListener.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -163,8 +163,8 @@ } } - private void createNode(Node groupNode, String path, String nodeType, List<String> mixinTypes, Map<String, String[]> permissions) - throws Exception + private void createNode(Node groupNode, String path, String nodeType, List<String> mixinTypes, + Map<String, String[]> permissions) throws Exception { dataDistributionType_.getOrCreateDataNode(groupNode, path, nodeType, mixinTypes, permissions); } 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NewUserListener.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -115,7 +115,8 @@ } } - private void createNode(Node userNode, String path, String nodeType, List<String> mixinTypes, Map<String, String[]> permissions) + private void createNode(Node userNode, String path, String nodeType, List<String> mixinTypes, + Map<String, String[]> permissions) throws Exception { dataDistributionType_.getOrCreateDataNode(userNode, path, nodeType, mixinTypes, permissions); 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RESTRegistryService.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -151,7 +151,8 @@ @Consumes(MediaType.APPLICATION_XML) @Deprecated public Response recreateEntry(InputStream entryStream, @PathParam("repository") String repository, - @PathParam("groupName") String groupName, @Context UriInfo uriInfo, @QueryParam("createIfNotExist") boolean createIfNotExist) + @PathParam("groupName") String groupName, @Context UriInfo uriInfo, + @QueryParam("createIfNotExist") boolean createIfNotExist) { try { @@ -277,7 +278,8 @@ @PUT @Path("/{groupName:.+}") @Consumes(MediaType.APPLICATION_XML) - public Response recreateEntry(InputStream entryStream, @PathParam("groupName") String groupName, @Context UriInfo uriInfo, @QueryParam("createIfNotExist") boolean createIfNotExist) + public Response recreateEntry(InputStream entryStream, @PathParam("groupName") String groupName, + @Context UriInfo uriInfo, @QueryParam("createIfNotExist") boolean createIfNotExist) { SessionProvider sessionProvider = sessionProviderService.getSessionProvider(null); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationService.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationService.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationService.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -53,8 +53,8 @@ String reserveRepositoryName(String repositoryName) throws RepositoryCreationException; /** - * Creates repository, using token of already reserved repository name. Good for cases, when repository creation should be delayed or - * made asynchronously in dedicated thread. + * Creates repository, using token of already reserved repository name. Good for cases, + * when repository creation should be delayed or made asynchronously in dedicated thread. * * @param rEntry - repository entry - note, that datasource must not exist * @param backupId - backup id Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/AbstractXMLViewNodeRepresentation.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -209,8 +209,8 @@ } - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentation#addProperty(java.lang.String, org.exoplatform.common.util.HierarchicalProperty) + /** + * {@inheritDoc} */ public void addProperty(HierarchicalProperty property) throws UnsupportedRepositoryOperationException { @@ -218,8 +218,8 @@ } - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentation#removeProperty(java.lang.String) + /** + * {@inheritDoc} */ public void removeProperty(String name) throws UnsupportedRepositoryOperationException { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/DocumentViewNodeRepresentationFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/DocumentViewNodeRepresentationFactory.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/DocumentViewNodeRepresentationFactory.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -30,16 +30,16 @@ public class DocumentViewNodeRepresentationFactory implements NodeRepresentationFactory { - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentationFactory#createNodeRepresentation(javax.jcr.Node, java.lang.String) + /** + * {@inheritDoc} */ public NodeRepresentation createNodeRepresentation(Node node, String mediaTypeHint) { return new DocumentViewNodeRepresentation(node); } - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentationFactory#getNodeType() + /** + * {@inheritDoc} */ public String getNodeType() { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/SystemViewNodeRepresentationFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/SystemViewNodeRepresentationFactory.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/SystemViewNodeRepresentationFactory.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -31,16 +31,16 @@ public class SystemViewNodeRepresentationFactory implements NodeRepresentationFactory, ResourceContainer { - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentationFactory#createNodeRepresentation(javax.jcr.Node, java.lang.String) + /** + * {@inheritDoc} */ public NodeRepresentation createNodeRepresentation(Node node, String mediaTypeHint) { return new SystemViewNodeRepresentation(node); } - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentationFactory#getNodeType() + /** + * {@inheritDoc} */ public String getNodeType() { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentation.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentation.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtFileNodeRepresentation.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -235,8 +235,8 @@ } - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentation#addProperty(java.lang.String, org.exoplatform.common.util.HierarchicalProperty) + /** + * {@inheritDoc} */ public void addProperty(HierarchicalProperty property) throws UnsupportedRepositoryOperationException { @@ -244,8 +244,8 @@ } - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentation#removeProperty(java.lang.String) + /** + * {@inheritDoc} */ public void removeProperty(String name) throws UnsupportedRepositoryOperationException { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtResourceNodeRepresentation.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtResourceNodeRepresentation.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/resource/representation/NtResourceNodeRepresentation.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -213,8 +213,8 @@ this.properties.addAll(properties); } - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentation#addProperty(java.lang.String, org.exoplatform.common.util.HierarchicalProperty) + /** + * {@inheritDoc} */ public void addProperty(HierarchicalProperty property) throws UnsupportedRepositoryOperationException { @@ -222,8 +222,8 @@ this.properties.add(property); } - /* (non-Javadoc) - * @see org.exoplatform.services.jcr.ext.resource.NodeRepresentation#removeProperty(java.lang.String) + /** + * {@inheritDoc} */ public void removeProperty(String name) throws UnsupportedRepositoryOperationException { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyClassLoaderProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyClassLoaderProvider.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/script/groovy/JcrGroovyClassLoaderProvider.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -67,8 +67,7 @@ } /** - * @see org.exoplatform.services.rest.ext.groovy.ExtendedGroovyClassLoader#createCompilationUnit(org.codehaus.groovy.control.CompilerConfiguration, - * java.security.CodeSource) + * {@inheritDoc} */ protected CompilationUnit createCompilationUnit(CompilerConfiguration config, CodeSource cs) { @@ -241,9 +240,8 @@ } /** - * @see org.exoplatform.services.rest.ext.groovy.GroovyClassLoaderProvider#getGroovyClassLoader(org.exoplatform.services.rest.ext.groovy.SourceFolder[]) + * {@inheritDoc} */ - @Override public ExtendedGroovyClassLoader getGroovyClassLoader(SourceFolder[] sources) throws MalformedURLException { if (sources == null || sources.length == 0) 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/FtpServerImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -219,7 +219,9 @@ { this.ftpServer = ftpServer; this.serverSocket = serverSocket; - setName("Ftp Server" + (configuration.getPortalContainer() == null ? "" : " " + configuration.getPortalContainer().getName())); + setName("Ftp Server" + + (configuration.getPortalContainer() == null ? "" : " " + + configuration.getPortalContainer().getName())); setDaemon(true); } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdMkd.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -80,7 +80,9 @@ if (replaceForbiddenChars) { - curPathName = FtpTextUtils.replaceForbiddenChars(curPathName, ftpConfig.getForbiddenChars(), ftpConfig.getReplaceChar()); + curPathName = + FtpTextUtils.replaceForbiddenChars(curPathName, ftpConfig.getForbiddenChars(), ftpConfig + .getReplaceChar()); } if (parentNode.hasNode(curPathName)) Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -94,7 +94,9 @@ if (ftpConfig.isReplaceForbiddenChars()) { String fName = newPath.get(newPath.size()-1); - String newfName = FtpTextUtils.replaceForbiddenChars(fName, ftpConfig.getForbiddenChars(), ftpConfig.getReplaceChar()); + String newfName = + FtpTextUtils.replaceForbiddenChars(fName, ftpConfig.getForbiddenChars(), ftpConfig + .getReplaceChar()); fileName = fileName.substring(0, fileName.indexOf(fName)) + newfName; } Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataTransiverImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataTransiverImpl.java 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/data/FtpDataTransiverImpl.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -211,7 +211,9 @@ public AcceptDataConnect() { - super("AcceptDataConnect" + (configuration.getPortalContainer() == null ? "" : " " + configuration.getPortalContainer().getName())); + super("AcceptDataConnect" + + (configuration.getPortalContainer() == null ? "" : " " + + configuration.getPortalContainer().getName())); } protected Log acceptLog = ExoLogger.getLogger("jcr.AcceptDataConnect"); @@ -244,7 +246,9 @@ public ConnectDataPort() { - super("ConnectDataPort" + (configuration.getPortalContainer() == null ? "" : " " + configuration.getPortalContainer().getName())); + super("ConnectDataPort" + + (configuration.getPortalContainer() == null ? "" : " " + + configuration.getPortalContainer().getName())); } protected Log connectLog = ExoLogger.getLogger("jcr.ConnectDataPort"); 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/AclCommand.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -34,8 +34,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Set; import java.util.Map.Entry; -import java.util.Set; import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; @@ -218,7 +218,8 @@ if (denyPermission.equals(grantPermission)) { throw new IllegalArgumentException( - "Malformed ace element (seems that a client is trying to grant and denay the same privilege in a single ace)"); + "Malformed ace element (seems that a client is trying to grant and denay the same privilege in " + + "a single ace)"); } } 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 2011-04-29 12:44:02 UTC (rev 4335) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/propfind/PropFindResponseEntity.java 2011-04-29 15:09:58 UTC (rev 4336) @@ -105,7 +105,8 @@ * @param propertyNames the list of properties requested * @param propertyNamesOnly if only property names a requested */ - public PropFindResponseEntity(int depth, Resource rootResource, Set<QName> propertyNames, boolean propertyNamesOnly, Session session) + public PropFindResponseEntity(int depth, Resource rootResource, Set<QName> propertyNames, boolean propertyNamesOnly, + Session session) { this.rootResource = rootResource; this.namespaceContext = rootResource.getNamespaceContext();