svn commit: r1138174 - in /openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples: GenerateIndex.java ViewHelper.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Jun 21 20:40:55 2011
New Revision: 1138174

URL: http://svn.apache.org/viewvc?rev=1138174&view=rev
Log:
fixing multi-module examples paths

Modified:
    openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
    openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java

Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java?rev=1138174&r1=1138173&r2=1138174&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java Tue Jun 21 20:40:55 2011
@@ -40,7 +40,7 @@ import static org.apache.openejb.tools.e
 import static org.apache.openejb.tools.examples.ViewHelper.getClassesByApi;
 import static org.apache.openejb.tools.examples.ViewHelper.getExamplesClassesByApi;
 import static org.apache.openejb.tools.examples.ViewHelper.getLink;
-import static org.apache.openejb.tools.examples.ViewHelper.startFromPrefix;
+import static org.apache.openejb.tools.examples.ViewHelper.removePrefix;
 import static org.apache.openejb.tools.examples.ZipHelper.extract;
 import static org.apache.openejb.tools.examples.ZipHelper.zipDirectory;
 
@@ -158,7 +158,7 @@ public class GenerateIndex {
                         .add(OpenEJBTemplate.USER_JAVASCRIPTS, newList(String.class).add("prettyprint.js").list())
                         .add("apis", apiCount)
                         .add("link", zip.getName())
-                        .add("files", startFromPrefix("src/", javaFiles))
+                        .add("files", removePrefix(example.getPath(), javaFiles))
                         .map(),
                     index.getPath());
             } else {

Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java?rev=1138174&r1=1138173&r2=1138174&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java Tue Jun 21 20:40:55 2011
@@ -61,11 +61,15 @@ public final class ViewHelper {
         return classes;
     }
 
-    public static List<String> startFromPrefix(String prefix, List<File> files) {
+    public static List<String> removePrefix(String prefix, List<File> files) {
         List<String> processed = new ArrayList<String>();
         for (File file : files) {
-            int index = file.getPath().indexOf(prefix);
-            processed.add(file.getPath().substring(index));
+            String path = file.getPath().substring(prefix.length());
+            if (path.startsWith("/")) {
+                processed.add(path.substring(1));
+            } else {
+                processed.add(path);
+            }
         }
         return processed;
     }