[xwiki-notifications] r9610 - in xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki: export/html render

[vmassol (SVN)]

Author: vmassol
Date: 2008-05-02 10:18:55 +0200 (Fri, 02 May 2008)
New Revision: 9610

Modified:
   xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/export/html/HtmlPackager.java
   xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/XWikiVelocityRenderer.java
Log:
XWIKI-2352: HTML export is broken

* Added missing functional test to prove that HTML export works
* Fixed bug

Merged from 1.4 branch (revs 9608, 9609)

Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/export/html/HtmlPackager.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/export/html/HtmlPackager.java	2008-05-02 07:17:25 UTC (rev 9609)
+++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/export/html/HtmlPackager.java	2008-05-02 08:18:55 UTC (rev 9610)
@@ -11,6 +11,8 @@
 import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.VelocityContext;
 
 import com.xpn.xwiki.XWikiContext;
@@ -29,6 +31,8 @@
  */
 public class HtmlPackager
 {
+    private static final Log LOG = LogFactory.getLog(HtmlPackager.class);
+
     /**
      * A point.
      */
@@ -325,6 +329,10 @@
     private static void addDirToZip(File directory, ZipOutputStream out, String basePath)
         throws IOException
     {
+    	if (LOG.isDebugEnabled()) {
+    		LOG.debug("Adding dir [" + directory.getPath() + "] to the Zip file being generated.");
+    	}
+    	
         if (!directory.isDirectory()) {
             return;
         }
@@ -346,6 +354,7 @@
 
             FileInputStream in = new FileInputStream(file);
 
+            // Starts a new Zip entry. It automatically closes the previous entry if present. 
             out.putNextEntry(new ZipEntry(basePath + file.getName()));
 
             int len;

Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/XWikiVelocityRenderer.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/XWikiVelocityRenderer.java	2008-05-02 07:17:25 UTC (rev 9609)
+++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/XWikiVelocityRenderer.java	2008-05-02 08:18:55 UTC (rev 9610)
@@ -123,7 +123,10 @@
         String skinMacros = context.getWiki().getSkinFile("macros.vm", skin, context);
         String cacheKey;
         if (skinMacros != null) {
-        	cacheKey = skinMacros.substring(skinMacros.indexOf("/skins/"));
+            // We're only using the path starting with the skin name since sometimes we'll
+            // get /skins/skins/<skinname>/..., sometimes we get "/skins/<skinname>/..." 
+            // and sometimes we get "skins/<skinname>/... 
+        	cacheKey = skinMacros.substring(skinMacros.indexOf("skins/"));
         } else {
             // If no skin macros.vm file exists then use a "default" cache id
         	cacheKey = "default";