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

Reverting changes from last commit: these were intended for the dev-template-engine-eval branch, not the trunk.

Browse source
This commit is contained in:
rjy7 2010-02-09 17:14:22 +00:00
parent 788b1cde36
commit 8dbfe7a9cd
1 changed files with 6 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
webapp/config/web.xml
View file

@ -17,12 +17,11 @@
<env-entry>
<env-entry-name>jdbc/vitro/connectionType</env-entry-name>
<!--
How to get a DataSource, Valid values:
SERVER_XML_POOL gets a named DataSource connection from the JNDI context,
most likely that was set up tomcat/conf/server.xml
PROPERTIES_FILE_POOL makes a DataSource using properties from a file that
is pointed to by the JNDI name "java:comp/env/path.configuration"
(set in the Tomcat context).
How to get a DataSource, Valid valies:
SERVER_XML_POOL gets a named DataSource connection from the
JNDI context, most likely that was set up tomcat/conf/server.xml
PROPERTIES_FILE_POOL makes a DataSource using properties from
a file in the classpath at /beans/connection.properties
-->
<!-- <env-entry-value>SERVER_XML_POOL</env-entry-value> -->
<env-entry-type>java.lang.String</env-entry-type>
@ -925,36 +924,6 @@
<load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>browsecontrollerJsp</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.BrowseControllerJsp</servlet-class>
<load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>browsecontrollerStringTemplate</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.BrowseControllerStringTemplate</servlet-class>
<load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>browsecontrollerFreeMarker</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.BrowseControllerFreeMarker</servlet-class>
<load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>browsecontrollerVelocity</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.BrowseControllerVelocity</servlet-class>
<load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>browsecontrollerWicket</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.BrowseControllerWicket</servlet-class>
<load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>pubsbyorg</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.vclass.PubsByDepartmentServlet</servlet-class>
@ -1063,30 +1032,6 @@
<servlet-name>browsecontroller</servlet-name>
<url-pattern>/browsecontroller</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>browsecontroller</servlet-name>
<url-pattern>/browsecontroller</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>browsecontrollerJsp</servlet-name>
<url-pattern>/browsecontroller-jsp</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>browsecontrollerStringTemplate</servlet-name>
<url-pattern>/browsecontroller-stringtemplate</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>browsecontrollerFreeMarker</servlet-name>
<url-pattern>/browsecontroller-freemarker</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>browsecontrollerVelocity</servlet-name>
<url-pattern>/browsecontroller-velocity</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>browsecontrollerWicket</servlet-name>
<url-pattern>/browsecontroller-wicket</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>pubsbyorg</servlet-name>
<url-pattern>/pubsbyorg</url-pattern>