Browse Source

fix paths for integration build, docs, add site task to main build.gradle

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1888580 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_5_1_0
Andreas Beeker 3 years ago
parent
commit
861ff65508

+ 53
- 1
build.gradle View File

@@ -381,4 +381,56 @@ rat {
}
}*/

//compileJava.dependsOn 'downloadJarsToLibs'
//compileJava.dependsOn 'downloadJarsToLibs'

task site(type:Exec) {
if (System.env.FORREST_HOME == null) {
throw new InvalidUserDataException(
'Apache Forrest is not installed.\n' +
'Please install Apache Forrest (see https://forrest.apache.org/index.html) and set the\n' +
'FORREST_HOME environment variable!')
}

if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
// maybe Java 9-11 works too?
throw new GradleScriptException("Apache Forrest must be executed with Java 8!")
}

if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
commandLine 'cmd', '/c', "${System.env.FORREST_HOME}/bin/forrest.bat"
} else {
commandLine "${System.env.FORREST_HOME}/bin/forrest"
}

//store the output instead of printing to the console:
standardOutput = new ByteArrayOutputStream()

ext.output = {
return standardOutput.toString()
}

doLast {
println 'Broken links:'
println file("${buildDir}/tmp/brokenlinks.xml").text

/* Apache Forrest is dead, so we cannot expect fixes there however it does not handle "https" in "credits"
currently if the *.xml file is in a sub-directory, see Apache Forrest code at
main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl:350

So we need to replace the links afterwards to have a fully "https" website and avoid browser warning about
a "mixed content" website */
def buildSite = "${buildDir}/site"

println "Fix https in ${buildSite}"

ant.replace(dir: buildSite, summary:'true', includes:'**/*.html',
token:'http://www.apache.org/events/current-event-125x125.png',
value:'https://www.apache.org/events/current-event-125x125.png')

ant.replace(dir: buildSite, summary:'true', includes:'**/*.html',
token:'http://www.google.com/search',
value:'https://www.google.com/search')

ant.fixcrlf(srcdir: buildSite, includes:'**/*.html,**/*.css', eol:'unix', eof:'remove')
}
}

+ 1
- 1
poi-integration/build.xml View File

@@ -139,7 +139,7 @@ Before running this, you should execute the "assemble" target in the main build.
</pathconvert>

<echo message="Compiling all examples with the additional scratchpad.jar"/>
<javac srcdir="../examples/src/main/java" destdir="${build}"
<javac srcdir="../poi-examples/src/main/java" destdir="${build}"
target="1.8" source="1.8" debug="true"
encoding="ASCII" fork="yes" includeantruntime="false"
classpath="${jarpackagescratchpad}" classpathref="libs">

+ 1
- 1
poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java View File

@@ -535,7 +535,7 @@ public class XSSFSheetXMLHandler extends DefaultHandler {
*
* Sheets that have missing or empty cells may result in
* sparse calls to <code>cell</code>. See the code in
* <code>src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java</code>
* <code>poi-examples/src/main/java/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java</code>
* for an example of how to handle this scenario.
*/
void cell(String cellReference, String formattedValue, XSSFComment comment);

+ 1
- 1
poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java View File

@@ -916,7 +916,7 @@ public class SXSSFCell extends CellBase {
}
}

//COPIED FROM https://svn.apache.org/repos/asf/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java since the functions are declared private there
//COPIED FROM https://svn.apache.org/repos/asf/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java since the functions are declared private there
/**
* Used to help format error messages
*/

+ 1
- 1
poi/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java View File

@@ -51,7 +51,7 @@ import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
* the XLS2CSVmra example
* </p>
*
* @see <a href="http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
* @see <a href="http://svn.apache.org/repos/asf/poi/trunk/poi-examples/src/main/java/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
*/
public class ExcelExtractor implements POIOLE2TextExtractor, org.apache.poi.ss.extractor.ExcelExtractor {
private final HSSFWorkbook _wb;

Loading…
Cancel
Save