Improve output: distinguish between failed assertions (failures) and unexpected exceptions (errors), and print a filtered stack trace for any exception.

webapp/web/jenaIngest/xmlFileUpload.jsp

@@ -0,0 +1,33 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%@ 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" %>
+
+<%
+
+    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
+    if (maker == null) {
+		maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");
+    }
+
+%>
+
+    <p><a href="ingest">Ingest Home</a></p>
+    
+
+    <form action="jenaXmlFileUpload" method="post" enctype="multipart/form-data">
+    
+    <input type="file" name="xmlfile"/>
+    
+	<select name="targetModel">
+
+<%  for (Iterator it = maker.listModels(); it.hasNext(); ) {
+	String modelName = (String) it.next();        %> 
+	  <option value="<%=modelName%>"><%= modelName %></option>                
+<% } %>
+        </select>
+        <input type="submit" name="submit" value="upload XML and convert to RDF"/>
+    </form>
+