From f6ba019b41bede8a8d7123801e54c1bb8cc9390c Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 29 Nov 2011 17:27:36 +0000
Subject: [PATCH] Updated vitro's web.xml to have access to the new n3editing
 controllers and updated the data input portion of the site admin page to
 include the correct parameter (editForm instead of editform) and the correct
 JAVA generator name.

---
 webapp/web/WEB-INF/web.xml                    | 37 +++++++++++++++++++
 .../body/siteAdmin/siteAdmin-dataInput.ftl    |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/webapp/web/WEB-INF/web.xml b/webapp/web/WEB-INF/web.xml
index 180b92069..dad98b02f 100644
--- a/webapp/web/WEB-INF/web.xml
+++ b/webapp/web/WEB-INF/web.xml
@@ -341,6 +341,43 @@
     <url-pattern>/uploadImages</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+  	<servlet-name>ProcessRdfFormController</servlet-name>
+  	<servlet-class>edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfFormController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+  	<servlet-name>ProcessRdfFormController</servlet-name>
+  	<url-pattern>/edit/process</url-pattern>
+  </servlet-mapping>
+  
+    <servlet>
+    <servlet-name>DeletePropertyController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.DeletePropertyController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DeletePropertyController</servlet-name>
+    <url-pattern>/deletePropertyController</url-pattern>
+  </servlet-mapping>
+  
+   <servlet>
+    <servlet-name>PostEditCleanupController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.PostEditCleanupController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>PostEditCleanupController</servlet-name>
+    <url-pattern>/postEditCleanupController</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+  	<servlet-name>EditRequestDispatch</servlet-name>
+  	<servlet-class>edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.EditRequestDispatchController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+  	<servlet-name>EditRequestDispatch</servlet-name>
+  	<url-pattern>/editRequestDispatch</url-pattern>
+  </servlet-mapping>
+  
+
   <servlet>
     <servlet-name>FlagUpdateController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.FlagUpdateController</servlet-class>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
index 15a2d0b57..5be180e1b 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
@@ -12,7 +12,7 @@
             <select id="VClassURI" name="typeOfNew" class="form-item" role="select">
                 <@form.optionGroups groups=dataInput.groupedClassOptions />
             </select>
-            <input type="hidden" name="editform" value="newIndividualForm.jsp" role="input" />
+            <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator" role="input" />
             <input type="submit" id="submit" value="Add individual of this class" role="button" />
         </form>
     </section>