Move FreeMarker templates, controllers, setup, and library upgrades into trunk. Not used to generate any pages or templates yet (except a couple of hidden pages that are only available through the url).

webapp/config/web.xml

@@ -138,6 +138,12 @@
     </listener-class>
   </listener>
 
+  <listener>
+    <listener-class>
+        edu.cornell.mannlib.vitro.webapp.servlet.setup.FreeMarkerSetup
+    </listener-class>
+  </listener>
+  
   <!--
     <listener>
         <listener-class>
@@ -267,6 +273,15 @@
     <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>
@@ -781,6 +796,15 @@
     <url-pattern>/entitylist</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>IndividualListControllerFM</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.IndividualListControllerFM</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>IndividualListControllerFM</servlet-name>
+    <url-pattern>/individuallistFM</url-pattern>
+  </servlet-mapping>
+  
   <servlet>
     <servlet-name>SearchController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController</servlet-class>
@@ -947,6 +971,12 @@
     <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>
     <servlet-name>pubsbyorg</servlet-name>
@@ -1064,6 +1094,10 @@
     <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>