Use FreeMarker controller and templates for About and Index pages. Improvements to FreeMarkerHttpServlet.getUrl() method. Unit tests for FreeMarkerHttpServlet static methods.
This commit is contained in:
parent
92f9280af0
commit
046ca60439
9 changed files with 140 additions and 68 deletions
|
@ -266,22 +266,13 @@
|
|||
|
||||
<servlet>
|
||||
<servlet-name>AboutController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.AboutController</servlet-class>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.AboutControllerFM</servlet-class>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>AboutController</servlet-name>
|
||||
<url-pattern>/about</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet>
|
||||
<servlet-name>AboutControllerFM</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.AboutControllerFM</servlet-class>
|
||||
</servlet>
|
||||
<servlet-mapping>
|
||||
<servlet-name>AboutControllerFM</servlet-name>
|
||||
<url-pattern>/about-fm</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet>
|
||||
<servlet-name>FakeSelfEditController</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.FakeSelfEditController</servlet-class>
|
||||
|
@ -968,16 +959,14 @@
|
|||
|
||||
<servlet>
|
||||
<servlet-name>browsecontroller</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.BrowseController</servlet-class>
|
||||
<load-on-startup>5</load-on-startup>
|
||||
</servlet>
|
||||
|
||||
<servlet>
|
||||
<servlet-name>browsecontrollerFM</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.BrowseControllerFM</servlet-class>
|
||||
<load-on-startup>5</load-on-startup>
|
||||
</servlet>
|
||||
|
||||
<servlet-mapping>
|
||||
<servlet-name>browsecontroller</servlet-name>
|
||||
<url-pattern>/browse</url-pattern>
|
||||
</servlet-mapping>
|
||||
|
||||
<servlet>
|
||||
<servlet-name>pubsbyorg</servlet-name>
|
||||
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.vclass.PubsByDepartmentServlet</servlet-class>
|
||||
|
@ -1090,14 +1079,6 @@
|
|||
<servlet-name>logout</servlet-name>
|
||||
<url-pattern>/logout</url-pattern>
|
||||
</servlet-mapping>
|
||||
<servlet-mapping>
|
||||
<servlet-name>browsecontroller</servlet-name>
|
||||
<url-pattern>/browsecontroller</url-pattern>
|
||||
</servlet-mapping>
|
||||
<servlet-mapping>
|
||||
<servlet-name>browsecontrollerFM</servlet-name>
|
||||
<url-pattern>/browse</url-pattern>
|
||||
</servlet-mapping>
|
||||
<servlet-mapping>
|
||||
<servlet-name>pubsbyorg</servlet-name>
|
||||
<url-pattern>/pubsbyorg</url-pattern>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue