svn commit: r1441111 - in /cxf/web/src/main/java/org/apache/cxf/cwiki: ConfluenceCleanupWriter.java SiteExporter.java

[dkulp]

Author: dkulp
Date: Thu Jan 31 18:38:20 2013
New Revision: 1441111

URL: http://svn.apache.org/viewvc?rev=1441111&view=rev
Log:
Fix a few minor issues.

Modified:
    cxf/web/src/main/java/org/apache/cxf/cwiki/ConfluenceCleanupWriter.java
    cxf/web/src/main/java/org/apache/cxf/cwiki/SiteExporter.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=1441111&r1=1441110&r2=1441111&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 Thu 
Jan 31 18:38:20 2013
@@ -230,7 +230,7 @@ public class ConfluenceCleanupWriter ext
                 if (cls == null) {
                     href = href.substring(0, href.lastIndexOf('?'));
                     href = href.substring(href.lastIndexOf('/'));
-                    String dirName = page.createFileName();
+                    String dirName = page.getPath();
                     dirName = dirName.substring(0, dirName.lastIndexOf(".")) + 
".data";
 
                     newAtts.addMapping("src", dirName + href);
@@ -242,7 +242,7 @@ public class ConfluenceCleanupWriter ext
                         System.out.println("Could not download userLogo " + 
href 
                                            + " linked from " + 
page.getTitle());                    
                     }
-                    String dirName = page.createFileName();
+                    String dirName = page.getPath();
                     dirName = dirName.substring(0, dirName.lastIndexOf(".")) + 
".userimage/";
 
                     newAtts.addMapping("src", dirName + name);                 
   
@@ -257,7 +257,7 @@ public class ConfluenceCleanupWriter ext
                     System.out.println("Could not download thumbnail " + href 
                                        + " linked from " + page.getTitle());   
                 
                 }
-                String dirName = page.createFileName();
+                String dirName = page.getPath();
                 dirName = dirName.substring(0, dirName.lastIndexOf(".")) + 
".thumbs/";
 
                 newAtts.addMapping("src", dirName + name);

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=1441111&r1=1441110&r2=1441111&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 Thu Jan 31 
18:38:20 2013
@@ -511,7 +511,7 @@ public class SiteExporter implements Run
             filename = filename.substring(0, filename.indexOf('?'));
         }
         
-        String dirName = p.createFileName();
+        String dirName = p.getPath();
         dirName = dirName.substring(0, dirName.lastIndexOf(".")) + "." + type;
         File file = new File(outputDir, dirName);
         if (!file.exists()) {