merging 4296 to the trunk

This commit is contained in:
tworrall 2012-10-05 17:40:45 +00:00
parent 09c40c4505
commit 1b9c1d9925

View file

@ -912,6 +912,15 @@
<url-pattern>/search</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>SearchHelpController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SearchHelpController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SearchHelpController</servlet-name>
<url-pattern>/searchHelp</url-pattern>
</servlet-mapping>
<!-- for now, need to make sure the links on CALS' site doesn't break -->
<servlet-mapping>
<servlet-name>SearchController</servlet-name>