svn commit: r392360 - /cocoon/trunk/tools/sitemaptags2daisy/src/main/java/org/apache/cocoon/documentation/daisy/SitemapTagsToDaisy.java

[br...@apache.org]

Author: bruno
Date: Fri Apr  7 11:45:23 2006
New Revision: 392360

URL: http://svn.apache.org/viewcvs?rev=392360&view=rev
Log:
Updated for new trunk directory structure.

Modified:
    cocoon/trunk/tools/sitemaptags2daisy/src/main/java/org/apache/cocoon/documentation/daisy/SitemapTagsToDaisy.java

Modified: cocoon/trunk/tools/sitemaptags2daisy/src/main/java/org/apache/cocoon/documentation/daisy/SitemapTagsToDaisy.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/sitemaptags2daisy/src/main/java/org/apache/cocoon/documentation/daisy/SitemapTagsToDaisy.java?rev=392360&r1=392359&r2=392360&view=diff
==============================================================================
--- cocoon/trunk/tools/sitemaptags2daisy/src/main/java/org/apache/cocoon/documentation/daisy/SitemapTagsToDaisy.java (original)
+++ cocoon/trunk/tools/sitemaptags2daisy/src/main/java/org/apache/cocoon/documentation/daisy/SitemapTagsToDaisy.java Fri Apr  7 11:45:23 2006
@@ -92,7 +92,7 @@
 
         String rootPath = prompt("Enter the path to the Cocoon source directory:");
         File rootDir = new File(rootPath);
-        File cocoonCoreDir = new File(rootDir, "cocoon-core");
+        File cocoonCoreDir = new File(new File(rootDir, "core"), "cocoon-core");
         if (!cocoonCoreDir.exists()) {
             System.out.println("This is not a valid Cocoon source directory, did not find the following path: " + cocoonCoreDir.getPath());
             System.exit(1);
@@ -234,6 +234,16 @@
         String subPath = path.substring(rootPath.length());
         if (subPath.startsWith("/"))
             subPath = subPath.substring(1);
+
+        if (subPath.startsWith("blocks/"))
+            subPath = subPath.substring("blocks/".length());
+        else if (subPath.startsWith("blocks-tobeconverted/"))
+            subPath = subPath.substring("blocks-tobeconverted/".length());
+        else if (subPath.startsWith("core/"))
+            subPath = subPath.substring("core/".length());
+        else
+            return null;
+
         if (!subPath.startsWith("cocoon-"))
             return null;
 
@@ -291,6 +301,16 @@
                 return false;
             else
                 return value1.equals(value2);
+        }
+
+        public void dump() {
+            System.out.println("blockName: " + blockName);
+            System.out.println("className: " + className);
+            System.out.println("componentType: " + componentType);
+            System.out.println("componentName: " + componentName);
+            System.out.println("documentation: " + documentation);
+            System.out.println("cacheInfo: " + cacheInfo);
+            System.out.println("deprecated: " + deprecated);
         }
     }