MPXDOC-106: One cannot call xdoc:copy-user-resources directly

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@289948 13f79535-47bb-0310-9956-ffa450edef68

xdoc/plugin.jelly

@@ -556,6 +556,18 @@
     <mkdir dir="${maven.gen.docs}"/>
     <mkdir dir="${maven.docs.dest}"/>
 
+    <available
+      file="${maven.gen.docs}"
+      type="dir"
+      property="maven.gen.docs.available"
+    />
+
+    <available
+      file="${maven.docs.src}"
+      type="dir"
+      property="maven.docs.src.available"
+    />
+
     <j:forEach var="locale" items="${locales}">
       <j:if test="${!currentLocale.equals(defaultLocale)}">
         <mkdir dir="${maven.gen.docs}/${locale}"/>
@@ -847,8 +859,9 @@
   </goal>
   
   <!-- copy user resources -->
+  <!-- Note: this should also prereq xdoc:copy-user-bundles, but that doesn't do anything yet -->
   <goal name="xdoc:copy-user-resources"
-    prereqs="xdoc:init, xdoc:copy-user-bundles"
+    prereqs="xdoc:init"
     description="Copy user provided resources to docs destination">
 
     <j:if test="${maven.docs.src.available}">
@@ -953,20 +966,7 @@
     prereqs="xdoc:init"
     description="Generate html project documentation xdoc sources">
 
-    <!-- Use jelly utils here -->
-    <available
-      file="${maven.gen.docs}"
-      type="dir"
-      property="maven.gen.docs.available"
-    />
-
-    <available
-      file="${maven.docs.src}"
-      type="dir"
-      property="maven.docs.src.available"
-    />
-
-    <!-- use JSL in Jelly to build the documenation -->
+    <!-- use JSL in Jelly to build the documentation -->
     <attainGoal name="xdoc:copy-resources"/>
     <attainGoal name="xdoc:copy-user-resources"/>
     <attainGoal name="xdoc:jelly-transform"/>

xdoc/xdocs/changes.xml

@@ -27,8 +27,8 @@
   </properties>
   <body>
     <release version="1.10" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPXDOC-106" due-to="Jerome Lacoste">One cannot call xdoc:copy-user-resources directly.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-126" due-to="Maarten Coene">Add support for more powered-by banners.</action>
-      
       <action dev="ltheussl" type="add" issue="MPXDOC-80" due-to="Joerg Schaible">Support global theme.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-24" due-to="Gilles Dodinet">Add a navigation bar.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-158">Add an optional id tag to sub/sections, so they can be referenced.</action>