Author: tolusha Date: 2009-12-08 03:46:54 -0500 (Tue, 08 Dec 2009) New Revision: 939 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/AbstractItemDefinitionAccessProvider.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JcrNodeTypeDataPersister.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionImpl.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCopyVisitor.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataRemoveVisitor.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TransientPropertyDataReader.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version/VersionHistoryDataHelper.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewCollision.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSessionDataManager.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestLinkedCacheMultithread.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspaceStorageCacheBaseCase.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWDCTest.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/StorageUpdateTest.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestRollbackBigFiles.java Log: EXOJCR-299: remove setters from code Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/PersistedPropertyData.java 2009-12-08 08:46:54 UTC (rev 939) @@ -45,10 +45,11 @@ protected final boolean multiValued; - public PersistedPropertyData(String id, QPath qpath, String parentId, int version, int type, boolean multiValued) + public PersistedPropertyData(String id, QPath qpath, String parentId, int version, int type, boolean multiValued, + List<ValueData> values) { super(id, qpath, parentId, version); - this.values = null; + this.values = values; this.type = type; this.multiValued = multiValued; } @@ -99,25 +100,4 @@ { visitor.visit(this); } - - /** - * @param type - */ - public void setType(int type) - { - throw new RuntimeException("DO NOT call setType! "); - } - - /** - * @param values - * @throws RepositoryException - */ - public void setValues(List values) throws RepositoryException - { - if (this.values == null) - this.values = values; - else - throw new RuntimeException("The values can not be changed "); - } - } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2009-12-08 08:46:54 UTC (rev 939) @@ -524,9 +524,6 @@ // Check value constraints checkValueConstraints(def, valueDataList, propType); - TransientPropertyData newData = - new TransientPropertyData(qpath, identifier, version, propType, parentNode.getInternalIdentifier(), multiValue); - if (requiredType != PropertyType.UNDEFINED && expectedType != PropertyType.UNDEFINED && requiredType != expectedType) { @@ -538,7 +535,10 @@ PropertyImpl prop = null; if (state != ItemState.DELETED) { - newData.setValues(valueDataList); + TransientPropertyData newData = + new TransientPropertyData(qpath, identifier, version, propType, parentNode.getInternalIdentifier(), + multiValue, valueDataList); + ItemState itemState = new ItemState(newData, state, true, qpath, false); prop = (PropertyImpl)dataManager.update(itemState, true); // launch event @@ -552,6 +552,10 @@ throw new ConstraintViolationException("Can not remove (by setting null value) mandatory property " + locationFactory.createJCRPath(qpath).getAsString(false)); } + TransientPropertyData newData = + new TransientPropertyData(qpath, identifier, version, propType, parentNode.getInternalIdentifier(), + multiValue); + // launch event session.getActionHandler().preRemoveItem(oldProp); dataManager.delete(newData); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java 2009-12-08 08:46:54 UTC (rev 939) @@ -97,8 +97,8 @@ { if (!started) { - if(log.isDebugEnabled()) - log.debug("Unable save namespace " + uri + "=" + prefix + " in to the storage. Storage not initialized"); + if (log.isDebugEnabled()) + log.debug("Unable save namespace " + uri + "=" + prefix + " in to the storage. Storage not initialized"); return; } PlainChangesLog changesLog = new PlainChangesLogImpl(); @@ -114,16 +114,16 @@ TransientNodeData.createNodeData(nsRoot, new InternalQName("", prefix), Constants.EXO_NAMESPACE); TransientPropertyData primaryType = - TransientPropertyData.createPropertyData(nsNode, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - primaryType.setValue(new TransientValueData(nsNode.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(nsNode, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(nsNode.getPrimaryTypeName())); TransientPropertyData exoUri = - TransientPropertyData.createPropertyData(nsNode, Constants.EXO_URI_NAME, PropertyType.STRING, false); - exoUri.setValue(new TransientValueData(uri)); + TransientPropertyData.createPropertyData(nsNode, Constants.EXO_URI_NAME, PropertyType.STRING, false, + new TransientValueData(uri)); TransientPropertyData exoPrefix = - TransientPropertyData.createPropertyData(nsNode, Constants.EXO_PREFIX, PropertyType.STRING, false); - exoPrefix.setValue(new TransientValueData(prefix)); + TransientPropertyData.createPropertyData(nsNode, Constants.EXO_PREFIX, PropertyType.STRING, false, + new TransientValueData(prefix)); changesLog.add(ItemState.createAddedState(nsNode)).add(ItemState.createAddedState(primaryType)).add( ItemState.createAddedState(exoUri)).add(ItemState.createAddedState(exoPrefix)); @@ -158,7 +158,7 @@ internallAdd(changesLog, prefix, uri); } } - dataManager.save(new TransactionChangesLog(changesLog)); + dataManager.save(new TransactionChangesLog(changesLog)); } @@ -182,7 +182,7 @@ if (!started) { - log.warn("Unable remove namspace "+prefix+" from the storage. Storage not initialized"); + log.warn("Unable remove namspace " + prefix + " from the storage. Storage not initialized"); return; } @@ -205,7 +205,7 @@ } - dataManager.save(new TransactionChangesLog(plainChangesLogImpl)); + dataManager.save(new TransactionChangesLog(plainChangesLogImpl)); } @@ -313,7 +313,6 @@ log.warn("Namespace storage (/jcr:system/exo:namespaces node) is not initialized. No namespaces loaded."); } - /** * Copy <code>PropertyData prop<code> to new TransientItemData * @@ -327,13 +326,8 @@ if (prop == null) return null; - // make a copy - TransientPropertyData newData = - new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(), - prop.getParentIdentifier(), prop.isMultiValued()); - + // make a copy, value may be null for deleting items List<ValueData> values = null; - // null is possible for deleting items if (prop.getValues() != null) { values = new ArrayList<ValueData>(); @@ -342,7 +336,10 @@ values.add(((AbstractValueData)val).createTransientCopy()); } } - newData.setValues(values); + TransientPropertyData newData = + new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(), + prop.getParentIdentifier(), prop.isMultiValued(), values); + return newData; } @@ -361,8 +358,8 @@ TransientNodeData.createNodeData(nsSystem, Constants.EXO_NAMESPACES, Constants.NT_UNSTRUCTURED); TransientPropertyData primaryType = - TransientPropertyData.createPropertyData(exoNamespaces, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - primaryType.setValue(new TransientValueData(exoNamespaces.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(exoNamespaces, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(exoNamespaces.getPrimaryTypeName())); changesLog.add(ItemState.createAddedState(exoNamespaces)).add(ItemState.createAddedState(primaryType)); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-12-08 08:46:54 UTC (rev 939) @@ -586,10 +586,8 @@ {// there was mixin prop prop = new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), - prop.getType(), prop.getParentIdentifier(), prop.isMultiValued()); + prop.getType(), prop.getParentIdentifier(), prop.isMultiValued(), values); - prop.setValues(values); - state = ItemState.createUpdatedState(prop); } else @@ -2506,14 +2504,13 @@ throw new RepositoryException("Property data is not found " + name.getAsString() + " for node " + nodeData().getQPath().getAsString()); - TransientPropertyData tdata = - new TransientPropertyData(QPath.makeChildPath(getInternalPath(), name), existed.getIdentifier(), existed - .getPersistedVersion(), existed.getType(), existed.getParentIdentifier(), existed.isMultiValued()); - if (!existed.isMultiValued()) throw new ValueFormatException("An existed property is single-valued " + name.getAsString()); - tdata.setValues(values); + TransientPropertyData tdata = + new TransientPropertyData(QPath.makeChildPath(getInternalPath(), name), existed.getIdentifier(), existed + .getPersistedVersion(), existed.getType(), existed.getParentIdentifier(), existed.isMultiValued(), values); + return tdata; } @@ -2528,9 +2525,7 @@ TransientPropertyData tdata = new TransientPropertyData(QPath.makeChildPath(getInternalPath(), name), existed.getIdentifier(), existed - .getPersistedVersion(), existed.getType(), existed.getParentIdentifier(), existed.isMultiValued()); - - tdata.setValue(value); + .getPersistedVersion(), existed.getType(), existed.getParentIdentifier(), existed.isMultiValued(), value); return tdata; } @@ -2890,10 +2885,8 @@ permProp = new TransientPropertyData(permProp.getQPath(), permProp.getIdentifier(), permProp.getPersistedVersion(), - permProp.getType(), permProp.getParentIdentifier(), permProp.isMultiValued()); + permProp.getType(), permProp.getParentIdentifier(), permProp.isMultiValued(), permValues); - permProp.setValues(permValues); - dataManager.update(new ItemState(data, ItemState.MIXIN_CHANGED, false, null, true), false); dataManager.update(ItemState.createUpdatedState(permProp, true), false); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2009-12-08 08:46:54 UTC (rev 939) @@ -199,8 +199,7 @@ TransientPropertyData primaryType = new TransientPropertyData(QPath.makeChildPath(rootNode.getQPath(), Constants.JCR_PRIMARYTYPE), IdGenerator - .generate(), -1, PropertyType.NAME, rootNode.getIdentifier(), false); - primaryType.setValue(new TransientValueData(rootNodeType)); + .generate(), -1, PropertyType.NAME, rootNode.getIdentifier(), false, new TransientValueData(rootNodeType)); changesLog.add(new ItemState(primaryType, ItemState.ADDED, false, null)); // @@ -264,8 +263,8 @@ TransientNodeData.createNodeData(root, Constants.JCR_SYSTEM, Constants.NT_UNSTRUCTURED, Constants.SYSTEM_UUID); TransientPropertyData primaryType = - TransientPropertyData.createPropertyData(jcrSystem, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - primaryType.setValue(new TransientValueData(jcrSystem.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(jcrSystem, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(jcrSystem.getPrimaryTypeName())); changesLog.add(ItemState.createAddedState(jcrSystem)).add(ItemState.createAddedState(primaryType)); @@ -314,8 +313,7 @@ TransientPropertyData vsPrimaryType = TransientPropertyData.createPropertyData(versionStorageNodeData, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, - false); - vsPrimaryType.setValue(new TransientValueData(versionStorageNodeData.getPrimaryTypeName())); + false, new TransientValueData(versionStorageNodeData.getPrimaryTypeName())); changesLog.add(ItemState.createAddedState(versionStorageNodeData)).add(ItemState.createAddedState(vsPrimaryType)); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2009-12-08 08:46:54 UTC (rev 939) @@ -575,13 +575,8 @@ if (prop == null) return null; - // make a copy - TransientPropertyData newData = - new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(), - prop.getParentIdentifier(), prop.isMultiValued()); - + // make a copy, value may be null for deleting items List<ValueData> values = null; - // null is possible for deleting items if (prop.getValues() != null) { values = new ArrayList<ValueData>(); @@ -590,7 +585,11 @@ values.add(((AbstractValueData)val).createTransientCopy()); } } - newData.setValues(values); + + TransientPropertyData newData = + new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(), + prop.getParentIdentifier(), prop.isMultiValued(), values); + return newData; } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2009-12-08 08:46:54 UTC (rev 939) @@ -665,8 +665,7 @@ final TransientPropertyData primaryTypeData = new TransientPropertyData(item.getQPath(), item.getIdentifier(), item.getPersistedVersion(), item.getType(), - item.getParentIdentifier(), item.isMultiValued()); - primaryTypeData.setValue(new TransientValueData(nodeTypeName)); + item.getParentIdentifier(), item.isMultiValued(), new TransientValueData(nodeTypeName)); changesLog.add(ItemState.createUpdatedState(primaryTypeData, true)); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/AbstractItemDefinitionAccessProvider.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/AbstractItemDefinitionAccessProvider.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/AbstractItemDefinitionAccessProvider.java 2009-12-08 08:46:54 UTC (rev 939) @@ -325,8 +325,8 @@ boolean value) { TransientPropertyData propertyData = - TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.BOOLEAN, false); - propertyData.setValue(new TransientValueData(value)); + TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.BOOLEAN, false, + new TransientValueData(value)); changesLog.add(ItemState.createAddedState(propertyData)); } @@ -352,38 +352,35 @@ InternalQName value) { TransientPropertyData propertyData = - TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.NAME, false); - propertyData.setValue(new TransientValueData(value)); + TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.NAME, false, + new TransientValueData(value)); changesLog.add(ItemState.createAddedState(propertyData)); } protected void writeNames(PlainChangesLog changesLog, NodeData parentNode, InternalQName propertyName, InternalQName[] value) { - TransientPropertyData propertyData = - TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.NAME, true); - List<ValueData> parents = new ArrayList<ValueData>(); for (InternalQName nt : value) parents.add(new TransientValueData(nt)); - propertyData.setValues(parents); + TransientPropertyData propertyData = + TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.NAME, true, parents); + changesLog.add(ItemState.createAddedState(propertyData)); } protected void writeString(PlainChangesLog changesLog, NodeData parentNode, InternalQName propertyName, String value) { TransientPropertyData propertyData = - TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.STRING, false); - propertyData.setValue(new TransientValueData(value)); + TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.STRING, false, + new TransientValueData(value)); changesLog.add(ItemState.createAddedState(propertyData)); } protected void writeStrings(PlainChangesLog changesLog, NodeData parentNode, InternalQName propertyName, String[] value) { - TransientPropertyData propertyData = - TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.STRING, true); List<ValueData> valueDatas = new ArrayList<ValueData>(); for (String vc : value) { @@ -391,7 +388,9 @@ valueDatas.add(new TransientValueData(vc)); } - propertyData.setValues(valueDatas); + TransientPropertyData propertyData = + TransientPropertyData.createPropertyData(parentNode, propertyName, PropertyType.STRING, true, valueDatas); + changesLog.add(ItemState.createAddedState(propertyData)); } } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JcrNodeTypeDataPersister.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JcrNodeTypeDataPersister.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JcrNodeTypeDataPersister.java 2009-12-08 08:46:54 UTC (rev 939) @@ -161,8 +161,8 @@ Constants.NODETYPESROOT_UUID); TransientPropertyData primaryType = - TransientPropertyData.createPropertyData(jcrNodetypes, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - primaryType.setValue(new TransientValueData(jcrNodetypes.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(jcrNodetypes, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(jcrNodetypes.getPrimaryTypeName())); changesLog.add(ItemState.createAddedState(jcrNodetypes)).add(ItemState.createAddedState(primaryType)); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java 2009-12-08 08:46:54 UTC (rev 939) @@ -408,8 +408,7 @@ TransientPropertyData mcp = new TransientPropertyData(QPath.makeChildPath(mergePath, cp.getQPath().getName()), existed != null ? existed.getIdentifier() : cp.getIdentifier(), existed != null ? existed.getPersistedVersion() : cp - .getPersistedVersion(), cp.getType(), mergedNode.getIdentifier(), cp.isMultiValued()); - mcp.setValues(cp.getValues()); + .getPersistedVersion(), cp.getType(), mergedNode.getIdentifier(), cp.isMultiValued(), cp.getValues()); changes.add(new ItemState(mcp, ItemState.ADDED, true, mergedNode.getQPath(), true)); } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionImpl.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionImpl.java 2009-12-08 08:46:54 UTC (rev 939) @@ -245,8 +245,7 @@ TransientPropertyData newSuccessorsProp = new TransientPropertyData(QPath.makeChildPath(nodeData().getQPath(), Constants.JCR_SUCCESSORS, successorsProp.getQPath().getIndex()), successorsProp.getIdentifier(), successorsProp - .getPersistedVersion(), PropertyType.REFERENCE, nodeData().getIdentifier(), true); - newSuccessorsProp.setValues(newSuccessors); + .getPersistedVersion(), PropertyType.REFERENCE, nodeData().getIdentifier(), true, newSuccessors); changesLog.add(ItemState.createUpdatedState(newSuccessorsProp)); } else @@ -284,8 +283,7 @@ TransientPropertyData newSuccessorsProp = new TransientPropertyData(QPath.makeChildPath(nodeData().getQPath(), Constants.JCR_SUCCESSORS, successorsProp.getQPath().getIndex()), successorsProp.getIdentifier(), successorsProp - .getPersistedVersion(), PropertyType.REFERENCE, nodeData().getIdentifier(), true); - newSuccessorsProp.setValues(newSuccessors); + .getPersistedVersion(), PropertyType.REFERENCE, nodeData().getIdentifier(), true, newSuccessors); changesLog.add(ItemState.createUpdatedState(newSuccessorsProp)); } else @@ -319,8 +317,7 @@ TransientPropertyData newPredecessorsProp = new TransientPropertyData(QPath.makeChildPath(nodeData().getQPath(), Constants.JCR_PREDECESSORS, predeccessorsProp.getQPath().getIndex()), predeccessorsProp.getIdentifier(), predeccessorsProp - .getPersistedVersion(), PropertyType.REFERENCE, nodeData().getIdentifier(), true); - newPredecessorsProp.setValues(newPredeccessors); + .getPersistedVersion(), PropertyType.REFERENCE, nodeData().getIdentifier(), true, newPredeccessors); changesLog.add(ItemState.createUpdatedState(newPredecessorsProp)); } else @@ -358,8 +355,7 @@ TransientPropertyData newPredecessorsProp = new TransientPropertyData(QPath.makeChildPath(nodeData().getQPath(), Constants.JCR_PREDECESSORS, predeccessorsProp.getQPath().getIndex()), predeccessorsProp.getIdentifier(), predeccessorsProp - .getPersistedVersion(), PropertyType.REFERENCE, nodeData().getIdentifier(), true); - newPredecessorsProp.setValues(newPredeccessors); + .getPersistedVersion(), PropertyType.REFERENCE, nodeData().getIdentifier(), true, newPredeccessors); changesLog.add(ItemState.createUpdatedState(newPredecessorsProp)); } else Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java 2009-12-08 08:46:54 UTC (rev 939) @@ -131,9 +131,8 @@ TransientPropertyData newProperty = new TransientPropertyData(QPath.makeChildPath(curParent().getQPath(), qname), keepIdentifiers ? property .getIdentifier() : IdGenerator.generate(), -1, property.getType(), curParent().getIdentifier(), property - .isMultiValued()); + .isMultiValued(), values); - newProperty.setValues(values); itemAddStates.add(new ItemState(newProperty, ItemState.ADDED, true, ancestorToSave, level != 0)); } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCopyVisitor.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCopyVisitor.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCopyVisitor.java 2009-12-08 08:46:54 UTC (rev 939) @@ -158,10 +158,8 @@ TransientPropertyData newProperty = new TransientPropertyData(QPath.makeChildPath(curParent().getQPath(), qname), keepIdentifiers ? property .getIdentifier() : IdGenerator.generate(), -1, property.getType(), curParent().getIdentifier(), property - .isMultiValued()); + .isMultiValued(), values); - newProperty.setValues(values); - if (log.isDebugEnabled()) log.debug("entering COPY " + newProperty.getQPath().getAsString() + "; pidentifier: " + newProperty.getParentIdentifier() + "; identifier: " + newProperty.getIdentifier()); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataMoveVisitor.java 2009-12-08 08:46:54 UTC (rev 939) @@ -236,9 +236,8 @@ TransientPropertyData newProperty = new TransientPropertyData(QPath.makeChildPath(curParent().getQPath(), qname), keepIdentifiers ? property .getIdentifier() : IdGenerator.generate(), -1, property.getType(), curParent().getIdentifier(), property - .isMultiValued()); + .isMultiValued(), values); - newProperty.setValues(values); addStates.add(new ItemState(newProperty, ItemState.RENAMED, false, ancestorToSave, false, false)); // get last from super.entering(property, level) Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataRemoveVisitor.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataRemoveVisitor.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataRemoveVisitor.java 2009-12-08 08:46:54 UTC (rev 939) @@ -319,13 +319,12 @@ // else - property final PropertyData prop = (PropertyData)item; - // make a copy + + // make a copy, value wil be null for deleting items TransientPropertyData newData = new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(), prop.getParentIdentifier(), prop.isMultiValued()); - // set null as it's delete state, was set list of createTransientCopy() - newData.setValues(null); return newData; } } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientNodeData.java 2009-12-08 08:46:54 UTC (rev 939) @@ -185,6 +185,25 @@ * @param primaryTypeName * @return */ + public static TransientNodeData createNodeData(NodeData parent, InternalQName name, InternalQName primaryTypeName, + InternalQName[] mixinTypeNames, String identifier) + { + TransientNodeData nodeData = null; + QPath path = QPath.makeChildPath(parent.getQPath(), name); + nodeData = + new TransientNodeData(path, identifier, -1, primaryTypeName, mixinTypeNames, 0, parent.getIdentifier(), parent + .getACL()); + return nodeData; + } + + /** + * Factory method + * + * @param parent + * @param name + * @param primaryTypeName + * @return + */ public static TransientNodeData createNodeData(NodeData parent, InternalQName name, InternalQName primaryTypeName) { TransientNodeData nodeData = null; Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientPropertyData.java 2009-12-08 08:46:54 UTC (rev 939) @@ -70,8 +70,44 @@ super(path, identifier, version, parentIdentifier); this.type = type; this.multiValued = multiValued; + this.values = null; } + /** + * @param path qpath + * @param identifier id + * @param version persisted version + * @param type property type + * @param parentIdentifier parentId + * @param multiValued multi-valued state + */ + public TransientPropertyData(QPath path, String identifier, int version, int type, String parentIdentifier, + boolean multiValued, List<ValueData> values) + { + super(path, identifier, version, parentIdentifier); + this.type = type; + this.multiValued = multiValued; + this.values = values; + } + + /** + * @param path qpath + * @param identifier id + * @param version persisted version + * @param type property type + * @param parentIdentifier parentId + * @param multiValued multi-valued state + */ + public TransientPropertyData(QPath path, String identifier, int version, int type, String parentIdentifier, + boolean multiValued, ValueData value) + { + super(path, identifier, version, parentIdentifier); + this.type = type; + this.multiValued = multiValued; + this.values = new ArrayList<ValueData>(); + values.add(value); + } + /* * (non-Javadoc) * @@ -146,9 +182,9 @@ public static TransientPropertyData createPropertyData(NodeData parent, InternalQName name, int type, boolean multiValued) { - TransientPropertyData propData = null; QPath path = QPath.makeChildPath(parent.getQPath(), name); - propData = new TransientPropertyData(path, IdGenerator.generate(), -1, type, parent.getIdentifier(), multiValued); + TransientPropertyData propData = + new TransientPropertyData(path, IdGenerator.generate(), -1, type, parent.getIdentifier(), multiValued); return propData; } @@ -156,16 +192,20 @@ public static TransientPropertyData createPropertyData(NodeData parent, InternalQName name, int type, boolean multiValued, ValueData value) { - TransientPropertyData propData = createPropertyData(parent, name, type, multiValued); - propData.setValue(value); + QPath path = QPath.makeChildPath(parent.getQPath(), name); + TransientPropertyData propData = + new TransientPropertyData(path, IdGenerator.generate(), -1, type, parent.getIdentifier(), multiValued, value); + return propData; } public static TransientPropertyData createPropertyData(NodeData parent, InternalQName name, int type, boolean multiValued, List<ValueData> values) { - TransientPropertyData propData = createPropertyData(parent, name, type, multiValued); - propData.setValues(values); + QPath path = QPath.makeChildPath(parent.getQPath(), name); + TransientPropertyData propData = + new TransientPropertyData(path, IdGenerator.generate(), -1, type, parent.getIdentifier(), multiValued, values); + return propData; } @@ -182,10 +222,6 @@ @Override public TransientPropertyData clone() { - TransientPropertyData dataCopy = - new TransientPropertyData(getQPath(), getIdentifier(), getPersistedVersion(), getType(), - getParentIdentifier(), isMultiValued()); - List<ValueData> copyValues = new ArrayList<ValueData>(); try { @@ -198,8 +234,11 @@ { throw new RuntimeException(e); } - dataCopy.setValues(copyValues); + TransientPropertyData dataCopy = + new TransientPropertyData(getQPath(), getIdentifier(), getPersistedVersion(), getType(), + getParentIdentifier(), isMultiValued(), copyValues); + return dataCopy; } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TransientPropertyDataReader.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TransientPropertyDataReader.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TransientPropertyDataReader.java 2009-12-08 08:46:54 UTC (rev 939) @@ -114,8 +114,7 @@ int type = in.readInt(); boolean multiValued = in.readBoolean(); - TransientPropertyData prop = - new TransientPropertyData(qpath, identifier, persistedVersion, type, parentIdentifier, multiValued); + TransientPropertyData prop; if (in.readByte() == SerializationConstants.NOT_NULL_DATA) { @@ -127,8 +126,14 @@ { values.add(rdr.read(in)); } - prop.setValues(values); + + prop = + new TransientPropertyData(qpath, identifier, persistedVersion, type, parentIdentifier, multiValued, values); } + else + { + prop = new TransientPropertyData(qpath, identifier, persistedVersion, type, parentIdentifier, multiValued); + } return prop; } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2009-12-08 08:46:54 UTC (rev 939) @@ -120,14 +120,14 @@ { return copyNodes(storageDataManager.getChildNodesData(parent)); } - + /** * {@inheritDoc} */ - public int getChildNodesCount(final NodeData parent) throws RepositoryException + public int getChildNodesCount(final NodeData parent) throws RepositoryException { return storageDataManager.getChildNodesCount(parent); - } + } /** * {@inheritDoc} @@ -187,13 +187,9 @@ // else - property final PropertyData prop = (PropertyData)item; - // make a copy - TransientPropertyData newData = - new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(), - prop.getParentIdentifier(), prop.isMultiValued()); + // make a copy, value may be null for deleting items List<ValueData> values = null; - // null is possible for deleting items if (prop.getValues() != null) { values = new ArrayList<ValueData>(); @@ -202,7 +198,10 @@ values.add(((AbstractValueData)val).createTransientCopy()); } } - newData.setValues(values); + TransientPropertyData newData = + new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(), + prop.getParentIdentifier(), prop.isMultiValued(), values); + return newData; } @@ -215,9 +214,8 @@ // make a copy TransientPropertyData newData = new TransientPropertyData(property.getQPath(), property.getIdentifier(), property.getPersistedVersion(), - property.getType(), property.getParentIdentifier(), property.isMultiValued()); + property.getType(), property.getParentIdentifier(), property.isMultiValued(), new ArrayList<ValueData>()); - newData.setValues(new ArrayList<ValueData>()); return newData; } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version/VersionHistoryDataHelper.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version/VersionHistoryDataHelper.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/version/VersionHistoryDataHelper.java 2009-12-08 08:46:54 UTC (rev 939) @@ -256,24 +256,25 @@ InternalQName vhName = new InternalQName(null, versionHistoryIdentifier); TransientNodeData versionHistory = - TransientNodeData.createNodeData(versionStorageData, vhName, Constants.NT_VERSIONHISTORY); - versionHistory.setIdentifier(versionHistoryIdentifier); + TransientNodeData.createNodeData(versionStorageData, vhName, Constants.NT_VERSIONHISTORY, + versionHistoryIdentifier); // jcr:primaryType TransientPropertyData vhPrimaryType = - TransientPropertyData.createPropertyData(versionHistory, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - vhPrimaryType.setValue(new TransientValueData(versionHistory.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(versionHistory, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(versionHistory.getPrimaryTypeName())); // jcr:uuid TransientPropertyData vhUuid = - TransientPropertyData.createPropertyData(versionHistory, Constants.JCR_UUID, PropertyType.STRING, false); - vhUuid.setValue(new TransientValueData(versionHistoryIdentifier)); + TransientPropertyData.createPropertyData(versionHistory, Constants.JCR_UUID, PropertyType.STRING, false, + new TransientValueData(versionHistoryIdentifier)); // jcr:versionableUuid - TransientPropertyData vhVersionableUuid = TransientPropertyData - // [PN] 10.04.07 VERSIONABLEUUID isn't referenceable!!! - .createPropertyData(versionHistory, Constants.JCR_VERSIONABLEUUID, PropertyType.STRING, false); - vhVersionableUuid.setValue(new TransientValueData(new Identifier(versionable.getIdentifier()))); + TransientPropertyData vhVersionableUuid = + TransientPropertyData + // [PN] 10.04.07 VERSIONABLEUUID isn't referenceable!!! + .createPropertyData(versionHistory, Constants.JCR_VERSIONABLEUUID, PropertyType.STRING, false, + new TransientValueData(new Identifier(versionable.getIdentifier()))); // ------ jcr:versionLabels ------ NodeData vhVersionLabels = @@ -281,8 +282,8 @@ // jcr:primaryType TransientPropertyData vlPrimaryType = - TransientPropertyData.createPropertyData(vhVersionLabels, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - vlPrimaryType.setValue(new TransientValueData(vhVersionLabels.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(vhVersionLabels, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(vhVersionLabels.getPrimaryTypeName())); // ------ jcr:rootVersion ------ NodeData rootVersionData = @@ -291,47 +292,43 @@ // jcr:primaryType TransientPropertyData rvPrimaryType = - TransientPropertyData.createPropertyData(rootVersionData, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - rvPrimaryType.setValue(new TransientValueData(rootVersionData.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(rootVersionData, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(rootVersionData.getPrimaryTypeName())); // jcr:uuid TransientPropertyData rvUuid = - TransientPropertyData.createPropertyData(rootVersionData, Constants.JCR_UUID, PropertyType.STRING, false); - rvUuid.setValue(new TransientValueData(baseVersionIdentifier)); + TransientPropertyData.createPropertyData(rootVersionData, Constants.JCR_UUID, PropertyType.STRING, false, + new TransientValueData(baseVersionIdentifier)); // jcr:mixinTypes TransientPropertyData rvMixinTypes = - TransientPropertyData.createPropertyData(rootVersionData, Constants.JCR_MIXINTYPES, PropertyType.NAME, true); - rvMixinTypes.setValue(new TransientValueData(Constants.MIX_REFERENCEABLE)); + TransientPropertyData.createPropertyData(rootVersionData, Constants.JCR_MIXINTYPES, PropertyType.NAME, true, + new TransientValueData(Constants.MIX_REFERENCEABLE)); // jcr:created - TransientPropertyData rvCreated = - TransientPropertyData.createPropertyData(rootVersionData, Constants.JCR_CREATED, PropertyType.DATE, false); - // TODO Current time source was // rvCreated.setValue(new // TransientValueData(dataManager.getTransactManager().getStorageDataManager // ().getCurrentTime())); - rvCreated.setValue(new TransientValueData(Calendar.getInstance())); + TransientPropertyData rvCreated = + TransientPropertyData.createPropertyData(rootVersionData, Constants.JCR_CREATED, PropertyType.DATE, false, + new TransientValueData(Calendar.getInstance())); // ----- VERSIONABLE properties ----- // jcr:versionHistory TransientPropertyData vh = TransientPropertyData.createPropertyData(versionable, Constants.JCR_VERSIONHISTORY, PropertyType.REFERENCE, - false); - vh.setValue(new TransientValueData(new Identifier(versionHistoryIdentifier))); + false, new TransientValueData(new Identifier(versionHistoryIdentifier))); // jcr:baseVersion TransientPropertyData bv = - TransientPropertyData - .createPropertyData(versionable, Constants.JCR_BASEVERSION, PropertyType.REFERENCE, false); - bv.setValue(new TransientValueData(new Identifier(baseVersionIdentifier))); + TransientPropertyData.createPropertyData(versionable, Constants.JCR_BASEVERSION, PropertyType.REFERENCE, + false, new TransientValueData(new Identifier(baseVersionIdentifier))); // jcr:predecessors TransientPropertyData pd = - TransientPropertyData - .createPropertyData(versionable, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, true); - pd.setValue(new TransientValueData(new Identifier(baseVersionIdentifier))); + TransientPropertyData.createPropertyData(versionable, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, + true, new TransientValueData(new Identifier(baseVersionIdentifier))); // update all QPath vpath = versionable.getQPath(); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-12-08 08:46:54 UTC (rev 939) @@ -600,16 +600,17 @@ throw new RepositoryException(e); } } - + /** * {@inheritDoc} */ - public int getChildNodesCount(NodeData parent) throws RepositoryException { + public int getChildNodesCount(NodeData parent) throws RepositoryException + { checkIfOpened(); try { ResultSet count = findChildNodesCountByParentIdentifier(getInternalId(parent.getIdentifier())); - if (count.next()) + if (count.next()) { return count.getInt(1); } @@ -622,7 +623,7 @@ { throw new RepositoryException(e); } - } + } /** * {@inheritDoc} @@ -1198,9 +1199,9 @@ QPath qpath = QPath.makeChildPath(parentPath == null ? traverseQPath(cpid) : parentPath, qname); PersistedPropertyData pdata = - new PersistedPropertyData(getIdentifier(cid), qpath, getIdentifier(cpid), cversion, cptype, cpmultivalued); + new PersistedPropertyData(getIdentifier(cid), qpath, getIdentifier(cpid), cversion, cptype, cpmultivalued, + new ArrayList<ValueData>()); - pdata.setValues(new ArrayList<ValueData>()); return pdata; } catch (InvalidItemStateException e) @@ -1606,10 +1607,11 @@ QPath qpath = QPath.makeChildPath(parentPath == null ? traverseQPath(cpid) : parentPath, InternalQName.parse(cname)); + String identifier = getIdentifier(cid); + List<ValueData> values = readValues(cid, identifier, cversion); PersistedPropertyData pdata = - new PersistedPropertyData(getIdentifier(cid), qpath, getIdentifier(cpid), cversion, cptype, cpmultivalued); + new PersistedPropertyData(identifier, qpath, getIdentifier(cpid), cversion, cptype, cpmultivalued, values); - pdata.setValues(readValues(cid, pdata)); return pdata; } catch (IllegalNameException e) @@ -1687,7 +1689,7 @@ * @throws ValueStorageNotFoundException * if no such storage found with Value storageId */ - private List<ValueData> readValues(String cid, PropertyData pdata) throws IOException, SQLException, + private List<ValueData> readValues(String cid, String identifier, int cversion) throws IOException, SQLException, ValueStorageNotFoundException { @@ -1701,8 +1703,8 @@ final int orderNum = valueRecords.getInt(COLUMN_VORDERNUM); final String storageId = valueRecords.getString(COLUMN_VSTORAGE_DESC); ValueData vdata = - valueRecords.wasNull() ? readValueData(cid, orderNum, pdata.getPersistedVersion(), valueRecords - .getBinaryStream(COLUMN_VDATA)) : readValueData(pdata, orderNum, storageId); + valueRecords.wasNull() ? readValueData(cid, orderNum, cversion, valueRecords + .getBinaryStream(COLUMN_VDATA)) : readValueData(identifier, orderNum, storageId); data.add(vdata); } } @@ -1731,13 +1733,13 @@ * @throws ValueStorageNotFoundException * if no such storage found with Value storageId */ - protected ValueData readValueData(PropertyData pdata, int orderNumber, String storageId) throws SQLException, + protected ValueData readValueData(String identifier, int orderNumber, String storageId) throws SQLException, IOException, ValueStorageNotFoundException { ValueIOChannel channel = valueStorageProvider.getChannel(storageId); try { - return channel.read(pdata.getIdentifier(), orderNumber, maxBufferSize); + return channel.read(identifier, orderNumber, maxBufferSize); } finally { @@ -1894,7 +1896,7 @@ protected abstract ResultSet findItemByName(String parentId, String name, int index) throws SQLException; protected abstract ResultSet findChildNodesByParentIdentifier(String parentIdentifier) throws SQLException; - + protected abstract ResultSet findChildNodesCountByParentIdentifier(String parentIdentifier) throws SQLException; protected abstract ResultSet findChildPropertiesByParentIdentifier(String parentIdentifier) throws SQLException; Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java 2009-12-08 08:46:54 UTC (rev 939) @@ -24,6 +24,7 @@ import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl; import org.exoplatform.services.jcr.datamodel.Identifier; import org.exoplatform.services.jcr.datamodel.NodeData; +import org.exoplatform.services.jcr.datamodel.ValueData; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.core.PropertyImpl; @@ -37,6 +38,8 @@ import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; @@ -134,23 +137,22 @@ // jcr:versionHistory TransientPropertyData vh = TransientPropertyData.createPropertyData(versionable, Constants.JCR_VERSIONHISTORY, PropertyType.REFERENCE, - false); - vh.setValue(new TransientValueData(new Identifier(versionHistory))); + false, new TransientValueData(new Identifier(versionHistory))); // jcr:baseVersion TransientPropertyData bv = - TransientPropertyData - .createPropertyData(versionable, Constants.JCR_BASEVERSION, PropertyType.REFERENCE, false); - bv.setValue(new TransientValueData(new Identifier(baseVersionUuid))); + TransientPropertyData.createPropertyData(versionable, Constants.JCR_BASEVERSION, PropertyType.REFERENCE, + false, new TransientValueData(new Identifier(baseVersionUuid))); // jcr:predecessors - TransientPropertyData pd = - TransientPropertyData - .createPropertyData(versionable, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, true); + List<ValueData> values = new ArrayList<ValueData>(); for (int i = 0; i < predecessors.length; i++) { - pd.setValue(new TransientValueData(new Identifier(predecessors[i]))); + values.add(new TransientValueData(new Identifier(predecessors[i]))); } + TransientPropertyData pd = + TransientPropertyData.createPropertyData(versionable, Constants.JCR_PREDECESSORS, PropertyType.REFERENCE, + true, values); PlainChangesLog changesLog = new PlainChangesLogImpl(); RemoveVisitor rv = new RemoveVisitor(); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewCollision.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewCollision.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewCollision.java 2009-12-08 08:46:54 UTC (rev 939) @@ -119,8 +119,8 @@ "nodeWithPredefUuid"), Constants.NT_UNSTRUCTURED, "id_uuidNode1"); changesLog.add(ItemState.createAddedState(testNodeData)); TransientPropertyData primaryType = - TransientPropertyData.createPropertyData(testNodeData, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - primaryType.setValue(new TransientValueData(testNodeData.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(testNodeData, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(testNodeData.getPrimaryTypeName())); changesLog.add(ItemState.createAddedState(primaryType)); session.getTransientNodesManager().getTransactManager().save(changesLog); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSessionDataManager.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSessionDataManager.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSessionDataManager.java 2009-12-08 08:46:54 UTC (rev 939) @@ -70,8 +70,7 @@ testRoot = (NodeImpl)modificationManager.update(ItemState.createAddedState(data), false); TransientPropertyData prop = TransientPropertyData.createPropertyData(data, new InternalQName(Constants.NS_JCR_URI, "primaryType"), - PropertyType.NAME, false); - prop.setValue(new TransientValueData(new InternalQName(Constants.NS_NT_URI, "unstructured"))); + PropertyType.NAME, false, new TransientValueData(new InternalQName(Constants.NS_NT_URI, "unstructured"))); PropertyImpl prop1 = (PropertyImpl)modificationManager.update(ItemState.createAddedState(prop), false); // System.out.println("Test root >>>>>> "+testRoot+" "+prop1); @@ -152,7 +151,6 @@ List<PropertyImpl> testProps = pool.getProperties(props); assertEquals(1, testProps.size()); assertEquals(prop1, testProps.get(0)); - prop.setValue(new TransientValueData(new InternalQName(Constants.NS_NT_URI, "unstructured"))); pool.remove(uuid); // in case for GC @@ -212,9 +210,7 @@ // ... add property to the node1 TransientPropertyData prop = TransientPropertyData.createPropertyData((NodeData)node1.getData(), new InternalQName(null, - "testSessionChangesLogP1"), PropertyType.STRING, false); - TransientValueData vData = new TransientValueData(false); - prop.setValue(vData); + "testSessionChangesLogP1"), PropertyType.STRING, false, new TransientValueData(false)); PropertyImpl prop1 = (PropertyImpl)modificationManager.update(ItemState.createAddedState(prop), true); assertTrue(changesLog.getItemState(node1.getInternalIdentifier()).isAdded()); @@ -247,9 +243,7 @@ // ... add property TransientPropertyData prop = TransientPropertyData.createPropertyData(parent, new InternalQName(null, "testReadMethodsP1"), - PropertyType.STRING, false); - TransientValueData vData = new TransientValueData(false); - prop.setValue(vData); + PropertyType.STRING, false, new TransientValueData(false)); PropertyImpl prop1 = (PropertyImpl)modificationManager.update(ItemState.createAddedState(prop), true); assertNotNull(modificationManager.getItemData(data.getQPath())); @@ -294,8 +288,7 @@ NodeImpl node1 = (NodeImpl)modificationManager.update(ItemState.createAddedState(data1), true); TransientPropertyData nt = TransientPropertyData.createPropertyData(data1, new InternalQName(Constants.NS_JCR_URI, "primaryType"), - PropertyType.NAME, false); - nt.setValue(new TransientValueData(new InternalQName(Constants.NS_NT_URI, "unstructured"))); + PropertyType.NAME, false, new TransientValueData(new InternalQName(Constants.NS_NT_URI, "unstructured"))); modificationManager.update(ItemState.createAddedState(nt), true); assertEquals(1, modificationManager.getChildPropertiesData(data1).size()); @@ -311,8 +304,7 @@ // ... add property TransientPropertyData prop = TransientPropertyData.createPropertyData(parent, new InternalQName(null, "testCommitAndRefreshP1"), - PropertyType.STRING, false); - prop.setValue(new TransientValueData("test")); + PropertyType.STRING, false, new TransientValueData("test")); modificationManager.update(ItemState.createAddedState(prop), true); assertEquals("test", ((PropertyImpl)modificationManager.getItem(prop.getQPath(), true)).getString()); } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestLinkedCacheMultithread.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestLinkedCacheMultithread.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestLinkedCacheMultithread.java 2009-12-08 08:46:54 UTC (rev 939) @@ -166,8 +166,7 @@ TransientPropertyData pd = new TransientPropertyData(QPath.makeChildPath(rndNode.getQPath(), InternalQName .parse("[]property-" + next)), IdGenerator.generate(), 1, PropertyType.STRING, rndNode - .getIdentifier(), false); - pd.setValue(new TransientValueData("prop data")); + .getIdentifier(), false, new TransientValueData("prop data")); cache.put(pd); } itemsProcessed++; @@ -347,8 +346,8 @@ { TransientPropertyData pd = new TransientPropertyData(QPath.makeChildPath(parent.getQPath(), InternalQName.parse("[]property-" + i)), - IdGenerator.generate(), 1, PropertyType.STRING, parent.getIdentifier(), false); - pd.setValue(new TransientValueData("prop data")); + IdGenerator.generate(), 1, PropertyType.STRING, parent.getIdentifier(), false, new TransientValueData( + "prop data")); props.add(pd); } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspaceStorageCacheBaseCase.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspaceStorageCacheBaseCase.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspaceStorageCacheBaseCase.java 2009-12-08 08:46:54 UTC (rev 939) @@ -192,95 +192,43 @@ private void initDataAsPersisted() { - propertyData11 = - new PersistedPropertyData(propertyUuid11, propertyPath11, nodeUuid1, 1, PropertyType.STRING, false); List<ValueData> stringData = new ArrayList<ValueData>(); stringData.add(new ByteArrayPersistedValueData("property data 1".getBytes(), 0)); stringData.add(new ByteArrayPersistedValueData("property data 2".getBytes(), 1)); stringData.add(new ByteArrayPersistedValueData("property data 3".getBytes(), 2)); - try - { - ((PersistedPropertyData)propertyData11).setValues(stringData); - } - catch (RepositoryException e) - { - e.printStackTrace(); - fail(e.getMessage()); - } + propertyData11 = + new PersistedPropertyData(propertyUuid11, propertyPath11, nodeUuid1, 1, PropertyType.STRING, false, stringData); - propertyData12 = - new PersistedPropertyData(propertyUuid12, propertyPath12, nodeUuid1, 1, PropertyType.BINARY, false); List<ValueData> binData = new ArrayList<ValueData>(); binData.add(new ByteArrayPersistedValueData("property data bin 1".getBytes(), 0)); - try - { - ((PersistedPropertyData)propertyData12).setValues(binData); - } - catch (RepositoryException e) - { - e.printStackTrace(); - fail(e.getMessage()); - } + propertyData12 = + new PersistedPropertyData(propertyUuid12, propertyPath12, nodeUuid1, 1, PropertyType.BINARY, false, binData); - propertyData21 = - new PersistedPropertyData(propertyUuid21, propertyPath21, nodeUuid2, 1, PropertyType.STRING, true); List<ValueData> stringData1 = new ArrayList<ValueData>(); stringData1.add(new ByteArrayPersistedValueData("property data 1".getBytes(), 0)); stringData1.add(new ByteArrayPersistedValueData("property data 2".getBytes(), 1)); stringData1.add(new ByteArrayPersistedValueData("property data 3".getBytes(), 2)); - try - { - ((PersistedPropertyData)propertyData21).setValues(stringData1); - } - catch (RepositoryException e) - { - e.printStackTrace(); - fail(e.getMessage()); - } + propertyData21 = + new PersistedPropertyData(propertyUuid21, propertyPath21, nodeUuid2, 1, PropertyType.STRING, true, stringData); - propertyData22 = - new PersistedPropertyData(propertyUuid22, propertyPath22, nodeUuid2, 1, PropertyType.BOOLEAN, false); List<ValueData> booleanData = new ArrayList<ValueData>(); booleanData.add(new ByteArrayPersistedValueData("true".getBytes(), 0)); - try - { - ((PersistedPropertyData)propertyData22).setValues(booleanData); - } - catch (RepositoryException e) - { - e.printStackTrace(); - fail(e.getMessage()); - } + propertyData22 = + new PersistedPropertyData(propertyUuid22, propertyPath22, nodeUuid2, 1, PropertyType.BOOLEAN, false, + booleanData); - propertyData311 = - new PersistedPropertyData(propertyUuid311, propertyPath311, nodeUuid31, 1, PropertyType.LONG, false); List<ValueData> longData = new ArrayList<ValueData>(); longData.add(new ByteArrayPersistedValueData(new Long(123456).toString().getBytes(), 0)); - try - { - ((PersistedPropertyData)propertyData311).setValues(longData); - } - catch (RepositoryException e) - { - e.printStackTrace(); - fail(e.getMessage()); - } + propertyData311 = + new PersistedPropertyData(propertyUuid311, propertyPath311, nodeUuid31, 1, PropertyType.LONG, false, longData); - propertyData312 = - new PersistedPropertyData(propertyUuid312, propertyPath312, nodeUuid31, 1, PropertyType.REFERENCE, true); List<ValueData> refData = new ArrayList<ValueData>(); refData.add(new ByteArrayPersistedValueData(nodeUuid1.getBytes(), 0)); refData.add(new ByteArrayPersistedValueData(nodeUuid2.getBytes(), 1)); refData.add(new ByteArrayPersistedValueData(nodeUuid3.getBytes(), 2)); - try - { - ((PersistedPropertyData)propertyData312).setValues(refData); - } - catch (RepositoryException e) - { - e.printStackTrace(); - fail(e.getMessage()); - } + propertyData312 = + new PersistedPropertyData(propertyUuid312, propertyPath312, nodeUuid31, 1, PropertyType.REFERENCE, true, + refData); } public void testGetItem_Persisted() throws Exception Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java 2009-12-08 08:46:54 UTC (rev 939) @@ -205,8 +205,8 @@ // jcr:primaryType TransientPropertyData ndpt = - TransientPropertyData.createPropertyData(ndata, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false); - ndpt.setValue(new TransientValueData(ndata.getPrimaryTypeName())); + TransientPropertyData.createPropertyData(ndata, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, + new TransientValueData(ndata.getPrimaryTypeName())); slog.add(ItemState.createAddedState(ndata)); slog.add(ItemState.createAddedState(ndpt)); Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWDCTest.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWDCTest.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCWDCTest.java 2009-12-08 08:46:54 UTC (rev 939) @@ -163,11 +163,12 @@ NodeData node = new TransientNodeData(rootPath, Constants.ROOT_UUID, 1, nt, new InternalQName[0], 0, null, new AccessControlList()); + + ValueData vd = new TransientValueData(Constants.NT_UNSTRUCTURED.getAsString()); TransientPropertyData ntProp = new TransientPropertyData(QPath.makeChildPath(rootPath, Constants.JCR_PRIMARYTYPE), "1", 1, PropertyType.NAME, - Constants.ROOT_UUID, false); - ValueData vd = new TransientValueData(Constants.NT_UNSTRUCTURED.getAsString()); - ntProp.setValue(vd); + Constants.ROOT_UUID, false, vd); + conn.add(node); conn.add(ntProp); conn.commit(); @@ -176,5 +177,4 @@ // assertEquals("nt:unstructured", // locationFactory.createJCRName(root.getPrimaryTypeName()).getAsString()); } - } Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/StorageUpdateTest.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/StorageUpdateTest.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/StorageUpdateTest.java 2009-12-08 08:46:54 UTC (rev 939) @@ -137,11 +137,11 @@ // ============================================================= PropertyData jcrUuid = (PropertyData)((PropertyImpl)node_V.getProperty("jcr:uuid")).getData(); + // Set a uuid of source node in Workspace.copy() TransientPropertyData bugData = new TransientPropertyData(jcrUuid.getQPath(), jcrUuid.getIdentifier(), jcrUuid.getPersistedVersion(), jcrUuid - .getType(), jcrUuid.getParentIdentifier(), jcrUuid.isMultiValued()); - // Set a uuid of source node in Workspace.copy() - bugData.setValue(new TransientValueData(node_R.getProperty("jcr:uuid").getString())); + .getType(), jcrUuid.getParentIdentifier(), jcrUuid.isMultiValued(), new TransientValueData(node_R + .getProperty("jcr:uuid").getString())); WorkspaceStorageConnection conn = dataContainer.openConnection(); if (conn instanceof JDBCStorageConnection) Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java 2009-12-08 08:46:54 UTC (rev 939) @@ -270,8 +270,8 @@ versionableLog = new SessionChangesLog(session.getId()); // target node - versionable = TransientNodeData.createNodeData(testRoot, nodeName1, Constants.NT_UNSTRUCTURED, nodeUuid1); - ((TransientNodeData)versionable).setMixinTypeNames(mixVersionable); + versionable = + TransientNodeData.createNodeData(testRoot, nodeName1, Constants.NT_UNSTRUCTURED, mixVersionable, nodeUuid1); versionableLog.add(ItemState.createAddedState(versionable)); PropertyData vChildProperty1 = Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestRollbackBigFiles.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestRollbackBigFiles.java 2009-12-08 08:46:46 UTC (rev 938) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestRollbackBigFiles.java 2009-12-08 08:46:54 UTC (rev 939) @@ -80,14 +80,11 @@ // added big file property JCRPath propPath = session.getLocationFactory().parseRelPath("bigProp"); + File f = this.createBLOBTempFile(1024); TransientPropertyData newProperty = new TransientPropertyData(propPath.getInternalPath(), IdGenerator.generate(), -1, PropertyType.BINARY, newNode - .getIdentifier(), false); + .getIdentifier(), false, new TransientValueData(new FileInputStream(f))); - File f = this.createBLOBTempFile(1024); - TransientValueData value = new TransientValueData(new FileInputStream(f)); - newProperty.setValue(value); - list.add(new ItemState(newProperty, ItemState.ADDED, false, parent.getQPath())); // crate broken node; @@ -119,5 +116,4 @@ assertNull("Item should not be found", dm.getItemData(id)); } - }