litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated dependencies

Browse source
This commit is contained in:
Graham Triggs 2017-09-18 15:58:09 +01:00
parent 99efe2a1cd
commit 5320a4f665
7 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/src/main/java/edu/cornell/mannlib/vedit/tags/OptionTag.java
View file

@ -2,8 +2,8 @@
package edu.cornell.mannlib.vedit.tags;
import org.apache.commons.collections.map.ListOrderedMap;
import org.apache.commons.collections.OrderedMapIterator;
import org.apache.commons.collections4.map.ListOrderedMap;
import org.apache.commons.collections4.OrderedMapIterator;
import java.util.List;
import java.util.Iterator;
import java.io.IOException;
@ -51,7 +51,7 @@ public class OptionTag extends EditTag {
} catch (ClassCastException e){
// maybe it's a ListOrderedMap of optgroups
optGroups = (ListOrderedMap) getFormObject().getOptionLists().get(name);
OrderedMapIterator ogKey = optGroups.orderedMapIterator();
OrderedMapIterator ogKey = optGroups.mapIterator();
while (ogKey.hasNext()) {
String optGroupName = (String) ogKey.next();
out.println("<optgroup label=\""+StringEscapeUtils.ESCAPE_HTML4.translate(optGroupName)+"\">");

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
View file

@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler;
import org.apache.commons.collections.map.ListOrderedMap;
import org.apache.commons.collections4.map.ListOrderedMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -230,7 +230,7 @@ public class EntityRetryController extends BaseEditController {
}
List<DynamicField> dynamicFields = new ArrayList();
Iterator<String> dpHashIt = dpMap.orderedMapIterator();
Iterator<String> dpHashIt = dpMap.mapIterator();
while (dpHashIt.hasNext()) {
String uri = dpHashIt.next();
DataProperty dp = (DataProperty) dpMap.get(uri);

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java
View file

@ -207,7 +207,7 @@ public class JenaXMLFileUpload extends JenaIngestController {
XsltTransformer t = xsltExec.load();
//this is how to set parameters:
//t.setParameter(new QName("someparametername"), new XdmAtomicValue(10));
Serializer out = new Serializer();
Serializer out = new Processor(false).newSerializer();
out.setOutputProperty(Serializer.Property.METHOD, "xml");
out.setOutputProperty(Serializer.Property.INDENT, "yes");
File outFile = new File(file.getAbsolutePath() + ".rdfxml");

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
View file

@ -19,7 +19,7 @@ import javax.servlet.annotation.WebFilter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.collections.EnumerationUtils;
import org.apache.commons.collections4.EnumerationUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;