diff --git a/webapp/web/WEB-INF/web.xml b/webapp/web/WEB-INF/web.xml index 8607ea6f9..5f5407e94 100644 --- a/webapp/web/WEB-INF/web.xml +++ b/webapp/web/WEB-INF/web.xml @@ -1186,12 +1186,12 @@ - http://java.sun.com/jstl/core + http://java.sun.com/jsp/jstl/core /WEB-INF/tlds/c.tld - http://java.sun.com/jstl/functions + http://java.sun.com/jsp/jstl/functions /WEB-INF/tlds/fn.tld diff --git a/webapp/web/admin/conceptRepair.jsp b/webapp/web/admin/conceptRepair.jsp index 87361de87..f8d0796cb 100644 --- a/webapp/web/admin/conceptRepair.jsp +++ b/webapp/web/admin/conceptRepair.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> diff --git a/webapp/web/admin/gotoIndividual.jsp b/webapp/web/admin/gotoIndividual.jsp index 11786d02f..d01251724 100644 --- a/webapp/web/admin/gotoIndividual.jsp +++ b/webapp/web/admin/gotoIndividual.jsp @@ -3,7 +3,7 @@ <%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> -<%@ 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.permissions.SimplePermission" %> diff --git a/webapp/web/admin/removeBadRestrictions.jsp b/webapp/web/admin/removeBadRestrictions.jsp index ba059de7f..6954e50d0 100644 --- a/webapp/web/admin/removeBadRestrictions.jsp +++ b/webapp/web/admin/removeBadRestrictions.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> diff --git a/webapp/web/admin/removeResourceDescription.jsp b/webapp/web/admin/removeResourceDescription.jsp index d2868c80c..080fb5f63 100644 --- a/webapp/web/admin/removeResourceDescription.jsp +++ b/webapp/web/admin/removeResourceDescription.jsp @@ -2,7 +2,7 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> diff --git a/webapp/web/admin/syncSesame.jsp b/webapp/web/admin/syncSesame.jsp index d65966109..d97aa3f56 100644 --- a/webapp/web/admin/syncSesame.jsp +++ b/webapp/web/admin/syncSesame.jsp @@ -11,7 +11,7 @@ <%@page import="java.util.Properties"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> diff --git a/webapp/web/error.jsp b/webapp/web/error.jsp index a429ebed2..07a8a2e37 100755 --- a/webapp/web/error.jsp +++ b/webapp/web/error.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page isErrorPage="true" %> <%@ page import="com.oreilly.servlet.ServletUtils,edu.cornell.mannlib.vitro.webapp.web.*" %> <%@page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> diff --git a/webapp/web/fileupload/datastreamModification.jsp b/webapp/web/fileupload/datastreamModification.jsp index 15ab6c109..0a134f8f8 100644 --- a/webapp/web/fileupload/datastreamModification.jsp +++ b/webapp/web/fileupload/datastreamModification.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%/* this is used by the FedoraDatastreamController and not by the N3 editing system.*/%> diff --git a/webapp/web/fileupload/datastreamModificationSuccess.jsp b/webapp/web/fileupload/datastreamModificationSuccess.jsp index ca8c7c517..663991cbe 100644 --- a/webapp/web/fileupload/datastreamModificationSuccess.jsp +++ b/webapp/web/fileupload/datastreamModificationSuccess.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
The file ${orginalFileName} was updated. The file received from you had the MD5 checksum ${checksum}.
diff --git a/webapp/web/fileupload/md5.jsp b/webapp/web/fileupload/md5.jsp index a97dffa1f..9ace23a43 100644 --- a/webapp/web/fileupload/md5.jsp +++ b/webapp/web/fileupload/md5.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
${checksum} "${fileName}"
diff --git a/webapp/web/jenaIngest/connectDB.jsp b/webapp/web/jenaIngest/connectDB.jsp index dabf67a66..a1bf3e469 100644 --- a/webapp/web/jenaIngest/connectDB.jsp +++ b/webapp/web/jenaIngest/connectDB.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ 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.permissions.SimplePermission" %> diff --git a/webapp/web/jenaIngest/csv2rdfSelectUri.jsp b/webapp/web/jenaIngest/csv2rdfSelectUri.jsp index bcaa75aa0..f7bb72afe 100644 --- a/webapp/web/jenaIngest/csv2rdfSelectUri.jsp +++ b/webapp/web/jenaIngest/csv2rdfSelectUri.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ 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="com.hp.hpl.jena.ontology.Individual" %> diff --git a/webapp/web/jenaIngest/merge_result.jsp b/webapp/web/jenaIngest/merge_result.jsp index c8752ee46..264ef8a56 100644 --- a/webapp/web/jenaIngest/merge_result.jsp +++ b/webapp/web/jenaIngest/merge_result.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@page import="edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils.MergeResult"%> -<%@ 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.permissions.SimplePermission" %> diff --git a/webapp/web/jenaIngest/notfound.jsp b/webapp/web/jenaIngest/notfound.jsp index f2f187a4b..cbbd0e58d 100644 --- a/webapp/web/jenaIngest/notfound.jsp +++ b/webapp/web/jenaIngest/notfound.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ page import="com.hp.hpl.jena.rdf.model.Model"%>

Individual Not Found

diff --git a/webapp/web/jenaIngest/renameResource.jsp b/webapp/web/jenaIngest/renameResource.jsp index c26f2c65d..3237fff4f 100644 --- a/webapp/web/jenaIngest/renameResource.jsp +++ b/webapp/web/jenaIngest/renameResource.jsp @@ -5,7 +5,7 @@ <%@ 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.permissions.SimplePermission" %> diff --git a/webapp/web/jenaIngest/renameResult.jsp b/webapp/web/jenaIngest/renameResult.jsp index 00125114a..811fd2901 100644 --- a/webapp/web/jenaIngest/renameResult.jsp +++ b/webapp/web/jenaIngest/renameResult.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ 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.permissions.SimplePermission" %> diff --git a/webapp/web/jenaIngest/sparqlConstruct.jsp b/webapp/web/jenaIngest/sparqlConstruct.jsp index 13101bab0..0c1652e59 100644 --- a/webapp/web/jenaIngest/sparqlConstruct.jsp +++ b/webapp/web/jenaIngest/sparqlConstruct.jsp @@ -8,7 +8,7 @@ <%@ page import="java.util.List"%> <%@ 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.permissions.SimplePermission" %> diff --git a/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp b/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp index 88b32006e..64fcbbae5 100644 --- a/webapp/web/jenaIngest/xmlFileUploadSuccess.jsp +++ b/webapp/web/jenaIngest/xmlFileUploadSuccess.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.permissions.SimplePermission" %> diff --git a/webapp/web/templates/alpha/alphaIndex.jsp b/webapp/web/templates/alpha/alphaIndex.jsp index fffe1c210..812a491f5 100644 --- a/webapp/web/templates/alpha/alphaIndex.jsp +++ b/webapp/web/templates/alpha/alphaIndex.jsp @@ -2,7 +2,7 @@ <%@ page import="org.apache.commons.logging.Log" %> <%@ page import="org.apache.commons.logging.LogFactory" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %> <%@ page errorPage="/error.jsp"%> <% /*********************************************** alphaIndex.jsp will just display the just the index, no entites. diff --git a/webapp/web/templates/edit/specific/applicationBean_retry.jsp b/webapp/web/templates/edit/specific/applicationBean_retry.jsp index 0d9ca94f5..0262336fa 100644 --- a/webapp/web/templates/edit/specific/applicationBean_retry.jsp +++ b/webapp/web/templates/edit/specific/applicationBean_retry.jsp @@ -3,7 +3,7 @@ <%@ page import="java.util.ArrayList" %> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> diff --git a/webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp b/webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp index a0438593a..5effa15e9 100644 --- a/webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp +++ b/webapp/web/templates/edit/specific/cardinalityRestriction_retry.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> wtffff diff --git a/webapp/web/templates/edit/specific/classes_edit.jsp b/webapp/web/templates/edit/specific/classes_edit.jsp index 64114531c..605810f1f 100644 --- a/webapp/web/templates/edit/specific/classes_edit.jsp +++ b/webapp/web/templates/edit/specific/classes_edit.jsp @@ -3,7 +3,7 @@ diff --git a/webapp/web/templates/edit/specific/classgroup_retry.jsp b/webapp/web/templates/edit/specific/classgroup_retry.jsp index cd01c2263..58e9a25b0 100644 --- a/webapp/web/templates/edit/specific/classgroup_retry.jsp +++ b/webapp/web/templates/edit/specific/classgroup_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/webapp/web/templates/edit/specific/dataprop_retry.jsp b/webapp/web/templates/edit/specific/dataprop_retry.jsp index 803c8e536..94bcccdee 100644 --- a/webapp/web/templates/edit/specific/dataprop_retry.jsp +++ b/webapp/web/templates/edit/specific/dataprop_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%-- colspan set to 4 in DatapropRetryController.java --%> diff --git a/webapp/web/templates/edit/specific/dataprops_edit.jsp b/webapp/web/templates/edit/specific/dataprops_edit.jsp index 61d34714c..904c84122 100644 --- a/webapp/web/templates/edit/specific/dataprops_edit.jsp +++ b/webapp/web/templates/edit/specific/dataprops_edit.jsp @@ -3,7 +3,7 @@
diff --git a/webapp/web/templates/edit/specific/entity_retry.jsp b/webapp/web/templates/edit/specific/entity_retry.jsp index 305795780..73ac96565 100644 --- a/webapp/web/templates/edit/specific/entity_retry.jsp +++ b/webapp/web/templates/edit/specific/entity_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/webapp/web/templates/edit/specific/entity_retry_init.jsp b/webapp/web/templates/edit/specific/entity_retry_init.jsp index 2ab88b284..8fd9fbe43 100644 --- a/webapp/web/templates/edit/specific/entity_retry_init.jsp +++ b/webapp/web/templates/edit/specific/entity_retry_init.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/webapp/web/templates/edit/specific/ents_edit.jsp b/webapp/web/templates/edit/specific/ents_edit.jsp index 3377c525e..75c6e1a99 100644 --- a/webapp/web/templates/edit/specific/ents_edit.jsp +++ b/webapp/web/templates/edit/specific/ents_edit.jsp @@ -3,10 +3,10 @@ <% /* For now, not using XML syntax because the output XHTML is not indented */ %> <% /* */ %> <% /* */ %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> diff --git a/webapp/web/templates/edit/specific/hasValueRestriction_retry.jsp b/webapp/web/templates/edit/specific/hasValueRestriction_retry.jsp index 9a0d1029b..6dd36ef53 100644 --- a/webapp/web/templates/edit/specific/hasValueRestriction_retry.jsp +++ b/webapp/web/templates/edit/specific/hasValueRestriction_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/webapp/web/templates/edit/specific/merge_result.jsp b/webapp/web/templates/edit/specific/merge_result.jsp index 98ab69f9b..aa165998f 100644 --- a/webapp/web/templates/edit/specific/merge_result.jsp +++ b/webapp/web/templates/edit/specific/merge_result.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>

Ingest Home

diff --git a/webapp/web/templates/edit/specific/moveInstances_retry.jsp b/webapp/web/templates/edit/specific/moveInstances_retry.jsp index fb07108bf..2e0f40caf 100644 --- a/webapp/web/templates/edit/specific/moveInstances_retry.jsp +++ b/webapp/web/templates/edit/specific/moveInstances_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> diff --git a/webapp/web/templates/edit/specific/movePropertyStatements_retry.jsp b/webapp/web/templates/edit/specific/movePropertyStatements_retry.jsp index bfd3f4c8b..225014e76 100644 --- a/webapp/web/templates/edit/specific/movePropertyStatements_retry.jsp +++ b/webapp/web/templates/edit/specific/movePropertyStatements_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/webapp/web/templates/edit/specific/ontologies_edit.jsp b/webapp/web/templates/edit/specific/ontologies_edit.jsp index b7ed9a61c..8fd9a53f8 100644 --- a/webapp/web/templates/edit/specific/ontologies_edit.jsp +++ b/webapp/web/templates/edit/specific/ontologies_edit.jsp @@ -3,7 +3,7 @@ diff --git a/webapp/web/templates/edit/specific/ontology_retry.jsp b/webapp/web/templates/edit/specific/ontology_retry.jsp index 200c5be29..716e8ec0b 100644 --- a/webapp/web/templates/edit/specific/ontology_retry.jsp +++ b/webapp/web/templates/edit/specific/ontology_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/webapp/web/templates/edit/specific/properties2properties_retry.jsp b/webapp/web/templates/edit/specific/properties2properties_retry.jsp index b7c7a92b2..a2c10abec 100644 --- a/webapp/web/templates/edit/specific/properties2properties_retry.jsp +++ b/webapp/web/templates/edit/specific/properties2properties_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/webapp/web/templates/edit/specific/propertyGroup_retry.jsp b/webapp/web/templates/edit/specific/propertyGroup_retry.jsp index c389ebdc5..0dfcaa2c9 100644 --- a/webapp/web/templates/edit/specific/propertyGroup_retry.jsp +++ b/webapp/web/templates/edit/specific/propertyGroup_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/webapp/web/templates/edit/specific/property_retry.jsp b/webapp/web/templates/edit/specific/property_retry.jsp index 00df2d613..0fcb23466 100644 --- a/webapp/web/templates/edit/specific/property_retry.jsp +++ b/webapp/web/templates/edit/specific/property_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%-- colspan set to 6 in PropertyRetryController.java --%> diff --git a/webapp/web/templates/edit/specific/props_edit.jsp b/webapp/web/templates/edit/specific/props_edit.jsp index 10b9261f1..1f55c02f5 100644 --- a/webapp/web/templates/edit/specific/props_edit.jsp +++ b/webapp/web/templates/edit/specific/props_edit.jsp @@ -3,7 +3,7 @@
diff --git a/webapp/web/templates/edit/specific/renameResource_retry.jsp b/webapp/web/templates/edit/specific/renameResource_retry.jsp index 8512ebdd4..4928e1584 100644 --- a/webapp/web/templates/edit/specific/renameResource_retry.jsp +++ b/webapp/web/templates/edit/specific/renameResource_retry.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/webapp/web/templates/edit/specific/upload_rdf.jsp b/webapp/web/templates/edit/specific/upload_rdf.jsp index 6bd745da1..61852c1b1 100644 --- a/webapp/web/templates/edit/specific/upload_rdf.jsp +++ b/webapp/web/templates/edit/specific/upload_rdf.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ 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.permissions.SimplePermission" %> diff --git a/webapp/web/templates/edit/specific/upload_rdf_result.jsp b/webapp/web/templates/edit/specific/upload_rdf_result.jsp index 026a087a6..a5346165a 100644 --- a/webapp/web/templates/edit/specific/upload_rdf_result.jsp +++ b/webapp/web/templates/edit/specific/upload_rdf_result.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
diff --git a/webapp/web/templates/edit/specific/user_retry.jsp b/webapp/web/templates/edit/specific/user_retry.jsp index 27780da69..15ff882f1 100644 --- a/webapp/web/templates/edit/specific/user_retry.jsp +++ b/webapp/web/templates/edit/specific/user_retry.jsp @@ -2,7 +2,7 @@ - + diff --git a/webapp/web/templates/edit/specific/vclass_retry.jsp b/webapp/web/templates/edit/specific/vclass_retry.jsp index 0bf0709fc..e09de9a68 100644 --- a/webapp/web/templates/edit/specific/vclass_retry.jsp +++ b/webapp/web/templates/edit/specific/vclass_retry.jsp @@ -2,7 +2,7 @@ - + diff --git a/webapp/web/templates/entity/entityListForTabs.jsp b/webapp/web/templates/entity/entityListForTabs.jsp index bebb8d9c8..136688b03 100644 --- a/webapp/web/templates/entity/entityListForTabs.jsp +++ b/webapp/web/templates/entity/entityListForTabs.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ page errorPage="/error.jsp"%> <% /*********************************************** diff --git a/webapp/web/templates/entity/entityListPages.jsp b/webapp/web/templates/entity/entityListPages.jsp index 6620e6bc6..22479a7af 100644 --- a/webapp/web/templates/entity/entityListPages.jsp +++ b/webapp/web/templates/entity/entityListPages.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%-- Show pages to select from --%> diff --git a/webapp/web/templates/error/error404content.jsp b/webapp/web/templates/error/error404content.jsp index 00d8dbd71..efaa57f3b 100644 --- a/webapp/web/templates/error/error404content.jsp +++ b/webapp/web/templates/error/error404content.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>

Page Not Found

diff --git a/webapp/web/templates/page/basicPage.jsp b/webapp/web/templates/page/basicPage.jsp index 07b328d72..e8a4d4754 100644 --- a/webapp/web/templates/page/basicPage.jsp +++ b/webapp/web/templates/page/basicPage.jsp @@ -3,7 +3,7 @@ <%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page errorPage="/error.jsp"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> diff --git a/webapp/web/templates/page/blankPage.jsp b/webapp/web/templates/page/blankPage.jsp index 9fec63cb2..383848315 100644 --- a/webapp/web/templates/page/blankPage.jsp +++ b/webapp/web/templates/page/blankPage.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <% /*********************************************** Display a single Page in the most basic fashion. diff --git a/webapp/web/templates/page/headContent.jsp b/webapp/web/templates/page/headContent.jsp index a69690ba0..06b73fe54 100644 --- a/webapp/web/templates/page/headContent.jsp +++ b/webapp/web/templates/page/headContent.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ page import="javax.servlet.ServletException" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%> diff --git a/webapp/web/templates/parts/emailUsers.jsp b/webapp/web/templates/parts/emailUsers.jsp index 0ae63410b..44b00b313 100644 --- a/webapp/web/templates/parts/emailUsers.jsp +++ b/webapp/web/templates/parts/emailUsers.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>