NIHVIVO-3432 refactor access to model makers in ingest tools

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java

@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -112,19 +113,19 @@ public class JenaIngestController extends BaseEditController {
     private static final Map<String, Model> attachedModels = new HashMap<String, Model>();
     
     @Override
-	public void doGet(HttpServletRequest request, HttpServletResponse response){
+    public void doGet(HttpServletRequest request, HttpServletResponse response) 
+            throws ServletException, IOException {
         if (!isAuthorizedToDisplayPage(request, response, new Actions(
                 new UseAdvancedDataToolsPages()))) {
             return;
         }
         
         VitroRequest vreq = new VitroRequest(request);   
-		
         ModelMaker maker = getVitroJenaModelMaker(vreq);
+        String modelType = getModelType(vreq, maker);
         
         String actionStr = vreq.getParameter("action");
         actionStr = (actionStr != null) ? actionStr : "";
-		String modelType = vreq.getParameter("modelType");
         
         if("listModels".equals(actionStr)) {
             processListModelsRequest(vreq, maker, modelType);
@@ -186,82 +187,42 @@ public class JenaIngestController extends BaseEditController {
             request.setAttribute("bodyJsp",INGEST_MENU_JSP);
         }
         
+        maker = getVitroJenaModelMaker(vreq); 
+        request.setAttribute("modelNames", maker.listModels().toList());
+        request.setAttribute("vitroJenaModelMaker", maker);
+   
         RequestDispatcher rd = request.getRequestDispatcher(
                 Controllers.BASIC_JSP);      
-        request.setAttribute("css", 
-        		"<link rel=\"stylesheet\" type=\"text/css\" href=\"" + 
-        		vreq.getAppBean().getThemeDir() + "css/edit.css\"/>");
-
         try {
             rd.forward(request, response);
         } catch (Exception e) {
             log.error(e,e);
+            throw new ServletException(e);
         }
         
     }
     
     private void processListModelsRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
-		String modelT = (String)getServletContext().getAttribute("modelT");
+        showModelList(vreq, maker, modelType);
-		if(modelT == null){
-			boolean initialSwitch = true; // SDB mode initially
-			if(initialSwitch){
-				VitroJenaSDBModelMaker vsmm = (VitroJenaSDBModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-				vreq.getSession().setAttribute("vitroJenaModelMaker", vsmm);
-				modelT = "sdb";
-			}
-			else{
-				modelT = "rdb";
-			}
-		}
-		if(modelT.equals("rdb")){
-			vreq.setAttribute("modelType", "rdb");
-			vreq.setAttribute("infoLine", "RDB models");
-		}
-		else{
-			vreq.setAttribute("modelType", "sdb");
-			vreq.setAttribute("infoLine", "SDB models");
-		}
-		vreq.setAttribute("title","Available Models");
-		vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
     }
     
     private void processRDBModelsRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
         VitroJenaModelMaker vjmm = (VitroJenaModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");
         vreq.getSession().setAttribute("vitroJenaModelMaker", vjmm);
-	    getServletContext().setAttribute("modelT", "rdb");
+        showModelList(vreq, vjmm, "rdb");
-	    getServletContext().setAttribute("info", "RDB models");
-    	vreq.setAttribute("modelType", "rdb");
-    	vreq.setAttribute("infoLine", "RDB models");
-		vreq.setAttribute("title","Available Models");
-		vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
     }
     
     private void processSDBModelsRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
         VitroJenaSDBModelMaker vsmm = (VitroJenaSDBModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
         vreq.getSession().setAttribute("vitroJenaModelMaker", vsmm);
-    	getServletContext().setAttribute("modelT", "sdb");
+        showModelList(vreq, vsmm, "sdb");
-		    getServletContext().setAttribute("info", "SDB models");
-    	vreq.setAttribute("modelType", "sdb");
-    	vreq.setAttribute("infoLine", "SDB models");
-    	vreq.setAttribute("title","Available Models");
-		vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
     }
     
     private void processCreateModelRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
         String modelName = vreq.getParameter("modelName");
         if (modelName != null) {
-			if(modelType.equals("sdb")){
-	        	maker = (VitroJenaSDBModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-	        	vreq.setAttribute("modelType", "sdb");
-	        	vreq.setAttribute("infoLine", "SDB models");
-			}
-			else{
-				vreq.setAttribute("modelType", "rdb");
-				vreq.setAttribute("infoLine", "RDB models");
-			}
             doCreateModel(modelName, maker);
-			vreq.setAttribute("title","Available Models");
+            showModelList(vreq, maker, modelType);
-			vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
         } else {
             vreq.setAttribute("modelType", modelType);
             vreq.setAttribute("title","Create New Model");
@@ -270,35 +231,19 @@ public class JenaIngestController extends BaseEditController {
     }
     
     private void processRemoveModelRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
-		if(modelType.equals("sdb")){
-			vreq.setAttribute("modelType", "sdb");
-			vreq.setAttribute("infoLine", "SDB models");
-		}
-		else{
-			vreq.setAttribute("modelType", "rdb");
-			vreq.setAttribute("infoLine", "RDB models");
-		}
         String modelName = vreq.getParameter("modelName");
         if (modelName!=null) {
             doRemoveModel(modelName, maker);
         }
-		vreq.setAttribute("title","Available Models");
+        showModelList(vreq, maker, modelType);
-		vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
     }
     
     private void processClearModelRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
-		if(modelType.equals("sdb")){
-			vreq.setAttribute("infoLine", "SDB models");
-		}
-		else{
-			vreq.setAttribute("infoLine", "RDB models");
-		}
         String modelName = vreq.getParameter("modelName");
         if (modelName != null) {
             doClearModel(modelName,maker);
         }
-		vreq.setAttribute("title","Available Models");
+        showModelList(vreq, maker, modelType);
-		vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
     }
     
     private void processLoadRDFDataRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
@@ -360,8 +305,7 @@ public class JenaIngestController extends BaseEditController {
         if (modelName != null) {
             doAttachModel(modelName,maker);
         }
-		vreq.setAttribute("title","Available Models");
+        showModelList(vreq, maker, modelType);
-		vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
     }
     
     private void processDetachModelRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
@@ -371,8 +315,7 @@ public class JenaIngestController extends BaseEditController {
         }
         //request.setAttribute("title","Ingest Menu");
         //request.setAttribute("bodyJsp",INGEST_MENU_JSP);
-		vreq.setAttribute("title","Available Models");
+        showModelList(vreq, maker, modelType);
-		vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
     }
     
     private void processRenameBNodesRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
@@ -752,7 +695,7 @@ public class JenaIngestController extends BaseEditController {
         }
     }
     
-	private ModelMaker getVitroJenaModelMaker(HttpServletRequest request) {
+    protected ModelMaker getVitroJenaModelMaker(HttpServletRequest request) {
         ModelMaker myVjmm = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
         myVjmm = (myVjmm == null) ? (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker") : myVjmm;
         return new VitroJenaSpecialModelMaker(myVjmm, request);
@@ -785,6 +728,21 @@ public class JenaIngestController extends BaseEditController {
         }
     }
     
+    private String getModelType(VitroRequest vreq, ModelMaker maker) {
+        String modelType = vreq.getParameter("modelType");
+        maker = (maker instanceof VitroJenaSpecialModelMaker) 
+                ? ((VitroJenaSpecialModelMaker) maker).getInnerModelMaker()
+                : maker;
+        if (modelType == null) {
+            if (maker instanceof VitroJenaSDBModelMaker) {
+                modelType = "sdb";
+            } else {
+                modelType = "rdb";
+            }
+        }
+        return modelType;
+    }
+    
     private void doCreateModel(String modelName, ModelMaker modelMaker) {
         modelMaker.createModel(modelName);
     }
@@ -1270,6 +1228,19 @@ public class JenaIngestController extends BaseEditController {
         return result;
     }
     
+    private void showModelList(VitroRequest vreq, ModelMaker maker, String modelType) {
+        if(modelType.equals("rdb")){
+            vreq.setAttribute("modelType", "rdb");
+            vreq.setAttribute("infoLine", "RDB models");
+        } else{
+            vreq.setAttribute("modelType", "sdb");
+            vreq.setAttribute("infoLine", "SDB models");
+        }
+        vreq.setAttribute("bodyAttr", "onLoad=\"init()\"");
+        vreq.setAttribute("title","Available Models");
+        vreq.setAttribute("bodyJsp",LIST_MODELS_JSP);
+    }
+
     private class CollationSort implements Comparator<String> {
         
         Collator collator = Collator.getInstance();

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java

@@ -41,7 +41,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSpecialModelMaker;
 import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
 
-public class JenaXMLFileUpload  extends BaseEditController  {	
+public class JenaXMLFileUpload  extends JenaIngestController  {	
 	Log log = LogFactory.getLog(JenaXMLFileUpload.class);
 	private String baseDirectoryForFiles;
 	private int maxFileSize = 1024 * 1024 * 500;
@@ -88,6 +88,7 @@ public class JenaXMLFileUpload  extends BaseEditController  {
 	 * defaultNamespace - namespace to use for elements in xml that lack a namespace
 	 * 
 	 */
+	@Override
 	public void doPost(HttpServletRequest rawRequest, HttpServletResponse resp)
 	throws ServletException, IOException {
 		FileUploadServletRequest request = FileUploadServletRequest.parseRequest(rawRequest, maxFileSize);
@@ -151,8 +152,8 @@ public class JenaXMLFileUpload  extends BaseEditController  {
         }
 	}
 	
-		
+	@Override	
-	protected void doGet(HttpServletRequest request,
+	public void doGet(HttpServletRequest request,
 			HttpServletResponse response) throws ServletException, IOException {		
         if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseAdvancedDataToolsPages()))) {
         	return;
@@ -164,6 +165,7 @@ public class JenaXMLFileUpload  extends BaseEditController  {
 		request.setAttribute("title","Upload file and convert to RDF");
 		request.setAttribute("bodyJsp","/jenaIngest/xmlFileUpload.jsp");
 		
+		request.setAttribute("modelNames", getVitroJenaModelMaker(vreq).listModels().toList());
 		request.setAttribute("models", null);				
 
 		RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);      
@@ -268,13 +270,6 @@ public class JenaXMLFileUpload  extends BaseEditController  {
         return filesToLoad;
 	}
 
-	private ModelMaker getVitroJenaModelMaker(HttpServletRequest request) {
-		ModelMaker myVjmm = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-		myVjmm = (myVjmm == null) ? (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker") : myVjmm;
-		return new VitroJenaSpecialModelMaker(myVjmm, request);
-	}
-	
-
 	private long countOfStatements( List<Model> models){
 		
 		long count =0;

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java

@@ -35,6 +35,10 @@ public class VitroJenaSpecialModelMaker implements ModelMaker {
 		this.request = request;
 	}
 	
+	public ModelMaker getInnerModelMaker() {
+		return this.innerModelMaker;
+	}
+	
 	public void close() {
 		innerModelMaker.close();
 	}

webapp/web/jenaIngest/csv2rdf.jsp

@@ -9,19 +9,12 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
-
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Convert CSV to RDF</h2>
 
     <form action="csv2rdf" method="post" enctype="multipart/form-data">
@@ -49,7 +42,7 @@
 -->
 
     <p>
-    <p>Each row in the spreadsheet will produce an resource.  Each of these
+    <p>Each row in the spreadsheet will produce a resource.  Each of these
     resources will be a member of a class in the namespace selected above.</p>  
     <p>What should the local name of this class be? This is normally a word or two 
     in "camel case" starting with an uppercase letter.  (For example, if the 
@@ -60,25 +53,19 @@
 
     <select name="destinationModelName">
         <option value="vitro:baseOntModel">webapp assertions</option>
-<%
+        <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+           <option value="${modelName}">${modelName}</option>
-	String modelName = (String) it.next();
+        </c:forEach>
-        %> <option value="<%=modelName%>"><%=modelName%></option>
+        <option value="">(none)</option>
-        <%    
-    }
-%>    <option value="">(none)</option>
     </select>
     <p>Model in which to save the converted spreadsheet data</p>
 
    <select name="tboxDestinationModelName">
         <option value="vitro:baseOntModel">webapp assertions</option>
-<%
+        <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+           <option value="${modelName}">${modelName}</option>
-	String modelName = (String) it.next();
+        </c:forEach>
-        %> <option value="<%=modelName%>"><%=modelName%></option>
+   <option value="">(none)</option>
-        <%    
-    }
-%>    <option value="">(none)</option>
     </select>
     <p>Model in which to save the automatically-generated ontology</p>
 

webapp/web/jenaIngest/csv2rdfSelectUri.jsp

@@ -20,14 +20,6 @@
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
 <script type="text/javascript" src="js/jquery.js"></script>
 <script type="text/javascript" src="js/jenaIngest/renameNode.js"></script>
 <script type="text/javascript">
@@ -90,6 +82,8 @@ function disableProperties(){
         <input type="hidden" name="sourceModelName" value="${sourceModelValue}"/>
     </c:forEach>
     
+    <p/>
+    
     <input class="submit" type="submit" value="Convert CSV"/>
     
     </form>

webapp/web/jenaIngest/executeWorkflow.jsp

@@ -13,14 +13,6 @@
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Execute RDF-Encoded Ingest Workflow</h2>
 
     <form action="ingest" method="get"i>

webapp/web/jenaIngest/generateTBox.jsp

@@ -9,19 +9,11 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
-
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Generate TBox from Assertions Data</h2>
 
     <form action="ingest" method="get">
@@ -32,13 +24,9 @@
     <ul>
 		<li><input type="checkbox" name="sourceModelName" value="vitro:jenaOntModel"/>webapp model</li>
 		<li><input type="checkbox" name="sourceModelName" value="vitro:baseOntModel"/>webapp assertions</li>
-<%
+        <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+            <li><input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
-	String modelName = (String) it.next();
+        </c:forEach>
-        %> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
-        <%    
-    }
-%>
     </ul>
 
     <h3>Select Destination Model for Generated TBox</h3>
@@ -46,14 +34,9 @@
     <select name="destinationModelName">
         <option value="vitro:baseOntModel"/>webapp assertions</option>   
         <option value="vitro:jenaOntModel"/>webapp model</option>   
-           
+        <c:forEach var="modelName" items="${modelNames}">
-<%
+          <option value="${modelName}"/>${modelName}</option>
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+        </c:forEach>
-	String modelName = (String) it.next();
-        %> <option value="<%=modelName%>"/><%=modelName%></option>
-        <%    
-    }
-%>   
     </select>
 
     <input class="submit" type="submit" value="Generate TBox"/>

webapp/web/jenaIngest/listModels.jsp

@@ -3,7 +3,7 @@
 <%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.net.URLEncoder" %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
@@ -22,15 +22,6 @@ function init(){
 }
 </script>
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-	maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");
-	getServletContext().setAttribute("vitroJenaModelMaker",maker);
-    }
-%>
-
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Available Jena Models</h2>
 
     <table>
@@ -60,15 +51,13 @@ function init(){
     
             Currently showing <font color="red">${infoLine}</font>
     <ul>
-<%
+      <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+          <li style="padding-bottom:2em;padding-top:2em;"> ${modelName}
-	String modelName = (String) it.next();
-        %>  <li style="padding-bottom:2em;padding-top:2em;"> <%=modelName%>
             <table style="margin-left:2em;"><tr>
             <td>
             <form action="ingest" method="get">
                 <input type="hidden" name="action" value="loadRDFData"/>
-                <input type="hidden" name="modelName" value="<%=modelName%>"/>
+                <input type="hidden" name="modelName" value="${modelName}"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
                 <input type="submit" name="submit" value="load RDF data"/>
             </form>
@@ -76,14 +65,14 @@ function init(){
             <td>
             <c:url var="outputModelURL" value="ingest">
             	<c:param name="action" value="outputModel"/>
-            	<c:param name="modelName" value="<%=modelName%>"/>
+            	<c:param name="modelName" value="${modelName}"/>
             </c:url>
             <a href="${outputModelURL}">output model</a>
             </td>
             <td>
             <form action="ingest" method="post">
                 <input type="hidden" name="action" value="clearModel"/>
-                <input type="hidden" name="modelName" value="<%=modelName%>"/>
+                <input type="hidden" name="modelName" value="${modelName}"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
                 <input type="submit" name="submit" value="clear statements"/>
             </form>
@@ -91,7 +80,7 @@ function init(){
             <td>
             <form action="ingest" method="post">
                 <input type="hidden" name="action" value="removeModel"/>
-                <input type="hidden" name="modelName" value="<%=modelName%>"/>
+                <input type="hidden" name="modelName" value="${modelName}"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
                 <input type="submit" name="submit" value="remove"/>
             </form>
@@ -101,7 +90,7 @@ function init(){
             <td>
             <form action="ingest" method="post">
                 <input type="hidden" name="action" value="attachModel"/>
-                <input type="hidden" name="modelName" value="<%=modelName%>"/>
+                <input type="hidden" name="modelName" value="${modelName}"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
                 <input type="submit" name="submit" value="attach to TBox (ontology)"/>
             </form>
@@ -109,7 +98,7 @@ function init(){
             <td>
             <form action="ingest" method="post">
                 <input type="hidden" name="action" value="detachModel"/>
-                <input type="hidden" name="modelName" value="<%=modelName%>"/>
+                <input type="hidden" name="modelName" value="${modelName}"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
                 <input type="submit" name="submit" value="detach from TBox (ontology)"/>
             </form>
@@ -117,16 +106,14 @@ function init(){
             <td>
 			<form action="ingest" method="get">
 			    <input type="hidden" name="action" value="permanentURI" />
-			    <input type="hidden" name="modelName" value="<%=modelName%>" /> 
+			    <input type="hidden" name="modelName" value="${modelName}" /> 
 				<input type="hidden" name="modelType" value="${modelType}"/>
 				<input type="submit" name="submit" value="generate permanent URIs" /></form>
 			</td>
             <td>&nbsp;</td>
             </tr>
             </table>
-        </li> <%    
+        </li>
-    }
+      </c:forEach>
-%>
     </ul>
 
-    <BODY onLoad="init()"></BODY>

webapp/web/jenaIngest/mergeResources.jsp

@@ -5,21 +5,13 @@
 <%@ page import="java.util.Iterator"%>
 <%@ page import="java.net.URLEncoder"%>
 <%@ page import="java.util.List"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-	maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
 <script type="text/javascript" src="js/jquery.js"></script>
 <script type="text/javascript" src="js/jenaIngest/ingestUtils.js"></script>
 

webapp/web/jenaIngest/permanentURI.jsp

@@ -5,22 +5,13 @@
 <%@ page import="java.util.Iterator"%>
 <%@ page import="java.net.URLEncoder"%>
 <%@ page import="java.util.List"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-	maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
-
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Assign Permanent URIs To Resources</h2>
 
 <p>This tool will rename the resources in the selected model to with new
@@ -34,32 +25,30 @@ resources."  Otherwise, the "use default namespace" option will generate
 URIs exactly of the form created through the GUI interface.</p>
 
 <form action="ingest" method="get" >
-<%String modelName = (String)request.getAttribute("modelName"); %>
+<input type="hidden" name="oldModel" value="${modelName}"/>
-<input type="hidden" name="oldModel" value="<%=modelName%>"/>
 <input type="hidden" name="action" value="permanentURI" />
-<p>Current namespace of resources  <select name=oldNamespace><%List namespaces = (List)request.getAttribute("namespaceList");
+<p>Current namespace of resources  
+<select name=oldNamespace>
+<%List namespaces = (List)request.getAttribute("namespaceList");
 if(namespaces != null) {
 	Iterator namespaceItr = namespaces.iterator();
 	Integer count = 0;
 	while (namespaceItr.hasNext()){
 		String namespaceText = (String) namespaceItr.next();
 		%>
-<option value="<%=namespaceText%>"><%=namespaceText%></option><%}}%>
+        <option value="<%=namespaceText%>"><%=namespaceText%></option>
+<%  }
+}%>
 </select></p>
 
-<p>Model to save  <select name=newModel>
+<p>Model in which to save results  <select name="newModel">
-<%
+<c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+    <option value="${modelName}">${modelName}</option>
-	String modelNames = (String) it.next();
+</c:forEach>
-        %>
+
-<option value="<%=modelNames%>"><%=modelNames%></option>
-<%    
-    }
-%>
 </select></p>
 <p>New namespace for resources  <input type="text" name="newNamespace" /></p>
-Or <%String defaultNamespace = (String)request.getAttribute("defaultNamespace");%>
+<p>Use default namespace ${defaultNamespace}  <input type="checkbox" name="defaultNamespace" value ="${defaultNamespace}"/>
-<p>Use default namespace <%=defaultNamespace%>  <input type="checkbox" name="defaultNamespace" value ="<%=defaultNamespace%>"/>
 </p>
 
 <p><input class="submit" type="submit" name="submit" value="Generate URIs" /></p>

webapp/web/jenaIngest/processStrings.jsp

@@ -9,18 +9,11 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Process Property Value Strings</h2>
 
     <form action="ingest" method="get"i>
@@ -39,38 +32,26 @@
     <p>New Property URI</p>
 
     <select name="destinationModelName">
-<%
+    <c:forEach var="modelName" items="${modelName}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+        <option value="${modelName}"/>${modelName}</option>
-	String modelName = (String) it.next();
+    </c:forEach>
-        %> <option value="<%=modelName%>"/><%=modelName%></option>
-        <%    
-    }
-%>   
     </select>
     <input type="checkbox" name="processModel" value="TRUE"/> apply changes directly to this model
     <p>model to use</p>
    
     <select name="additionsModel">
 		<option value="">none</option>
-<%
+		<forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+            <option value="${modelName}">${modelName}</option>
-	String modelName = (String) it.next();
+        </forEach>
-        %> <option value="<%=modelName%>"><%=modelName%></option>
-        <%    
-    }
-%>   
 	</select>
     <p>model in which to save added statements</p>
 
     <select name="retractionsModel">
 		<option value="">none</option>
-<%
+		<c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+            <option value="${modelName}">${modelName}</option>
-	String modelName = (String) it.next();
+        </c:forEach>
-        %> <option value="<%=modelName%>"><%=modelName%></option>
-        <%    
-    }
-%>   
 	</select>
     <p>model in which to save retracted statements</p>
 

webapp/web/jenaIngest/renameBNodes.jsp

@@ -9,19 +9,11 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
-
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Convert Blank Nodes to Named Resources</h2>
 
     <form action="ingest" method="get">
@@ -30,14 +22,9 @@
     <h3>Select Source Models</h3>
 
     <ul>
-
+        <c:forEach var="modelName" items="${modelNames}">
-<%
+            <li> <input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+        </c:forEach>
-	String modelName = (String) it.next();
-        %> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
-        <%    
-    }
-%>
     </ul>
 
     <input class="submit" type="submit" value="Next Step"/>

webapp/web/jenaIngest/renameBNodesURISelect.jsp

@@ -12,21 +12,13 @@
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Set" %>
 <%@ page import="java.util.Map.Entry" %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
 <script type="text/javascript" src="js/jquery.js"></script>
 <script type="text/javascript">
 function selectProperties(){
@@ -104,13 +96,9 @@ function disableProperties(){
 
     <select name="destinationModelName">
         <option value="vitro:baseOntModel">webapp assertions</option>
-<%
+        <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+            <option value="${modelName}"/>${modelName}</option>
-	String modelName = (String) it.next();
+        </c:forEach>
-        %> <option value="<%=modelName%>"/><%=modelName%></option>
-        <%    
-    }
-%>   
     </select>
 
     <input class="submit" type="submit" value="Rename Blank Nodes"/>

webapp/web/jenaIngest/smushSingleModel.jsp

@@ -9,19 +9,11 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
   
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
-  
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Smush Resources</h2>
 
     <form action="ingest" method="get"i>
@@ -34,26 +26,18 @@
 
     <ul>
         <li> <input type="checkbox" name="sourceModelName" value="vitro:baseOntModel"/>webapp assertions</li>
-<%
+	    <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+	         <li> <input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
-	String modelName = (String) it.next();
+	    </c:forEach>
-        %> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
-        <%    
-    }
-%>
     </ul>
 
     <h3>Select Destination Model</h3>
 
     <select name="destinationModelName">
         <option value="vitro:baseOntModel">webapp assertions</option>
-<%
+        <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+            <option value="${modelName}"/>${modelName}</option>
-	String modelName = (String) it.next();
+        </c:forEach>
-        %> <option value="<%=modelName%>"/><%=modelName%></option>
-        <%    
-    }
-%>   
     </select>
 
     <input id="submit" type="submit" value="Smush Resources"/>

webapp/web/jenaIngest/sparqlConstruct.jsp

@@ -16,12 +16,7 @@
 <vitro:confirmAuthorization />
 
 <%
-
+    ModelMaker maker = (ModelMaker) request.getAttribute("vitroJenaModelMaker");
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
 %>
 
 

webapp/web/jenaIngest/splitPropertyValues.jsp

@@ -9,18 +9,11 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Split Property Value Strings into Multiple Property Values</h2>
 
     <form action="ingest" method="get">
@@ -29,13 +22,9 @@
     <ul>
 		  <li><input type="checkbox" name="sourceModelName" value="vitro:jenaOntModel"/>webapp model</li>
 		  <li><input type="checkbox" name="sourceModelName" value="vitro:baseOntModel"/>webapp assertions</li>
-<%
+          <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+              <li> <input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
-	String modelName = (String) it.next();
+          </c:forEach>
-        %> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
-        <%    
-    }
-%>
     </ul>
 
 	
@@ -57,13 +46,9 @@
     <h3>Select Destination Model</h3>
 
     <select name="destinationModelName">
-<%
+        <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+            <option value="${modelName}"/>${modelName}</option>
-	String modelName = (String) it.next();
+        </c:forEach>
-        %> <option value="<%=modelName%>"/><%=modelName%></option>
-        <%    
-    }
-%>   
     </select>
 
     <input id="submit" type="submit" value="Split Values"/>

webapp/web/jenaIngest/subtractModels.jsp

@@ -9,19 +9,11 @@
 <%@ page import="java.net.URLEncoder" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
-
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Subtract One Model from Another</h2>
 
     <form action="ingest" method="get"i>
@@ -29,38 +21,25 @@
 
     <select name="modela">
          <option value="vitro:baseOntModel">webapp assertions</option>
-<%
+         <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+             <option value="${modelName}">${modelName}</option>
-	String modelName = (String) it.next();
+         </c:forEach>
-        %> <option value="<%=modelName%>"><%=modelName%></option>
-        <%    
-    }
-%>   
     </select>
     <p>model to be subtracted from</p>
 
     <select name="modelb">
          <option value="vitro:baseOntModel">webapp assertions</option>
-<%
+         <c:forEach var="modelName" items="${modelNames}">
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+             <option value="${modelName}">${modelName}</option>
-	String modelName = (String) it.next();
+         </c:forEach>
-        %> <option value="<%=modelName%>"><%=modelName%></option>
-        <%    
-    }
-%>   
 	</select>
     <p>model to subtract</p>
 
     <select name="destinationModelName">
          <option value="vitro:baseOntModel">webapp assertions</option>
-
+         <c:forEach var="modelName" items="${modelNames}">
-<%
+             <option value="${modelName}">${modelName}</option>
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+         </c:forEach>
-	String modelName = (String) it.next();
-        %> <option value="<%=modelName%>"><%=modelName%></option>
-        <%    
-    }
-%>   
 	</select>
     <p>model in which difference should be saved</p>
 

webapp/web/jenaIngest/workflowStep.jsp

@@ -13,14 +13,6 @@
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");
-    }
-
-%>
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Execute RDF-Encoded Ingest Workflow</h2>
 
     <form action="ingest" method="get"i>

webapp/web/jenaIngest/xmlFileUpload.jsp

@@ -3,22 +3,13 @@
 <%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.net.URLEncoder" %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
 <% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
 <vitro:confirmAuthorization />
 
-<%
-
-    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
-    if (maker == null) {
-		maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
-    }
-
-%>
-
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Load XML and convert to RDF</h2>
 
     <form action="jenaXmlFileUpload" method="post" enctype="multipart/form-data">
@@ -29,10 +20,9 @@
     
 	<select name="targetModel">
         <option value="vitro:baseOntModel">webapp assertions</option>
-<%  for (Iterator it = maker.listModels(); it.hasNext(); ) {
+        <c:forEach var="modelName" items="${modelNames}">
-	String modelName = (String) it.next();        %> 
+            <option value="${modelName}">${modelName}</option>
-	  <option value="<%=modelName%>"><%= modelName %></option>                
+        </c:forEach>
-<% } %>
         </select>
 
         <p>Destination model</p>