[Openutils-svn] SF.net SVN: openutils:[1091] trunk/openutils-mgnlcriteria/src/main/java/net /sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/ MagnoliaCriteriaWithLimitImpl.java

[<fg...@us...>]

Revision: 1091
          http://openutils.svn.sourceforge.net/openutils/?rev=1091&view=rev
Author:   fgrilli
Date:     2009-03-12 12:35:33 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
fixed compilation problem after updating to magnolia 4.0. Now gets AccessManager through HieararchyManager.

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java

Modified: trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java	2009-03-12 12:03:03 UTC (rev 1090)
+++ trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/xpath/impl/MagnoliaCriteriaWithLimitImpl.java	2009-03-12 12:35:33 UTC (rev 1091)
@@ -2,6 +2,7 @@
 
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.core.DefaultContent;
+import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.ItemType;
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.core.search.Query;
@@ -40,7 +41,7 @@
 public class MagnoliaCriteriaWithLimitImpl extends AbstractMagnoliaCriteriaImpl
 {
 
-    private static final String ACCESS_MANAGER = "accessManager";
+    private static final String HIERARCHY_MANAGER = "hm";
 
     private static final String QUERY_MANAGER = "queryManager";
 
@@ -109,15 +110,13 @@
             log.debug("Query executed in {} milliseconds", stop - start);
 
             Collection retVal = new ArrayList();
-            field = managerClass.getDeclaredField(ACCESS_MANAGER);
+            field = managerClass.getDeclaredField(HIERARCHY_MANAGER);
             field.setAccessible(true);
-            info.magnolia.cms.security.AccessManager accessManager = (info.magnolia.cms.security.AccessManager) field
-                .get(queryManager);
+            HierarchyManager hm = (HierarchyManager) field.get(queryManager);
 
             log.debug("getting content...");
             start = System.currentTimeMillis();
-
-            QueryResultImpl filteredResult = new QueryResultImpl(result, accessManager);
+            QueryResultImpl filteredResult = new QueryResultImpl(result, hm);
             retVal = filteredResult.getContent(itemType);
 
             stop = System.currentTimeMillis();
@@ -199,10 +198,10 @@
 
         private Map<String, String> dirtyHandles = new Hashtable<String, String>();
 
-        protected QueryResultImpl(javax.jcr.query.QueryResult result, AccessManager accessManager)
+        protected QueryResultImpl(javax.jcr.query.QueryResult result, HierarchyManager hm)
         {
             this.result = result;
-            this.accessManager = accessManager;
+            this.accessManager = hm.getAccessManager();
         }
 
         public AccessManager getAccessManager()
@@ -260,7 +259,7 @@
                         Permission.READ);
                     if (isAllowed)
                     {
-                        collection.add(new DefaultContent(node, this.accessManager));
+                        collection.add(new DefaultContent(node, null));
                         this.dirtyHandles.put(node.getPath(), StringUtils.EMPTY);
                     }
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.