You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2008/02/07 22:17:40 UTC

svn commit: r619641 - in /commons/proper/math/trunk: ./ src/site/resources/style/ src/site/xdoc/ src/site/xdoc/userguide/ xdocs/

Author: luc
Date: Thu Feb  7 13:17:35 2008
New Revision: 619641

URL: http://svn.apache.org/viewvc?rev=619641&view=rev
Log:
make maven1 and maven2 use the same maven2-compliant xdoc layout

Added:
    commons/proper/math/trunk/src/site/resources/style/
    commons/proper/math/trunk/src/site/resources/style/project.css
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/style/project.css
    commons/proper/math/trunk/src/site/xdoc/
    commons/proper/math/trunk/src/site/xdoc/changes.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/changes.xml
    commons/proper/math/trunk/src/site/xdoc/developers.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/developers.xml
    commons/proper/math/trunk/src/site/xdoc/index.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/index.xml
    commons/proper/math/trunk/src/site/xdoc/issue-tracking.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/issue-tracking.xml
    commons/proper/math/trunk/src/site/xdoc/navigation.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/navigation.xml
    commons/proper/math/trunk/src/site/xdoc/proposal.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/proposal.xml
    commons/proper/math/trunk/src/site/xdoc/releases.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/releases.xml
    commons/proper/math/trunk/src/site/xdoc/tasks.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/tasks.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/
    commons/proper/math/trunk/src/site/xdoc/userguide/analysis.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/analysis.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/complex.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/complex.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/distribution.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/distribution.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/estimation.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/estimation.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/fraction.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/fraction.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/geometry.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/geometry.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/index.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/index.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/linear.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/linear.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/ode.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/ode.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/optimization.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/optimization.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/overview.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/overview.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/random.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/random.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/special.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/special.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/stat.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/stat.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/transform.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/transform.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/utilities.xml
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/utilities.xml
    commons/proper/math/trunk/src/site/xdoc/userguide/xdoc.xsl
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/userguide/xdoc.xsl
    commons/proper/math/trunk/src/site/xdoc/xdoc.xsl
      - copied unchanged from r619634, commons/proper/math/trunk/xdocs/xdoc.xsl
Removed:
    commons/proper/math/trunk/xdocs/
Modified:
    commons/proper/math/trunk/maven.xml
    commons/proper/math/trunk/project.properties

Modified: commons/proper/math/trunk/maven.xml
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/maven.xml?rev=619641&r1=619640&r2=619641&view=diff
==============================================================================
--- commons/proper/math/trunk/maven.xml (original)
+++ commons/proper/math/trunk/maven.xml Thu Feb  7 13:17:35 2008
@@ -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>
@@ -60,7 +58,16 @@
  -->
  
  <!-- Limit maven resources included in site generation -->
-  <postGoal name="xdoc:copy-resources">  
+  <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}"/>

Modified: commons/proper/math/trunk/project.properties
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/project.properties?rev=619641&r1=619640&r2=619641&view=diff
==============================================================================
--- commons/proper/math/trunk/project.properties (original)
+++ commons/proper/math/trunk/project.properties Thu Feb  7 13:17:35 2008
@@ -40,6 +40,8 @@
 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/,\