litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simple refactoring: changed name of freemarker base classes

Browse source
This commit is contained in:
rjy7 2010-07-27 18:58:27 +00:00
parent e7328ae668
commit 7f8b9159db
21 changed files with 35 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/config/web.xml
View file

@ -154,7 +154,7 @@
<listener> <listener>
<listener-class> <listener-class>
edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerSetup edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
</listener-class> </listener-class>
</listener> </listener>
@ -323,11 +323,11 @@
</servlet-mapping> </servlet-mapping>
<servlet> <servlet>
<servlet-name>FreeMarkerTestController</servlet-name> <servlet-name>FreemarkerTestController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>FreeMarkerTestController</servlet-name> <servlet-name>FreemarkerTestController</servlet-name>
<url-pattern>/freemarkertest</url-pattern> <url-pattern>/freemarkertest</url-pattern>
</servlet-mapping> </servlet-mapping>

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java
View file

@ -14,9 +14,6 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
public class VitroHttpServlet extends HttpServlet public class VitroHttpServlet extends HttpServlet
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
View file

@ -29,7 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.RoleBasedPolicy.AuthRole;
import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; 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.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Message; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Message;
import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State;
@ -38,7 +38,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginEvent;
import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginLogoutEvent; import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginLogoutEvent;
public class Authenticate extends FreeMarkerHttpServlet { public class Authenticate extends FreemarkerHttpServlet {
private static final Log log = LogFactory.getLog(Authenticate.class private static final Log log = LogFactory.getLog(Authenticate.class
.getName()); .getName());

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
View file

@ -27,7 +27,7 @@ import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; 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.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena; import edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena;
@ -35,7 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditN3Utils;
import freemarker.template.Configuration; import freemarker.template.Configuration;
public class PrimitiveRdfEdit extends FreeMarkerHttpServlet{ public class PrimitiveRdfEdit extends FreemarkerHttpServlet{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java
View file

@ -11,7 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import freemarker.template.Configuration; import freemarker.template.Configuration;
public class AboutController extends FreeMarkerHttpServlet { public class AboutController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(AboutController.class.getName()); private static final Log log = LogFactory.getLog(AboutController.class.getName());

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
View file

@ -35,7 +35,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
public class BrowseController extends FreeMarkerHttpServlet { public class BrowseController extends FreemarkerHttpServlet {
static final long serialVersionUID=2006030721126L; static final long serialVersionUID=2006030721126L;
private transient ConcurrentHashMap<Integer, List> _groupListMap private transient ConcurrentHashMap<Integer, List> _groupListMap

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
View file

@ -26,7 +26,7 @@ import freemarker.template.Configuration;
* Controller for comments ("contact us") page * Controller for comments ("contact us") page
* * @author bjl23 * * @author bjl23
*/ */
public class ContactFormController extends FreeMarkerHttpServlet { public class ContactFormController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(ContactFormController.class.getName()); private static final Log log = LogFactory.getLog(ContactFormController.class.getName());

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java
View file

@ -30,7 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import freemarker.template.Configuration; import freemarker.template.Configuration;
public class ContactMailController extends FreeMarkerHttpServlet { public class ContactMailController extends FreemarkerHttpServlet {
private static final Log log = LogFactory private static final Log log = LogFactory
.getLog(ContactMailController.class); .getLog(ContactMailController.class);
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerComponentGenerator.java → webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
View file

@ -21,14 +21,14 @@ import freemarker.template.Configuration;
* @author rjy7 * @author rjy7
* *
*/ */
public class FreeMarkerComponentGenerator extends FreeMarkerHttpServlet { public class FreemarkerComponentGenerator extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(FreeMarkerHttpServlet.class.getName()); private static final Log log = LogFactory.getLog(FreemarkerHttpServlet.class.getName());
private static ServletContext context = null; private static ServletContext context = null;
FreeMarkerComponentGenerator(HttpServletRequest request) { FreemarkerComponentGenerator(HttpServletRequest request) {
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);
Configuration config = getConfig(vreq); Configuration config = getConfig(vreq);

8
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServlet.java → webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -47,10 +47,10 @@ import freemarker.template.TemplateException;
import freemarker.template.TemplateModel; import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException; import freemarker.template.TemplateModelException;
public class FreeMarkerHttpServlet extends VitroHttpServlet { public class FreemarkerHttpServlet extends VitroHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(FreeMarkerHttpServlet.class.getName()); private static final Log log = LogFactory.getLog(FreemarkerHttpServlet.class.getName());
private static final int FILTER_SECURITY_LEVEL = LoginFormBean.EDITOR; private static final int FILTER_SECURITY_LEVEL = LoginFormBean.EDITOR;
public void doGet( HttpServletRequest request, HttpServletResponse response ) public void doGet( HttpServletRequest request, HttpServletResponse response )
@ -429,10 +429,10 @@ public class FreeMarkerHttpServlet extends VitroHttpServlet {
// TEMPORARY method for transition from JSP to FreeMarker. // TEMPORARY method for transition from JSP to FreeMarker.
// It's a static method because it needs to be called from JSPs that don't go through a servlet. // It's a static method because it needs to be called from JSPs that don't go through a servlet.
public static void getFreeMarkerComponentsForJsp(HttpServletRequest request) { public static void getFreemarkerComponentsForJsp(HttpServletRequest request) {
// We need to create a FreeMarkerHttpServlet object in order to call the instance methods // We need to create a FreeMarkerHttpServlet object in order to call the instance methods
// to set up the data model. // to set up the data model.
new FreeMarkerComponentGenerator(request); new FreemarkerComponentGenerator(request);
} }
} }

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerSetup.java → webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerSetup.java
View file

@ -14,16 +14,16 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
import freemarker.template.Configuration; import freemarker.template.Configuration;
public class FreeMarkerSetup implements ServletContextListener { public class FreemarkerSetup implements ServletContextListener {
private static final Log log = LogFactory.getLog(FreeMarkerSetup.class); private static final Log log = LogFactory.getLog(FreemarkerSetup.class);
public void contextInitialized(ServletContextEvent event) { public void contextInitialized(ServletContextEvent event) {
ServletContext sc = event.getServletContext(); ServletContext sc = event.getServletContext();
sc.setAttribute("themeToConfigMap", new HashMap<String, Configuration>()); sc.setAttribute("themeToConfigMap", new HashMap<String, Configuration>());
BaseTemplateModel.setServletContext(sc); BaseTemplateModel.setServletContext(sc);
FreeMarkerComponentGenerator.setServletContext(sc); FreemarkerComponentGenerator.setServletContext(sc);
UrlBuilder.contextPath = sc.getContextPath(); UrlBuilder.contextPath = sc.getContextPath();
} }

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
View file

@ -36,7 +36,7 @@ import freemarker.template.Configuration;
/** /**
* Handle adding, replacing or deleting the main image on an Individual. * Handle adding, replacing or deleting the main image on an Individual.
*/ */
public class ImageUploadController extends FreeMarkerHttpServlet { public class ImageUploadController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory private static final Log log = LogFactory
.getLog(ImageUploadController.class); .getLog(ImageUploadController.class);

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
View file

@ -69,7 +69,7 @@ build up the list of actually rendered items first. Only then, if there are any,
*/ */
public class IndividualController extends FreeMarkerHttpServlet { public class IndividualController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(IndividualController.class.getName()); private static final Log log = LogFactory.getLog(IndividualController.class.getName());

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
View file

@ -21,7 +21,7 @@ import freemarker.template.Configuration;
/** /**
* Generates a list of individuals for display in a template * Generates a list of individuals for display in a template
*/ */
public class IndividualListController extends FreeMarkerHttpServlet { public class IndividualListController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(IndividualListController.class.getName()); private static final Log log = LogFactory.getLog(IndividualListController.class.getName());

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/NavigationController.java
View file

@ -31,7 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.web.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.web.DisplayVocabulary;
import freemarker.template.Configuration; import freemarker.template.Configuration;
public class NavigationController extends FreeMarkerHttpServlet { public class NavigationController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(NavigationController.class.getName()); private static final Log log = LogFactory.getLog(NavigationController.class.getName());

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java
View file

@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.utils.StringUtils; import edu.cornell.mannlib.vitro.webapp.utils.StringUtils;
import freemarker.template.Configuration; import freemarker.template.Configuration;
public class TermsOfUseController extends FreeMarkerHttpServlet { public class TermsOfUseController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(TermsOfUseController.class.getName()); private static final Log log = LogFactory.getLog(TermsOfUseController.class.getName());

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
View file

@ -20,7 +20,7 @@ import freemarker.template.Configuration;
* @author rjy7 * @author rjy7
* *
*/ */
public class TestController extends FreeMarkerHttpServlet { public class TestController extends FreemarkerHttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(TestController.class); private static final Log log = LogFactory.getLog(TestController.class);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
View file

@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate; 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.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State;
import freemarker.template.Configuration; import freemarker.template.Configuration;
@ -27,7 +27,7 @@ import freemarker.template.Configuration;
* *
* This class contains stuff that I swiped from {@link Authenticate}. The base * This class contains stuff that I swiped from {@link Authenticate}. The base
* class, {@link LoginTemplateHelperBase}, contains stuff that I swiped from * class, {@link LoginTemplateHelperBase}, contains stuff that I swiped from
* {@link FreeMarkerHttpServlet}. * {@link FreemarkerHttpServlet}.
*/ */
public class LoginTemplateHelper extends LoginTemplateHelperBase { public class LoginTemplateHelper extends LoginTemplateHelperBase {
private static final Log log = LogFactory.getLog(LoginTemplateHelper.class); private static final Log log = LogFactory.getLog(LoginTemplateHelper.class);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelperBase.java
View file

@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.login;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
/** /**
* A temporary means of displaying the Login templates within the SiteAdmin * A temporary means of displaying the Login templates within the SiteAdmin
@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServ
* *
* The constructor insures that the ServletContext is set. * The constructor insures that the ServletContext is set.
*/ */
public class LoginTemplateHelperBase extends FreeMarkerHttpServlet { public class LoginTemplateHelperBase extends FreemarkerHttpServlet {
private final ServletContext servletContext; private final ServletContext servletContext;
LoginTemplateHelperBase(HttpServletRequest req) { LoginTemplateHelperBase(HttpServletRequest req) {

4
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
View file

@ -40,7 +40,7 @@ import org.apache.lucene.store.FSDirectory;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; 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.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
import edu.cornell.mannlib.vitro.webapp.flags.PortalFlag; import edu.cornell.mannlib.vitro.webapp.flags.PortalFlag;
import edu.cornell.mannlib.vitro.webapp.search.SearchException; import edu.cornell.mannlib.vitro.webapp.search.SearchException;
@ -59,7 +59,7 @@ import freemarker.template.Configuration;
* through a Lucene search. * through a Lucene search.
*/ */
public class AutocompleteController extends FreeMarkerHttpServlet implements Searcher{ public class AutocompleteController extends FreemarkerHttpServlet implements Searcher{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(AutocompleteController.class); private static final Log log = LogFactory.getLog(AutocompleteController.class);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java
View file

@ -15,7 +15,7 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.LoginFormBean; import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; 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.FreemarkerHttpServlet;
import edu.cornell.mannlib.vitro.webapp.search.IndexingException; import edu.cornell.mannlib.vitro.webapp.search.IndexingException;
import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder; import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
import freemarker.template.Configuration; import freemarker.template.Configuration;
@ -33,7 +33,7 @@ import freemarker.template.Configuration;
* @author bdc34 * @author bdc34
* *
*/ */
public class IndexController extends FreeMarkerHttpServlet { public class IndexController extends FreemarkerHttpServlet {
private static final Log log = LogFactory.getLog(IndexController.class.getName()); private static final Log log = LogFactory.getLog(IndexController.class.getName());