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

Minor dependency updates

Browse source
This commit is contained in:
Graham Triggs 2017-09-28 22:14:07 +01:00
parent ff71245de1
commit 93884142b4
3 changed files with 6 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MakeTidy.java
View file

@ -1,107 +0,0 @@
/* $This file is distributed under the terms of the license in LICENSE$ */
package edu.cornell.mannlib.vitro.webapp.utils;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.tidy.Tidy;
public class MakeTidy {
private static final Log log = LogFactory.getLog(MakeTidy.class);
private static PrintWriter outFile = new PrintWriter(new LoggingWriter(log));
public String process(String value) {
Tidy tidy = new Tidy(); // obtain a new Tidy instance
// set desired config options using tidy setters: see http://jtidy.sourceforge.net/apidocs/index.html
tidy.setAsciiChars(true); // convert quotes and dashes to nearest ASCII character
tidy.setDropEmptyParas(true); // discard empty p elements
tidy.setDropFontTags(true); // discard presentation tags
tidy.setDropProprietaryAttributes(true); // discard proprietary attributes
tidy.setForceOutput(true); // output document even if errors were found
tidy.setLogicalEmphasis(true); // replace i by em and b by strong
tidy.setMakeBare(true); // remove Microsoft cruft
tidy.setMakeClean(true); // remove presentational clutter
tidy.setPrintBodyOnly(true); // output BODY content only
tidy.setShowWarnings(true); // show warnings
tidy.setTidyMark(true); // add meta element indicating tidied doc
tidy.setTrimEmptyElements(true); // trim empty elements
tidy.setWord2000(true); // draconian cleaning for Word 2000
tidy.setXHTML(true); // output extensible HTML
tidy.setErrout(outFile);
tidy.setShowErrors(Integer.MAX_VALUE);
outFile.println("\nInput:\n" + value + "\n");
StringWriter sw = new StringWriter();
/* Node rootNode = */tidy.parse(new StringReader(value), sw);
String outputStr = sw.toString();
log.debug("\nTidied Output:\n" + outputStr + "\n");
return outputStr;
}
/**
* A {@link Writer} that sends its output to a log file, at INFO level.
*/
private static class LoggingWriter extends Writer {
private final Log logger;
private String buffer;
LoggingWriter(Log logger) {
this.logger = logger;
this.buffer = "";
}
/**
* Append the new stuff to the buffer, and write any complete lines to
* the log.
*/
@Override
public void write(char[] cbuf, int off, int len) throws IOException {
buffer += new String(cbuf, off, len);
dumpLines();
}
/**
* If the buffer isn't empty, clean it out by completing the line and
* dumping it to the log.
*/
@Override
public void close() throws IOException {
if (buffer.length() > 0) {
buffer += "\n";
dumpLines();
}
}
/**
* We don't want to log a partial line, so does
* nothing.
*/
@Override
public void flush() throws IOException {
}
/**
* If there are any complete lines in the buffer, write them to the log
* and remove them from the buffer.
*/
private void dumpLines() {
while (true) {
int lineEnd = buffer.indexOf("\n");
if (lineEnd == -1) {
return;
} else {
logger.info(buffer.substring(0, lineEnd).trim());
buffer = buffer.substring(lineEnd + 1);
}
}
}
}
}

30
api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/MakeTidyTest.java
View file

@ -1,30 +0,0 @@
/* $This file is distributed under the terms of the license in LICENSE$ */
package edu.cornell.mannlib.vitro.webapp.utils;
import org.apache.log4j.Level;
import org.junit.Before;
import org.junit.Test;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
/**
* User: jc55
* Date: August 22, 2008
* Time: 4:37 PM
*/
public class MakeTidyTest extends AbstractTestClass {
@Before
public void suppressLogging() {
setLoggerLevel(MakeTidy.class, Level.WARN);
}
@Test
public void testTidy(){
String inputStr = "<p garbage here/><ul><li>list element one</li><li>list element two</li></ul></p";
String expected = "<ul><li>list element one</li><li>list element two</li></ul>";
MakeTidy tidy = new MakeTidy();
assertEquivalentXmlDocs(expected, tidy.process(inputStr));
}
}

17
dependencies/pom.xml vendored
View file

@ -68,22 +68,22 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>3.4.4</version>
<version>59.1</version>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-jpeg</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.imageio</groupId>
<artifactId>imageio-tiff</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.servlet</groupId>
<artifactId>servlet</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@ -149,12 +149,12 @@
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-api</artifactId>
<version>5.0.4</version>
<version>5.1.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-apibinding</artifactId>
<version>5.0.4</version>
<version>5.1.1</version>
<!-- Exclude rio binding as we don't use Sesame -->
<exclusions>
<exclusion>
@ -214,11 +214,6 @@
<artifactId>freemarker</artifactId>
<version>2.3.23</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>jtidy</artifactId>
<version>r8-20060801</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>