From 70e14edaf73ff23d76e89d517bdeb7e2f3686424 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 2 Jan 2018 17:45:09 +0000
Subject: [PATCH] Work around incorrect layout of generated epub archive

Previously, the Docbook Maven plugin would generate an epub archive
with the majority of contents in OEBPS/, including content.opf, while
the META-INF/container.xml file reference to content.opf in the root
of the archive.

This commit overrides the epub.oebps.dir variable to move the content
into the root of the archive where it's expected to be. Implementing
this override highlighted that our customization stylesheet was not
being applied as the configuration property was incorrect (it was
epubCustomnization rather than the required epub3Customization). This
has been corrected along with a problem with missing images that
fixing it revealed.

Closes gh-11470
---
 spring-boot-project/spring-boot-docs/pom.xml             | 9 ++++++++-
 .../spring-boot-docs/src/main/docbook/xsl/epub.xsl       | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-docs/pom.xml b/spring-boot-project/spring-boot-docs/pom.xml
index 79477b17a0..798ca9d721 100644
--- a/spring-boot-project/spring-boot-docs/pom.xml
+++ b/spring-boot-project/spring-boot-docs/pom.xml
@@ -1261,8 +1261,15 @@
 								</goals>
 								<phase>prepare-package</phase>
 								<configuration>
-									<epubCustomization>${basedir}/src/main/docbook/xsl/epub.xsl</epubCustomization>
+									<epub3Customization>${basedir}/src/main/docbook/xsl/epub.xsl</epub3Customization>
 									<targetDirectory>${basedir}/target/docbook/epub</targetDirectory>
+									<preProcess>
+										<copy todir="${basedir}/target/docbook/epub/images">
+											<fileset dir="${basedir}/src/main/docbook/images">
+												<include name="*.png" />
+											</fileset>
+										</copy>
+									</preProcess>
 									<postProcess>
 										<copy todir="${basedir}/target/contents/reference/epub">
 											<fileset dir="${basedir}/target/docbook">
diff --git a/spring-boot-project/spring-boot-docs/src/main/docbook/xsl/epub.xsl b/spring-boot-project/spring-boot-docs/src/main/docbook/xsl/epub.xsl
index 031406ca44..178ba8d5dd 100644
--- a/spring-boot-project/spring-boot-docs/src/main/docbook/xsl/epub.xsl
+++ b/spring-boot-project/spring-boot-docs/src/main/docbook/xsl/epub.xsl
@@ -27,5 +27,6 @@ under the License.
 
 	<xsl:import href="urn:docbkx:stylesheet"/>
 	<xsl:import href="common.xsl"/>
+	<xsl:variable name="epub.oebps.dir" select="'./'"/>
 
 </xsl:stylesheet>