You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/12/19 20:09:11 UTC
svn commit: r1646828 -
/cxf/web/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java
Author: dkulp
Date: Fri Dec 19 19:09:11 2014
New Revision: 1646828
URL: http://svn.apache.org/r1646828
Log:
Patches to the exporter from Bob Harner to point images away from cwiki
Modified:
cxf/web/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java
Modified: cxf/web/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java
URL: http://svn.apache.org/viewvc/cxf/web/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java?rev=1646828&r1=1646827&r2=1646828&view=diff
==============================================================================
--- cxf/web/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java (original)
+++ cxf/web/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java Fri Dec 19 19:09:11 2014
@@ -225,9 +225,9 @@ public class ConfluenceCleanupWriter ext
}
String cls = atts.getValue("class");
if (href != null && href.startsWith("/confluence/images/")) {
- newAtts.addMapping("src", SiteExporter.HOST + href);
+ newAtts.addMapping("src", href.replaceFirst("^/confluence/images/", "/images/confluence/"));
} 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();