From e398bdd79a3c9c575a87bc78e7e1ad37b4ddf48c Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 3 Dec 2010 20:36:22 +0000 Subject: [PATCH] NIHVIVO-1476 Made ResponseValues and implementing classes public, and moved to their own package, for use by classes not in the freemarker package and not subclassing FreemarkerHttpServlet. --- .../FakeExternalAuthController.java | 3 + .../UnrecognizedUserController.java | 2 + .../controller/edit/PrimitiveRdfEdit.java | 2 + .../freemarker/AboutController.java | 2 + .../freemarker/BrowseController.java | 4 +- .../freemarker/ContactFormController.java | 4 +- .../freemarker/ContactMailController.java | 2 + .../freemarker/EmptyController.java | 2 + .../freemarker/FreemarkerHttpServlet.java | 329 +----------------- .../freemarker/HomePageController.java | 4 +- .../freemarker/ImageUploadController.java | 5 + .../freemarker/IndividualController.java | 5 + .../freemarker/IndividualListController.java | 4 +- .../freemarker/N3EditFormController.java | 3 + .../freemarker/NavigationController.java | 3 +- .../controller/freemarker/PageController.java | 3 + .../freemarker/RevisionInfoController.java | 2 + .../freemarker/SamplesController.java | 2 + .../freemarker/SiteAdminController.java | 3 +- .../freemarker/TemplateProcessingHelper.java | 2 +- .../freemarker/TermsOfUseController.java | 4 +- .../controller/freemarker/TestController.java | 4 +- .../responsevalues/BaseResponseValues.java | 80 +++++ .../ExceptionResponseValues.java | 45 +++ .../responsevalues/ForwardResponseValues.java | 22 ++ .../responsevalues/RdfResponseValues.java | 21 ++ .../RedirectResponseValues.java | 23 ++ .../responsevalues/ResponseValues.java | 31 ++ .../TemplateResponseValues.java | 55 +++ .../controller/login/LoginTemplateHelper.java | 1 + .../FreemarkerPagedSearchController.java | 3 + .../search/controller/IndexController.java | 4 + 32 files changed, 343 insertions(+), 336 deletions(-) create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ExceptionResponseValues.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ForwardResponseValues.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RedirectResponseValues.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/TemplateResponseValues.java diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java index af05b3d05..577db8ff9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java @@ -17,6 +17,9 @@ import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; /** * This allows a DBA to pretend that he's logged in with an external username. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java index 4bb9cf8f4..33e367f26 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/UnrecognizedUserController.java @@ -7,6 +7,8 @@ import java.util.Map; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; /** * A user logged in using external authentication, but we don't have an account diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java index c27e9afba..90586e0d3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java @@ -26,6 +26,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; 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.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java index 8139fc8ed..f81eafe09 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java @@ -10,6 +10,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import freemarker.template.Configuration; public class AboutController extends FreemarkerHttpServlet { 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 bbdfcb788..27970f271 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 @@ -13,8 +13,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.TemplateResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java index 3dc0cbbd8..f86e05846 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java @@ -19,8 +19,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.ContactMailServlet; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.TemplateResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import freemarker.template.Configuration; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java index 52184d123..628e4b89b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java @@ -29,6 +29,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import freemarker.template.Configuration; public class ContactMailController extends FreemarkerHttpServlet { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java index 010092211..e9d01cc32 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/EmptyController.java @@ -9,6 +9,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; /* * Servlet that only specifies a template, without putting any data diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index 7a09f0d77..9ee617e8b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Calendar; -import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -17,8 +16,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; - import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage; @@ -28,9 +25,14 @@ import edu.cornell.mannlib.vitro.webapp.controller.ContactMailServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ForwardResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RdfResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import edu.cornell.mannlib.vitro.webapp.web.BreadCrumbsUtil; -import edu.cornell.mannlib.vitro.webapp.web.ContentType; import edu.cornell.mannlib.vitro.webapp.web.PortalWebUtil; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.User; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.files.Scripts; @@ -245,7 +247,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { protected void doException(VitroRequest vreq, HttpServletResponse response, ResponseValues values) { // Log the error, and display an error message on the page. log.error(values.getException(), values.getException()); - TemplateResponseValues trv = new TemplateResponseValues(values.getTemplateName(), values.getMap()); + TemplateResponseValues trv = TemplateResponseValues.getTemplateResponseValuesFromException((ExceptionResponseValues)values); doTemplate(vreq, response, trv); } @@ -504,321 +506,4 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { // to set up the data model. new FreemarkerComponentGenerator(request); } - - protected static interface ResponseValues { - - String getTemplateName(); - - int getStatusCode(); - - void setStatusCode(int statusCode); - - Map getMap(); - - String getRedirectUrl(); - - String getForwardUrl(); - - Throwable getException(); - - ContentType getContentType(); - - Model getModel(); - } - - protected static abstract class BaseResponseValues implements ResponseValues { - private int statusCode = 0; - private ContentType contentType = null; - - BaseResponseValues() { } - - BaseResponseValues(int statusCode) { - this.statusCode = statusCode; - } - - BaseResponseValues(ContentType contentType) { - this.contentType = contentType; - } - - public int getStatusCode() { - return statusCode; - } - - public void setStatusCode(int statusCode) { - this.statusCode = statusCode; - } - - public ContentType getContentType() { - return contentType; - } - - public void setContentType(ContentType contentType) { - this.contentType = contentType; - } - } - - protected static class TemplateResponseValues extends BaseResponseValues { - private final String templateName; - private final Map map; - - public TemplateResponseValues(String templateName) { - this.templateName = templateName; - this.map = new HashMap(); - } - - public TemplateResponseValues(String templateName, int statusCode) { - super(statusCode); - this.templateName = templateName; - this.map = new HashMap(); - } - - public TemplateResponseValues(String templateName, Map map) { - this.templateName = templateName; - this.map = map; - } - - public TemplateResponseValues(String templateName, Map map, int statusCode) { - super(statusCode); - this.templateName = templateName; - this.map = map; - } - - public TemplateResponseValues put(String key, Object value) { - this.map.put(key, value); - return this; - } - - @Override - public Map getMap() { - return Collections.unmodifiableMap(this.map); - } - - @Override - public String getTemplateName() { - return this.templateName; - } - - @Override - public String getRedirectUrl() { - throw new UnsupportedOperationException( - "This is not a redirect response."); - } - - @Override - public String getForwardUrl() { - throw new UnsupportedOperationException( - "This is not a forwarding response."); - } - - @Override - public Throwable getException() { - throw new UnsupportedOperationException( - "This is not an exception response."); - } - - @Override - public Model getModel() { - throw new UnsupportedOperationException( - "This is not an RDF response."); - } - - } - - protected static class RedirectResponseValues extends BaseResponseValues { - private final String redirectUrl; - - public RedirectResponseValues(String redirectUrl) { - this.redirectUrl = redirectUrl; - } - - public RedirectResponseValues(String redirectUrl, int statusCode) { - super(statusCode); - this.redirectUrl = redirectUrl; - } - - @Override - public String getRedirectUrl() { - return this.redirectUrl; - } - - @Override - public String getTemplateName() { - throw new UnsupportedOperationException( - "This is not a template response."); - } - - @Override - public Map getMap() { - throw new UnsupportedOperationException( - "This is not a template response."); - } - - @Override - public String getForwardUrl() { - throw new UnsupportedOperationException( - "This is not a forwarding response."); - } - - @Override - public Throwable getException() { - throw new UnsupportedOperationException( - "This is not an exception response."); - } - - @Override - public Model getModel() { - throw new UnsupportedOperationException( - "This is not an RDF response."); - } - } - - protected static class ForwardResponseValues extends BaseResponseValues { - private final String forwardUrl; - - public ForwardResponseValues(String forwardUrl) { - this.forwardUrl = forwardUrl; - } - - public ForwardResponseValues(String forwardUrl, int statusCode) { - super(statusCode); - this.forwardUrl = forwardUrl; - } - - @Override - public String getForwardUrl() { - return this.forwardUrl; - } - - @Override - public String getTemplateName() { - throw new UnsupportedOperationException( - "This is not a template response."); - } - - @Override - public Map getMap() { - throw new UnsupportedOperationException( - "This is not a template response."); - } - - @Override - public String getRedirectUrl() { - throw new UnsupportedOperationException( - "This is not a redirect response."); - } - - @Override - public Throwable getException() { - throw new UnsupportedOperationException( - "This is not an exception response."); - } - - @Override - public Model getModel() { - throw new UnsupportedOperationException( - "This is not an RDF response."); - } - } - - protected static class ExceptionResponseValues extends TemplateResponseValues { - private final static String DEFAULT_TEMPLATE_NAME = "error-standard.ftl"; - private final Throwable cause; - - public ExceptionResponseValues(Throwable cause) { - super(DEFAULT_TEMPLATE_NAME); - this.cause = cause; - } - - public ExceptionResponseValues(Throwable cause, int statusCode) { - super(DEFAULT_TEMPLATE_NAME, statusCode); - this.cause = cause; - } - - public ExceptionResponseValues(String templateName, Throwable cause) { - super(templateName); - this.cause = cause; - } - - public ExceptionResponseValues(String templateName, Throwable cause, int statusCode) { - super(templateName, statusCode); - this.cause = cause; - } - - public ExceptionResponseValues(String templateName, Map map, Throwable cause) { - super(templateName, map); - this.cause = cause; - } - - public ExceptionResponseValues(String templateName, Map map, Throwable cause, int statusCode) { - super(templateName, map, statusCode); - this.cause = cause; - } - - @Override - public Throwable getException() { - return cause; - } - - @Override - public String getRedirectUrl() { - throw new UnsupportedOperationException( - "This is not a redirect response."); - } - - @Override - public String getForwardUrl() { - throw new UnsupportedOperationException( - "This is not a forwarding response."); - } - - @Override - public Model getModel() { - throw new UnsupportedOperationException( - "This is not an RDF response."); - } - } - - protected static class RdfResponseValues extends BaseResponseValues { - private final Model model; - - RdfResponseValues(ContentType contentType, Model model) { - super(contentType); - this.model = model; - } - - @Override - public String getTemplateName() { - throw new UnsupportedOperationException( - "This is not a template response."); - } - - @Override - public Map getMap() { - throw new UnsupportedOperationException( - "This is not a template response."); - } - - @Override - public String getRedirectUrl() { - throw new UnsupportedOperationException( - "This is not a redirect response."); - } - - @Override - public String getForwardUrl() { - throw new UnsupportedOperationException( - "This is not a forwarding response."); - } - - @Override - public Throwable getException() { - throw new UnsupportedOperationException( - "This is not an exception response."); - } - - @Override - public Model getModel() { - return model; - } - } } \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java index c766a3500..5f7f73eb4 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java @@ -10,9 +10,9 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.Template; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.TemplateResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; public class HomePageController extends FreemarkerHttpServlet { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java index 357c76052..cb24cf169 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java @@ -27,6 +27,11 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjPro import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ForwardResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage; import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java index dfa3f1b8b..a4195615a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java @@ -40,6 +40,11 @@ import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RdfResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java index b51916bf1..e839cca77 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java @@ -14,7 +14,9 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel; import freemarker.template.Configuration; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/N3EditFormController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/N3EditFormController.java index c86491714..8f1b2ce27 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/N3EditFormController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/N3EditFormController.java @@ -8,6 +8,9 @@ import java.util.Map; import javax.servlet.http.HttpSession; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditSubmission; import freemarker.template.ObjectWrapper; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java index fb4d405f1..a54425ecf 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java @@ -28,7 +28,8 @@ import com.hp.hpl.jena.rdf.model.Statement; import com.hp.hpl.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.web.DisplayVocabulary; import freemarker.template.Configuration; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java index 8c7a8d032..8dd42b124 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java @@ -13,6 +13,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; /** * Controller for getting data for pages defined in the display model. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java index bea5deae4..fbbe3fb33 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java @@ -11,6 +11,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; /** * Display the detailed revision information. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java index 973457ee8..63105935c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java @@ -14,6 +14,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration; /** diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java index 1d31aebba..24f2c75af 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java @@ -15,9 +15,10 @@ import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.util.FormUtils; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginTemplateHelper; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java index a3366e487..577c6852b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import freemarker.core.Environment; import freemarker.template.Configuration; import freemarker.template.Template; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java index e4c7931e6..c17c6c6f6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java @@ -10,8 +10,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.TemplateResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import freemarker.template.Configuration; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java index 475aa7ad7..05c0fd528 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java @@ -14,8 +14,8 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.beans.Portal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.ResponseValues; -import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet.TemplateResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import freemarker.template.Configuration; /** diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java new file mode 100644 index 000000000..94f8fa275 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java @@ -0,0 +1,80 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; + +import java.util.Map; + +import com.hp.hpl.jena.rdf.model.Model; + +import edu.cornell.mannlib.vitro.webapp.web.ContentType; + +public abstract class BaseResponseValues implements ResponseValues { + + private int statusCode = 0; + private ContentType contentType = null; + + BaseResponseValues() { } + + BaseResponseValues(int statusCode) { + this.statusCode = statusCode; + } + + BaseResponseValues(ContentType contentType) { + this.contentType = contentType; + } + + @Override + public int getStatusCode() { + return statusCode; + } + + @Override + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + + @Override + public ContentType getContentType() { + return contentType; + } + + public void setContentType(ContentType contentType) { + this.contentType = contentType; + } + + @Override + public String getTemplateName() { + throw new UnsupportedOperationException( + "This is not a template response."); + } + + @Override + public Map getMap() { + throw new UnsupportedOperationException( + "This is not a template response."); + } + + @Override + public String getRedirectUrl() { + throw new UnsupportedOperationException( + "This is not a redirect response."); + } + + @Override + public String getForwardUrl() { + throw new UnsupportedOperationException( + "This is not a forwarding response."); + } + + @Override + public Throwable getException() { + throw new UnsupportedOperationException( + "This is not an exception response."); + } + + @Override + public Model getModel() { + throw new UnsupportedOperationException( + "This is not an RDF response."); + } +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ExceptionResponseValues.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ExceptionResponseValues.java new file mode 100644 index 000000000..065db7ad0 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ExceptionResponseValues.java @@ -0,0 +1,45 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; + +import java.util.Map; + +public class ExceptionResponseValues extends TemplateResponseValues { + private final static String DEFAULT_TEMPLATE_NAME = "error-standard.ftl"; + private final Throwable cause; + + public ExceptionResponseValues(Throwable cause) { + super(DEFAULT_TEMPLATE_NAME); + this.cause = cause; + } + + public ExceptionResponseValues(Throwable cause, int statusCode) { + super(DEFAULT_TEMPLATE_NAME, statusCode); + this.cause = cause; + } + + public ExceptionResponseValues(String templateName, Throwable cause) { + super(templateName); + this.cause = cause; + } + + public ExceptionResponseValues(String templateName, Throwable cause, int statusCode) { + super(templateName, statusCode); + this.cause = cause; + } + + public ExceptionResponseValues(String templateName, Map map, Throwable cause) { + super(templateName, map); + this.cause = cause; + } + + public ExceptionResponseValues(String templateName, Map map, Throwable cause, int statusCode) { + super(templateName, map, statusCode); + this.cause = cause; + } + + @Override + public Throwable getException() { + return cause; + } +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ForwardResponseValues.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ForwardResponseValues.java new file mode 100644 index 000000000..91474a3a5 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ForwardResponseValues.java @@ -0,0 +1,22 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; + + +public class ForwardResponseValues extends BaseResponseValues { + private final String forwardUrl; + + public ForwardResponseValues(String forwardUrl) { + this.forwardUrl = forwardUrl; + } + + public ForwardResponseValues(String forwardUrl, int statusCode) { + super(statusCode); + this.forwardUrl = forwardUrl; + } + + @Override + public String getForwardUrl() { + return this.forwardUrl; + } +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java new file mode 100644 index 000000000..470139e0b --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java @@ -0,0 +1,21 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; + +import com.hp.hpl.jena.rdf.model.Model; + +import edu.cornell.mannlib.vitro.webapp.web.ContentType; + +public class RdfResponseValues extends BaseResponseValues { + private final Model model; + + public RdfResponseValues(ContentType contentType, Model model) { + super(contentType); + this.model = model; + } + + @Override + public Model getModel() { + return model; + } +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RedirectResponseValues.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RedirectResponseValues.java new file mode 100644 index 000000000..f8a1869ca --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RedirectResponseValues.java @@ -0,0 +1,23 @@ + /* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; + +public class RedirectResponseValues extends BaseResponseValues { + + private final String redirectUrl; + + public RedirectResponseValues(String redirectUrl) { + this.redirectUrl = redirectUrl; + } + + public RedirectResponseValues(String redirectUrl, int statusCode) { + super(statusCode); + this.redirectUrl = redirectUrl; + } + + @Override + public String getRedirectUrl() { + return this.redirectUrl; + } +} + diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java new file mode 100644 index 000000000..c0a28b4f2 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java @@ -0,0 +1,31 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; + +import java.util.Map; + +import com.hp.hpl.jena.rdf.model.Model; + +import edu.cornell.mannlib.vitro.webapp.web.ContentType; + +public interface ResponseValues { + + public String getTemplateName(); + + public int getStatusCode(); + + public void setStatusCode(int statusCode); + + public Map getMap(); + + public String getRedirectUrl(); + + public String getForwardUrl(); + + public Throwable getException(); + + public ContentType getContentType(); + + public Model getModel(); + +} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/TemplateResponseValues.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/TemplateResponseValues.java new file mode 100644 index 000000000..7e35ed737 --- /dev/null +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/TemplateResponseValues.java @@ -0,0 +1,55 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +public class TemplateResponseValues extends BaseResponseValues { + + private final String templateName; + private final Map map; + + public TemplateResponseValues(String templateName) { + this.templateName = templateName; + this.map = new HashMap(); + } + + public TemplateResponseValues(String templateName, int statusCode) { + super(statusCode); + this.templateName = templateName; + this.map = new HashMap(); + } + + public TemplateResponseValues(String templateName, Map map) { + this.templateName = templateName; + this.map = map; + } + + public TemplateResponseValues(String templateName, Map map, int statusCode) { + super(statusCode); + this.templateName = templateName; + this.map = map; + } + + public TemplateResponseValues put(String key, Object value) { + this.map.put(key, value); + return this; + } + + @Override + public Map getMap() { + return Collections.unmodifiableMap(this.map); + } + + @Override + public String getTemplateName() { + return this.templateName; + } + + public static TemplateResponseValues getTemplateResponseValuesFromException(ExceptionResponseValues responseValues) { + return new TemplateResponseValues(responseValues.getTemplateName(), responseValues.getMap()); + } +} + diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java index 05e238ded..75b24af82 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java @@ -15,6 +15,7 @@ import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State; import freemarker.template.Configuration; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/FreemarkerPagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/FreemarkerPagedSearchController.java index ee6d8d31b..c26af2d20 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/FreemarkerPagedSearchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/FreemarkerPagedSearchController.java @@ -52,6 +52,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java index 460b6ee82..aee1488f8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java @@ -13,6 +13,10 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet; 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.freemarker.responsevalues.ExceptionResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.search.IndexingException; import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;