svn commit: r1306999 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java

[md...@apache.org]

Author: mduerig
Date: Thu Mar 29 17:10:51 2012
New Revision: 1306999

URL: http://svn.apache.org/viewvc?rev=1306999&view=rev
Log:
OAK-15: Clean up oak-jcr
- simplify

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java?rev=1306999&r1=1306998&r2=1306999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java Thu Mar 29 17:10:51 2012
@@ -18,18 +18,6 @@
  */
 package org.apache.jackrabbit.oak.jcr.query;
 
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.query.InvalidQueryException;
-import javax.jcr.query.Query;
-import javax.jcr.query.QueryManager;
-import javax.jcr.query.QueryResult;
-import javax.jcr.query.qom.QueryObjectModelFactory;
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.oak.jcr.SessionContext;
 import org.apache.jackrabbit.oak.jcr.SessionImpl;
@@ -39,6 +27,19 @@ import org.apache.jackrabbit.oak.query.C
 import org.apache.jackrabbit.oak.query.QueryEngine;
 import org.apache.jackrabbit.oak.query.Result;
 
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.query.InvalidQueryException;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.qom.QueryObjectModelFactory;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
 /**
  * The implementation of the corresponding JCR interface.
  */
@@ -48,7 +49,7 @@ public class QueryManagerImpl implements
     private final QueryEngine qe;
 
     public QueryManagerImpl(WorkspaceImpl workspace, SessionContext<SessionImpl> sessionContext) {
-        MicroKernel mk = sessionContext.getGlobalContext().getInstance(MicroKernel.class);
+        MicroKernel mk = sessionContext.getMicrokernel();
         qe = new QueryEngine(mk);
     }