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

Use FreeMarker controller and templates for About and Index pages. Improvements to FreeMarkerHttpServlet.getUrl() method. Unit tests for FreeMarkerHttpServlet static methods.

Browse source
This commit is contained in:
rjy7 2010-05-17 17:26:40 +00:00
parent 92f9280af0
commit 046ca60439
9 changed files with 140 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

31
webapp/config/web.xml
View file

@ -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>