[richfaces-svn-commits] JBoss Rich Faces SVN: r1636 - in trunk/docs: ajaxguide and 6 other directories.

Author: alexsmirnov Date: 2007-07-16 15:35:22 -0400 (Mon, 16 Jul 2007) New Revision: 1636 Removed: trunk/docs/docbook/ trunk/docs/xslt/src/main/resources/support/ trunk/docs/xslt/support/ Modified: trunk/docs/ajaxguide/en/pom.xml trunk/docs/ajaxguide/pom.xml trunk/docs/pom.xml trunk/docs/userguide/en/pom.xml trunk/docs/userguide/pom.xml trunk/docs/xslt/src/main/resources/en/f.xsl trunk/docs/xslt/src/main/resources/en/fopdf.xsl trunk/docs/xslt/src/main/resources/en/html.xsl trunk/docs/xslt/src/main/resources/en/html_chunk.xsl Log: refactoring in the documentation build Modified: trunk/docs/ajaxguide/en/pom.xml =================================================================== --- trunk/docs/ajaxguide/en/pom.xml 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/ajaxguide/en/pom.xml 2007-07-16 19:35:22 UTC (rev 1636) @@ -10,7 +10,7 @@ </parent> <groupId>org.richfaces.docs.ajaxguide</groupId> <artifactId>${translation}</artifactId> - <packaging>jar</packaging> + <packaging>jdocbook</packaging> <name>Ajax4jsf Manual (${translation})</name> <properties> @@ -28,8 +28,9 @@ </plugin> <plugin> - <groupId>org.richfaces.docs</groupId> - <artifactId>maven-docbook-plugin</artifactId> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <extensions>true</extensions> </plugin> </plugins> </build> Modified: trunk/docs/ajaxguide/pom.xml =================================================================== --- trunk/docs/ajaxguide/pom.xml 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/ajaxguide/pom.xml 2007-07-16 19:35:22 UTC (rev 1636) @@ -96,13 +96,13 @@ </goals> </execution> </executions> - <dependencies> + <dependencies> <dependency> - <groupId>net.sf.saxon</groupId> - <artifactId>saxon</artifactId> - <version>8.7</version> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon</artifactId> + <version>8.7</version> </dependency> - </dependencies> + </dependencies> <configuration> <transformationSets> <transformationSet> @@ -130,7 +130,7 @@ <parameter> <name>lang</name> <value> - ${basedir}${file.separator}src${file.separator}main${file.separator}docbook + ..${file.separator}..${file.separator}..${file.separator}src${file.separator}main${file.separator}docbook </value> </parameter> <parameter> @@ -148,9 +148,10 @@ </plugin> <plugin> - <groupId>org.richfaces.docs</groupId> - <artifactId>maven-docbook-plugin</artifactId> - <version>${project.version}</version> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.0.0</version> + <extensions>true</extensions> <executions> <execution> <id>generate</id> @@ -182,9 +183,17 @@ <sourceDirectory> ${basedir}/src/main/docbook </sourceDirectory> - <targetDirectory> + <imageResource> + <directory>${basedir}/src/main/resources/images</directory> + </imageResource> + <cssResource> + <directory>${basedir}/src/main/resources/css</directory> + </cssResource> + <!-- + <targetDirectory> ${project.build.outputDirectory} - </targetDirectory> + </targetDirectory> + --> <sourceDocumentName> master.xml </sourceDocumentName> Modified: trunk/docs/pom.xml =================================================================== --- trunk/docs/pom.xml 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/pom.xml 2007-07-16 19:35:22 UTC (rev 1636) @@ -1,21 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>root</artifactId> <groupId>org.richfaces</groupId> <version>3.1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>docs</artifactId> - <name>Project documentation</name> - <packaging>pom</packaging> - <modules> - <module>xslt</module> - <module>docbook</module> - <module>maven-docbook-plugin</module> - <module>userguide</module> - <module>ajaxguide</module> - </modules> -</project> - + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>docs</artifactId> + <name>Project documentation</name> + <packaging>pom</packaging> + <modules> + <module>xslt</module> + <!-- + <module>docbook</module> + <module>maven-docbook-plugin</module> + --> + <module>userguide</module> + <module>ajaxguide</module> + <module>maven-transform-plugin</module> + </modules> +</project> \ No newline at end of file Modified: trunk/docs/userguide/en/pom.xml =================================================================== --- trunk/docs/userguide/en/pom.xml 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/userguide/en/pom.xml 2007-07-16 19:35:22 UTC (rev 1636) @@ -10,7 +10,7 @@ </parent> <groupId>org.richfaces.docs.userguide</groupId> <artifactId>${translation}</artifactId> - <packaging>jar</packaging> + <packaging>jdocbook</packaging> <name>Richfaces Manual (${translation})</name> <properties> @@ -28,8 +28,9 @@ </plugin> <plugin> - <groupId>org.richfaces.docs</groupId> - <artifactId>maven-docbook-plugin</artifactId> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <extensions>true</extensions> </plugin> </plugins> </build> Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/userguide/pom.xml 2007-07-16 19:35:22 UTC (rev 1636) @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>docs</artifactId> <groupId>org.richfaces</groupId> <version>3.1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.docs</groupId> - <artifactId>userguide</artifactId> - <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.docs</groupId> + <artifactId>userguide</artifactId> + <packaging>pom</packaging> <description>RichFaces user guide</description> <pluginRepositories> <pluginRepository> @@ -43,7 +43,9 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> dataFilterSlider </artifactId> @@ -52,7 +54,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> datascroller </artifactId> @@ -61,7 +65,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> dataTable </artifactId> @@ -70,7 +76,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> drag-drop </artifactId> @@ -79,7 +87,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> dropdown-menu </artifactId> @@ -88,16 +98,18 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> - <artifactId> - gmap - </artifactId> + <groupId> + org.richfaces.ui + </groupId> + <artifactId>gmap</artifactId> <version> ${project.version} </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> inputnumber-slider </artifactId> @@ -106,7 +118,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> inputnumber-spinner </artifactId> @@ -115,7 +129,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> menu-components </artifactId> @@ -124,7 +140,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> modal-panel </artifactId> @@ -133,25 +151,27 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> - <artifactId> - paint2D - </artifactId> + <groupId> + org.richfaces.ui + </groupId> + <artifactId>paint2D</artifactId> <version> ${project.version} </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> - <artifactId> - panel - </artifactId> + <groupId> + org.richfaces.ui + </groupId> + <artifactId>panel</artifactId> <version> ${project.version} </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> panelbar </artifactId> @@ -160,7 +180,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> simpleTogglePanel </artifactId> @@ -169,7 +191,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> separator </artifactId> @@ -178,16 +202,18 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> - <artifactId> - spacer - </artifactId> + <groupId> + org.richfaces.ui + </groupId> + <artifactId>spacer</artifactId> <version> ${project.version} </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> suggestionbox </artifactId> @@ -196,7 +222,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> tabPanel </artifactId> @@ -205,7 +233,9 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> + <groupId> + org.richfaces.ui + </groupId> <artifactId> togglePanel </artifactId> @@ -214,19 +244,19 @@ </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> - <artifactId> - toolBar - </artifactId> + <groupId> + org.richfaces.ui + </groupId> + <artifactId>toolBar</artifactId> <version> ${project.version} </version> </artifactItem> <artifactItem> - <groupId>org.richfaces.ui</groupId> - <artifactId> - tree - </artifactId> + <groupId> + org.richfaces.ui + </groupId> + <artifactId>tree</artifactId> <version> ${project.version} </version> @@ -305,13 +335,17 @@ <parameter> <name>lang</name> <value> - ${basedir}/src/main/docbook + ..${file.separator}..${file.separator}..${file.separator}src${file.separator}main${file.separator}docbook </value> </parameter> <parameter> <name>title</name> <value>${project.name}</value> </parameter> + <parameter> + <name>separator</name> + <value>${file.separator}</value> + </parameter> </parameters> </transformationSet> </transformationSets> @@ -319,29 +353,25 @@ </plugin> <plugin> - <groupId>org.richfaces.docs</groupId> - <artifactId>maven-docbook-plugin</artifactId> - <version>3.1.0-SNAPSHOT</version> - <executions> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.0.0</version> + <!-- + <executions> <execution> - <id>generate</id> - <!-- - <phase>compile</phase> - --> - <goals> - <goal>generate</goal> - </goals> + <id>generate</id> + <goals> + <goal>generate</goal> + </goals> </execution> <execution> - <id>resources</id> - <!-- - <phase>compile</phase> - --> - <goals> - <goal>resources</goal> - </goals> + <id>resources</id> + <goals> + <goal>resources</goal> + </goals> </execution> - </executions> + </executions> + --> <dependencies> <dependency> <groupId>org.richfaces.docs</groupId> @@ -353,9 +383,16 @@ <sourceDirectory> ${basedir}/src/main/docbook </sourceDirectory> - <targetDirectory> - ${project.build.outputDirectory} - </targetDirectory> + <imageResource> + <directory> + ${basedir}/src/main/resources + </directory> + </imageResource> + <!-- + <cssResource> + <directory>${basedir}/src/main/resources/css</directory> + </cssResource> + --> <sourceDocumentName> master.xml </sourceDocumentName> @@ -369,6 +406,9 @@ <finalName> richfaces_reference.pdf </finalName> + <imagePathSettingRequired> + true + </imagePathSettingRequired> </format> <format> <formatName>html</formatName> @@ -376,6 +416,12 @@ /${translation}/html_chunk.xsl </stylesheetResource> <finalName>index.html</finalName> + <imageCopyingRequired> + true + </imageCopyingRequired> + <imagePathSettingRequired> + true + </imagePathSettingRequired> </format> <format> @@ -383,7 +429,12 @@ <stylesheetResource> /${translation}/html.xsl </stylesheetResource> - + <imageCopyingRequired> + true + </imageCopyingRequired> + <imagePathSettingRequired> + true + </imagePathSettingRequired> <finalName> richfaces_reference.html </finalName> @@ -393,6 +444,9 @@ <xincludeSupported>true</xincludeSupported> <options> <xincludeSupported>true</xincludeSupported> + <useRelativeImageUris> + false + </useRelativeImageUris> <xmlTransformerType> saxon </xmlTransformerType> @@ -406,6 +460,7 @@ </property> </transformerParameters> --> + <docbookVersion>1.72.0</docbookVersion> </options> </configuration> @@ -432,5 +487,5 @@ <module>en</module> </modules> -</project> - +</project> + Modified: trunk/docs/xslt/src/main/resources/en/f.xsl =================================================================== --- trunk/docs/xslt/src/main/resources/en/f.xsl 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/xslt/src/main/resources/en/f.xsl 2007-07-16 19:35:22 UTC (rev 1636) @@ -2,7 +2,7 @@ <xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:javaee="http://java.sun.com/JSP/TagLibraryDescriptor" version="1.0" exclude-result-prefixes="javaee"> - <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/> + <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/> <xsl:param name="lang" /> <xsl:param name="title" /> <xsl:param name="separator" /> @@ -48,7 +48,7 @@ <xsl:attribute name="id"><xsl:value-of select="$tag_name"/></xsl:attribute> <title>&lt;<xsl:value-of select="concat($prefix,':', $tag_name)" />&gt;</title> - <xsl:for-each select="document(concat('file:/',$lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/*"> + <xsl:for-each select="document(concat($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/*"> <xsl:copy-of select="./*"/> </xsl:for-each> <table> @@ -76,7 +76,7 @@ </tbody> </tgroup> </table> - <xsl:for-each select="document(concat('file:/',$lang, $separator,'included',$separator,$tag_name, '.xml'))/*"> + <xsl:for-each select="document(concat($lang, $separator,'included',$separator,$tag_name, '.xml'))/*"> <xsl:copy-of select="./*"/> </xsl:for-each> </section> Modified: trunk/docs/xslt/src/main/resources/en/fopdf.xsl =================================================================== --- trunk/docs/xslt/src/main/resources/en/fopdf.xsl 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/xslt/src/main/resources/en/fopdf.xsl 2007-07-16 19:35:22 UTC (rev 1636) @@ -18,8 +18,8 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" exclude-result-prefixes="#default"> - <!-- import the main docbook.xsl before we apply our overrides --> - <xsl:import href="&db_xsl_path;/fo/docbook.xsl"/> + <!-- assume catalog-based resolution... --> + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.... /> <!-- ########## XRef --> Modified: trunk/docs/xslt/src/main/resources/en/html.xsl =================================================================== --- trunk/docs/xslt/src/main/resources/en/html.xsl 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/xslt/src/main/resources/en/html.xsl 2007-07-16 19:35:22 UTC (rev 1636) @@ -23,7 +23,7 @@ xmlns="http://www.w3.org/TR/xhtml1/transitional" exclude-result-prefixes="#default"> -<xsl:import href="&db_xsl_path;/html/docbook.xsl"/> +<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docboo... <!--################################################### HTML Settings Modified: trunk/docs/xslt/src/main/resources/en/html_chunk.xsl =================================================================== --- trunk/docs/xslt/src/main/resources/en/html_chunk.xsl 2007-07-16 15:40:31 UTC (rev 1635) +++ trunk/docs/xslt/src/main/resources/en/html_chunk.xsl 2007-07-16 19:35:22 UTC (rev 1636) @@ -23,7 +23,7 @@ xmlns="http://www.w3.org/TR/xhtml1/transitional" exclude-result-prefixes="#default"> -<xsl:import href="&db_xsl_path;/html/chunk.xsl"/> +<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.... <!--################################################### HTML Settings