Author: alexsmirnov Date: 2007-07-16 19:12:27 -0400 (Mon, 16 Jul 2007) New Revision: 1642 Added: trunk/docs/ajaxguide/CatalogManager.properties trunk/docs/ajaxguide/build.xml trunk/docs/ajaxguide/f.xsl trunk/docs/userguide/f.xsl trunk/docs/xslt/en/src/ trunk/docs/xslt/en/src/main/ Removed: trunk/docs/ajaxguide/CatalogManager.properties trunk/docs/ajaxguide/build.xml trunk/docs/maven-docbook-plugin/ trunk/docs/userguide/f.xsl trunk/docs/xslt/en/src/main/ trunk/docs/xslt/src/ trunk/docs/xslt/support.properties trunk/docs/xslt/support.xml 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/en/pom.xml trunk/docs/xslt/pom.xml Log: finish refactoring in the documentation build Deleted: trunk/docs/ajaxguide/CatalogManager.properties =================================================================== --- trunk/docs/ajaxguide/CatalogManager.properties 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/ajaxguide/CatalogManager.properties 2007-07-16 23:12:27 UTC (rev 1642) @@ -1,5 +0,0 @@ -verbosity=1 -catalogs=./dtd/catalog.xml -prefer=public -static-catalog=yes -relative-catalogs=no \ No newline at end of file Added: trunk/docs/ajaxguide/CatalogManager.properties =================================================================== --- trunk/docs/ajaxguide/CatalogManager.properties (rev 0) +++ trunk/docs/ajaxguide/CatalogManager.properties 2007-07-16 23:12:27 UTC (rev 1642) @@ -0,0 +1,5 @@ +verbosity=1 +catalogs=./dtd/catalog.xml +prefer=public +static-catalog=yes +relative-catalogs=no \ No newline at end of file Property changes on: trunk/docs/ajaxguide/CatalogManager.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/docs/ajaxguide/build.xml =================================================================== --- trunk/docs/ajaxguide/build.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/ajaxguide/build.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -1,20 +0,0 @@ -<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}/../target/usersguide"/> - - <property name="pdf.name" value="ajax4jsf-usersguide.pdf" /> - <import file="../xslt/support.xml" /> - - <target name="all.doc" depends="clean"> - <antcall target="lang.all"><param name="lang" value="en"/></antcall> - </target> - - <!-- Use this alternate target to enable uptodate checking, i.e. - don't generate docs if nothing has changed - <target name="all.doc"> - <antcall target="lang.all.run"><param name="lang" value="en"/></antcall> - </target> - --> - -</project> Added: trunk/docs/ajaxguide/build.xml =================================================================== --- trunk/docs/ajaxguide/build.xml (rev 0) +++ trunk/docs/ajaxguide/build.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -0,0 +1,20 @@ +<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}/../target/"/> + + <property name="pdf.name" value="richfaces-usersguide.pdf" /> + <import file="../resources/support.xml" /> + + <target name="all.doc" depends="clean"> + <antcall target="lang.all"><param name="lang" value="en"/></antcall> + </target> + + <!-- Use this alternate target to enable uptodate checking, i.e. + don't generate docs if nothing has changed + <target name="all.doc"> + <antcall target="lang.all.run"><param name="lang" value="en"/></antcall> + </target> + --> + +</project> Property changes on: trunk/docs/ajaxguide/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/docs/ajaxguide/en/pom.xml =================================================================== --- trunk/docs/ajaxguide/en/pom.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/ajaxguide/en/pom.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -17,6 +17,7 @@ <translation>en</translation> </properties> <build> + <finalName>${project.parent.artifactId}_${translation}-${version}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> Added: trunk/docs/ajaxguide/f.xsl =================================================================== --- trunk/docs/ajaxguide/f.xsl (rev 0) +++ trunk/docs/ajaxguide/f.xsl 2007-07-16 23:12:27 UTC (rev 1642) @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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" omit-xml-declaration="yes"/> + <xsl:param name="lang" /> + <xsl:param name="title" /> + <xsl:param name="separator" /> + + <xsl:template match="javaee:taglib | taglib"> + <xsl:variable name="excluded-tag-names">header2,header3,header4,header5,header6</xsl:variable> + + <xsl:for-each select="javaee:tag | tag"> + + <!--xsl:value-of select="./name/text()" /--> + + <xsl:if test="not(contains($excluded-tag-names, javaee:name))"> + <xsl:call-template name="tag" /> + </xsl:if> + <xsl:if test="not(contains($excluded-tag-names, ./name/text()))"> + <xsl:call-template name="tag" /> + </xsl:if> + </xsl:for-each> + </xsl:template> + + <xsl:template name="tag"> + <section role="NotInToc"> + <xsl:variable name="tag_name"> + <xsl:choose> + <xsl:when test="javaee:name"> + <xsl:value-of select="javaee:name" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="./name/text()" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="prefix"> + <xsl:choose> + <xsl:when test="/javaee:taglib/javaee:short-name"> + <xsl:value-of select="/javaee:taglib/javaee:short-name" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="/taglib/short-name/text()" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <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($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/*"> + <xsl:copy-of select="./*"/> + </xsl:for-each> + <table> + <title><xsl:value-of select="$prefix"/>:<xsl:value-of select="javaee:name"/><xsl:value-of select="name"/> attributes</title> + <tgroup cols="2"> + <thead> + <row> + <entry>Attribute Name</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <xsl:for-each select="javaee:attribute | attribute"> + <row> + <entry> + <xsl:value-of select="javaee:name"/> + <xsl:value-of select="name"/> + </entry> + <entry> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + <xsl:value-of select="description" disable-output-escaping="yes"/> + </entry> + </row> + </xsl:for-each> + </tbody> + </tgroup> + </table> + <xsl:for-each select="document(concat($lang, $separator,'included',$separator,$tag_name, '.xml'))/*"> + <xsl:copy-of select="./*"/> + </xsl:for-each> + </section> + </xsl:template> +</xsl:transform> \ No newline at end of file Property changes on: trunk/docs/ajaxguide/f.xsl ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/docs/ajaxguide/pom.xml =================================================================== --- trunk/docs/ajaxguide/pom.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/ajaxguide/pom.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -11,6 +11,7 @@ <groupId>org.richfaces.docs</groupId> <artifactId>ajaxguide</artifactId> <packaging>pom</packaging> + <name>Ajax4jsf user guide</name> <description>Ajax4jsf user guide</description> <pluginRepositories> <pluginRepository> @@ -58,11 +59,13 @@ </artifactItem> <artifactItem> <groupId> - org.richfaces.docs + org.richfaces.docs.xslt </groupId> - <artifactId>xslt</artifactId> + <artifactId> + ${translation} + </artifactId> <version> - ${project.version} + 3.1.0-SNAPSHOT </version> <type>jar</type> <overWrite>true</overWrite> @@ -116,7 +119,7 @@ ${project.build.directory}/generated/ </outputDir> <stylesheet> - ${project.build.directory}/xslt/${translation}/f.xsl + ${project.build.directory}/xslt/xslt/f.xsl </stylesheet> <fileMappers> <fileMapper @@ -152,31 +155,12 @@ <artifactId>maven-jdocbook-plugin</artifactId> <version>2.0.0</version> <extensions>true</extensions> - <executions> - <execution> - <id>generate</id> - <!-- - <phase>compile</phase> - --> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>resources</id> - <!-- - <phase>compile</phase> - --> - <goals> - <goal>resources</goal> - </goals> - </execution> - </executions> <dependencies> <dependency> - <groupId>org.richfaces.docs</groupId> - <artifactId>xslt</artifactId> - <version>${project.version}</version> + <groupId>org.richfaces.docs.xslt</groupId> + <artifactId>${translation}</artifactId> + <version>3.1.0-SNAPSHOT</version> + <type>jar</type> </dependency> </dependencies> <configuration> @@ -184,10 +168,17 @@ ${basedir}/src/main/docbook </sourceDirectory> <imageResource> - <directory>${basedir}/src/main/resources/images</directory> + <directory> + ${basedir}/src/main/resources + </directory> + <!-- + <directory>${project.build.directory}/xslt/images</directory> + --> </imageResource> <cssResource> - <directory>${basedir}/src/main/resources/css</directory> + <directory> + ${project.build.directory}/xslt/css + </directory> </cssResource> <!-- <targetDirectory> @@ -201,27 +192,36 @@ <format> <formatName>html_single</formatName> <stylesheetResource> - /${translation}/html.xsl + /xslt/html.xsl </stylesheetResource> <finalName> ajax4jsf_reference.html </finalName> + <imageCopyingRequired> + true + </imageCopyingRequired> </format> <format> <formatName>html</formatName> <stylesheetResource> - /${translation}/html_chunk.xsl + /xslt/html_chunk.xsl </stylesheetResource> <finalName>index.html</finalName> + <imageCopyingRequired> + true + </imageCopyingRequired> </format> <format> <formatName>pdf</formatName> <stylesheetResource> - /${translation}/fopdf.xsl + /xslt/fopdf.xsl </stylesheetResource> <finalName> ajax4jsf_reference.pdf </finalName> + <imagePathSettingRequired> + true + </imagePathSettingRequired> </format> </formats> <xincludeSupported>true</xincludeSupported> @@ -240,6 +240,7 @@ </property> </transformerParameters> --> + <docbookVersion>1.72.0</docbookVersion> </options> </configuration> Modified: trunk/docs/pom.xml =================================================================== --- trunk/docs/pom.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/pom.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -1,5 +1,7 @@ <?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"> +<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> @@ -10,6 +12,63 @@ <artifactId>docs</artifactId> <name>Project documentation</name> <packaging>pom</packaging> + <!-- setup repositories, to build documentation separate from Java projects --> + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>repository.jboss.com</id> + <name>Jboss Repository for Maven</name> + <url>http://repository.jboss.com/maven2/</url> + <layout>default</layout> + </repository> + <repository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + <id>maven2-snapshots.exadel.com</id> + <name>Exadel Repository for Maven Snapshots</name> + <url>http://maven.exadel.com/</url> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>maven2-snapshots.exadel.com</id> + <name>Exadel Repository for Maven Snapshots</name> + <url>http://maven.exadel.com/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + </pluginRepository> + <pluginRepository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>repository.jboss.com</id> + <name>Jboss Repository for Maven</name> + <url>http://repository.jboss.com/maven2/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + <modules> <module>xslt</module> <!-- @@ -18,6 +77,5 @@ --> <module>userguide</module> <module>ajaxguide</module> - <module>maven-transform-plugin</module> - </modules> + </modules> </project> \ No newline at end of file Modified: trunk/docs/userguide/en/pom.xml =================================================================== --- trunk/docs/userguide/en/pom.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/userguide/en/pom.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -17,6 +17,7 @@ <translation>en</translation> </properties> <build> + <finalName>${project.parent.artifactId}_${translation}-${version}</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> Deleted: trunk/docs/userguide/f.xsl =================================================================== --- trunk/docs/userguide/f.xsl 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/userguide/f.xsl 2007-07-16 23:12:27 UTC (rev 1642) @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:javaee="http://java.sun.com/JSP/TagLibraryDescriptor" - version="2.0" exclude-result-prefixes="javaee"> - <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/> - <xsl:param name="lang" /> - - <xsl:template match="javaee:taglib | taglib"> - <xsl:variable name="excluded-tag-names">header2,header3,header4,header5,header6</xsl:variable> - - <xsl:for-each select="javaee:tag | tag"> - <xsl:sort select="name" /> - <xsl:sort select="javaee:name" /> - <!--xsl:value-of select="./name/text()" /--> - - <xsl:if test="not(contains($excluded-tag-names, javaee:name))"> - <xsl:call-template name="tag" /> - </xsl:if> - <xsl:if test="not(contains($excluded-tag-names, ./name/text()))"> - <xsl:call-template name="tag" /> - </xsl:if> - </xsl:for-each> - </xsl:template> - - <xsl:template name="tag"> - <xsl:variable name="tag_name"> - <xsl:choose> - <xsl:when test="javaee:name"> - <xsl:value-of select="javaee:name" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="./name/text()" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <section id="tag_name"> - <xsl:attribute name="id"><xsl:value-of select="$tag_name"/></xsl:attribute> - <xsl:processing-instruction name="dbhtml"> - <xsl:text>filename="</xsl:text><xsl:value-of select="$tag_name" /><xsl:text>.html" </xsl:text> - </xsl:processing-instruction> - <title>&lt;<xsl:value-of select="concat('rich:', $tag_name)" />&gt;</title> - <xsl:for-each select="document(concat($lang, '/included/',$tag_name, '.desc.xml'))/*"> - <xsl:copy-of select="./*"/> - </xsl:for-each> - <table> - <title>rich:<xsl:value-of select="javaee:name"/><xsl:value-of select="name"/> attributes</title> - <tgroup cols="2"> - <thead> - <row> - <entry>Attribute Name</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <xsl:for-each select="javaee:attribute | attribute"> - <xsl:sort select="name" /> - <xsl:sort select="javaee:name" /> - <row> - <entry> - <xsl:value-of select="javaee:name"/> - <xsl:value-of select="name"/> - </entry> - <entry> - <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> - <xsl:value-of select="description" disable-output-escaping="yes"/> - </entry> - </row> - </xsl:for-each> - </tbody> - </tgroup> - </table> - <xsl:for-each select="document(concat($lang, '/included/',$tag_name, '.xml'))/*"> - <xsl:copy-of select="./*"/> - </xsl:for-each> - </section> - </xsl:template> -</xsl:transform> \ No newline at end of file Added: trunk/docs/userguide/f.xsl =================================================================== --- trunk/docs/userguide/f.xsl (rev 0) +++ trunk/docs/userguide/f.xsl 2007-07-16 23:12:27 UTC (rev 1642) @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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" omit-xml-declaration="yes"/> + <xsl:param name="lang" /> + <xsl:param name="title" /> + <xsl:param name="separator" /> + + <xsl:template match="javaee:taglib | taglib"> + <xsl:variable name="excluded-tag-names">header2,header3,header4,header5,header6</xsl:variable> + + <xsl:for-each select="javaee:tag | tag"> + + <!--xsl:value-of select="./name/text()" /--> + + <xsl:if test="not(contains($excluded-tag-names, javaee:name))"> + <xsl:call-template name="tag" /> + </xsl:if> + <xsl:if test="not(contains($excluded-tag-names, ./name/text()))"> + <xsl:call-template name="tag" /> + </xsl:if> + </xsl:for-each> + </xsl:template> + + <xsl:template name="tag"> + <section role="NotInToc"> + <xsl:variable name="tag_name"> + <xsl:choose> + <xsl:when test="javaee:name"> + <xsl:value-of select="javaee:name" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="./name/text()" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="prefix"> + <xsl:choose> + <xsl:when test="/javaee:taglib/javaee:short-name"> + <xsl:value-of select="/javaee:taglib/javaee:short-name" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="/taglib/short-name/text()" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <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($lang, $separator,'included',$separator,$tag_name, '.desc.xml'))/*"> + <xsl:copy-of select="./*"/> + </xsl:for-each> + <table> + <title><xsl:value-of select="$prefix"/>:<xsl:value-of select="javaee:name"/><xsl:value-of select="name"/> attributes</title> + <tgroup cols="2"> + <thead> + <row> + <entry>Attribute Name</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <xsl:for-each select="javaee:attribute | attribute"> + <row> + <entry> + <xsl:value-of select="javaee:name"/> + <xsl:value-of select="name"/> + </entry> + <entry> + <xsl:value-of select="javaee:description" disable-output-escaping="yes"/> + <xsl:value-of select="description" disable-output-escaping="yes"/> + </entry> + </row> + </xsl:for-each> + </tbody> + </tgroup> + </table> + <xsl:for-each select="document(concat($lang, $separator,'included',$separator,$tag_name, '.xml'))/*"> + <xsl:copy-of select="./*"/> + </xsl:for-each> + </section> + </xsl:template> +</xsl:transform> \ No newline at end of file Property changes on: trunk/docs/userguide/f.xsl ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/userguide/pom.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -11,6 +11,7 @@ <groupId>org.richfaces.docs</groupId> <artifactId>userguide</artifactId> <packaging>pom</packaging> + <name>User guide</name> <description>RichFaces user guide</description> <pluginRepositories> <pluginRepository> @@ -263,9 +264,9 @@ </artifactItem> <artifactItem> <groupId> - org.richfaces.docs + org.richfaces.docs.xslt </groupId> - <artifactId>xslt</artifactId> + <artifactId>${translation}</artifactId> <version> 3.1.0-SNAPSHOT </version> @@ -321,7 +322,7 @@ ${project.build.directory}/generated/ </outputDir> <stylesheet> - ${project.build.directory}/xslt/${translation}/f.xsl + ${project.build.directory}/xslt/xslt/f.xsl </stylesheet> <fileMappers> <fileMapper @@ -374,9 +375,10 @@ --> <dependencies> <dependency> - <groupId>org.richfaces.docs</groupId> - <artifactId>xslt</artifactId> + <groupId>org.richfaces.docs.xslt</groupId> + <artifactId>${translation}</artifactId> <version>3.1.0-SNAPSHOT</version> + <type>jar</type> </dependency> </dependencies> <configuration> @@ -387,12 +389,13 @@ <directory> ${basedir}/src/main/resources </directory> + <!-- + <directory>${project.build.directory}/xslt/images</directory> + --> </imageResource> - <!-- <cssResource> - <directory>${basedir}/src/main/resources/css</directory> + <directory>${project.build.directory}/xslt/css</directory> </cssResource> - --> <sourceDocumentName> master.xml </sourceDocumentName> @@ -401,7 +404,7 @@ <format> <formatName>pdf</formatName> <stylesheetResource> - /${translation}/fopdf.xsl + /xslt/fopdf.xsl </stylesheetResource> <finalName> richfaces_reference.pdf @@ -413,7 +416,7 @@ <format> <formatName>html</formatName> <stylesheetResource> - /${translation}/html_chunk.xsl + /xslt/html_chunk.xsl </stylesheetResource> <finalName>index.html</finalName> <imageCopyingRequired> @@ -427,7 +430,7 @@ <format> <formatName>html_single</formatName> <stylesheetResource> - /${translation}/html.xsl + /xslt/html.xsl </stylesheetResource> <imageCopyingRequired> true Modified: trunk/docs/xslt/en/pom.xml =================================================================== --- trunk/docs/xslt/en/pom.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/xslt/en/pom.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -3,14 +3,42 @@ 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>docs</artifactId> - <groupId>org.richfaces</groupId> + <artifactId>xslt</artifactId> + <groupId>org.richfaces.docs</groupId> <version>3.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs.xslt</groupId> <artifactId>en</artifactId> - <packaging>jdocbook-style</packaging> - <description>Docbook documentation stylesheets for En-Us translation</description> + <packaging>jar</packaging> + <name>Documentation stylesheets (English translation)</name> + <description> + Docbook documentation stylesheets for En-Us translation + </description> + <build> + <resources> + <resource> + <directory>src/main/xslt</directory> + <targetPath>xslt</targetPath> + </resource> + <resource> + <directory>src/main/css</directory> + <targetPath>css</targetPath> + </resource> + <resource> + <directory>src/main/images</directory> + <targetPath>images</targetPath> + </resource> + </resources> + <!-- + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-style-plugin</artifactId> + <version>1.0.0</version> + <extensions>true</extensions> + </plugin> + </plugins> + --></build> </project> Copied: trunk/docs/xslt/en/src (from rev 1639, trunk/docs/xslt/src) Copied: trunk/docs/xslt/en/src/main (from rev 1641, trunk/docs/xslt/src/main) Modified: trunk/docs/xslt/pom.xml =================================================================== --- trunk/docs/xslt/pom.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/xslt/pom.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -1,13 +1,20 @@ -<?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>docs</artifactId> <groupId>org.richfaces</groupId> <version>3.1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.docs</groupId> - <artifactId>xslt</artifactId> - <description>Docbook documentation stylesheets</description> -</project> - + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.docs</groupId> + <artifactId>xslt</artifactId> + <packaging>pom</packaging> + <name>Documentation stylesheets</name> + <description>Docbook documentation stylesheets</description> + <modules> + <module>en</module> + </modules> +</project> + Deleted: trunk/docs/xslt/support.properties =================================================================== --- trunk/docs/xslt/support.properties 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/xslt/support.properties 2007-07-16 23:12:27 UTC (rev 1642) @@ -1,2 +0,0 @@ -#Wed Apr 11 15:30:36 EEST 2007 -ajax4jsf.location=${support.startdir}/../.. Deleted: trunk/docs/xslt/support.xml =================================================================== --- trunk/docs/xslt/support.xml 2007-07-16 22:00:15 UTC (rev 1641) +++ trunk/docs/xslt/support.xml 2007-07-16 23:12:27 UTC (rev 1642) @@ -1,259 +0,0 @@ -<project name="DocSupport" default="all.doc" basedir="."> - - <dirname property="support.startdir" file="${ant.file.DocSupport}"/> - - <property name="support.basedir" value="${support.startdir}"/> - - <property file="${support.startdir}/support.properties" /> - - <!-- Set build directories for all formats. --> - <property name="build.dir" value="${basedir}/build"/> - - <!-- Support files for build process. --> - <property name="support.dir" value="${support.basedir}/support"/> - <property name="styles.dir" value="${support.basedir}/src/main/resources"/> - - <!-- Set DocBook stylesheets. --> - <property name="db.style.fopdf" value="fopdf.xsl"/> - <property name="db.style.html" value="html_chunk.xsl"/> - <property name="db.style.htmlsingle" value="html.xsl"/> - - <property name="maxmem" value="1024m" /> - - <xmlcatalog id="docbook.catalog"> - <catalogpath path="${support.basedir}/src/main/resources/support/docbook-dtd/catalog.xml" /> - </xmlcatalog> - - - <!-- Classpath for the build tools. --> - <path id="lib.classpath"> - <fileset dir="${support.dir}/lib"> - <include name="**/saxon1.jar" /> - </fileset> - <dirset dir="." /> - <fileset dir="${support.dir}/lib"> - <include name="**/*.jar"/> - <exclude name="**/saxon1.jar"/> - </fileset> - </path> - - <!-- ################################################################## --> - - <target name="all.doc" depends="clean"> - <antcall target="lang.all"><param name="lang" value="en"/></antcall> - </target> - - <!-- ################################################################## --> - - <target name="lang.all.bypass.check" unless="lang.all.bypass.disabled"> - <uptodate property="lang.all.bypass.on" targetfile="${build.dir}/${lang}pdf/${pdf.name}"> - <srcfiles dir="${support.basedir}" includes="**"/> - <srcfiles dir="${basedir}/${lang}" includes="**"/> - <srcfiles dir="${basedir}" includes="build.xml"/> - </uptodate> - </target> - - <target name="lang.all.run" depends="lang.all.bypass.check, lang.all.bypass.message" unless="lang.all.bypass.on"> - <antcall target="clean"/> - <antcall target="lang.all"/> - </target> - - <target name="lang.all.bypass.message" if="lang.all.bypass.on"> - <echo>Already uptodate: ${build.dir}/${lang}pdf/${pdf.name}</echo> - <echo>add -Dlang.all.bypass.disabled=true to force a rebuild</echo> - </target> - - <!-- ################################################################## --> - - <target name="lang.dochtml.bypass.check" unless="lang.dochtml.bypass.disabled"> - <uptodate property="lang.dochtml.bypass.on" targetfile="${build.dir}/${lang}html/index.html"> - <srcfiles dir="${support.basedir}" includes="**"/> - <srcfiles dir="${basedir}/${lang}" includes="**"/> - <srcfiles dir="${basedir}" includes="build.xml"/> - </uptodate> - </target> - - <target name="lang.dochtml.run" depends="lang.dochtml.bypass.check, lang.dochtml.bypass.message" unless="lang.dochtml.bypass.on"> - <antcall target="clean.dochtml"/> - <antcall target="lang.dochtml"/> - <antcall target="lang.dochtmlsingle"/> - </target> - - <target name="lang.dochtml.bypass.message" if="lang.dochtml.bypass.on"> - <echo>Already uptodate: ${build.dir}/${lang}html/index.html</echo> - <echo>add -Dlang.dochtml.bypass.disabled=true to force a rebuild</echo> - </target> - - <!-- ################################################################## --> - - <target name="clean"> - <!-- Delete build directory. --> - <delete dir="${build.dir}"/> - </target> - - <target name="clean.dochtml"> - <!-- Delete build directory for single html --> - <delete dir="${build.dir}/${lang}html"/> - <delete dir="${build.dir}/${lang}html_single"/> - </target> - - <target name="collect-tld"> - <mkdir dir="${basedir}/${lang}/target/generated" /> - <copy flatten="yes" todir="${basedir}/${lang}/target/generated"> - <fileset dir="${ajax4jsf.location}"> - <include name="framework/target/classes/META-INF/*.tld"/> - </fileset> - - </copy> - <touch> - <fileset dir="${basedir}/${lang}/target/generated"> - <include name="*.tld" /> - </fileset> - </touch> - </target> - - <!-- - - - - - - - - - - - - - - - - - - target: tld2docbook - - - - - - - - - - - - - - - - - - --> - <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="${styles.dir}/${lang}/f.xsl" basedir="${basedir}/${lang}/target/generated" destdir="${basedir}/${lang}/target/generated"> - <include name="*.tld"/> - - <mapper type="glob" from="*.tld" to="*.xml" /> - - <param name="lang" expression="${basedir}/${lang}/src/main/docbook"/> - </xslt> - <!--End of the tld process--> - </target> - - - - <!-- ################################################################## --> - - <target name="lang.all"> - <antcall target="lang.docpdf"/> - <antcall target="lang.dochtml"/> - <antcall target="lang.dochtmlsingle"/> - <!-- - <antcall target="lang.htmlmisc"/> - --> - </target> - - <target name="lang.docpdf" depends="tld2docbook"> - <!-- Copy all the images to the output location, - will be removed later. --> - <copy todir="${build.dir}/${lang}/pdf/images"> - <fileset dir="${basedir}/${lang}/src/main/resources/images"> - <include name="**/*.png"/> - <include name="**/*.svg"/> - <include name="**/*.gif"/> - <include name="**/*.jpg"/> - </fileset> - </copy> - - <!-- Create the XSL/FO temporary file. --> - - <java classname="com.icl.saxon.StyleSheet" - maxmemory="${maxmem}" - fork="true" dir="${basedir}"> - <classpath refid="lib.classpath"/> - <arg value="-o" /> - <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> - <arg value="${basedir}/${lang}/src/main/docbook/master.xml"/> - <arg value="${styles.dir}/${lang}/${db.style.fopdf}"/> - </java> - - -<!-- - <xslt out="${build.dir}/${lang}pdf/docbook_fop.tmp" - in="${basedir}/${lang}/src/main/docbook/master.xml" - style="${styles.dir}/${lang}/${db.style.fopdf}"> - <xmlcatalog refid="docbook.catalog"/> - </xslt> ---> - <!-- Create a PDF from the XSL/FO. --> - <java classname="org.apache.fop.apps.Fop" - maxmemory="${maxmem}" - fork="true" dir="${basedir}"> - <classpath refid="lib.classpath"/> - <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> - <arg value="${build.dir}/${lang}/pdf/${pdf.name}"/> - </java> - - <!-- Delete temporary files. --> - <delete file="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> - <delete dir="${build.dir}/${lang}/pdf/images"/> - </target> - - <target name="lang.dochtml" depends="tld2docbook"> - <mkdir dir="${build.dir}/${lang}/html/"/> - - <!-- Copy all the images to the output location --> - <copy todir="${build.dir}/${lang}/html/images"> - <fileset dir="${basedir}/${lang}/src/main/resources/images"> - <include name="**/*.png"/> - <include name="**/*.gif"/> - <include name="**/*.jpg"/> - </fileset> - </copy> - <copy todir="${build.dir}/${lang}/html/css"> - <fileset dir="${styles.dir}/${lang}"> - <include name="**/*.css"/> - </fileset> - </copy> - - <java classname="com.icl.saxon.StyleSheet" - fork="true" dir="${build.dir}/${lang}/html"> - <classpath refid="lib.classpath"/> - <arg value="${basedir}/${lang}/src/main/docbook/master.xml"/> - <arg value="${styles.dir}/${lang}/${db.style.html}"/> - </java> - </target> - - <target name="lang.dochtmlsingle" depends="tld2docbook"> - <mkdir dir="${build.dir}/${lang}/html_single/"/> - - <!-- Copy all the images to the output location --> - <copy todir="${build.dir}/${lang}/html_single/images"> - <fileset dir="${basedir}/${lang}/src/main/resources/images"> - <include name="**/*.png"/> - <include name="**/*.gif"/> - <include name="**/*.jpg"/> - </fileset> - </copy> - <copy todir="${build.dir}/${lang}/html_single/css"> - <fileset dir="${styles.dir}/${lang}"> - <include name="**/*.css"/> - </fileset> - </copy> - - <java classname="com.icl.saxon.StyleSheet" - fork="true" dir="${basedir}"> - <classpath refid="lib.classpath"/> - <arg value="-o"/> - <arg value="${build.dir}/${lang}/html_single/index.html"/> - <arg value="${basedir}/${lang}/src/main/docbook/master.xml"/> - <arg value="${styles.dir}/${lang}/${db.style.htmlsingle}"/> - </java> - </target> - - <!-- I do not really like to have external dependency for HTML pages - So, I am not using this task ... --> - <target name="lang.htmlmisc" depends="tld2docbook"> - <!-- Copy images and CSS for HTML documentation, language specific. --> - <copy todir="${build.dir}/${lang}/shared/images"> - <fileset dir="${basedir}/${lang}/images"> - <include name="**/*.png"/> - <include name="**/*.gif"/> - </fileset> - </copy> - - <copy todir="${build.dir}/${lang}/shared/css"> - <fileset dir="${styles.dir}/${lang}"> - <include name="**/*.css"/> - </fileset> - </copy> - </target> -</project>