From 98edd591f0028a4d5e554d62a8db83387c8f7097 Mon Sep 17 00:00:00 2001
From: briancaruso <briancaruso@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 14 Nov 2011 21:28:04 +0000
Subject: [PATCH] adding jsp to generator map so all old jsp will now redirect
 to generators

---
 productMods/edit/forms/addAuthorsToInformationResource.jsp   | 2 ++
 productMods/edit/forms/addEditWebpageForm.jsp                | 2 ++
 productMods/edit/forms/addGrantRoleToPerson.jsp              | 2 ++
 productMods/edit/forms/addPublicationToPerson.jsp            | 4 +++-
 productMods/edit/forms/addRoleToPersonTwoStage.jsp           | 4 +++-
 productMods/edit/forms/manageWebpagesForIndividual.jsp       | 2 ++
 productMods/edit/forms/newIndividualForm.jsp                 | 2 ++
 productMods/edit/forms/organizationHasPositionHistory.jsp    | 2 ++
 productMods/edit/forms/personHasEducationalTraining.jsp      | 1 +
 productMods/edit/forms/personHasPositionHistory.jsp          | 2 ++
 productMods/edit/forms/terminologyAnnotation.jsp             | 2 ++
 productMods/edit/forms/unsupportedBrowserMessage.jsp         | 3 ++-
 .../generators/PersonHasEducationalTraining.java             | 5 +++--
 13 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/productMods/edit/forms/addAuthorsToInformationResource.jsp b/productMods/edit/forms/addAuthorsToInformationResource.jsp
index 1c3734f2..ba4f1a5c 100644
--- a/productMods/edit/forms/addAuthorsToInformationResource.jsp
+++ b/productMods/edit/forms/addAuthorsToInformationResource.jsp
@@ -290,6 +290,8 @@ SPARQL queries for existing values. --%>
 
 <jsp:include page="${preForm}" />
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE ON THIS PAGE WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%>
 <h2>${title}</h2>
 
diff --git a/productMods/edit/forms/addEditWebpageForm.jsp b/productMods/edit/forms/addEditWebpageForm.jsp
index 69c342d3..a087ef07 100644
--- a/productMods/edit/forms/addEditWebpageForm.jsp
+++ b/productMods/edit/forms/addEditWebpageForm.jsp
@@ -236,6 +236,8 @@ core:rank
 <c:set var="requiredHint" value="<span class='requiredHint'> *</span>" />
 
 <jsp:include page="${preForm}"/>
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 
 <h2>${title}&nbsp;<%= subjectName %></h2>
 
diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp
index b42c0f64..e52de8a1 100644
--- a/productMods/edit/forms/addGrantRoleToPerson.jsp
+++ b/productMods/edit/forms/addGrantRoleToPerson.jsp
@@ -405,6 +405,8 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
 <c:set var="yearHint" value="<span class='hint'>(YYYY)</span>" />
 
 <jsp:include page="${preForm}" />
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 
 <% if( mode == EditMode.ERROR ){ %>
  <div>This form is unable to handle the editing of this position because it is associated with 
diff --git a/productMods/edit/forms/addPublicationToPerson.jsp b/productMods/edit/forms/addPublicationToPerson.jsp
index 3ab257c3..2dae767e 100644
--- a/productMods/edit/forms/addPublicationToPerson.jsp
+++ b/productMods/edit/forms/addPublicationToPerson.jsp
@@ -296,6 +296,8 @@ SPARQL queries for existing values. --%>
 
 <jsp:include page="${preForm}" />
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <% if( mode == EditMode.ERROR ){ %>
  <div>This form is unable to handle the editing of this position because it is associated with 
       multiple Position individuals.</div>      
@@ -347,4 +349,4 @@ var customFormData  = {
 
 <% } %>
 
-<jsp:include page="${postForm}"/>
\ No newline at end of file
+<jsp:include page="${postForm}"/>
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 0e4a8595..8a982512 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -500,6 +500,8 @@ log.debug("TYPE QUERY: " + vreq.getAttribute("typeQuery"));
 
 <jsp:include page="${preForm}" />
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <% if( mode == EditMode.ERROR ){ %>
  <div>This form is unable to handle the editing of this role because it is associated with 
       multiple ${param.roleDescriptor} individuals.</div>      
@@ -668,4 +670,4 @@ private String getActivityTypeQuery(VitroRequest vreq) {
 	
     return activityTypeQuery;
 }
-%>
\ No newline at end of file
+%>
diff --git a/productMods/edit/forms/manageWebpagesForIndividual.jsp b/productMods/edit/forms/manageWebpagesForIndividual.jsp
index 6a2f534f..ae39c5af 100644
--- a/productMods/edit/forms/manageWebpagesForIndividual.jsp
+++ b/productMods/edit/forms/manageWebpagesForIndividual.jsp
@@ -109,6 +109,8 @@
 
 <jsp:include page="${preForm}"/>
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <h2><em><%= subjectName %></em></h2>
 
 <h3>Manage Web Pages</h3>
diff --git a/productMods/edit/forms/newIndividualForm.jsp b/productMods/edit/forms/newIndividualForm.jsp
index 25797273..ddc61220 100644
--- a/productMods/edit/forms/newIndividualForm.jsp
+++ b/productMods/edit/forms/newIndividualForm.jsp
@@ -173,6 +173,8 @@ parameter set up by editRequestDispatch.
 
 <jsp:include page="${preForm}" />
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <h2>Create a new ${typeName}</h2>
 
 <form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
diff --git a/productMods/edit/forms/organizationHasPositionHistory.jsp b/productMods/edit/forms/organizationHasPositionHistory.jsp
index 293196e1..a4a93a54 100644
--- a/productMods/edit/forms/organizationHasPositionHistory.jsp
+++ b/productMods/edit/forms/organizationHasPositionHistory.jsp
@@ -320,6 +320,8 @@
 
 <jsp:include page="${preForm}"/>
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <h2>${title}</h2>
 <form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
 	<v:input type="text" label="Position Title ${requiredHint}" id="title" size="30"/>
diff --git a/productMods/edit/forms/personHasEducationalTraining.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp
index 702e1818..1951504d 100644
--- a/productMods/edit/forms/personHasEducationalTraining.jsp
+++ b/productMods/edit/forms/personHasEducationalTraining.jsp
@@ -506,6 +506,7 @@ This goes to an experimental FM based form:
 <c:set var="yearHint" value="<span class='hint'>(YYYY)</span>" />
 
 <jsp:include page="${preForm}" />
+<h1>JSP form, must be removed for the 1.4!</h1>
 
 <% if( mode == EditMode.ERROR ){ %>
  <div>This form is unable to handle the editing of this position because it is associated with 
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index 3765d2f7..cab18dc5 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -422,6 +422,8 @@ type is returned and we don't get a match to the select element options. --%>
 
 <jsp:include page="${preForm}" />
 
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 <% if( mode == EditMode.ERROR ){ %>
  <div>This form is unable to handle the editing of this position because it is associated with 
       multiple Position individuals.</div>      
diff --git a/productMods/edit/forms/terminologyAnnotation.jsp b/productMods/edit/forms/terminologyAnnotation.jsp
index 57146759..8458898d 100644
--- a/productMods/edit/forms/terminologyAnnotation.jsp
+++ b/productMods/edit/forms/terminologyAnnotation.jsp
@@ -192,6 +192,8 @@ SPARQL queries for existing values. --%>
 <c:set var="title" value="<em>${subjectName}</em>"/>
 
 <jsp:include page="${preForm}" />
+<h1>JSP form, must be removed for the 1.4!</h1>
+
 
 <%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE ON THIS PAGE WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%>
 <h2>${title}</h2>
diff --git a/productMods/edit/forms/unsupportedBrowserMessage.jsp b/productMods/edit/forms/unsupportedBrowserMessage.jsp
index fd63e787..fb3b38dd 100644
--- a/productMods/edit/forms/unsupportedBrowserMessage.jsp
+++ b/productMods/edit/forms/unsupportedBrowserMessage.jsp
@@ -7,9 +7,10 @@
 <c:set var="themeDir" value="${contextPath}/${portal.themeDir}"/>
 
 <div id="ie67DisableWrapper">
+<h1>JSP form, must be removed for the 1.4!</h1>
 	<div id="ie67DisableContent">
 		<img src="${themeDir}site_icons/iconAlertBig.png" alt="Alert Icon"/>
 		<p>This form is not supported in versions of Internet Explorer below version 8. Please upgrade your browser, or
 		switch to another browser, such as FireFox.</p>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
index 2e44f5b3..1593f3cd 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
@@ -64,6 +64,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo;
  */
 public class PersonHasEducationalTraining  extends VivoBaseGenerator implements EditConfigurationGenerator{            
 
+    //TODO: can we get rid of the session and get it form the vreq?
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
  
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
@@ -77,7 +78,7 @@ public class PersonHasEducationalTraining  extends VivoBaseGenerator implements
         conf.setVarNameForSubject("person");
         conf.setVarNameForPredicate("predicate");
         conf.setVarNameForObject("edTraining");
-        
+                
         conf.setN3Required( Arrays.asList( n3ForNewEdTraining, orgLabelAssertion, orgTypeAssertion ) );
         conf.setN3Optional(Arrays.asList( 
                 n3ForEdTrainingToOrg, majorFieldAssertion, degreeAssertion, 
@@ -90,7 +91,7 @@ public class PersonHasEducationalTraining  extends VivoBaseGenerator implements
         conf.addNewResource("startNode",DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode",DEFAULT_NS_FOR_NEW_RESOURCE);
         
-        //uris in scope: none                
+        //uris in scope: none   
         //literals in scope: none
         
         conf.setUrisOnform( Arrays.asList( "org", "orgType", "degree"));