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

Author: andrew.plotnikov Date: 2011-12-26 10:36:07 -0500 (Mon, 26 Dec 2011) New Revision: 5359 Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/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/core/nodetype/ExtendedItemDefinition.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/access/JAASAuthenticator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.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/cacheable/AbstractCacheableLockManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataHierarchyHolder.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/NodeDefinitionComparator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDefinitionAccessProvider.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/XmlNodeTypeDataPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/AdditionalNamespaceResolver.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexRecoveryImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/LocationStepQueryNode.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiColumnQueryResult.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/QueryHitsQuery.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/RowIteratorImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.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/value/ValueFactoryImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientItemData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/StreamPersistedValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.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/serialization/FileObjectReaderImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/ObjectWriterImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableSimpleFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableTreeFileIOChannel.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/storage/value/fs/operations/ValueFileOperation.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.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/storage/value/ValueStoragePluginProvider.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/AbstractIncrementalBackupJob.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/BackupMessage.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/WorkspaceDataTransmitter.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/BaseReplicationTestCase.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/transport/ChannelManager.java jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.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/LockCommand.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/acl/ACLProperties.java jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/ParameterNotFoundException.java jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/CreateFolderCommand.java jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/UploadFileCommand.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedItemDefinition.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedItemDefinition.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedItemDefinition.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -29,11 +29,5 @@ public interface ExtendedItemDefinition extends ItemDefinition { - - /** - * TODO Remove it from NodeImpl.findNodeType, BaseXmlExporter.findNodeType, tests - */ - // @Deprecated - // public static String RESIDUAL_SET = "*"; public boolean isResidualSet(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/TransactionChangesLog.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -89,10 +89,6 @@ */ public List<ItemState> getAllStates() { - // TODO [PN] use a wrapping List/Iterator for all changes logs instead of - // putting all logs - // content into one list - // will increase a performance of tx-related operations List<ItemState> states = new ArrayList<ItemState>(); for (PlainChangesLog changesLog : changesLogs) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -225,7 +225,6 @@ // writing configuration in to the persister if (configurationPersister != null) { - // TODO file output stream configurationPersister.write(new ByteArrayInputStream(((ByteArrayOutputStream)saveStream).toByteArray())); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -920,7 +920,6 @@ throw new ConstraintViolationException("Node definition not found for " + getPath()); } - // TODO same functionality in NodeTypeImpl InternalQName[] rnames = definition.getRequiredPrimaryTypes(); NodeType[] rnts = new NodeType[rnames.length]; for (int j = 0; j < rnames.length; j++) @@ -1559,7 +1558,7 @@ /** * Indicates whether this node is of the specified node type. Returns true if this node is of the * specified node type or a subtype of the specified node type. Returns false otherwise. <br/> - * Nodetype name asked in for mof internal QName. TODO have it private. + * Nodetype name asked in for mof internal QName. * * @param qName * InternalQName @@ -1605,7 +1604,6 @@ { NodeData nodeData = (NodeData)data; - // TODO do we need this three checks here? if (nodeData.getPrimaryTypeName() == null) { throw new RepositoryException("Load data: NodeData has no primaryTypeName. Null value found. " @@ -2963,7 +2961,6 @@ List<PropertyData> storedProps = new ArrayList<PropertyData>(dataManager.getChildPropertiesData(nodeData())); - // TODO we should not sort here! Collections.sort(storedProps, new PropertiesDataOrderComparator<PropertyData>()); return storedProps; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -103,7 +103,6 @@ rootNodeType = config.getInitializer().getParameterValue(WorkspaceInitializer.ROOT_NODETYPE_PARAMETER, null); } - // use deprecated params if found, temporary TODO if (config.getAutoInitializedRootNt() != null) { if (rootNodeType == null) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/access/JAASAuthenticator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/access/JAASAuthenticator.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/access/JAASAuthenticator.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -76,7 +76,6 @@ "Credentials for the authentication should be CredentialsImpl or SimpleCredentials type"); // SYSTEM - // TODO do we need to cache system state (identity) in registry? if (thisCredentials.getUserID().equals(SystemIdentity.SYSTEM)) { Identity sid = new Identity(SystemIdentity.SYSTEM, new HashSet<MembershipEntry>()); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -45,7 +45,6 @@ private SessionImpl session; - // TODO remove this constructor, need refactor lock classes ierarchy public LockImpl() { } 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -282,18 +282,6 @@ // if no session currently holds lock except this try { - // TODO it's possible to have next error - // java.lang.NullPointerException - // at - // org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl.onCloseSession(LockManagerImpl.java:312) - // at org.exoplatform.services.jcr.impl.core.SessionImpl.logout(SessionImpl.java:794) - // 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) - // at - // org.exoplatform.services.jcr.impl.proccess.WorkerThread.run(WorkerThread.java:46) ((NodeImpl)sessionImpl.getTransientNodesManager().getItemByIdentifier( lockData.getNodeIdentifier(), false)).unlock(); } 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -703,7 +703,6 @@ { NodeData nData = (NodeData)dataManager.getItemData(nodeIdentifier); - //TODO EXOJCR-412, should be refactored in future. //Skip removing, because that node was removed in other node of cluster. if (nData == null) { @@ -717,7 +716,6 @@ copyItemData((PropertyData)dataManager.getItemData(nData, new QPathEntry(Constants.JCR_LOCKOWNER, 1), ItemType.PROPERTY)); - //TODO EXOJCR-412, should be refactored in future. //Skip removing, because that lock was removed in other node of cluster. if (lockOwner == null) { @@ -730,7 +728,6 @@ copyItemData((PropertyData)dataManager.getItemData(nData, new QPathEntry(Constants.JCR_LOCKISDEEP, 1), ItemType.PROPERTY)); - //TODO EXOJCR-412, should be refactored in future. //Skip removing, because that lock was removed in other node of cluster. if (lockIsDeep == null) { @@ -749,7 +746,6 @@ } catch (JCRInvalidItemStateException e) { - //TODO EXOJCR-412, should be refactored in future. //Skip property not found in DB, because that lock property was removed in other node of cluster. if (LOG.isDebugEnabled()) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/ItemAutocreator.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -180,8 +180,6 @@ } else { - // TODO if autocreated property exists it's has wrong data (e.g. ACL) - // - throw an exception if (this.log.isDebugEnabled()) { this.log.debug("Skipping existed property " + pdef.getName() + " in " Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataHierarchyHolder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataHierarchyHolder.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataHierarchyHolder.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -87,7 +87,6 @@ */ public Set<InternalQName> getDeclaredSubtypes(final InternalQName nodeTypeName) { - // TODO Speed up this method Set<InternalQName> resultSet = new HashSet<InternalQName>(); for (Map.Entry<InternalQName, NodeTypeHolder> entry : nodeTypes.entrySet()) { @@ -141,7 +140,6 @@ */ public Set<InternalQName> getSubtypes(final InternalQName nodeTypeName) { - // TODO Speed up this method Set<InternalQName> resultSet = new HashSet<InternalQName>(); for (InternalQName ntName : nodeTypes.keySet()) { 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -319,7 +319,6 @@ } catch (RepositoryException e) { - // TODO throw new RuntimeException("Wrong name in nodeTypeData " + e, e); } } @@ -338,7 +337,6 @@ } catch (RepositoryException e) { - // TODO throw new RuntimeException("Wrong primary item name in nodeTypeData " + e, e); } } @@ -736,29 +734,6 @@ { return false; } - - // TODO old code - // if (constraints != null && constraints.length > 0) - // { - // for (int i = 0; i < constraints.length; i++) - // { - // try - // { - // if (constraints[i].equals(value.getString())) - // { - // return true; - // } - // } - // catch (RepositoryException e) - // { - // LOG.error("Can't get value's string value " + e, e); - // } - // } - // } - // else - // return true; - // - // return false; } private String getCharsetString(String source, String charSetName) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeDefinitionComparator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeDefinitionComparator.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeDefinitionComparator.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -384,7 +384,6 @@ NodeDefinitionData ancestorDefinitionData = changedDefinitions.getAncestorDefinition(); NodeDefinitionData recipientDefinitionData = changedDefinitions.getRecepientDefinition(); // change from mandatory=false to mandatory = true - // TODO residual if (!ancestorDefinitionData.isMandatory() && recipientDefinitionData.isMandatory()) { for (NodeData nodeData : nodesData) @@ -409,7 +408,6 @@ // change from Protected=false to Protected = true if (!ancestorDefinitionData.isProtected() && recipientDefinitionData.isProtected()) { - // TODO residual for (NodeData nodeData : nodesData) { @@ -463,7 +461,6 @@ { List<NodeData> childs = dataConsumer.getChildNodesData(nodeData); // more then mixin and primary type - // TODO it could be possible, check add definitions if (childs.size() > 0) { for (NodeData nodeData2 : childs) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDataValidator.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -226,7 +226,6 @@ + " in nodetype " + nodeType.getName().getAsString(), e); } - // TODO validate constraints, we have issue with TCK nodetype tests:canSetProperty try { validateValueConstraints(pdef.getRequiredType(), pdef.getValueConstraints()); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDefinitionAccessProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDefinitionAccessProvider.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/NodeTypeDefinitionAccessProvider.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -88,10 +88,6 @@ boolean mixin = readMandatoryBoolean(nodeData, Constants.JCR_ISMIXIN); boolean hasOrderableChildNodes = readMandatoryBoolean(nodeData, Constants.JCR_HASORDERABLECHILDNODES); - // TODO fix to mandatory - // boolean isAbstract = readMandatoryBoolean(nodeData, Constants.JCR_ISABSTRACT); - // - // boolean isQueryable = readBoolean(nodeData, Constants.JCR_ISQUERYABLE); InternalQName[] declaredSupertypeNames = readNames(nodeData, Constants.JCR_SUPERTYPES); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionAccessProvider.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -63,11 +63,6 @@ boolean multiple = readMandatoryBoolean(nodeData, Constants.JCR_MULTIPLE); - // TODO 3 Query atributes - // boolean isQueryOrderable = readMandatoryBoolean(nodeData, Constants.JCR_QUERYORDERABLE); - // String[] availableQueryOperators = readMandatoryStrings(nodeData, Constants.JCR_AVAILABLEQUERYOPERATORS); - // boolean isFullTextSearchable = readMandatoryBoolean(nodeData, Constants.JCR_ISFULLTEXTSEARCHABLE); - String[] valueConstraints = readStrings(nodeData, Constants.JCR_VALUECONSTRAINTS); String[] defaultValues = readStrings(nodeData, Constants.JCR_DEFAULTVALUES); @@ -94,7 +89,6 @@ writeBoolean(changesLog, propertyDefinition, Constants.JCR_MULTIPLE, propertyDefinitionData.isMultiple()); - //TODO 3 Query atributes // writeBoolean(changesLog, propertyDefinition, Constants.JCR_QUERYORDERABLE, propertyDefinitionData // .isQueryOrderable()); // writeStrings(changesLog, propertyDefinition, Constants.JCR_AVAILABLEQUERYOPERATORS, propertyDefinitionData Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/PropertyDefinitionComparator.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -559,7 +559,6 @@ { List<PropertyData> childs = dataConsumer.getChildPropertiesData(nodeData); // more then mixin and primary type - // TODO it could be possible, check add definitions for (PropertyData propertyData : childs) { if (!isNonResidualMatch(propertyData.getQPath().getName(), recipientDefinition)) @@ -574,7 +573,6 @@ } else if (!isResidualMatch(removePropertyDefinitionData.getName(), recipientDefinition)) { - // TODO more complex exception List<NodeData> nodes = getNodes(nodesData, new InternalQName[]{removePropertyDefinitionData.getName()}, new InternalQName[]{}); if (nodes.size() > 0) 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/XmlNodeTypeDataPersister.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -188,7 +188,6 @@ */ public NodeTypeData getNodeType(InternalQName nodeTypeName) throws RepositoryException { - // TODO Auto-generated method stub return null; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/AdditionalNamespaceResolver.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/AdditionalNamespaceResolver.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/AdditionalNamespaceResolver.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -18,17 +18,16 @@ -import javax.jcr.NamespaceException; -import javax.jcr.NamespaceRegistry; -import javax.jcr.RepositoryException; - import org.exoplatform.services.jcr.core.NamespaceAccessor; -import org.exoplatform.services.jcr.impl.core.query.lucene.NamespaceMappings; import java.util.Enumeration; import java.util.Properties; import java.util.Set; +import javax.jcr.NamespaceException; +import javax.jcr.NamespaceRegistry; +import javax.jcr.RepositoryException; + /** * A simple namespace resolver implementation, that uses the additional * namespaces declared in an XML element. @@ -106,20 +105,17 @@ public String[] getAllNamespacePrefixes() throws RepositoryException { - // TODO Auto-generated method stub Set keySet = prefixToURI.keySet(); return (String[])keySet.toArray(); } public String getNamespacePrefixByURI(String uri) throws NamespaceException, RepositoryException { - // TODO Auto-generated method stub return getPrefix(uri); } public String getNamespaceURIByPrefix(String prefix) throws NamespaceException, RepositoryException { - // TODO Auto-generated method stub return getURI(prefix); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexRecoveryImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexRecoveryImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexRecoveryImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -148,7 +148,6 @@ if (!file.isDirectory()) { // if parent directory is not "offline" then add this file. Otherwise skip it. - // TODO implement list retrieval via index state manager if (!file.getParent().endsWith(OfflinePersistentIndex.NAME)) { result.add(PrivilegedFileHelper.getAbsolutePath(file).substring(indexDirLen)); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/LocationStepQueryNode.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/LocationStepQueryNode.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/LocationStepQueryNode.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -16,12 +16,12 @@ */ package org.exoplatform.services.jcr.impl.core.query; -import javax.jcr.RepositoryException; - import org.exoplatform.services.jcr.datamodel.InternalQName; +import javax.jcr.RepositoryException; + /** * Defines a location step for querying the path of a node. * <p/> @@ -44,7 +44,6 @@ /** * The empty name used in matching the root node. This is an implementation * specific constant as the empty name is not a valid JCR name. - * TODO: The root location step should be refactored somehow */ public static final InternalQName EMPTY_NAME = new InternalQName("", ""); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiColumnQueryResult.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiColumnQueryResult.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiColumnQueryResult.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -65,7 +65,6 @@ */ protected ExcerptProvider createExcerptProvider() throws IOException { - // TODO return null; } } 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -3323,7 +3323,6 @@ */ public void refreshIndexList() throws IOException { - // TODO: re-study synchronization here. synchronized (updateMonitor) { // release reader if any Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryHitsQuery.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryHitsQuery.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryHitsQuery.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -151,7 +151,6 @@ */ @Override public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException { - // TODO: use arguments! return new QueryHitsQueryScorer(reader, similarity); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -430,7 +430,6 @@ { try { - // TODO: rather use AccessManager.canRead(Path) //if (nodes[i] != null && !accessMgr.isGranted(nodes[i].getNodeId(), PermissionType.READ)) { if (nodes[i] != null) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/RowIteratorImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/RowIteratorImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/RowIteratorImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -503,7 +503,6 @@ ScoreNode s = sn[getSelectorIndex(selectorName)]; if (s == null) { - // TODO correct? return null; } return (Node)itemMgr.getItemByIdentifier(s.getNodeId(), true); @@ -613,7 +612,6 @@ ScoreNode s = sn[getSelectorIndex(selectorName)]; if (s == null) { - // TODO correct? return Double.NaN; } return s.getScore(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/Util.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -226,7 +226,6 @@ case PropertyType.REFERENCE : case PropertyType.STRING : return value.getString(); - // TODO: JSR 283 now node types default : throw new RepositoryException("Unsupported type: " + PropertyType.nameFromValue(value.getType())); } @@ -313,7 +312,6 @@ case PropertyType.STRING : c2 = v2.getString(); break; - // TODO: JSR 283 now node types default : throw new RepositoryException("Unsupported type: " + PropertyType.nameFromValue(v2.getType())); } @@ -398,7 +396,6 @@ */ public static long getLength(ValueData value, int propType) { - // TODO: support new JSR 283 property types if (propType == PropertyType.BINARY) { return value.getLength(); 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/sql/JCRSQLQueryBuilder.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -152,7 +152,6 @@ { parser = new JCRSQLParser(new StringReader(statement)); //parser.setNameResolver(resolver); - //TODO FIX ME!!! parser.setLocationfactory(resolver); parsers.put(resolver, parser); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueFactoryImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueFactoryImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueFactoryImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -79,7 +79,6 @@ this.fileCleaner = cleanerHolder.getFileCleaner(); this.tempDirectory = new File(PrivilegedSystemHelper.getProperty("java.io.tmpdir")); - // TODO we use WorkspaceDataContainer constants but is it ok? this.maxBufferSize = workspaceConfig.getContainer().getParameterInteger(WorkspaceDataContainer.MAXBUFFERSIZE_PROP, WorkspaceDataContainer.DEF_MAXBUFFERSIZE); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -842,8 +842,6 @@ @Override protected void entering(PropertyData property, int level) throws RepositoryException { - - // TODO what to do if REFERENCE property target doesn't exists in workspace if (currentNode() != null) { NodeData frozenParent = (NodeData)dataManager.getItemData(property.getParentIdentifier()); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -58,7 +58,6 @@ this.spooled = true; } - // TODO use InputStream instead of spoolFile and use Channel.transferFrom. public NewEditableValueData(SpoolFile spoolFile, int orderNumber, FileCleaner fileCleaner, int maxBufferSize, File tempDirectory) throws IOException { @@ -280,7 +279,6 @@ } // write update data - // TODO don't use Channels.newChannel in Java5 ReadableByteChannel sch = Channels.newChannel(stream); chch.transferFrom(sch, newIndex, length); sch.close(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientItemData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientItemData.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientItemData.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -97,7 +97,6 @@ if (obj instanceof ItemData) { - // TODO use String.equals, but check performance! return getIdentifier().hashCode() == ((ItemData)obj).getIdentifier().hashCode(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -252,7 +252,6 @@ */ public long getLength() { - // TODO try ask on FileChannel (via FileInputStream if have such stream). if (isByteArrayAfterSpool()) { return data.length; @@ -354,7 +353,7 @@ MappedByteBuffer bb = spoolChannel.map(FileChannel.MapMode.READ_ONLY, position, length); - WritableByteChannel ch = Channels.newChannel(stream); // TODO don't use Channels.newChannel on java5 + WritableByteChannel ch = Channels.newChannel(stream); ch.write(bb); ch.close(); @@ -653,7 +652,6 @@ try { - //TODO do refactor of work with NIO and java6 ByteBuffer bb = ByteBuffer.allocate((int)fch.size()); fch.read(bb); if (bb.hasArray()) 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -1509,7 +1509,7 @@ { List<PropertyData> childProperties = CacheableWorkspaceDataManager.super.getChildPropertiesData(nodeData); - // TODO childProperties.size() > 0 for SDB + if (childProperties.size() > 0 && cache.isEnabled()) { cache.addChildProperties(nodeData, childProperties); @@ -1866,7 +1866,7 @@ { List<PropertyData> propertiesList = CacheableWorkspaceDataManager.super.listChildPropertiesData(nodeData); - // TODO propertiesList.size() > 0 for SDB + if (propertiesList.size() > 0 && cache.isEnabled()) { cache.addChildPropertiesList(nodeData, propertiesList); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -83,7 +83,6 @@ if (!PrivilegedFileHelper.delete(file)) { - //TODO FileCleaner maybe null. if (cleaner != null) { cleaner.addFile(file); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -196,7 +196,6 @@ */ private byte[] fileToByteArray() throws IOException { - // TODO do refactor of work with NIO and java6 FileChannel fch = PrivilegedFileHelper.fileInputStream(file).getChannel(); try @@ -263,7 +262,6 @@ // write canonical file path if (file != null) { - // TODO for tests byte[] buf = file.getPath().getBytes("UTF-8"); byte[] buf = PrivilegedFileHelper.getCanonicalPath(file).getBytes("UTF-8"); out.writeInt(buf.length); out.write(buf); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/StreamPersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/StreamPersistedValueData.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/StreamPersistedValueData.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -173,7 +173,6 @@ @Override public InputStream getAsStream() throws IOException { - // TODO check if file exists, wait a bit (for replication etc.) return super.getAsStream(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -464,8 +464,6 @@ } else { - // TODO ask dest file from VS provider, can be null after - // TODO for JBC case, the storage connection will evict the replicated Value to read it from the DB File destFile = null; if (tvd.getSpoolFile() != null) @@ -841,7 +839,7 @@ * connection * @throws RepositoryException * @throws InvalidItemStateException - * if the item not found TODO compare persistedVersion number + * if the item not found */ protected void doUpdate(final ItemData item, final WorkspaceStorageConnection con) throws RepositoryException, InvalidItemStateException 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -1101,7 +1101,7 @@ */ public void addChildPropertiesList(NodeData parent, List<PropertyData> childProperties) { - // TODO not implemented, will force read from DB + } /** @@ -1830,9 +1830,9 @@ NodeData prevNode = (NodeData)data; TransientNodeData newNode = - new TransientNodeData(newPath, prevNode.getIdentifier(), prevNode.getPersistedVersion(), prevNode - .getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), prevNode - .getParentIdentifier(), inheritACL ? acl : prevNode.getACL()); // TODO check ACL + new TransientNodeData(newPath, prevNode.getIdentifier(), prevNode.getPersistedVersion(), + prevNode.getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), + prevNode.getParentIdentifier(), inheritACL ? acl : prevNode.getACL()); // update this node cache.put(makeItemFqn(newNode.getIdentifier()), ITEM_DATA, newNode); } @@ -1899,9 +1899,9 @@ QPath .makeChildPath(rootPath, prevNode.getQPath().getEntries()[prevNode.getQPath().getEntries().length - 1]); TransientNodeData newNode = - new TransientNodeData(newPath, prevNode.getIdentifier(), prevNode.getPersistedVersion(), prevNode - .getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), prevNode - .getParentIdentifier(), inheritACL ? acl : prevNode.getACL()); // TODO check ACL + new TransientNodeData(newPath, prevNode.getIdentifier(), prevNode.getPersistedVersion(), + prevNode.getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), + prevNode.getParentIdentifier(), inheritACL ? acl : prevNode.getACL()); // update this node cache.put(makeItemFqn(newNode.getIdentifier()), ITEM_DATA, newNode); // update childs recursive Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/FileObjectReaderImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/FileObjectReaderImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/FileObjectReaderImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -25,7 +25,6 @@ import java.io.EOFException; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; @@ -94,7 +93,7 @@ public boolean readBoolean() throws IOException { int v = readInt(); - if (v < 0) // TODO ? + if (v < 0) throw new EOFException(); return v != 0; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/ObjectWriterImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/ObjectWriterImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/ObjectWriterImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -107,7 +107,6 @@ out.write(v ? 1 : 0); } - // TODO can be useful to flag write /** * {@inheritDoc} */ Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -55,8 +55,6 @@ * applied (for ex RMI) this implementation is responsible for making copy of persisted (shared) * data objects for session data manager and pass it on top (to TransactionableDM) (and vice versa?) * - * <p>TODO not used since optimization EXOJCR-272.</p> - * * @author Gennady Azarenkov * @version $Id: LocalWorkspaceStorageDataManagerProxy.java 11907 2008-03-13 15:36:21Z ksm $ */ @@ -284,7 +282,7 @@ private List<NodeData> copyNodes(final List<NodeData> childNodes) throws RepositoryException { final List<NodeData> copyOfChildsNodes = new LinkedList<NodeData>(); - synchronized (childNodes) // TODO EXOJCR-273 + synchronized (childNodes) { for (NodeData nodeData : childNodes) { @@ -298,7 +296,7 @@ private List<PropertyData> copyProperties(final List<PropertyData> traverseProperties) throws RepositoryException { final List<PropertyData> copyOfChildsProperties = new LinkedList<PropertyData>(); - synchronized (traverseProperties) // TODO EXOJCR-273 + synchronized (traverseProperties) { for (PropertyData nodeProperty : traverseProperties) { @@ -313,7 +311,7 @@ throws RepositoryException { final List<PropertyData> copyOfChildsProperties = new LinkedList<PropertyData>(); - synchronized (traverseProperties) // TODO EXOJCR-273 + synchronized (traverseProperties) { for (PropertyData nodeProperty : traverseProperties) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -167,8 +167,7 @@ for (QPath p : paths) { - if (itemPath.equals(p) || itemPath.isDescendantOf(p, !isDeep))// TODO is - // Child + if (itemPath.equals(p) || itemPath.isDescendantOf(p, !isDeep)) return true; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -537,7 +537,6 @@ } else { - // TODO unused externaly feature (except tests) ps = con.prepareStatement(sqlSelectRecords); ps.setString(1, propertyId); rs = ps.executeQuery(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableSimpleFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableSimpleFileIOChannel.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableSimpleFileIOChannel.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -93,7 +93,6 @@ // CASableDeleteValues saves VCAS record on commit, but it's possible the Property just // added in this transaction and not commited. - // TODO 08.04.2009 Skip error now files = new File[0]; } CASableDeleteValues o = new CASableDeleteValues(files, resources, cleaner, tempDir, propertyId, vcas); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableTreeFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableTreeFileIOChannel.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableTreeFileIOChannel.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -69,7 +69,6 @@ // own ids File[] files = new File[hids.size()]; for (int i = 0; i < hids.size(); i++) - // TODO super.getFile calls mkdirs(tfile.getParentFile()) files[i] = super.getFile(hids.get(i), CASableIOSupport.HASHFILE_ORDERNUMBER); return files; @@ -99,7 +98,6 @@ // CASableDeleteValues saves VCAS record on commit, but it's possible the Property just // added in this transaction and not commited. - // TODO 08.04.2009 Skip error now files = new File[0]; } CASableDeleteValues o = new CASableDeleteValues(files, resources, cleaner, tempDir, propertyId, vcas); 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -301,8 +301,6 @@ ReadableByteChannel inch = inFile ? ((FileInputStream)in).getChannel() : Channels.newChannel(in); WritableByteChannel outch = outFile ? ((FileOutputStream)out).getChannel() : Channels.newChannel(out); - // TODO buffers show same perfomance as bytes copy via Input/Output streams - // NIO buffers article http://www.odi.ch/weblog/posting.php?posting=371 long size = 0; int r = 0; ByteBuffer buff = ByteBuffer.allocate(IOBUFFER_SIZE); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -64,7 +64,6 @@ private static String LOCAL_ADDRESS; static { - // TODO this info may be is not necessary try { // get the inet address @@ -145,7 +144,7 @@ lockFile = new File(tempDir, targetFile.getName() + LOCK_FILE_EXTENSION); FileOutputStream lout = new FileOutputStream(lockFile, true); - lout.write(operationInfo.getBytes()); // TODO write info + lout.write(operationInfo.getBytes()); lout.getChannel().lock(); // wait for unlock (on Windows will wait for this JVM too) lockFileStream = lout; @@ -175,7 +174,7 @@ lockFileStream.close(); if (!lockFile.delete()) - { // TODO don't use FileCleaner, delete should be enough + { LOG.warn("Cannot delete lock file " + lockFile.getAbsolutePath() + ". Add to the FileCleaner"); cleaner.addFile(lockFile); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/BaseXmlExporter.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -267,7 +267,6 @@ case PropertyType.NAME : case PropertyType.DATE : case PropertyType.PATH : - // TODO namespace mapping for values try { charValue = systemValueFactory.loadValue(data, type).getString(); 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -685,7 +685,6 @@ { InputStream vStream = propertyInfo.getValues().get(k).getInputStream(); - // TODO cleanup // TransientValueData binaryValue = new TransientValueData(vStream); TransientValueData binaryValue = new TransientValueData(k, null, vStream, null, valueFactory.getFileCleaner(), Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/value/ValueStoragePluginProvider.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/value/ValueStoragePluginProvider.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/value/ValueStoragePluginProvider.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -62,8 +62,6 @@ /** * Run consistency check operation on each plugin registered. * - * TODO: NOT USED yet (empty implementations). - * * @param dataConnection * WorkspaceStorageConnection persistent connection */ Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -820,7 +820,7 @@ */ public void addChildPropertiesList(NodeData parent, List<PropertyData> childProperties) { - // TODO not implemented, will force read from DB + } /** Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/AbstractIncrementalBackupJob.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/AbstractIncrementalBackupJob.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/AbstractIncrementalBackupJob.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -119,7 +119,6 @@ */ public final void run() { - // TODO [PN] listener was added but never will be removed repository.addItemPersistenceListener(workspaceName, this); state = WORKING; 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -673,8 +673,6 @@ } else { - // TODO do we not restoring same content few times, i.e. on STARTING, WAITIG, FINISHED - // events which are logged in chan log one after another try { incrementalRestore(list.get(i).getURL().getPath(), reposytoryName, workspaceName); @@ -765,8 +763,6 @@ } else { - // TODO do we not restoring same content few times, i.e. on STARTING, WAITIG, FINISHED - // events which are logged in chan log one after another try { incrementalRestore(list.get(i).getURL().getPath(), reposytoryName, workspaceName); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupMessage.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupMessage.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupMessage.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -25,9 +25,6 @@ * Created by The eXo Platform SAS Author : Peter Nedonosko peter.nedonosko(a)exoplatform.com.ua * 15.01.2008 * - * TODO message may be associated with chain, i.e. it's will be possible to select only given chain - * messages in BackupMessagesLog - * * @author <a href="mailto:peter.nedonosko@exoplatform.com.ua">Peter Nedonosko</a> * @version $Id: BackupMessage.java 760 2008-02-07 15:08:07Z pnedonosko $ */ Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -114,7 +114,6 @@ protected final List<String> mixinNames; - // TODO temporary flag to have start() run once protected boolean started = false; /** Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/WorkspaceDataTransmitter.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/WorkspaceDataTransmitter.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/WorkspaceDataTransmitter.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -86,7 +86,7 @@ public WorkspaceDataTransmitter(CacheableWorkspaceDataManager dataManager) throws RepositoryConfigurationException { dataManager.addItemPersistenceListener(this); - // TODO: need to use FileCleaner from FileCleanerHolder + // need to use FileCleaner from FileCleanerHolder this.fileCleaner = new FileCleaner(ReplicationService.FILE_CLEANRE_TIMEOUT); } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/BaseReplicationTestCase.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/BaseReplicationTestCase.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/test/BaseReplicationTestCase.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -154,7 +154,6 @@ protected String getNormalizePath(String repoPath) { // return repoPath; - // TODO remove it ? return repoPath.replaceAll("[:][:]", "/"); } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/transport/ChannelManager.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/transport/ChannelManager.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/replication/transport/ChannelManager.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -613,14 +613,19 @@ if (channel.getView() != null) { if (channel.getView().getMembers().size() == confMembersCount) - // TODO run without one (few) members will not work, see LastMemberWaiter in initializer + { packetsHandler.handle(); + } else + { LOG.warn("Not all members connected to the channel " + +channel.getView().getMembers().size() + " != " + confMembersCount + ", queue message " + message); + } } else + { LOG.warn("No members found or channel closed, queue message " + message); + } return new String("Success"); } 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStor.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -66,7 +66,6 @@ try { - // TODO: Add TimeOut here while (!clientSession().getDataTransiver().isConnected()) { Thread.sleep(100); 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-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/AclCommand.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -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; @@ -161,7 +161,6 @@ HierarchicalProperty principalProperty = ace.getChild(ACLProperties.PRINCIPAL); // each ace element must contain principal element - // TODO invert element is not implemented // <!ELEMENT ace ((principal | invert), (grant|deny), protected?, inherited?)> if (principalProperty == null) { @@ -180,7 +179,6 @@ } // each principal must contain either href or all element - // TODO authenticated, unauthenticated, property, self are not implemented // <!ELEMENT principal (href | all | authenticated | unauthenticated | property | self)> else { Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -146,8 +146,6 @@ .ok(body(nsContext, requestEntity, depth, lockToken, requestEntity.getOwner(), timeout), "text/xml") .header("Lock-Token", "<" + lockToken + ">").build(); } - - // TODO 412 Precondition Failed ? } catch (LockException exc) { Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/acl/ACLProperties.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/acl/ACLProperties.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/acl/ACLProperties.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -185,13 +185,6 @@ return ownerProperty; } - // TODO support for DAV:supported-privilege-set property - // specified here: http://www.webdav.org/specs/rfc3744.html#PROPERTY_supported-privilege-set - // TODO support for DAV:acl-restrictions property - // specified here: http://www.webdav.org/specs/rfc3744.html#PROPERTY_acl-restrictions - // TODO support for DAV:current-user-privilege-set property - // specified here: http://www.webdav.org/specs/rfc3744.html#PROPERTY_current-user-privilege-set - private static HierarchicalProperty getPrincipalProperty(String principal) { HierarchicalProperty principalProperty = new HierarchicalProperty(PRINCIPAL); Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/ParameterNotFoundException.java =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/ParameterNotFoundException.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/ParameterNotFoundException.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -31,25 +31,21 @@ public ParameterNotFoundException() { super(); - // TODO Auto-generated constructor stub } public ParameterNotFoundException(String arg0, Throwable arg1) { super(arg0, arg1); - // TODO Auto-generated constructor stub } public ParameterNotFoundException(String arg0) { super(arg0); - // TODO Auto-generated constructor stub } public ParameterNotFoundException(Throwable arg0) { super(arg0); - // TODO Auto-generated constructor stub } } Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/CreateFolderCommand.java =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/CreateFolderCommand.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/CreateFolderCommand.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -111,7 +111,6 @@ Document doc = rootElement.getOwnerDocument(); - // TODO String retVal = "0"; Element errElement = doc.createElement("Error"); Modified: jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/UploadFileCommand.java =================================================================== --- jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/UploadFileCommand.java 2011-12-26 14:21:05 UTC (rev 5358) +++ jcr/trunk/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/command/web/fckeditor/UploadFileCommand.java 2011-12-26 15:36:07 UTC (rev 5359) @@ -134,7 +134,6 @@ parentFolder.save(); - // TODO int retVal = 0; out.println("<script type=\"text/javascript\">");