Author: bobharner
Date: Sun Dec 14 12:47:03 2014
New Revision: 1645453
URL: http://svn.apache.org/r1645453
Log:
Fixed problem of SiteExporter generating image links that point to the
Confluence (cwiki.apache.org) instead of the local image in the "xxx.data"
subfolder
Modified:
tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java
Modified:
tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java?rev=1645453&r1=1645452&r2=1645453&view=diff
==============================================================================
---
tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java
(original)
+++
tapestry/tapestry-site/trunk/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java
Sun Dec 14 12:47:03 2014
@@ -227,7 +227,7 @@ public class ConfluenceCleanupWriter ext
if (href != null && href.startsWith("/confluence/images/")) {
newAtts.addMapping("src", SiteExporter.HOST + href);
} else if (href != null &&
href.startsWith("/confluence/download/attachments")) {
- if (cls == null) {
+ if (cls == null || cls.contains("confluence-embedded-image")) {
href = href.substring(0, href.lastIndexOf('?'));
href = href.substring(href.lastIndexOf('/'));
String dirName = page.createFileName();