[richfaces-svn-commits] JBoss Rich Faces SVN: r1063 - in trunk/docs: userguide and 1 other directories.

Author: alexsmirnov Date: 2007-06-06 16:02:15 -0400 (Wed, 06 Jun 2007) New Revision: 1063 Modified: trunk/docs/resources/support.properties trunk/docs/resources/support.xml trunk/docs/userguide/build.xml trunk/docs/userguide/en/src/main/docbook/master.xml trunk/docs/userguide/pom.xml Log: Restore ant documentation build, in addition to a maven build. Modified: trunk/docs/resources/support.properties =================================================================== --- trunk/docs/resources/support.properties 2007-06-06 18:41:43 UTC (rev 1062) +++ trunk/docs/resources/support.properties 2007-06-06 20:02:15 UTC (rev 1063) @@ -1,2 +1,2 @@ #Wed Apr 11 15:30:36 EEST 2007 -richfaces.location=E:\\projects\\eclipse-worspaces\\workspace\\RichFaces \ No newline at end of file +richfaces.location=${support.startdir}/../.. \ No newline at end of file Modified: trunk/docs/resources/support.xml =================================================================== --- trunk/docs/resources/support.xml 2007-06-06 18:41:43 UTC (rev 1062) +++ trunk/docs/resources/support.xml 2007-06-06 20:02:15 UTC (rev 1063) @@ -3,7 +3,7 @@ <dirname property="support.startdir" file="${ant.file.DocSupport}"/> <property file="${support.startdir}/support.properties" /> - <property name="support.basedir" value="${support.startdir}/../../../jbosstools/trunk/documentation/resources"/> + <property name="support.basedir" value="${support.startdir}"/> <!-- Set build directories for all formats. --> @@ -98,16 +98,19 @@ </target> <target name="collect-tld"> - <mkdir dir="../build/generated/${lang}" /> - <copy flatten="yes" todir="../build/generated/${lang}"> + <mkdir dir="${basedir}/${lang}/target/generated" /> + <copy flatten="yes" todir="${basedir}/${lang}/target/generated"> <fileset dir="${richfaces.location}"> <include name="richfaces/*/target/generated-component/resources/META-INF/*.tld"/> + <include name="richfaces/assembly/target/classes/META-INF/*.tld"/> + <!-- <exclude name="richfaces/assembly" /> + --> </fileset> </copy> <touch> - <fileset dir="../build/generated/${lang}"> + <fileset dir="${basedir}/${lang}/target/generated"> <include name="*.tld" /> </fileset> </touch> @@ -119,12 +122,12 @@ <target name="tld2docbook" depends="collect-tld"> <!--Target must be started for every component in library till the one tld file for all the components isn't present--> - <xslt classpathref="lib.classpath" style="f.xsl" basedir="../build/generated/${lang}" destdir="../build/generated/${lang}"> + <xslt classpathref="lib.classpath" style="f.xsl" basedir="${basedir}/${lang}/target/generated" destdir="${basedir}/${lang}/target/generated"> <include name="*.tld"/> - <mapper type="glob" from="*.tld" to="*_table.xml" /> + <mapper type="glob" from="*.tld" to="*.xml" /> - <param name="lang" expression="${lang}"/> + <param name="lang" expression="${lang}/src/main/docbook"/> </xslt> <!--End of the tld process--> </target> @@ -146,7 +149,7 @@ <!-- Copy all the images to the output location, will be removed later. --> <copy todir="${build.dir}/${lang}/pdf/images"> - <fileset dir="${basedir}/${lang}/images"> + <fileset dir="${basedir}/${lang}/src/main/resources/images"> <include name="**/*.png"/> <include name="**/*.svg"/> <include name="**/*.gif"/> @@ -162,7 +165,7 @@ <classpath refid="lib.classpath"/> <arg value="-o" /> <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> - <arg value="${basedir}/${lang}/master.xml"/> + <arg value="${basedir}/${lang}/src/main/docbook/master.xml"/> <arg value="${styles.dir}/${lang}/${db.style.fopdf}"/> </java> @@ -193,7 +196,7 @@ <!-- Copy all the images to the output location --> <copy todir="${build.dir}/${lang}/html/images"> - <fileset dir="${basedir}/${lang}/images"> + <fileset dir="${basedir}/${lang}/src/main/resources/images"> <include name="**/*.png"/> <include name="**/*.gif"/> <include name="**/*.jpg"/> @@ -208,7 +211,7 @@ <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${build.dir}/${lang}/html"> <classpath refid="lib.classpath"/> - <arg value="${basedir}/${lang}/master.xml"/> + <arg value="${basedir}/${lang}/src/main/docbook/master.xml"/> <arg value="${styles.dir}/${lang}/${db.style.html}"/> </java> </target> @@ -218,7 +221,7 @@ <!-- Copy all the images to the output location --> <copy todir="${build.dir}/${lang}/html_single/images"> - <fileset dir="${basedir}/${lang}/images"> + <fileset dir="${basedir}/${lang}/src/main/resources/images"> <include name="**/*.png"/> <include name="**/*.gif"/> <include name="**/*.jpg"/> @@ -235,7 +238,7 @@ <classpath refid="lib.classpath"/> <arg value="-o"/> <arg value="${build.dir}/${lang}/html_single/index.html"/> - <arg value="${basedir}/${lang}/master.xml"/> + <arg value="${basedir}/${lang}/src/main/docbook/master.xml"/> <arg value="${styles.dir}/${lang}/${db.style.htmlsingle}"/> </java> </target> Modified: trunk/docs/userguide/build.xml =================================================================== --- trunk/docs/userguide/build.xml 2007-06-06 18:41:43 UTC (rev 1062) +++ trunk/docs/userguide/build.xml 2007-06-06 20:02:15 UTC (rev 1063) @@ -1,7 +1,7 @@ <project name="Documentation" default="all.doc" basedir="."> <!-- Set the following property to generate the doco in the output folder --> - <property name="build.dir" value="${basedir}/../build/usersguide"/> + <property name="build.dir" value="${basedir}/../target/"/> <property name="pdf.name" value="richfaces-usersguide.pdf" /> <import file="../resources/support.xml" /> Modified: trunk/docs/userguide/en/src/main/docbook/master.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/master.xml 2007-06-06 18:41:43 UTC (rev 1062) +++ trunk/docs/userguide/en/src/main/docbook/master.xml 2007-06-06 20:02:15 UTC (rev 1063) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" -"../../resources/support/docbook-dtd/docbookx.dtd" +"../../../../../resources/support/docbook-dtd/docbookx.dtd" [ <!ENTITY rfcintro SYSTEM "modules/RFCintro.xml"> <!ENTITY rfcdocumentroadmap SYSTEM "modules/RFCdocumentroadmap.xml"> <!ENTITY rfctechreqs SYSTEM "modules/RFCtechreqs.xml"> @@ -10,28 +10,28 @@ <!ENTITY rfclibrary SYSTEM "modules/RFClibrary.xml"> -<!ENTITY richfaces_table SYSTEM "../../../target/generated/en/rich.xml"> -<!ENTITY dataFilterSlider_table SYSTEM "../../../target/generated/en/dataFilterSlider.xml"> -<!ENTITY dataScroller_table SYSTEM "../../../target/generated/en/datascroller.xml"> -<!ENTITY dataTable_table SYSTEM "../../../target/generated/en/dataTable.xml"> -<!ENTITY dnd_table SYSTEM "../../../target/generated/en/dnd.xml"> -<!ENTITY gmap_table SYSTEM "../../../target/generated/en/gmap.xml"> -<!ENTITY inputNumberSlider_table SYSTEM "../../../target/generated/en/inputnumber-slider.xml"> -<!ENTITY inputNumberSpinner_table SYSTEM "../../../target/generated/en/inputnumber-spinner.xml"> -<!ENTITY modalPanel_table SYSTEM "../../../target/generated/en/modal-panel.xml"> -<!ENTITY paint2D_table SYSTEM "../../../target/generated/en/paint2D.xml"> -<!ENTITY panel_table SYSTEM "../../../target/generated/en/panel.xml"> -<!ENTITY panelBar_table SYSTEM "../../../target/generated/en/panelbar.xml"> -<!ENTITY separator_table SYSTEM "../../../target/generated/en/separator.xml"> -<!ENTITY simpleTogglePanel_table SYSTEM "../../../target/generated/en/simpleTogglePanel.xml"> -<!ENTITY spacer_table SYSTEM "../../../target/generated/en/spacer.xml"> -<!ENTITY suggestionbox_table SYSTEM "../../../target/generated/en/suggestionbox.xml"> -<!ENTITY tabPanel_table SYSTEM "../../../target/generated/en/tabPanel.xml"> -<!ENTITY togglePanel_table SYSTEM "../../../target/generated/en/togglePanel.xml"> -<!ENTITY toolBar_table SYSTEM "../../../target/generated/en/toolBar.xml"> -<!ENTITY tree_table SYSTEM "../../../target/generated/en/tree.xml"> -<!ENTITY dropDownMenu_table SYSTEM "../../../target/generated/en/dropdown-menu.xml"> -<!ENTITY menuComponents_table SYSTEM "../../../target/generated/en/menu-components.xml"> +<!ENTITY richfaces_table SYSTEM "../../../target/generated/rich.xml"> +<!ENTITY dataFilterSlider_table SYSTEM "../../../target/generated/dataFilterSlider.xml"> +<!ENTITY dataScroller_table SYSTEM "../../../target/generated/datascroller.xml"> +<!ENTITY dataTable_table SYSTEM "../../../target/generated/dataTable.xml"> +<!ENTITY dnd_table SYSTEM "../../../target/generated/dnd.xml"> +<!ENTITY gmap_table SYSTEM "../../../target/generated/gmap.xml"> +<!ENTITY inputNumberSlider_table SYSTEM "../../../target/generated/inputnumber-slider.xml"> +<!ENTITY inputNumberSpinner_table SYSTEM "../../../target/generated/inputnumber-spinner.xml"> +<!ENTITY modalPanel_table SYSTEM "../../../target/generated/modal-panel.xml"> +<!ENTITY paint2D_table SYSTEM "../../../target/generated/paint2D.xml"> +<!ENTITY panel_table SYSTEM "../../../target/generated/panel.xml"> +<!ENTITY panelBar_table SYSTEM "../../../target/generated/panelbar.xml"> +<!ENTITY separator_table SYSTEM "../../../target/generated/separator.xml"> +<!ENTITY simpleTogglePanel_table SYSTEM "../../../target/generated/simpleTogglePanel.xml"> +<!ENTITY spacer_table SYSTEM "../../../target/generated/spacer.xml"> +<!ENTITY suggestionbox_table SYSTEM "../../../target/generated/suggestionbox.xml"> +<!ENTITY tabPanel_table SYSTEM "../../../target/generated/tabPanel.xml"> +<!ENTITY togglePanel_table SYSTEM "../../../target/generated/togglePanel.xml"> +<!ENTITY toolBar_table SYSTEM "../../../target/generated/toolBar.xml"> +<!ENTITY tree_table SYSTEM "../../../target/generated/tree.xml"> +<!ENTITY dropDownMenu_table SYSTEM "../../../target/generated/dropdown-menu.xml"> +<!ENTITY menuComponents_table SYSTEM "../../../target/generated/menu-components.xml"> <!ENTITY rfcidesupport SYSTEM "modules/RFCidesupport.xml"> <!ENTITY rfclinks SYSTEM "modules/RFClinks.xml"> Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2007-06-06 18:41:43 UTC (rev 1062) +++ trunk/docs/userguide/pom.xml 2007-06-06 20:02:15 UTC (rev 1063) @@ -135,7 +135,7 @@ <include>*.tld</include> </includes> <outputDir> - ${project.build.directory}/generated/${translation}/ + ${project.build.directory}/generated/ </outputDir> <stylesheet> ${project.build.directory}/xslt/${translation}/f.xsl @@ -195,7 +195,7 @@ master.xml </sourceDocumentName> <formats> - <!-- + <format> <formatName>pdf</formatName> <stylesheetResource> @@ -205,7 +205,7 @@ ajax4jsf_reference.pdf </finalName> </format> - --> + <format> <formatName>html</formatName> <stylesheetResource>