From 8dbfe7a9cdc66b7f4fa0241be9e6c555877835d1 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 9 Feb 2010 17:14:22 +0000
Subject: [PATCH] Reverting changes from last commit: these were intended for
 the dev-template-engine-eval branch, not the trunk.

---
 webapp/config/web.xml | 67 ++++---------------------------------------
 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 524e55bc7..d79070fdd 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -17,13 +17,12 @@
   <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>
     <env-entry-value>PROPERTIES_FILE_POOL</env-entry-value>
@@ -924,36 +923,6 @@
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.BrowseController</servlet-class>
     <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>
@@ -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>