cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1688721 - /cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
Date Wed, 01 Jul 2015 19:50:10 GMT
Author: dkulp
Date: Wed Jul  1 19:50:09 2015
New Revision: 1688721

URL: http://svn.apache.org/r1688721
Log:
wrap the content to match how the old content was returned

Modified:
    cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java

Modified: cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java
URL: http://svn.apache.org/viewvc/cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java?rev=1688721&r1=1688720&r2=1688721&view=diff
==============================================================================
--- cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java (original)
+++ cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.java Wed Jul  1 19:50:09 2015
@@ -268,7 +268,7 @@ public class SiteExporter implements Run
         // debug stuff, force regen of a page
         //forcePage("Navigation");
         //forcePage("Index");
-        //forcePage("JavaDoc");
+        //forcePage("JavaDocs");
         //forcePage("DOSGi Architecture");
         //forcePage("Book In One Page");
         //forcePage("Security");
@@ -419,6 +419,7 @@ public class SiteExporter implements Run
             loadAttachments(p);
             
             loadPageContent(p, null, null);
+            
             VelocityContext ctx = new VelocityContext();
             ctx.put("autoexport", this);
             ctx.put("page", p);
@@ -750,7 +751,7 @@ public class SiteExporter implements Run
                     inExportView = true;
                 }
             } else if (tok == JsonToken.VALUE_STRING && inExportView && parser.getCurrentName().equals("value"))
{
-                return parser.getText();
+                return "<div id='ConfluenceContent'>" + parser.getText() + "</div>";
             }
             tok = parser.nextToken();
         }



Mime
View raw message