### Eclipse Workspace Patch 1.0 #P oak-jcr Index: src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (revision 1384703) +++ src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (working copy) @@ -1218,7 +1218,7 @@ try { ContentSession session = sessionDelegate.getContentSession(); CoreValueFactory factory = session.getCoreValueFactory(); - Root root = session.getCurrentRoot(); + Root root = session.getCurrentHeadRoot(); Tree tree = root.getTree(dlg.getPath()); if (tree == null) { throw new ItemNotFoundException(); @@ -1291,7 +1291,7 @@ String lockOwner = sessionDelegate.getOakPathOrThrow(JCR_LOCK_OWNER); String lockIsDeep = sessionDelegate.getOakPathOrThrow(JCR_LOCK_IS_DEEP); try { - Root root = sessionDelegate.getContentSession().getCurrentRoot(); + Root root = sessionDelegate.getContentSession().getCurrentHeadRoot(); Tree tree = root.getTree(dlg.getPath()); if (tree == null) { throw new ItemNotFoundException(); Index: src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java (revision 1384708) +++ src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java (working copy) @@ -92,7 +92,7 @@ this.contentSession = contentSession; this.workspace = new WorkspaceImpl(this); this.session = new SessionImpl(this); - this.root = contentSession.getCurrentRoot(); + this.root = contentSession.getCurrentHeadRoot(); this.conflictHandler = new AnnotatingConflictHandler(contentSession.getCoreValueFactory()); this.autoRefresh = autoRefresh; this.idManager = new IdentifierManager(contentSession.getQueryEngine(), root); @@ -371,7 +371,7 @@ } try { - Root currentRoot = contentSession.getCurrentRoot(); + Root currentRoot = contentSession.getCurrentHeadRoot(); currentRoot.copy(srcPath, destPath); currentRoot.commit(DefaultConflictHandler.OURS); } @@ -390,7 +390,7 @@ public void move(String srcPath, String destPath, boolean transientOp) throws RepositoryException { - Root moveRoot = transientOp ? root : contentSession.getCurrentRoot(); + Root moveRoot = transientOp ? root : contentSession.getCurrentHeadRoot(); // check destination Tree dest = moveRoot.getTree(destPath); #P oak-core Index: src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java (revision 1384708) +++ src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java (working copy) @@ -80,7 +80,7 @@ * @return the current head root */ @Nonnull - Root getCurrentRoot(); + Root getCurrentHeadRoot(); /** * Get the query engine. Index: src/test/java/org/apache/jackrabbit/oak/plugins/lucene/AbstractLuceneQueryTest.java =================================================================== --- src/test/java/org/apache/jackrabbit/oak/plugins/lucene/AbstractLuceneQueryTest.java (revision 1384708) +++ src/test/java/org/apache/jackrabbit/oak/plugins/lucene/AbstractLuceneQueryTest.java (working copy) @@ -65,7 +65,7 @@ public void before() throws Exception { super.before(); session = createAdminSession(); - root = session.getCurrentRoot(); + root = session.getCurrentHeadRoot(); vf = session.getCoreValueFactory(); qe = session.getQueryEngine(); } @@ -96,6 +96,6 @@ } protected Result executeQuery(String statement) throws ParseException { - return qe.executeQuery(statement, SQL2, Long.MAX_VALUE, 0, null, session.getCurrentRoot(), null); + return qe.executeQuery(statement, SQL2, Long.MAX_VALUE, 0, null, session.getCurrentHeadRoot(), null); } } \ No newline at end of file Index: src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java =================================================================== --- src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java (revision 1384708) +++ src/test/java/org/apache/jackrabbit/oak/query/QueryTest.java (working copy) @@ -232,7 +232,7 @@ private Result executeQuery(String statement, String language, HashMap sv) throws ParseException { return qe.executeQuery(statement, language, Long.MAX_VALUE, 0, sv, - session.getCurrentRoot(), null); + session.getCurrentHeadRoot(), null); } /** Index: src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java (revision 1384703) +++ src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java (working copy) @@ -84,7 +84,7 @@ public TokenProviderImpl(ContentSession contentSession, long tokenExpiration, UserContext userContext) { this.contentSession = contentSession; - this.root = contentSession.getCurrentRoot(); + this.root = contentSession.getCurrentHeadRoot(); this.tokenExpiration = tokenExpiration; this.userProvider = userContext.getUserProvider(contentSession, root); Index: src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderImplTest.java =================================================================== --- src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderImplTest.java (revision 1384703) +++ src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderImplTest.java (working copy) @@ -75,7 +75,7 @@ @Before public void setUp() throws Exception { contentSession = createAdminSession(); - root = contentSession.getCurrentRoot(); + root = contentSession.getCurrentHeadRoot(); defaultConfig = new UserConfig("admin"); defaultUserPath = defaultConfig.getConfigValue(UserConfig.PARAM_USER_PATH, UserConstants.DEFAULT_USER_PATH); Index: src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeManagerImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeManagerImpl.java (revision 1384703) +++ src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeManagerImpl.java (working copy) @@ -187,7 +187,7 @@ @Override protected Tree getTypes() { - return session.getCurrentRoot().getTree(NODE_TYPES_PATH); + return session.getCurrentHeadRoot().getTree(NODE_TYPES_PATH); } @Override @@ -210,7 +210,7 @@ @Override public NodeType registerNodeType(NodeTypeDefinition ntd, boolean allowUpdate) throws RepositoryException { // TODO proper node type registration... (OAK-66) - Root root = session.getCurrentRoot(); + Root root = session.getCurrentHeadRoot(); Tree types = getOrCreateNodeTypes(root); try { NodeType type = internalRegister(types, ntd, allowUpdate); @@ -225,7 +225,7 @@ public final NodeTypeIterator registerNodeTypes(NodeTypeDefinition[] ntds, boolean allowUpdate) throws RepositoryException { // TODO handle inter-type dependencies (OAK-66) - Root root = session.getCurrentRoot(); + Root root = session.getCurrentHeadRoot(); Tree types = getOrCreateNodeTypes(root); try { List list = Lists.newArrayList(); @@ -360,7 +360,7 @@ } private boolean nodeTypesInContent() { - Root currentRoot = session.getCurrentRoot(); + Root currentRoot = session.getCurrentHeadRoot(); Tree types = currentRoot.getTree(NODE_TYPES_PATH); return types != null && types.getChildrenCount() > 0; } @@ -368,7 +368,7 @@ @Override public void unregisterNodeType(String name) throws RepositoryException { Tree type = null; - Root root = session.getCurrentRoot(); + Root root = session.getCurrentHeadRoot(); Tree types = root.getTree(NODE_TYPES_PATH); if (types != null) { type = types.getChild(getOakName(name)); @@ -388,7 +388,7 @@ @Override public void unregisterNodeTypes(String[] names) throws RepositoryException { - Root root = session.getCurrentRoot(); + Root root = session.getCurrentHeadRoot(); Tree types = root.getTree(NODE_TYPES_PATH); if (types == null) { throw new NoSuchNodeTypeException("Node types can not be unregistered."); Index: src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java (revision 1384703) +++ src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionReader.java (working copy) @@ -62,7 +62,7 @@ } PrivilegeDefinitionReader(ContentSession contentSession) { - this(contentSession.getCurrentRoot().getTree(PRIVILEGES_PATH)); + this(contentSession.getCurrentHeadRoot().getTree(PRIVILEGES_PATH)); } Map readDefinitions() { Index: src/test/java/org/apache/jackrabbit/oak/util/JsopUtilTest.java =================================================================== --- src/test/java/org/apache/jackrabbit/oak/util/JsopUtilTest.java (revision 1384703) +++ src/test/java/org/apache/jackrabbit/oak/util/JsopUtilTest.java (working copy) @@ -42,7 +42,7 @@ public void before() throws Exception { super.before(); session = createAdminSession(); - root = session.getCurrentRoot(); + root = session.getCurrentHeadRoot(); vf = session.getCoreValueFactory(); } Index: src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeRegistry.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeRegistry.java (revision 1384703) +++ src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeRegistry.java (working copy) @@ -108,7 +108,7 @@ //------------------------------------------------------------< private >--- private void internalRegisterDefinitions(PrivilegeDefinition toRegister) throws RepositoryException { - Root root = contentSession.getCurrentRoot(); + Root root = contentSession.getCurrentHeadRoot(); try { // make sure the privileges path is defined Index: src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java =================================================================== --- src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java (revision 1384703) +++ src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java (working copy) @@ -65,7 +65,7 @@ session = createAdminSession(); vf = session.getCoreValueFactory(); qe = session.getQueryEngine(); - root = session.getCurrentRoot(); + root = session.getCurrentHeadRoot(); } } \ No newline at end of file Index: src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (revision 1384703) +++ src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (working copy) @@ -73,7 +73,7 @@ @Nonnull @Override - public Root getCurrentRoot() { + public Root getCurrentHeadRoot() { // TODO: improve initial repository/session. See OAK-41 synchronized (this) { if (!initialised) { Index: src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceRegistryImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceRegistryImpl.java (revision 1384703) +++ src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceRegistryImpl.java (working copy) @@ -59,7 +59,7 @@ public void registerNamespace(String prefix, String uri) throws RepositoryException { try { - Root root = session.getCurrentRoot(); + Root root = session.getCurrentHeadRoot(); Tree namespaces = getOrCreate(root, JcrConstants.JCR_SYSTEM, REP_NAMESPACES); namespaces.setProperty( prefix, session.getCoreValueFactory().createValue(uri)); @@ -76,7 +76,7 @@ @Override public void unregisterNamespace(String prefix) throws RepositoryException { - Root root = session.getCurrentRoot(); + Root root = session.getCurrentHeadRoot(); Tree namespaces = root.getTree(NAMESPACES_PATH); if (namespaces == null || !namespaces.hasProperty(prefix)) { throw new NamespaceException( @@ -114,7 +114,7 @@ @Nonnull public String[] getPrefixes() throws RepositoryException { try { - Tree root = session.getCurrentRoot().getTree("/"); + Tree root = session.getCurrentHeadRoot().getTree("/"); Map map = Namespaces.getNamespaceMap(root); String[] prefixes = map.keySet().toArray(new String[map.size()]); Arrays.sort(prefixes); @@ -130,7 +130,7 @@ @Nonnull public String[] getURIs() throws RepositoryException { try { - Tree root = session.getCurrentRoot().getTree("/"); + Tree root = session.getCurrentHeadRoot().getTree("/"); Map map = Namespaces.getNamespaceMap(root); String[] uris = map.values().toArray(new String[map.size()]); Arrays.sort(uris); @@ -146,7 +146,7 @@ @Nonnull public String getURI(String prefix) throws RepositoryException { try { - Tree root = session.getCurrentRoot().getTree("/"); + Tree root = session.getCurrentHeadRoot().getTree("/"); Map map = Namespaces.getNamespaceMap(root); String uri = map.get(prefix); if (uri == null) { @@ -166,7 +166,7 @@ @Nonnull public String getPrefix(String uri) throws RepositoryException { try { - Tree root = session.getCurrentRoot().getTree("/"); + Tree root = session.getCurrentHeadRoot().getTree("/"); Map map = Namespaces.getNamespaceMap(root); for (Map.Entry entry : map.entrySet()) { if (entry.getValue().equals(uri)) {