Author: alexsmirnov Date: 2007-06-08 17:37:36 -0400 (Fri, 08 Jun 2007) New Revision: 258 Removed: trunk/docs/userguide/en/src/main/resources/shared/ Modified: trunk/docs/docbook/pom.xml trunk/docs/maven-docbook-plugin/pom.xml trunk/docs/maven-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java trunk/docs/userguide/en/src/main/docbook/master.xml trunk/docs/userguide/en/src/main/docbook/modules/a4jUGtechreqs.xml trunk/docs/userguide/pom.xml Log: build documentation by internal maven plugin Modified: trunk/docs/docbook/pom.xml =================================================================== --- trunk/docs/docbook/pom.xml 2007-06-08 18:01:10 UTC (rev 257) +++ trunk/docs/docbook/pom.xml 2007-06-08 21:37:36 UTC (rev 258) @@ -30,7 +30,7 @@ <dependency> <groupId>saxon</groupId> <artifactId>saxon</artifactId> - <version>8.7</version> + <version>6.5.3</version> </dependency> </dependencies> Modified: trunk/docs/maven-docbook-plugin/pom.xml =================================================================== --- trunk/docs/maven-docbook-plugin/pom.xml 2007-06-08 18:01:10 UTC (rev 257) +++ trunk/docs/maven-docbook-plugin/pom.xml 2007-06-08 21:37:36 UTC (rev 258) @@ -1,142 +1,154 @@ <?xml version="1.0"?> -<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"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>docs</artifactId> <groupId>org.ajax4jsf</groupId> <version>1.1.2-SNAPSHOT</version> </parent> + + <groupId>org.ajax4jsf.docs</groupId> + <artifactId>maven-docbook-plugin</artifactId> + <packaging>maven-plugin</packaging> - <groupId>org.ajax4jsf.docs</groupId> - <artifactId>maven-docbook-plugin</artifactId> - <packaging>maven-plugin</packaging> + <name>DocBook XML Transformations</name> + <description> + Plugin for generating documentation from DocBook sources and + either standard or custom XSL stylesheets. + </description> - <name>DocBook XML Transformations</name> - <description>Plugin for generating documentation from DocBook sources and either standard or custom XSL stylesheets.</description> + <dependencies> + <dependency> + <groupId>org.ajax4jsf.docs</groupId> + <artifactId>docbook</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + <version>4.1.5</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxiaVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + <version>${doxiaSiteVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + <version>${doxiaSiteVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <version>2.6.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>saxon</groupId> + <artifactId>saxon</artifactId> + <version>6.5.3</version> + </dependency> + <dependency> + <groupId>fop</groupId> + <artifactId>fop</artifactId> + <version>0.93</version> + <classifier>jdk14</classifier> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + <version>0.93</version> + </dependency> + <!-- + <dependency> + <groupId>batik</groupId> + <artifactId>batik-1.5-fop</artifactId> + <version>0.20-5</version> + </dependency> + --> + <dependency> + <groupId>javax.media</groupId> + <artifactId>jai-core</artifactId> + <version>1.1.3</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.sun.media</groupId> + <artifactId>jai-codec</artifactId> + <version>1.1.3</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.2</version> + </dependency> + </dependencies> - <dependencies> - <dependency> - <groupId>org.ajax4jsf.docs</groupId> - <artifactId>docbook</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - <version>4.1.5</version> - </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <version>${doxiaVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-decoration-model</artifactId> - <version>${doxiaSiteVersion}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-site-renderer</artifactId> - <version>${doxiaSiteVersion}</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xml-resolver</groupId> - <artifactId>xml-resolver</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.0</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - <version>2.6.2</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>saxon</groupId> - <artifactId>saxon</artifactId> - <version>6.5.3</version> - </dependency> - <dependency> - <groupId>fop</groupId> - <artifactId>fop</artifactId> - <version>0.93</version> - <classifier>jdk14</classifier> - </dependency> - <dependency> - <groupId>batik</groupId> - <artifactId>batik-1.5-fop</artifactId> - <version>0.20-5</version> - </dependency> - <dependency> - <groupId>javax.media</groupId> - <artifactId>jai-core</artifactId> - <version>1.1.3</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.sun.media</groupId> - <artifactId>jai-codec</artifactId> - <version>1.1.3</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> - </dependency> - </dependencies> + <properties> + <doxiaVersion>1.0-alpha-8</doxiaVersion> + <doxiaSiteVersion>1.0-alpha-8</doxiaSiteVersion> + </properties> - <properties> - <doxiaVersion>1.0-alpha-8</doxiaVersion> - <doxiaSiteVersion>1.0-alpha-8</doxiaSiteVersion> - </properties> - </project> Modified: trunk/docs/maven-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java =================================================================== --- trunk/docs/maven-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java 2007-06-08 18:01:10 UTC (rev 257) +++ trunk/docs/maven-docbook-plugin/src/main/java/org/jboss/maven/plugin/docbook/gen/render/PdfRenderer.java 2007-06-08 21:37:36 UTC (rev 258) @@ -1,12 +1,17 @@ package org.jboss.maven.plugin.docbook.gen.render; +import java.io.BufferedOutputStream; import java.io.File; import java.io.OutputStream; import java.io.FileNotFoundException; import javax.xml.transform.Result; import javax.xml.transform.sax.SAXResult; -import org.apache.fop.apps.Driver; +//import org.apache.fop.apps.Driver; +import org.apache.fop.apps.FOPException; +import org.apache.fop.apps.Fop; +import org.apache.fop.apps.FopFactory; +import org.apache.fop.apps.MimeConstants; import org.apache.avalon.framework.logger.Logger; import org.apache.maven.plugin.logging.Log; @@ -22,19 +27,28 @@ protected Result buildResult(File targetFile) throws RenderingException { getLog().info( "building formatting result [" + targetFile.getAbsolutePath() + "]" ); - Driver driver = new Driver(); - driver.setLogger( new LoggingBridge( getLog() ) ); - driver.setRenderer( Driver.RENDER_PDF ); - +// Step 1: Construct a FopFactory +// (reuse if you plan to render multiple documents!) + FopFactory fopFactory = FopFactory.newInstance(); +// Driver driver = new Driver(); +// driver.setLogger( new LoggingBridge( getLog() ) ); +// driver.setRenderer( Driver.RENDER_PDF ); try { - OutputStream out = new java.io.FileOutputStream( targetFile ); - driver.setOutputStream( out ); - return new SAXResult( driver.getContentHandler() ); + OutputStream out = new BufferedOutputStream(new java.io.FileOutputStream( targetFile )); +// Step 3: Construct fop with desired output format + Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out); + +// driver.setOutputStream( out ); + return new SAXResult( fop.getDefaultHandler() ); } catch ( FileNotFoundException e ) { throw new RenderingException( "unable to access target file " + targetFile.getAbsolutePath() ); + } catch (FOPException e) { + throw new RenderingException( + "Error create FOP renderer ",e + ); } } Modified: trunk/docs/userguide/en/src/main/docbook/master.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/master.xml 2007-06-08 18:01:10 UTC (rev 257) +++ trunk/docs/userguide/en/src/main/docbook/master.xml 2007-06-08 21:37:36 UTC (rev 258) @@ -6,7 +6,7 @@ <!ENTITY getttingStarted SYSTEM "modules/a4jUGstart.xml"> <!ENTITY envSettings SYSTEM "modules/a4jUGenvsettings.xml"> <!ENTITY usingAJAX SYSTEM "modules/a4jUGusingAJAX.xml"> - <!ENTITY componentDetails SYSTEM "../../../target/generated/en/a4j.xml"> + <!ENTITY componentDetails SYSTEM "../../../target/generated/a4j.xml"> <!ENTITY skinnability SYSTEM "modules/a4jUGskinnability.xml"> <!ENTITY IDEintegration SYSTEM "modules/a4jUGideintegration.xml"> <!ENTITY EVCP SYSTEM "modules/a4jUGevcp.xml"> Modified: trunk/docs/userguide/en/src/main/docbook/modules/a4jUGtechreqs.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/a4jUGtechreqs.xml 2007-06-08 18:01:10 UTC (rev 257) +++ trunk/docs/userguide/en/src/main/docbook/modules/a4jUGtechreqs.xml 2007-06-08 21:37:36 UTC (rev 258) @@ -1,6 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<chapter id="TechnicalRequirements" xreflabel="TechnicalRequirements"> - <?dbhtml filename="TechnicalRequirements.html" ?> +<chapter id="TechnicalRequirements" xreflabel="TechnicalRequirements"><?dbhtml filename="TechnicalRequirements.html" ?> <chapterinfo> <keywordset> @@ -14,7 +13,7 @@ </chapterinfo> <title>Technical Requirements</title> - <para>Ajax4jsf is an open architecture framework developed to be compatible with widespread environments.<para> + <para>Ajax4jsf is an open architecture framework developed to be compatible with widespread environments.</para> <para>This is what you need to start working with Ajax4jsf:</para> <itemizedlist> <listitem> @@ -38,8 +37,8 @@ </listitem> </itemizedlist> </section> - <section id="Supported JavaServer Faces Implementations"> - <?dbhtml filename="SupportedJavaVersions.html"?> + <section id="Supported JavaServer Faces Implementations"> +<?dbhtml filename="SupportedJavaVersions.html"?> <title>Supported JavaServer Faces Implementations</title> <itemizedlist> <listitem> @@ -54,7 +53,7 @@ </itemizedlist> </section> <section id="SupportedServers"> - <?dbhtml filename="SupportedServers.html"?> +<?dbhtml filename="SupportedServers.html"?> <title>Supported Servers</title> <itemizedlist> <listitem> @@ -87,7 +86,7 @@ </itemizedlist> </section> <section id="SupportedBrowsers"> - <?dbhtml filename="SupportedBrowsers.html"?> +<?dbhtml filename="SupportedBrowsers.html"?> <title>Supported Browsers</title> <itemizedlist> <listitem> Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2007-06-08 18:01:10 UTC (rev 257) +++ trunk/docs/userguide/pom.xml 2007-06-08 21:37:36 UTC (rev 258) @@ -114,7 +114,7 @@ <include>*.tld</include> </includes> <outputDir> - ${project.build.directory}/generated/${translation}/ + ${project.build.directory}/generated/ </outputDir> <stylesheet> ${project.build.directory}/xslt/${translation}/f.xsl @@ -149,12 +149,24 @@ <artifactId>maven-docbook-plugin</artifactId> <version>${project.version}</version> <executions> - <execution><!-- - <phase>compile</phase> - --><goals> + <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> @@ -168,18 +180,20 @@ ${basedir}/src/main/docbook </sourceDirectory> <targetDirectory> - ${project.build.outputDirectory} + ${project.build.directory}/doc </targetDirectory> <sourceDocumentName> master.xml </sourceDocumentName> <formats> <format> - <formatName>html</formatName> + <formatName>html_single</formatName> <stylesheetResource> /${translation}/html.xsl </stylesheetResource> - <finalName>ajax4jsf_reference.html</finalName> + <finalName> + ajax4jsf_reference.html + </finalName> </format> <format> <formatName>html</formatName>