From 7b9bd45ad56a927e2d099d59a47ad3daeb7eb1cd Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 22 Apr 2011 15:15:41 +0000
Subject: [PATCH] NIHVIVO-2535 The Lucene index builder uses a "public" filter,
 which now uses a PropertyRestrictionPolicyHelper, so that must be set up
 first.

---
 webapp/config/web.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 9a59ac549..db805f0df 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -128,6 +128,17 @@
     </listener>    
 -->
 
+  <listener>
+    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper$Setup
+    </listener-class>
+  </listener>
+ 
+  <listener>
+    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CommonPolicyFamilySetup
+    </listener-class>
+  </listener>
+
+  <!-- The Lucene index uses a "public" filter, so the PropertyRestrictionPolicyHelper must already be set up. -->
   <listener>
     <listener-class> edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup </listener-class>
   </listener>
@@ -164,16 +175,6 @@
     </listener-class>
   </listener>
  
-  <listener>
-    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CommonPolicyFamilySetup
-    </listener-class>
-  </listener>
-
-  <listener>
-    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper$Setup
-    </listener-class>
-  </listener>
- 
   <listener>
     <listener-class>
         edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup