unstick r1831793

Revision 1831793

Date:
2018/05/17 15:55:40
Author:
dkulp
Revision Log:
Update to translate new style code macro HTML to the SyntaxHighlighter format
Files:

Legend:

 
Added
 
Removed
 
Modified
  • cxf/web/pom.xml

     
    28 28 <parent>
    29 29 <groupId>org.apache.cxf</groupId>
    30 30 <artifactId>cxf-parent</artifactId>
    31 <version>3.1.13</version>
    31 <version>3.1.15</version>
    32 32 </parent>
    33 33
    34 34 <properties>
    35 35 <enforcer.skip>true</enforcer.skip>
    36 <cxf.version>3.1.13</cxf.version>
    36 <cxf.version>3.1.15</cxf.version>
    37 37 <extra.arg></extra.arg>
    38 38 <svn.arg1></svn.arg1>
    39 39 <svn.arg2></svn.arg2>
  • cxf/web/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java

     
    299 299 if (value != null && value.startsWith("/confluence/")) {
    300 300 newAtts.addMapping("value", SiteExporter.ROOT + value.substring(11));
    301 301 }
    302 } else if ("pre".equals(localName.toLowerCase())
    303 || "pre".equals(qName.toLowerCase())) {
    304 String cls = atts.getValue("class");
    305 if ("syntaxhighlighter-pre".equalsIgnoreCase(cls)) {
    306 String brush = atts.getValue("data-syntaxhighlighter-params");
    307 if (brush.toLowerCase().startsWith("brush")) {
    308 newAtts.remove("data-syntaxhighlighter-params");
    309 newAtts.remove("data-theme");
    310 newAtts.addMapping("class", brush);
    311 }
    312 }
    302 313 }
    303 314 super.startElement(uri, localName, qName, newAtts);
    304 315 }