Author: ltheussl
Date: Tue Oct 4 09:41:28 2005
New Revision: 294820
URL: http://svn.apache.org/viewcvs?rev=294820&view=rev
Log:
MPXDOC-176: Always copy generated docs
Modified:
maven/maven-1/plugins/trunk/xdoc/plugin.jelly
maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/xdoc/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/plugin.jelly?rev=294820&r1=294819&r2=294820&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/xdoc/plugin.jelly Tue Oct 4 09:41:28 2005
@@ -959,16 +959,6 @@
<exclude name="stylesheets/*"/>
<exclude name="**/*.properties"/>
</fileset>
-
- <fileset dir="${maven.gen.docs}">
- <exclude name="**/*.xml"/>
- <exclude name="**/CVS/*"/>
- <exclude name="**/*.properties"/>
- <j:forEach var="locale" items="${locales}">
- <exclude name="${locale}/**"/>
- </j:forEach>
- <exclude name="stylesheets/*"/>
- </fileset>
</copy>
<!-- Copy all default site structure to differents locales -->
@@ -1010,6 +1000,20 @@
</copy>
</util:available>
</j:if>
+
+ <!-- Copy generated resources -->
+ <copy todir="${maven.docs.dest}" filtering="no">
+ <fileset dir="${maven.gen.docs}">
+ <exclude name="**/*.xml"/>
+ <exclude name="**/CVS/*"/>
+ <exclude name="**/*.properties"/>
+ <j:forEach var="locale" items="${locales}">
+ <exclude name="${locale}/**"/>
+ </j:forEach>
+ <exclude name="stylesheets/*"/>
+ </fileset>
+ </copy>
+
<j:set var="theme" value="${maven.xdoc.theme.file}" />
<j:if test="${!empty(theme)}">
Modified: maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml?rev=294820&r1=294819&r2=294820&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/xdocs/changes.xml Tue Oct 4 09:41:28 2005
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.10" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPXDOC-176">When there's no
user provided documentation, some generated docs don't get copied to
site.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-175" due-to="Phil
Steitz">Menus with <code>type="header"</code> are not processed by
<code>site.jsl</code>.</action>
<action dev="ltheussl" type="fix" issue="MPXDOC-174">Unclear error
message when <code><currentVersion/></code> in <code>project.xml</code>
file not defined.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-141" due-to="M. Sean
Gilligan">Perform JSL transforms on xdocs <strong>only</strong> when they have
changed.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
