diff --git a/webapp/config/log4j.properties b/webapp/config/log4j.properties index b5cf2bf83..fbb00c755 100644 --- a/webapp/config/log4j.properties +++ b/webapp/config/log4j.properties @@ -35,7 +35,6 @@ log4j.rootLogger=INFO, AllAppender # These classes are too chatty to display INFO messages. log4j.logger.edu.cornell.mannlib.vitro.webapp.startup.StartupStatus=WARN -log4j.logger.edu.cornell.mannlib.vitro.webapp.controller.freemarker.BrowseController=WARN log4j.logger.edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener=WARN log4j.logger.edu.cornell.mannlib.vitro.webapp.dao.jena.RDBGraphGenerator=WARN log4j.logger.edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase=DEBUG diff --git a/webapp/rdf/auth/everytime/permission_config.n3 b/webapp/rdf/auth/everytime/permission_config.n3 index ce304db4b..2a84a6609 100644 --- a/webapp/rdf/auth/everytime/permission_config.n3 +++ b/webapp/rdf/auth/everytime/permission_config.n3 @@ -18,7 +18,6 @@ auth:ADMIN auth:hasPermission simplePermission:ManageProxies ; auth:hasPermission simplePermission:ManageSearchIndex ; auth:hasPermission simplePermission:ManageUserAccounts ; - auth:hasPermission simplePermission:RebuildVClassGroupCache ; auth:hasPermission simplePermission:RefreshVisualizationCache ; auth:hasPermission simplePermission:SeeConfiguration ; auth:hasPermission simplePermission:SeeStartupStatus ; diff --git a/webapp/rdf/display/everytime/permissions.n3 b/webapp/rdf/display/everytime/permissions.n3 index d16cdf784..6b22e4e13 100644 --- a/webapp/rdf/display/everytime/permissions.n3 +++ b/webapp/rdf/display/everytime/permissions.n3 @@ -78,11 +78,6 @@ action:QueryUserAccountsModel rdfs:label "QUERY_USER_ACCOUNTS_MODEL" . -action:RebuildVClassGroupCache - a display:RequiredAction ; - rdfs:label "REBUILD_VCLASS_GROUP_CACHE" . - - action:RefreshVisualizationCache a display:RequiredAction ; rdfs:label "REFRESH_VISUALIZATION_CACHE" . diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java index 4572cd06f..600fbe95c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java @@ -56,8 +56,6 @@ public class SimplePermission extends Permission { NAMESPACE + "QueryFullModel"); public static final SimplePermission QUERY_USER_ACCOUNTS_MODEL = new SimplePermission( NAMESPACE + "QueryUserAccountsModel"); - public static final SimplePermission REBUILD_VCLASS_GROUP_CACHE = new SimplePermission( - NAMESPACE + "RebuildVClassGroupCache"); public static final SimplePermission REFRESH_VISUALIZATION_CACHE = new SimplePermission( NAMESPACE + "RefreshVisualizationCache"); public static final SimplePermission SEE_CONFIGURATION = new SimplePermission( diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java index 1a10c92a3..dfcc56ba1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java @@ -66,7 +66,6 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) { urls.put("recomputeInferences", UrlBuilder.getUrl("/RecomputeInferences")); - urls.put("rebuildClassGroupCache", UrlBuilder.getUrl("/browse?clearcache=1")); } if (PolicyHelper.isAuthorizedForActions(vreq, IndexController.REQUIRED_ACTIONS)) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java index ff921ce64..4a8f7ea36 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java @@ -10,9 +10,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; @@ -33,29 +30,12 @@ public class BrowseController extends FreemarkerHttpServlet { return "Index of Contents"; } - - @Override - protected Actions requiredActions(VitroRequest vreq) { - if ( vreq.getParameter("clearcache") != null ) - return SimplePermission.REBUILD_VCLASS_GROUP_CACHE.ACTIONS; - else - return Actions.AUTHORIZED; - } - - @Override protected ResponseValues processRequest(VitroRequest vreq) { Map body = new HashMap(); String templateName = TEMPLATE_DEFAULT; - if ( vreq.getParameter("clearcache") != null ) { - //mainly for debugging - if( PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.REBUILD_VCLASS_GROUP_CACHE.ACTIONS) ){ - clearGroupCache(); - } - } - List groups = null; VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq); groups =vcgc.getGroups(); @@ -67,8 +47,4 @@ public class BrowseController extends FreemarkerHttpServlet { return new TemplateResponseValues(templateName, body); } - - protected void clearGroupCache(){ - VClassGroupCache.getVClassGroupCache(getServletContext()).doSynchronousRebuild(); - } -} \ No newline at end of file +}