@Override public NodeIterator merge( String absPath, String srcWorkspace, boolean bestEffort, boolean isShallow ) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException { if (LOGGER.isDebugEnabled()) LOGGER.debug("VersionManager.merge('{0}','{1}',{2})", absPath, srcWorkspace, bestEffort); CheckArg.isNotNull(srcWorkspace, "source workspace name"); // Create a new session in which we'll finish the merge, so this session remains thread-safe ... JcrSession mergeSession = session.spawnSession(false); AbstractJcrNode node = mergeSession.getNode(absPath); return merge(node, srcWorkspace, bestEffort, isShallow); }
@Override public NodeIterator merge( String absPath, String srcWorkspace, boolean bestEffort, boolean isShallow ) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException { if (LOGGER.isDebugEnabled()) LOGGER.debug("VersionManager.merge('{0}','{1}',{2})", absPath, srcWorkspace, bestEffort); CheckArg.isNotNull(srcWorkspace, "source workspace name"); // Create a new session in which we'll finish the merge, so this session remains thread-safe ... JcrSession mergeSession = session.spawnSession(false); AbstractJcrNode node = mergeSession.getNode(absPath); return merge(node, srcWorkspace, bestEffort, isShallow); }
@Override public NodeIterator merge( String srcWorkspace, boolean bestEffort ) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException { CheckArg.isNotNull(srcWorkspace, "srcWorkspace"); checkNotProtected(); return versionManager().merge(this, srcWorkspace, bestEffort, false); }
@Override public NodeIterator merge( String srcWorkspace, boolean bestEffort ) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException { CheckArg.isNotNull(srcWorkspace, "srcWorkspace"); checkNotProtected(); return versionManager().merge(this, srcWorkspace, bestEffort, false); }