From 75405ea0e445e4402b09610232bc9dbc8778f86a Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Apr 2004 08:39:58 +0000
Subject: [PATCH] MPJBUILDER-10". Add xdocs and subdir into jbuilder folder(s).

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115053 13f79535-47bb-0310-9956-ffa450edef68
---
 jbuilder/plugin.jelly      | 53 ++++++++++++++++++++++++++++++++++++++
 jbuilder/xdocs/changes.xml |  1 +
 2 files changed, 54 insertions(+)
diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly
index f8faf6fc..83b6d5e6 100644
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@@ -230,6 +230,53 @@
         </library>
       </j:file>
     </def:tag>
+    
+
+    <!-- ================================================================== -->
+    <!-- jbuilder:generateXdocsSubFolder                                    -->
+    <!-- ================================================================== -->
+    <!-- Generate a JBuilder xdocs folder and sub folder(s)                 -->
+    <!--                                                                    -->
+    <!-- The following parameters can be used with the                      -->
+    <!-- generateXdocsSubFolder tag by setting the appropriate attribute    -->
+    <!-- when invoking the tag:                                             -->
+    <!--                                                                    -->
+    <!-- @param subdir  a xdocs sub directory                               -->
+    <!-- ================================================================== -->
+    <def:tag name="generateXdocsSubFolder">
+       
+      <!-- first, must get the folder name -->
+      <u:replace oldChar="\\" newChar="/" var="newSubDir" value="${subdir}"/>      
+      <u:tokenize var="dirList" delim="/">${newSubDir}</u:tokenize>      
+      <j:forEach var="dirName" items="${dirList}">
+        <j:set var="jbuilderFolderName" value="${dirName}"/>    
+      </j:forEach>     
+      
+      <node name="${jbuilderFolderName}" type="Folder">
+      
+        <!-- retreive all files and subfolder within a folder -->
+        <ant:fileScanner var="xdocsFiles">
+          <ant:fileset dir="${subdir}">
+            <ant:patternset>
+              <ant:include name="*"/> 
+            </ant:patternset>
+          </ant:fileset>
+        </ant:fileScanner>
+      
+        <!-- add all files under a subdir into its conresponding folder -->
+        <j:forEach var="file" items="${xdocsFiles.iterator()}">
+          <maven:makeRelativePath var="relativeFile" basedir="${basedir}" path="${file}" />
+          <file path="${relativeFile}"/>
+        </j:forEach>
+        
+        <!-- recursively create folder within folder if any -->
+        <j:forEach var="dir" items="${xdocsFiles.directories()}">
+          <jbuilder:generateXdocsSubFolder subdir="${dir}" />        
+        </j:forEach>
+        
+      </node>        
+    </def:tag>
+    
   </def:taglib>
 
   <!-- ================================================================== -->
@@ -480,6 +527,12 @@
         </j:forEach>
         <property category="runtime" name="ConfigurationCount" value="${runtimeIndex - 1}"/>
 
+        <!-- Write all files under xdocs directories to xdocs folders -->
+        <ant:available file="${maven.docs.src}" type="dir" property="maven.docs.src.available"/>
+        <j:if test="${maven.docs.src.available}">
+          <jbuilder:generateXdocsSubFolder subdir="${maven.docs.src}" />        
+        </j:if>        
+
   	  </project>
   	</j:file>	
   </goal>
diff --git a/jbuilder/xdocs/changes.xml b/jbuilder/xdocs/changes.xml
index 622478f4..7305af2d 100644
--- a/jbuilder/xdocs/changes.xml
+++ b/jbuilder/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.5" date="In CVS">
+      <action dev="evenisse" type="add" issue="MPJBUILDER-10">Add xdocs and subdir into jbuilder folder(s).</action>
       <action dev="evenisse" type="fix" issue="MPJBUILDER-9">Fix crash with Maven RC2.</action>
     </release>
     <release version="1.4" date="2004-03-10">
