make maven1 and maven2 use the same maven2-compliant xdoc layout

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@619641 13f79535-47bb-0310-9956-ffa450edef68

maven.xml

@@ -38,10 +38,8 @@
       <fileset file='${basedir}/RELEASE-NOTES.txt'/>
       <fileset file='${basedir}/release-notes.jsl'/>
     </copy>
-    <copy todir="${maven.dist.src.assembly.dir}/xdocs">
-        <fileset dir="./xdocs"/>
-    </copy>
     <delete dir="${maven.dist.src.assembly.dir}/src/experimental" />
+    <delete dir="${maven.dist.src.assembly.dir}/src/mantissa" />
     <move todir="${maven.dist.src.assembly.dir}-src">
       <fileset dir="${maven.dist.src.assembly.dir}"/>
     </move>
@@ -61,6 +59,15 @@
  
  <!-- Limit maven resources included in site generation -->
   <postGoal name="xdoc:copy-resources">
+    <copy todir="${maven.docs.dest}/images">
+      <fileset file='${maven.docs.src}/../resources/images/**'/>
+    </copy>
+    <copy todir="${maven.docs.dest}/style">
+      <fileset file='${maven.docs.src}/../resources/style/**'/>
+    </copy>
+    <copy todir="${maven.docs.dest}/userguide">
+      <fileset file='${maven.docs.src}/../resources/userguide/**'/>
+    </copy>
     <delete includeEmptyDirs="true">
       <fileset dir="${maven.docs.dest}" 
         includes="${maven.xdoc.copy.excludes},${maven.xdoc.copy.excludes.classic}"/>

project.properties

@@ -40,6 +40,8 @@ maven.junit.fork=true
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
 maven.xdoc.developmentProcessUrl=http://commons.apache.org/charter.html
+maven.docs.dest=${maven.build.dir}/site
+maven.docs.src=${basedir}/src/site/xdoc
 
 maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/,\
                       http://commons.apache.org/collections/api/,\