diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java index 0f662be08..509148a31 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java @@ -32,20 +32,20 @@ public class BrowseWidget extends Widget { @Override protected WidgetTemplateValues process(Environment env, Map params, - VitroRequest vreq, ServletContext context) throws Exception + HttpServletRequest request, ServletContext context) throws Exception { - Mode mode = getMode( vreq, params ); + Mode mode = getMode( request, params ); switch( mode ){ case VCLASS_ALPHA: - return doClassAlphaDisplay(env,params,vreq,context); + return doClassAlphaDisplay(env,params,request,context); case CLASS_GROUP: - return doClassGroupDisplay(env, params, vreq, context); + return doClassGroupDisplay(env, params, request, context); case VCLASS: - return doClassDisplay(env, params, vreq, context); + return doClassDisplay(env, params, request, context); case ALL_CLASS_GROUPS: - return doAllClassGroupsDisplay(env, params, vreq, context); + return doAllClassGroupsDisplay(env, params, request, context); default: - return doAllClassGroupsDisplay(env, params, vreq, context); + return doAllClassGroupsDisplay(env, params, request, context); } } @@ -56,8 +56,8 @@ public class BrowseWidget extends Widget { } protected WidgetTemplateValues doAllClassGroupsDisplay(Environment env, Map params, - VitroRequest vreq, ServletContext context) { - Map body = getAllClassGroupData(vreq, params); + HttpServletRequest request, ServletContext context) { + Map body = getAllClassGroupData(request, params); try { body.put("urls",env.getDataModel().get("urls")); body.put("urlMapping",env.getDataModel().get("urlMapping")); @@ -69,9 +69,10 @@ public class BrowseWidget extends Widget { return new WidgetTemplateValues(macroName, body); } - protected Map getAllClassGroupData(VitroRequest vreq, Map params){ + protected Map getAllClassGroupData(HttpServletRequest request, Map params){ Map map = new HashMap(); + VitroRequest vreq = new VitroRequest(request); List classGroups = vreq.getWebappDaoFactory().getVClassGroupDao().getPublicGroupsWithVClasses(); @@ -84,9 +85,9 @@ public class BrowseWidget extends Widget { } protected WidgetTemplateValues doClassDisplay(Environment env, Map params, - VitroRequest vreq, ServletContext context) { + HttpServletRequest request, ServletContext context) { - Map body = getClassData(vreq,params); + Map body = getClassData(request,params); try { body.put("urls",env.getDataModel().get("urls")); @@ -99,12 +100,13 @@ public class BrowseWidget extends Widget { return new WidgetTemplateValues(macroName, body); } - private Map getClassData(VitroRequest vreq, Map params) { + private Map getClassData(HttpServletRequest request, Map params) { Map map = new HashMap(); - map.putAll(getClassGroupData(vreq, params)); + map.putAll(getClassGroupData(request, params)); - String classUri = getParam(Mode.VCLASS, vreq, params); + String classUri = getParam(Mode.VCLASS, request, params); + VitroRequest vreq = new VitroRequest(request); VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri); map.put("class", new VClassTemplateModel(vclass)); @@ -121,9 +123,9 @@ public class BrowseWidget extends Widget { } protected WidgetTemplateValues doClassGroupDisplay(Environment env, - Map params, VitroRequest vreq, ServletContext context) { + Map params, HttpServletRequest request, ServletContext context) { - Map body = getClassGroupData(vreq,params); + Map body = getClassGroupData(request,params); try { body.put("urls",env.getDataModel().get("urls")); @@ -136,10 +138,11 @@ public class BrowseWidget extends Widget { return new WidgetTemplateValues(macroName, body); } - protected Map getClassGroupData(VitroRequest vreq, Map params) { + protected Map getClassGroupData(HttpServletRequest request, Map params) { Map map = new HashMap(); - String vcgName = getParam(Mode.CLASS_GROUP, vreq, params); + String vcgName = getParam(Mode.CLASS_GROUP, request, params); + VitroRequest vreq = new VitroRequest(request); VClassGroup vcg = vreq.getWebappDaoFactory().getVClassGroupDao().getGroupByName(vcgName); vreq.getWebappDaoFactory().getVClassDao().addVClassesToGroup(vcg, false, true); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java index 24f2c0f95..18f96d8fc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java @@ -13,7 +13,6 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean; @@ -68,14 +67,14 @@ public class LoginWidget extends Widget { @Override protected WidgetTemplateValues process(Environment env, Map params, - VitroRequest vreq, ServletContext context) { + HttpServletRequest request, ServletContext context) { WidgetTemplateValues values = null; TemplateModel urls = null; try { urls = env.getDataModel().get("urls"); - State state = getCurrentLoginState(vreq); + State state = getCurrentLoginState(request); log.debug("State on exit: " + state); switch (state) { @@ -83,17 +82,17 @@ public class LoginWidget extends Widget { // On the login page itself, show a message that the user is already logged in. // Otherwise, when redirecting to login page from a page that the logged-in user // doesn't have access to, we would just show a blank page. - if (vreq.getServletPath().equals(Route.LOGIN.path())) { - values = showMessageToLoggedInUser(vreq); + if (request.getServletPath().equals(Route.LOGIN.path())) { + values = showMessageToLoggedInUser(request); break; } else { return null; } case FORCED_PASSWORD_CHANGE: - values = showPasswordChangeScreen(vreq); + values = showPasswordChangeScreen(request); break; default: - values = showLoginScreen(vreq); + values = showLoginScreen(request); } } catch (Exception e) { log.error(e); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/SelectListWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/SelectListWidget.java index 4745d2090..924e96afa 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/SelectListWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/SelectListWidget.java @@ -6,6 +6,7 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; @@ -24,7 +25,7 @@ public class SelectListWidget extends Widget { @Override protected WidgetTemplateValues process(Environment env, Map params, - VitroRequest vreq, ServletContext context) { + HttpServletRequest request, ServletContext context) { Object obj = params.get("fieldName"); if( obj == null || !(obj instanceof SimpleScalar)){ @@ -36,9 +37,10 @@ public class SelectListWidget extends Widget { log.error("SelectListWidget must have a parameter 'fieldName'"); throw new Error("SelectListWidget must have a parameter 'fieldName' of type String"); } - - HttpSession session = vreq.getSession(false); - EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,vreq); + + VitroRequest vreq = new VitroRequest(request); + HttpSession session = request.getSession(false); + EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request); WebappDaoFactory wdf; if (editConfig != null) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/TestWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/TestWidget.java index cc29da32c..71c1e3702 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/TestWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/TestWidget.java @@ -6,19 +6,19 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import freemarker.core.Environment; public class TestWidget extends Widget { @Override protected WidgetTemplateValues process(Environment env, Map params, - VitroRequest vreq, ServletContext context) { + HttpServletRequest request, ServletContext context) { Map map = new HashMap(); String macroName; - if (LoginStatusBean.getBean(vreq).isLoggedIn()) { + if (LoginStatusBean.getBean(request).isLoggedIn()) { map.put("status", "logged in"); macroName = "loggedIn"; } else { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java index 790cab4a4..3357bd092 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java @@ -10,11 +10,11 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import freemarker.core.Environment; import freemarker.core.Macro; import freemarker.template.Template; @@ -52,13 +52,13 @@ public abstract class Widget { } public String doMarkup(Environment env, Map params) { - VitroRequest vreq = (VitroRequest) env.getCustomAttribute("vreq"); + HttpServletRequest request = (HttpServletRequest) env.getCustomAttribute("request"); ServletContext context = (ServletContext) env.getCustomAttribute("context"); WidgetTemplateValues values = null; try { - values = process(env, params, vreq, context); + values = process(env, params, request, context); } catch (Exception e) { log.error(e, e); } @@ -100,7 +100,7 @@ public abstract class Widget { // } protected abstract WidgetTemplateValues process(Environment env, Map params, - VitroRequest vreq, ServletContext context) throws Exception; + HttpServletRequest request, ServletContext context) throws Exception; private String processMacroToString(Environment env, String widgetName, Macro macro, Map map) { StringWriter out = new StringWriter();