NIHVIVO-3432 refactor access to model makers in ingest tools

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>
-
-<%
-    for (Iterator it = maker.listModels(); it.hasNext(); ) {
-	String modelName = (String) it.next();
-        %> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
-        <%    
-    }
-%>
+        <c:forEach var="modelName" items="${modelNames}">
+            <li> <input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
+        </c:forEach>
     </ul>
 
     <input class="submit" type="submit" value="Next Step"/>