[exo-jcr-commits] exo-jcr SVN: r4978 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/backup and 10 other directories.

Author: tolusha Date: 2011-09-26 07:49:40 -0400 (Mon, 26 Sep 2011) New Revision: 4978 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLog.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.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/SessionDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.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/core/version/VersionHistoryImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.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/dataflow/session/SessionChangesLog.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestSessionsObservation.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestJCRVSReadWrite.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java Log: EXOJCR-1562: rever changes Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLog.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLog.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLog.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -22,8 +22,6 @@ import java.util.List; -import javax.jcr.Session; - /** * Created by The eXo Platform SAS.<br/> Plain changes log implementation (i.e. no nested logs * inside) @@ -35,12 +33,12 @@ { /** - * Return Session Id. + * Return Sesion Id. * * @return sessionId of a session produced this changes log */ String getSessionId(); - + /** * Return pair Id of system and non-system logs. * @@ -69,11 +67,4 @@ * @param states List of ItemState */ PlainChangesLog addAll(List<ItemState> states); - - /** - * Return Session instance if any. - * - * @return Session instance if any. - */ - Session getSession(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PlainChangesLogImpl.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -27,8 +27,6 @@ import java.util.ArrayList; import java.util.List; -import javax.jcr.Session; - /** * Created by The eXo Platform SAS. * @@ -39,7 +37,7 @@ public class PlainChangesLogImpl implements Externalizable, PlainChangesLog { private static final int NULL_VALUE = -1; - + private static final int NOT_NULL_VALUE = 1; private static final long serialVersionUID = 5624550860372364084L; @@ -55,8 +53,6 @@ */ protected String pairId = null; - protected Session session = null; - /** * Full qualified constructor. * @@ -65,13 +61,12 @@ * @param eventType int * @param pairId String */ - public PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType, String pairId, Session session) + public PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType, String pairId) { this.items = items; this.sessionId = sessionId; this.eventType = eventType; this.pairId = pairId; - this.session = session; } /** @@ -81,21 +76,11 @@ * @param sessionId String * @param eventType int */ - public PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType, Session session) - { - this(items, sessionId, eventType, null, session); - } - - /** - * Constructor. - * - * @param items List of ItemState - * @param sessionId String - * @param eventType int - */ public PlainChangesLogImpl(List<ItemState> items, String sessionId, int eventType) { - this(items, sessionId, eventType, (Session)null); + this.items = items; + this.sessionId = sessionId; + this.eventType = eventType; } /** @@ -104,9 +89,9 @@ * @param items List of ItemState * @param sessionId String */ - public PlainChangesLogImpl(List<ItemState> items, String sessionId, Session session) + public PlainChangesLogImpl(List<ItemState> items, String sessionId) { - this(items, sessionId, -1, session); + this(items, sessionId, -1); } /** @@ -114,19 +99,9 @@ * * @param sessionId String */ - public PlainChangesLogImpl(String sessionId, Session session) - { - this(new ArrayList<ItemState>(), sessionId, session); - } - - /** - * An empty log. - * - * @param sessionId String - */ public PlainChangesLogImpl(String sessionId) { - this(new ArrayList<ItemState>(), sessionId, (Session)null); + this(new ArrayList<ItemState>(), sessionId); } /** @@ -134,7 +109,7 @@ */ public PlainChangesLogImpl() { - this(new ArrayList<ItemState>(), null, null); + this(new ArrayList<ItemState>(), null); } /* @@ -221,25 +196,15 @@ return pairId; } - /** - * {@inheritDoc} - */ - public Session getSession() - { - return session; - } - public String dump() { String str = "ChangesLog: \n"; for (int i = 0; i < items.size(); i++) - { str += " " + ItemState.nameFromValue(items.get(i).getState()) + "\t" + items.get(i).getData().getIdentifier() + "\t" + "isPersisted=" + items.get(i).isPersisted() + "\t" + "isEventFire=" + items.get(i).isEventFire() + "\t" + "isInternallyCreated=" + items.get(i).isInternallyCreated() + "\t" + items.get(i).getData().getQPath().getAsString() + "\n"; - } return str; } @@ -262,7 +227,7 @@ out.writeObject(items.get(i)); } - if (pairId != null) + if (pairId != null) { out.writeInt(NOT_NULL_VALUE); buff = pairId.getBytes(Constants.DEFAULT_ENCODING); @@ -288,7 +253,7 @@ { add((ItemState)in.readObject()); } - + if (in.readInt() == NOT_NULL_VALUE) { buf = new byte[in.readInt()]; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/JCRRestore.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -171,9 +171,7 @@ while (cli.hasNextLog()) { if (cli.nextLog().getEventType() == ExtendedEvent.LOCK) - { cli.removeLog(); - } } saveChangesLog(changesLog); @@ -196,30 +194,22 @@ TransactionChangesLog normalizeChangesLog = getNormalizedChangesLog(e.getIdentifier(), e.getState(), changesLog); if (normalizeChangesLog != null) - { saveChangesLog(normalizeChangesLog); - } else - { throw new RepositoryException( "Collisions found during save of restore changes log, but caused item is not found by ID " + e.getIdentifier() + ". " + e, e); - } } catch (JCRItemExistsException e) { TransactionChangesLog normalizeChangesLog = getNormalizedChangesLog(e.getIdentifier(), e.getState(), changesLog); if (normalizeChangesLog != null) - { saveChangesLog(normalizeChangesLog); - } else - { throw new RepositoryException( "Collisions found during save of restore changes log, but caused item is not found by ID " + e.getIdentifier() + ". " + e, e); - } } } @@ -249,9 +239,7 @@ // Node... by ID and desc path if (!item.getIdentifier().equals(collisionID) && !item.getQPath().isDescendantOf(citem.getData().getQPath())) - { normalized.add(change); - } } else if (!item.getIdentifier().equals(collisionID)) { @@ -260,13 +248,11 @@ } } else - { // another state normalized.add(change); - } } - PlainChangesLog plog = new PlainChangesLogImpl(normalized, next.getSessionId(), next.getEventType(), next.getSession()); + PlainChangesLog plog = new PlainChangesLogImpl(normalized, next.getSessionId(), next.getEventType()); result.addLog(plog); } @@ -407,9 +393,7 @@ } for (int i = 0; i < listFile.size(); i++) - { fileCleaner.addFile(listFile.get(i)); - } } } @@ -443,13 +427,9 @@ { boolean b = true; if (fs.getItemSateId() != this.getItemSateId()) - { b = false; - } if (fs.getValueDataId() != this.getValueDataId()) - { b = false; - } return b; } 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-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -413,7 +413,7 @@ checkValid(); - PlainChangesLog changesLog = new PlainChangesLogImpl(session.getId(), session); + PlainChangesLog changesLog = new PlainChangesLogImpl(session.getId()); removeMergeFailed(version, changesLog); @@ -497,7 +497,7 @@ // the new version identifier String verIdentifier = IdGenerator.generate(); - SessionChangesLog changesLog = new SessionChangesLog(session); + SessionChangesLog changesLog = new SessionChangesLog(session.getId()); VersionHistoryImpl vh = versionHistory(false); vh.addVersion(this.nodeData(), verIdentifier, changesLog); @@ -550,7 +550,7 @@ return; } - SessionChangesLog changesLog = new SessionChangesLog(session); + SessionChangesLog changesLog = new SessionChangesLog(session.getId()); changesLog.add(ItemState.createUpdatedState(updatePropertyData(Constants.JCR_ISCHECKEDOUT, new TransientValueData(true)))); @@ -711,7 +711,7 @@ + session.getUserID() + " item owner " + getACL().getOwner()); } - PlainChangesLog changesLog = new PlainChangesLogImpl(session.getId(), session); + PlainChangesLog changesLog = new PlainChangesLogImpl(session.getId()); VersionImpl base = (VersionImpl)getBaseVersion(); base.addPredecessor(version.getUUID(), changesLog); @@ -1701,7 +1701,7 @@ Lock newLock = session.getLockManager().addLock(this, isDeep, isSessionScoped, -1); PlainChangesLog changesLog = - new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK, session); + new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK); PropertyData propData = TransientPropertyData.createPropertyData(nodeData(), Constants.JCR_LOCKOWNER, PropertyType.STRING, false, @@ -1750,7 +1750,7 @@ Lock newLock = session.getLockManager().addLock(this, isDeep, false, timeOut); PlainChangesLog changesLog = - new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK, session); + new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK); PropertyData propData = TransientPropertyData.createPropertyData(nodeData(), Constants.JCR_LOCKOWNER, PropertyType.STRING, false, @@ -2511,7 +2511,7 @@ throw new LockException("Node " + getPath() + " is locked "); } - SessionChangesLog changes = new SessionChangesLog(session); + SessionChangesLog changes = new SessionChangesLog(session.getId()); String srcPath; try @@ -2842,7 +2842,7 @@ { PlainChangesLog changesLog = - new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.UNLOCK, session); + new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.UNLOCK); ItemData lockOwner = dataManager.getItemData(nodeData(), new QPathEntry(Constants.JCR_LOCKOWNER, 0), ItemType.PROPERTY); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -107,7 +107,7 @@ public SessionDataManager(SessionImpl session, LocalWorkspaceDataManagerStub dataManager) throws RepositoryException { this.session = session; - this.changesLog = new SessionChangesLog(session); + this.changesLog = new SessionChangesLog(session.getId()); this.itemsPool = new ItemReferencePool(); this.itemFactory = new SessionItemFactory(); this.accessManager = session.getAccessManager(); @@ -2034,7 +2034,7 @@ // remove from changes log (Session pending changes) PlainChangesLog slog = changesLog.pushLog(item.getQPath()); - SessionChangesLog changes = new SessionChangesLog(slog.getAllStates(), session); + SessionChangesLog changes = new SessionChangesLog(slog.getAllStates(), session.getId()); String exceptions = ""; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/WorkspaceImpl.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -127,7 +127,7 @@ { session.checkLive(); - SessionChangesLog changes = new SessionChangesLog(session); + SessionChangesLog changes = new SessionChangesLog(session.getId()); clone(srcWorkspace, srcAbsPath, destAbsPath, removeExisting, changes); @@ -214,7 +214,7 @@ srcNode.getData().accept(initializer); - PlainChangesLogImpl changesLog = new PlainChangesLogImpl(initializer.getItemAddStates(), session.getId(), session); + PlainChangesLogImpl changesLog = new PlainChangesLogImpl(initializer.getItemAddStates(), session.getId()); session.getTransientNodesManager().getTransactManager().save(changesLog); } @@ -466,7 +466,7 @@ (NodeData)srcParentNode.getData(), nodeTypeManager, session.getTransientNodesManager(), true); srcNode.getData().accept(initializer); - PlainChangesLog changes = new PlainChangesLogImpl(session.getId(), session); + PlainChangesLog changes = new PlainChangesLogImpl(session.getId()); changes.addAll(initializer.getAllStates()); // reload items pool @@ -590,7 +590,7 @@ List<VersionImpl> notExistedVersions = new ArrayList<VersionImpl>(); TransactionableDataManager dataManager = session.getTransientNodesManager().getTransactManager(); - SessionChangesLog changesLog = new SessionChangesLog(session); + SessionChangesLog changesLog = new SessionChangesLog(session.getId()); for (Version v : versions) { String versionableIdentifier = v.getContainingHistory().getVersionableUUID(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -93,14 +93,8 @@ String sessionId = subLog.getSessionId(); SessionImpl userSession = sessionRegistry.getSession(sessionId); - // try to get session from changesLog - if (userSession == null) - { - userSession = (SessionImpl)subLog.getSession(); - } if (userSession != null) - { for (ItemState itemState : subLog.getAllStates()) { if (itemState.isEventFire()) @@ -129,7 +123,6 @@ } } } - } } if (events.getSize() > 0) { @@ -149,18 +142,14 @@ private boolean isSessionMatch(ListenerCriteria criteria, String sessionId) { if (criteria.getNoLocal() && criteria.getSessionId().equals(sessionId)) - { return false; - } return true; } private boolean isPathMatch(ListenerCriteria criteria, ItemData item, SessionImpl userSession) { if (criteria.getAbsPath() == null) - { return true; - } try { QPath cLoc = userSession.getLocationFactory().parseAbsPath(criteria.getAbsPath()).getInternalPath(); @@ -182,21 +171,15 @@ { if (criteria.getIdentifier() == null) - { return true; - } // assotiated parent is node itself for node and parent for property ???? for (int i = 0; i < criteria.getIdentifier().length; i++) { if (item.isNode() && criteria.getIdentifier()[i].equals(item.getIdentifier())) - { return true; - } else if (!item.isNode() && criteria.getIdentifier()[i].equals(item.getParentIdentifier())) - { return true; - } } return false; @@ -206,9 +189,7 @@ PlainChangesLog changesLog) throws RepositoryException { if (criteria.getNodeTypeName() == null) - { return true; - } NodeData node = (NodeData)workspaceDataManager.getItemData(item.getParentIdentifier()); if (node == null) @@ -250,9 +231,7 @@ testQNames[0] = node.getPrimaryTypeName(); } if (ntManager.isNodeType(criteriaNT.getName(), testQNames)) - { return true; - } } return false; } @@ -263,40 +242,24 @@ if (state.getData().isNode()) { if (state.isAdded() || state.isRenamed() || state.isUpdated()) - { return Event.NODE_ADDED; - } else if (state.isDeleted()) - { return Event.NODE_REMOVED; - } else if (state.isUpdated()) - { return SKIP_EVENT; - } else if (state.isUnchanged()) - { return SKIP_EVENT; - } } else { // property if (state.isAdded()) - { return Event.PROPERTY_ADDED; - } else if (state.isDeleted()) - { return Event.PROPERTY_REMOVED; - } else if (state.isUpdated()) - { return Event.PROPERTY_CHANGED; - } else if (state.isUnchanged()) - { return SKIP_EVENT; - } } throw new RepositoryException("Unexpected ItemState for Node " + ItemState.nameFromValue(state.getState()) + " " + state.getData().getQPath().getAsString()); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataMergeVisitor.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -174,7 +174,7 @@ this.bestEffort = bestEffort; this.failed = failed; - this.changes = new SessionChangesLog(mergeSession); + this.changes = new SessionChangesLog(mergeSession.getId()); } @Override @@ -530,7 +530,6 @@ ItemType.PROPERTY); if (predecessorsProperty != null) - { for (ValueData pv : predecessorsProperty.getValues()) { try @@ -538,9 +537,7 @@ String pidentifier = new String(pv.getAsByteArray()); if (pidentifier.equals(corrVersion.getIdentifier())) - { return true; // got it - } // search in predecessors of the predecessor NodeData predecessor = (NodeData)mergeDataManager.getItemData(pidentifier); @@ -563,7 +560,6 @@ } } // else it's a root version - } return false; } @@ -580,7 +576,6 @@ ItemType.PROPERTY); if (successorsProperty != null) - { for (ValueData sv : successorsProperty.getValues()) { try @@ -588,9 +583,7 @@ String sidentifier = new String(sv.getAsByteArray()); if (sidentifier.equals(corrVersion.getIdentifier())) - { return true; // got it - } // search in successors of the successor NodeData successor = (NodeData)mergeDataManager.getItemData(sidentifier); @@ -613,7 +606,6 @@ } } // else it's a end of version graph node - } return false; } 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-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -204,8 +204,8 @@ parent.getPrimaryTypeName(), parent.getMixinTypeNames()).getOnParentVersion(); if (onParentVersion == OnParentVersionAction.VERSION - && nodeTypeDataManager.isNodeType(Constants.MIX_VERSIONABLE, node.getPrimaryTypeName(), node - .getMixinTypeNames())) + && nodeTypeDataManager.isNodeType(Constants.MIX_VERSIONABLE, node.getPrimaryTypeName(), + node.getMixinTypeNames())) { remainedNode = node.getQPath(); @@ -240,8 +240,8 @@ } ItemState state = - new ItemState(node, ItemState.DELETED, true, ancestorToSave != null ? ancestorToSave : removedRoot - .getQPath()); + new ItemState(node, ItemState.DELETED, true, ancestorToSave != null ? ancestorToSave + : removedRoot.getQPath()); itemRemovedStates.add(state); } @@ -282,7 +282,7 @@ super(userSession.getTransientNodesManager().getTransactManager()); this.userSession = userSession; - this.changes = new SessionChangesLog(userSession); + this.changes = new SessionChangesLog(userSession.getId()); this.context = context; this.destName = destName; this.history = history; @@ -309,9 +309,7 @@ for (ItemState state : delegatedChanges.getAllStates()) { if (state.getData().getIdentifier().equals(identifier)) - { return state.getData(); - } } } @@ -325,9 +323,7 @@ for (ItemState state : delegatedChanges.getAllStates()) { if (state.getData().getQPath().equals(path)) - { return state.getData(); - } } } @@ -342,9 +338,7 @@ for (ItemState state : delegatedChanges.getAllStates()) { if (state.getData().getQPath().equals(path) || state.getData().getQPath().isDescendantOf(path)) - { removed.add(state); - } } for (ItemState state : removed) @@ -361,9 +355,7 @@ QPath nodePath = QPath.makeChildPath(parentData.getQPath(), name); if (log.isDebugEnabled()) - { log.debug("Restore: " + nodePath.getAsString() + ", removeExisting=" + removeExisting); - } PropertyData frozenIdentifier = (PropertyData)dataManager.getItemData(frozen, new QPathEntry(Constants.JCR_FROZENUUID, 1), ItemType.PROPERTY); @@ -391,13 +383,11 @@ // parent sameIdentifierPath.getName().equals(nodePath.getName())) { // same - // name + // name if (sameIdentifierPath.getIndex() != nodePath.getIndex()) - { // but different index, see below... fix it nodePath = QPath.makeChildPath(parentData.getQPath(), name, sameIdentifierPath.getIndex()); - } // if it's a target node existing = sameIdentifierNode; @@ -616,9 +606,7 @@ NodeData cHistory = null; if ((cHistory = (NodeData)dataManager.getItemData(vhIdentifier)) == null) - { throw new RepositoryException("Version history is not found with uuid " + vhIdentifier); - } childHistory = new VersionHistoryDataHelper(cHistory, dataManager, nodeTypeDataManager); } @@ -689,7 +677,8 @@ int action = nodeTypeDataManager.getChildNodeDefinition(qname, frozen.getPrimaryTypeName(), - currentNode().getPrimaryTypeName(), currentNode().getMixinTypeNames()).getOnParentVersion(); + currentNode().getPrimaryTypeName(), + currentNode().getMixinTypeNames()).getOnParentVersion(); if (log.isDebugEnabled()) { @@ -706,8 +695,8 @@ // jcr:uuid String jcrUuid = null; NodeData existing = null; - if (nodeTypeDataManager.isNodeType(Constants.MIX_REFERENCEABLE, frozen.getPrimaryTypeName(), frozen - .getMixinTypeNames())) + if (nodeTypeDataManager.isNodeType(Constants.MIX_REFERENCEABLE, frozen.getPrimaryTypeName(), + frozen.getMixinTypeNames())) { // copy uuid from frozen state of mix:referenceable, // NOTE: mix:referenceable stored in frozen state with genereted ID @@ -783,12 +772,12 @@ AccessControlList acl = currentNode().getACL(); boolean isPrivilegeable = - nodeTypeDataManager.isNodeType(Constants.EXO_PRIVILEGEABLE, frozen.getPrimaryTypeName(), frozen - .getMixinTypeNames()); + nodeTypeDataManager.isNodeType(Constants.EXO_PRIVILEGEABLE, frozen.getPrimaryTypeName(), + frozen.getMixinTypeNames()); boolean isOwneable = - nodeTypeDataManager.isNodeType(Constants.EXO_OWNEABLE, frozen.getPrimaryTypeName(), frozen - .getMixinTypeNames()); + nodeTypeDataManager.isNodeType(Constants.EXO_OWNEABLE, frozen.getPrimaryTypeName(), + frozen.getMixinTypeNames()); if (isPrivilegeable || isOwneable) { @@ -827,8 +816,8 @@ { // copy existed - i.e. left unchanged ItemDataCopyVisitor copyVisitor = - new ItemDataCopyVisitor(currentNode(), frozen.getQPath().getName(), nodeTypeDataManager, userSession - .getTransientNodesManager(), userSession.getTransientNodesManager(), true); + new ItemDataCopyVisitor(currentNode(), frozen.getQPath().getName(), nodeTypeDataManager, + userSession.getTransientNodesManager(), userSession.getTransientNodesManager(), true); existed.accept(copyVisitor); changes.addAll(copyVisitor.getItemAddStates()); } // else - nothing to do, i.e. left unchanged @@ -850,7 +839,6 @@ InternalQName qname = property.getQPath().getName(); if (nodeTypeDataManager.isNodeType(Constants.NT_FROZENNODE, frozenParent.getPrimaryTypeName())) - { if (qname.equals(Constants.JCR_FROZENPRIMARYTYPE)) { qname = Constants.JCR_PRIMARYTYPE; @@ -869,11 +857,11 @@ // skip these props, as they are a nt:frozenNode special props return; } - } int action = - nodeTypeDataManager.getPropertyDefinitions(qname, currentNode().getPrimaryTypeName(), - currentNode().getMixinTypeNames()).getAnyDefinition().getOnParentVersion(); + nodeTypeDataManager + .getPropertyDefinitions(qname, currentNode().getPrimaryTypeName(), currentNode().getMixinTypeNames()) + .getAnyDefinition().getOnParentVersion(); if (log.isDebugEnabled()) { @@ -890,14 +878,14 @@ if (qname.equals(Constants.JCR_PREDECESSORS)) { tagetProperty = - TransientPropertyData.createPropertyData(currentNode(), qname, property.getType(), property - .isMultiValued(), new ArrayList<ValueData>()); + TransientPropertyData.createPropertyData(currentNode(), qname, property.getType(), + property.isMultiValued(), new ArrayList<ValueData>()); } else { tagetProperty = - TransientPropertyData.createPropertyData(currentNode(), qname, property.getType(), property - .isMultiValued(), copyValues(property)); + TransientPropertyData.createPropertyData(currentNode(), qname, property.getType(), + property.isMultiValued(), copyValues(property)); } changes.add(ItemState.createAddedState(tagetProperty)); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionHistoryImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionHistoryImpl.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/VersionHistoryImpl.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -347,7 +347,7 @@ + refs.get(0).getQPath().getAsString()); } - PlainChangesLog changes = new PlainChangesLogImpl(session.getId(), session); + PlainChangesLog changes = new PlainChangesLogImpl(session.getId()); // remove labels first try @@ -527,7 +527,7 @@ NodeData versionData = getVersionData(versionName); - SessionChangesLog changesLog = new SessionChangesLog(session); + SessionChangesLog changesLog = new SessionChangesLog(session.getId()); PropertyData labelData = TransientPropertyData.createPropertyData(labels, labelQName, PropertyType.REFERENCE, false, @@ -553,7 +553,7 @@ if (vldata != null) { - PlainChangesLog changes = new PlainChangesLogImpl(session.getId(), session); + PlainChangesLog changes = new PlainChangesLogImpl(session.getId()); changes.add(ItemState.createDeletedState(vldata)); dataManager.getTransactManager().save(changes); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -145,8 +145,8 @@ * {@inheritDoc} */ @Override - public List<PropertyData> getChildPropertiesData(final NodeData nodeData, - final List<QPathEntryFilter> itemDataFilters) throws RepositoryException + public List<PropertyData> getChildPropertiesData(final NodeData nodeData, final List<QPathEntryFilter> itemDataFilters) + throws RepositoryException { if (isSystemDescendant(nodeData.getQPath()) && !this.equals(versionDataManager)) { @@ -286,20 +286,18 @@ final String pairId = IdGenerator.generate(); versionLogs.addLog(new PlainChangesLogImpl(vstates, changes.getSessionId(), changes.getEventType(), - pairId, changes.getSession())); + pairId)); nonVersionLogs.addLog(new PlainChangesLogImpl(nvstates, changes.getSessionId(), changes.getEventType(), - pairId, changes.getSession())); + pairId)); } else { - versionLogs.addLog(new PlainChangesLogImpl(vstates, changes.getSessionId(), changes.getEventType(), - changes.getSession())); + versionLogs.addLog(new PlainChangesLogImpl(vstates, changes.getSessionId(), changes.getEventType())); } } else if (nvstates.size() > 0) { - nonVersionLogs.addLog(new PlainChangesLogImpl(nvstates, changes.getSessionId(), changes.getEventType(), - changes.getSession())); + nonVersionLogs.addLog(new PlainChangesLogImpl(nvstates, changes.getSessionId(), changes.getEventType())); } } 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-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -420,7 +420,7 @@ // copy state PlainChangesLogImpl newLog = new PlainChangesLogImpl(new ArrayList<ItemState>(), changesLog.getSessionId(), changesLog.getEventType(), - changesLog.getPairId(), changesLog.getSession()); + changesLog.getPairId()); for (Iterator<ItemState> iter = changesLog.getAllStates().iterator(); iter.hasNext();) { 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-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/LocalWorkspaceStorageDataManagerProxy.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -95,8 +95,7 @@ .getAncestorToSave(), change.isInternallyCreated(), change.isPersisted(), change.getOldPath())); } - newLog.addLog(new PlainChangesLogImpl(states, changes.getSessionId(), changes.getEventType(), changes - .getSession())); + newLog.addLog(new PlainChangesLogImpl(states, changes.getSessionId(), changes.getEventType())); } storageDataManager.save(newLog); @@ -146,8 +145,7 @@ /** * {@inheritDoc} */ - public List<NodeData> getChildNodesData(NodeData parent, List<QPathEntryFilter> patternFilters) - throws RepositoryException + public List<NodeData> getChildNodesData(NodeData parent, List<QPathEntryFilter> patternFilters) throws RepositoryException { return copyNodes(storageDataManager.getChildNodesData(parent, patternFilters)); } @@ -168,7 +166,7 @@ { return storageDataManager.getLastOrderNumber(parent); } - + /** * {@inheritDoc} */ Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLog.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -28,7 +28,6 @@ import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.impl.Constants; -import org.exoplatform.services.jcr.impl.core.SessionImpl; import java.util.ArrayList; import java.util.Collection; @@ -36,8 +35,6 @@ import java.util.List; import java.util.Map; -import javax.jcr.Session; - /** * Created by The eXo Platform SAS.<br/> Responsible for managing session changes log. Relying on * fact that ItemData inside ItemState SHOULD be TransientItemData @@ -87,19 +84,9 @@ * * @param sessionId */ - public SessionChangesLog(Session session) - { - super(((SessionImpl)session).getId(), session); - } - - /** - * Create empty ChangesLog. - * - * @param sessionId - */ public SessionChangesLog(String sessionId) { - super(sessionId, null); + super(sessionId); } /** @@ -108,14 +95,14 @@ * @param items * @param sessionId */ - public SessionChangesLog(List<ItemState> items, Session session) + public SessionChangesLog(List<ItemState> items, String sessionId) { - super(items, ((SessionImpl)session).getId(), session); + super(items, sessionId); for (int i = 0, length = items.size(); i < length; i++) { ItemState change = items.get(i); addItem(change); - } + } } /** @@ -189,13 +176,9 @@ if (childInfo != null) { if (item.isDeleted()) - { ++childInfo[CHILD_NODES_COUNT_INDEX]; - } else if (item.isAdded()) - { --childInfo[CHILD_NODES_COUNT_INDEX]; - } childNodesInfo.put(item.getData().getParentIdentifier(), childInfo); } @@ -205,17 +188,13 @@ { Map<String, ItemState> children = lastChildNodeStates.get(item.getData().getParentIdentifier()); if (children != null) - { children.remove(item.getData().getIdentifier()); - } } else { Map<String, ItemState> children = lastChildPropertyStates.get(item.getData().getParentIdentifier()); if (children != null) - { children.remove(item.getData().getIdentifier()); - } } } } @@ -342,7 +321,7 @@ */ public PlainChangesLog pushLog(QPath rootPath) { - PlainChangesLog cLog = new PlainChangesLogImpl(sessionId, session); + PlainChangesLog cLog = new PlainChangesLogImpl(sessionId); if (rootPath.equals(Constants.ROOT_PATH)) { @@ -440,9 +419,7 @@ { ItemData item = items.get(i).getData(); if (item.getParentIdentifier().equals(rootIdentifier) || item.getIdentifier().equals(rootIdentifier)) - { list.add(items.get(i)); - } } return list; } @@ -498,15 +475,11 @@ { // the node if (items.get(i).isAdded()) - { // if a new item - no modify changes can be return new ArrayList<ItemState>(); - } if (!items.get(i).isDeleted()) - { changes.put(item.getIdentifier(), items.get(i)); - } } else if (item.getParentIdentifier().equals(rootData.getIdentifier())) { @@ -563,9 +536,7 @@ rename = state; delete = allStates.get(i - 1); // try the fresh delete state if (delete.getData().getIdentifier().equals(rename.getData().getIdentifier())) - { return new ItemState[]{delete, rename}; // 3. ok, got it - } } } @@ -621,9 +592,7 @@ } } else - { byState = true; - } if (byState && (isPersisted != null ? istate.isPersisted() == isPersisted : true) && ((orAncestor != null && orAncestor ? rootPath.isDescendantOf(istate.getData().getQPath()) : true) || rootPath @@ -670,9 +639,7 @@ } } else - { byState = true; - } if (byState && (isPersisted != null ? istate.isPersisted() == isPersisted : true) && istate.getData().getIdentifier().equals(id)) { @@ -720,9 +687,7 @@ { int[] childInfo = childNodesInfo.get(item.getData().getParentIdentifier()); if (childInfo == null) - { childInfo = new int[2]; - } if (item.isDeleted()) { @@ -788,34 +753,22 @@ public boolean equals(Object obj) { if (this == obj) - { return true; - } if (obj == null) - { return false; - } if (getClass() != obj.getClass()) - { return false; - } IDStateBasedKey other = (IDStateBasedKey)obj; if (identifier == null) { if (other.identifier != null) - { return false; - } } else if (!identifier.equals(other.identifier)) - { return false; - } if (state != other.state) - { return false; - } return true; } } @@ -889,55 +842,37 @@ public boolean equals(Object obj) { if (this == obj) - { return true; - } if (obj == null) - { return false; - } if (getClass() != obj.getClass()) - { return false; - } ParentIDQPathBasedKey other = (ParentIDQPathBasedKey)obj; if (name == null) { if (other.name != null) - { return false; - } } else if (!name.getName().equals(other.name.getName()) || !name.getNamespace().equals(other.name.getNamespace()) || name.getIndex() != other.name.getIndex()) - { return false; - } if (parentIdentifier == null) { if (other.parentIdentifier != null) - { return false; - } } else if (!parentIdentifier.equals(other.parentIdentifier)) - { return false; - } if (itemType == null) { if (other.itemType != null) - { return false; - } } else if (!itemType.equals(other.itemType)) - { return false; - } return true; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -129,7 +129,6 @@ this.currentWorkspaceName = currentWorkspaceName; this.tree = new Stack<NodeData>(); this.tree.push(parent); - // no session instance required this.changesLog = new PlainChangesLogImpl(SESSION_ID); this.ancestorToSave = ancestorToSave; this.isNeedReloadAncestorToSave = false; @@ -158,7 +157,6 @@ { String str = ""; for (int i = 0; i < changesLog.getAllStates().size(); i++) - { str += " " + ItemState.nameFromValue(changesLog.getAllStates().get(i).getState()) + "\t\t" + changesLog.getAllStates().get(i).getData().getIdentifier() + "\t" + "isPersisted=" @@ -166,7 +164,6 @@ + changesLog.getAllStates().get(i).isEventFire() + "\t" + "isInternallyCreated=" + changesLog.getAllStates().get(i).isInternallyCreated() + "\t" + changesLog.getAllStates().get(i).getData().getQPath().getAsString() + "\n"; - } log.debug(str); } if (isNeedReloadAncestorToSave) @@ -199,9 +196,7 @@ { int cur = ((NodeData)stateData).getOrderNumber(); if (cur > max) - { max = cur; - } } } return ++max; @@ -406,9 +401,7 @@ currentNodeInfo.setIsNewIdentifer(true); } if (uuidBehavior == ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING) - { currentNodeInfo.setParentIdentifer(getParent().getIdentifier()); - } } @@ -446,9 +439,7 @@ { ((ImportItemData)data).setParentIdentifer(identifier); if (reloadSNS) - { ((ImportItemData)data).setQPath(QPath.makeChildPath(newPath, data.getQPath().getName())); - } } @@ -574,9 +565,7 @@ { ItemState state = allStates.get(i); if (state.getData().getIdentifier().equals(identifer)) - { return state; - } } return null; } @@ -593,13 +582,9 @@ String id1 = data.getParentIdentifier(); String id2 = parent.getIdentifier(); if (id1 == id2) - { return true; - } if (id1 == null && id2 != null) - { return false; - } return id1.equals(id2); } @@ -699,13 +684,9 @@ if (i1.getState() != i2.getState()) { if (i2.isDeleted()) - { sign = 1; - } else - { sign = -1; - } } return sign; } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestSessionsObservation.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestSessionsObservation.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestSessionsObservation.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -23,7 +23,6 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; -import javax.jcr.Session; import javax.jcr.observation.Event; public class TestSessionsObservation extends JcrAPIBaseTest @@ -262,26 +261,4 @@ sessionWs1.getWorkspace().getObservationManager().removeEventListener(listener2); } } - - public void testMoveOnClosedSession() throws Exception - { - - testRootWs1.addNode("newNode"); - sessionWs1.save(); - - int counter = 0; - - SimpleListener listener = new SimpleListener("testSessionOpen", log, counter); - - Session sessionWs1ForListener = repository.login(credentials, "ws1"); - - sessionWs1ForListener.getWorkspace().getObservationManager().addEventListener(listener, - Event.NODE_ADDED | Event.NODE_REMOVED, testRootWs1.getPath() + "/", false, null, null, false); - - sessionWs1ForListener.logout(); - - sessionWs1.logout(); - sessionWs1.getWorkspace().move(testRootWs1.getPath() + "/newNode", testRootWs1.getPath() + "/newNode2"); - assertEquals(2, listener.getCounter()); - } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionChangesLogTest.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -120,9 +120,7 @@ try { userSession = (SessionImpl)frepository.login(fcredentials, "ws"); - chlog[0] = - new SessionChangesLogInfo(new SessionChangesLog(userSession), userSession - .getId()); + chlog[0] = new SessionChangesLogInfo(new SessionChangesLog(userSession.getId()), userSession.getId()); } catch (RepositoryException e) { @@ -150,7 +148,7 @@ public void testSameSession() { - SessionChangesLog chlog = new SessionChangesLog(session); + SessionChangesLog chlog = new SessionChangesLog(session.getId()); assertEquals("Session must be same as given id owns", session, getRegisteredSession(chlog.getSessionId())); } @@ -250,7 +248,7 @@ public void testAddRootChanges() throws Exception { - SessionChangesLog changesLog = new SessionChangesLog(session); + SessionChangesLog changesLog = new SessionChangesLog(session.getId()); try { changesLog.add(new ItemState(new TransientPropertyData(Constants.ROOT_PATH, Constants.ROOT_UUID, 0, Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestJCRVSReadWrite.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestJCRVSReadWrite.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestJCRVSReadWrite.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -147,9 +147,7 @@ path = resource.setProperty("jcr:data", vals).getPath(); } else - { path = resource.setProperty("jcr:data", fBLOB1).getPath(); - } resource.setProperty("jcr:mimeType", "application/x-octet-stream"); resource.setProperty("jcr:lastModified", Calendar.getInstance()); testRoot.save(); @@ -193,7 +191,7 @@ { try { - SessionChangesLog changes = new SessionChangesLog(((NodeImpl)testRoot).getSession()); + SessionChangesLog changes = new SessionChangesLog(((NodeImpl)testRoot).getSession().getId()); TransientNodeData ntfile = TransientNodeData.createNodeData(rootData, InternalQName.parse("[]blob" + i), Constants.NT_FILE); @@ -220,9 +218,7 @@ data.add(new TransientValueData(fBLOB2)); } else - { data.add(new TransientValueData(fBLOB1)); - } TransientPropertyData resData = TransientPropertyData.createPropertyData(res, Constants.JCR_DATA, PropertyType.BINARY, data.size() > 1, @@ -263,7 +259,7 @@ { final DataManager dm = ((NodeImpl)testRoot).getSession().getTransientNodesManager().getTransactManager().getStorageDataManager(); - final SessionChangesLog changes = new SessionChangesLog(((NodeImpl)testRoot).getSession()); + final SessionChangesLog changes = new SessionChangesLog(((NodeImpl)testRoot).getSession().getId()); class Remover { @@ -305,18 +301,12 @@ } if (item == null) - { break; - } if (item.isNode()) - { parent = (NodeData)item; - } else if (i < relPathEntries.length - 1) - { throw new IllegalPathException("Path can not contains a property as the intermediate element"); - } } return item; } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java 2011-09-26 11:28:46 UTC (rev 4977) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/version/BaseVersionImplTest.java 2011-09-26 11:49:40 UTC (rev 4978) @@ -223,7 +223,7 @@ versionedVersionHistoryData = new ArrayList<ValueData>(); versionedVersionHistoryData.add(new TestTransientValueData(versionedVersionHistoryUuid.getBytes(), 0)); - changesLog = new SessionChangesLog(session); + changesLog = new SessionChangesLog(session.getId()); ntManager = (NodeTypeManagerImpl)session.getWorkspace().getNodeTypeManager(); @@ -267,7 +267,7 @@ public void createVersionable(int testCase) throws Exception { - versionableLog = new SessionChangesLog(session); + versionableLog = new SessionChangesLog(session.getId()); // target node versionable =