[jboss-svn-commits] JBL Code SVN: r36922 - in labs/jbosstm/trunk: ArjunaJTA and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 13 16:23:59 EDT 2011
Author: tomjenkinson
Date: 2011-04-13 16:23:59 -0400 (Wed, 13 Apr 2011)
New Revision: 36922
Modified:
labs/jbosstm/trunk/ArjunaCore/build.xml
labs/jbosstm/trunk/ArjunaJTA/build.xml
labs/jbosstm/trunk/ArjunaJTA/docs/administration_guide/en-US/Book_Info.xml
labs/jbosstm/trunk/ArjunaJTS/build.xml
labs/jbosstm/trunk/ArjunaJTS/docs/quick_start/en-US/Quick_Start_to_JTS_OTS.xml
labs/jbosstm/trunk/docs/build.xml
Log:
JBTM-830 updated to build the docs into the distribution
Modified: labs/jbosstm/trunk/ArjunaCore/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/build.xml 2011-04-13 19:06:28 UTC (rev 36921)
+++ labs/jbosstm/trunk/ArjunaCore/build.xml 2011-04-13 20:23:59 UTC (rev 36922)
@@ -29,6 +29,10 @@
<target name="dist" depends="dist.compositenode, install.docs, install.scripts, install.services, install.etc">
</target>
+ <target name="clean" depends="sharedbuild.clean">
+ <delete dir="docs/failure_recovery_guide/target"/>
+ </target>
+
<target name="htdocs">
<htdocs.composite.macro>
<packagesets>
@@ -82,10 +86,6 @@
<property name="dest.dir" value="docs"/>
- <copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
- <fileset dir="docs" includes="**/*.pdf"/>
- </copy>
-
<if>
<istrue value="${publican}" />
<then>
@@ -99,13 +99,12 @@
<arg value="--langs=en-US"/>
<arg value="--formats=pdf,html"/>
</exec>
+ <copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
+ <fileset dir="." includes="**/*.pdf"/>
+ </copy>
</then>
</if>
- <copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
- <fileset dir="." includes="**/*.pdf"/>
- </copy>
-
</target>
<target name="install.services">
Modified: labs/jbosstm/trunk/ArjunaJTA/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/build.xml 2011-04-13 19:06:28 UTC (rev 36921)
+++ labs/jbosstm/trunk/ArjunaJTA/build.xml 2011-04-13 20:23:59 UTC (rev 36922)
@@ -30,6 +30,12 @@
<copy file="INSTALL" todir="${build.dir}/install"/>
</target>
+ <target name="clean" depends="sharedbuild.clean">
+ <delete dir="docs/quick_start/target"/>
+ <delete dir="docs/administration_guide/target"/>
+ <delete dir="docs/installation_guide/target"/>
+ </target>
+
<target name="htdocs">
<htdocs.composite.macro>
<packagesets>
@@ -69,16 +75,16 @@
<arg value="--langs=en-US"/>
<arg value="--formats=pdf,html"/>
</exec>
+ <copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
+ <fileset dir="." includes="**/*.pdf"/>
+ </copy>
</then>
</if>
+ <ant dir="../ArjunaCore" target="install.docs"/>
<copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
- <fileset dir="." includes="**/*.pdf"/>
+ <fileset dir="../ArjunaCore" includes="**/*.pdf"/>
</copy>
-
- <!--<copy todir="${build.dir}/install/${dest.dir}/user_guide/transaction_core" overwrite="true">-->
- <!--<fileset dir="../ArjunaCore/docs/user_guide" includes="*.pdf" excludes="Admin*"/>-->
- <!--</copy>-->
</target>
<target name="install.scripts">
Modified: labs/jbosstm/trunk/ArjunaJTA/docs/administration_guide/en-US/Book_Info.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/docs/administration_guide/en-US/Book_Info.xml 2011-04-13 19:06:28 UTC (rev 36921)
+++ labs/jbosstm/trunk/ArjunaJTA/docs/administration_guide/en-US/Book_Info.xml 2011-04-13 20:23:59 UTC (rev 36922)
@@ -7,7 +7,7 @@
<title>JBossJTA Administration Guide</title>
<subtitle>Administration of the &PRODUCT; toolkit, which implements the JTA API in the &PRODUCT;
Transaction Service</subtitle>
- <productname>&PRODUCT;</productname>
+ <productname>JBossJTA</productname>
<productnumber>4.15.0</productnumber>
<edition>1</edition>
<pubsnumber>1</pubsnumber>
Modified: labs/jbosstm/trunk/ArjunaJTS/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/build.xml 2011-04-13 19:06:28 UTC (rev 36921)
+++ labs/jbosstm/trunk/ArjunaJTS/build.xml 2011-04-13 20:23:59 UTC (rev 36922)
@@ -97,18 +97,25 @@
<arg value="--langs=en-US"/>
<arg value="--formats=pdf,html"/>
</exec>
+ <copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
+ <fileset dir="." includes="**/*.pdf"/>
+ </copy>
</then>
</if>
-
- <copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
- <fileset dir="." includes="**/*.pdf"/>
- </copy>
-
<copy todir="${build.dir}/install/${dest.dir}" overwrite="true">
<fileset dir="docs" includes="images/*"/>
<fileset dir="docs" includes="index.html"/>
</copy>
+
+ <ant dir="../ArjunaJTA" target="install.docs"/>
+
+ <copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
+ <fileset dir="../ArjunaJTA" includes="**/*.pdf"/>
+ </copy>
+ <copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
+ <fileset dir="../ArjunaCore" includes="**/*.pdf"/>
+ </copy>
</target>
<target name="install.scripts">
Modified: labs/jbosstm/trunk/ArjunaJTS/docs/quick_start/en-US/Quick_Start_to_JTS_OTS.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/docs/quick_start/en-US/Quick_Start_to_JTS_OTS.xml 2011-04-13 19:06:28 UTC (rev 36921)
+++ labs/jbosstm/trunk/ArjunaJTS/docs/quick_start/en-US/Quick_Start_to_JTS_OTS.xml 2011-04-13 20:23:59 UTC (rev 36922)
@@ -184,7 +184,7 @@
<title>Interposition relationship</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/interposition.gif" format="GIF" />
+ <imagedata fileref="extras/interposition.gif" format="GIF" />
</imageobject>
</mediaobject>
</figure>
Modified: labs/jbosstm/trunk/docs/build.xml
===================================================================
--- labs/jbosstm/trunk/docs/build.xml 2011-04-13 19:06:28 UTC (rev 36921)
+++ labs/jbosstm/trunk/docs/build.xml 2011-04-13 20:23:59 UTC (rev 36922)
@@ -26,10 +26,13 @@
<target name="clean">
<delete dir="${build.dir}"/>
+ <delete dir="failure_recovery_guide/target"/>
+ <delete dir="transactions_overview_guide/target"/>
</target>
<target name="install.docs">
<property name="dest.dir" value="${build.dir}/install/docs"/>
+
<if>
<istrue value="${publican}" />
<then>
More information about the jboss-svn-commits
mailing list