Author: artdaw Date: 2009-05-27 07:09:26 -0400 (Wed, 27 May 2009) New Revision: 14364 Modified: branches/community/3.3.X/docs/cdkguide/en/pom.xml branches/community/3.3.X/docs/cdkguide/pom.xml branches/community/3.3.X/docs/common-resources/en/pom.xml branches/community/3.3.X/docs/common-resources/pom.xml branches/community/3.3.X/docs/faq/en/pom.xml branches/community/3.3.X/docs/faq/pom.xml branches/community/3.3.X/docs/migrationguide/en/pom.xml branches/community/3.3.X/docs/migrationguide/pom.xml branches/community/3.3.X/docs/photo_album_app_guide/pom.xml branches/community/3.3.X/docs/pom.xml branches/community/3.3.X/docs/userguide/en/pom.xml branches/community/3.3.X/docs/userguide/pom.xml Log: https://jira.jboss.org/jira/browse/RF-7129 - Guide build was fixed and checked on Windows, Linux with Maven 2.0.7 and 2.1.0 Modified: branches/community/3.3.X/docs/cdkguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/en/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/cdkguide/en/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -37,14 +37,6 @@ <artifactId>maven-jdocbook-plugin</artifactId> <extensions>true</extensions> </plugin> - <!-- - <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> \ No newline at end of file +</project> Modified: branches/community/3.3.X/docs/cdkguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/cdkguide/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/cdkguide/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -48,7 +48,7 @@ org.richfaces.docs.common-resources </groupId> <artifactId> - ${project.translation} + ${translation} </artifactId> <version> ${project.version} @@ -120,11 +120,11 @@ <artifactId>fop</artifactId> <version>0.95</version> </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.saxon</artifactId> - <version>9.1.0.1_1</version> -</dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>saxon</artifactId> + <version>8.7</version> + </dependency> </dependencies> <configuration> <sourceDirectory> @@ -197,16 +197,6 @@ <xmlTransformerType> saxon </xmlTransformerType> - <!-- - <transformerParameters> - <property> - <name>custom.titlepage.img</name> - <value> - ${basedir}/src/main/resources/shared/images/hibernate_logo_a.png - </value> - </property> - </transformerParameters> - --> <docbookVersion>1.72.0</docbookVersion> </options> </configuration> @@ -215,21 +205,6 @@ </plugins> </pluginManagement> </build> - - <!-- report plugin is currently hosed - <reporting> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugin</groupId> - <artifactId>jboss-docbook-plugin</artifactId> - </plugin> - </plugins> - </reporting> - --> - <properties> - <masterTranslation>en</masterTranslation> - </properties> - <modules> <module>en</module> </modules> Modified: branches/community/3.3.X/docs/common-resources/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/en/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/common-resources/en/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -6,12 +6,12 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.docs.common-resources</groupId> - <artifactId>en</artifactId> + <artifactId>${translation}</artifactId> <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> - <name>Documentation common resources (en)</name> + <name>Documentation common resources (${translation})</name> <description> - Documentation common resources for En-Us translation + Documentation common resources for ${translation} translation </description> <dependencies> <dependency> @@ -39,13 +39,5 @@ <targetPath>common-resources/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> \ No newline at end of file +</project> Modified: branches/community/3.3.X/docs/common-resources/pom.xml =================================================================== --- branches/community/3.3.X/docs/common-resources/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/common-resources/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -14,16 +14,4 @@ <modules> <module>en</module> </modules> - <!--build> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - </plugins> - </pluginManagement> - </build--> -</project> \ No newline at end of file +</project> Modified: branches/community/3.3.X/docs/faq/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/en/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/faq/en/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -13,10 +13,6 @@ <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> - - <properties> - <translation>en</translation> - </properties> <build> <finalName> ${project.parent.artifactId}_${translation}-${version} @@ -37,19 +33,6 @@ <artifactId>maven-jdocbook-plugin</artifactId> <extensions>true</extensions> </plugin> - <!--plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-spellChecker-plugin</artifactId> - </plugin--> - - <!-- - <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> Modified: branches/community/3.3.X/docs/faq/pom.xml =================================================================== --- branches/community/3.3.X/docs/faq/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/faq/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -119,7 +119,7 @@ org.richfaces.docs.common-resources </groupId> <artifactId> - ${project.translation} + ${translation} </artifactId> <version> ${project.version} @@ -263,16 +263,6 @@ <xmlTransformerType> saxon </xmlTransformerType> - <!-- - <transformerParameters> - <property> - <name>custom.titlepage.img</name> - <value> - ${basedir}/src/main/resources/shared/images/hibernate_logo_a.png - </value> - </property> - </transformerParameters> - --> <docbookVersion>1.72.0</docbookVersion> </options> </configuration> @@ -281,21 +271,6 @@ </plugins> </pluginManagement> </build> - - <!-- report plugin is currently hosed - <reporting> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugin</groupId> - <artifactId>jboss-docbook-plugin</artifactId> - </plugin> - </plugins> - </reporting> - --> - <properties> - <masterTranslation>en</masterTranslation> - </properties> - <modules> <module>en</module> </modules> Modified: branches/community/3.3.X/docs/migrationguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/migrationguide/en/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/migrationguide/en/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -13,10 +13,6 @@ <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>RichFaces Migration Guide (${translation})</name> - - <properties> - <translation>en</translation> - </properties> <build> <finalName> ${project.parent.artifactId}_${translation}-${version} @@ -39,4 +35,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: branches/community/3.3.X/docs/migrationguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/migrationguide/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/migrationguide/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -46,7 +46,7 @@ org.richfaces.docs.common-resources </groupId> <artifactId> - ${project.translation} + ${translation} </artifactId> <version> ${project.version} @@ -176,12 +176,7 @@ </plugins> </pluginManagement> </build> - <properties> - <masterTranslation>en</masterTranslation> - </properties> - <modules> <module>en</module> </modules> - </project> Modified: branches/community/3.3.X/docs/photo_album_app_guide/pom.xml =================================================================== --- branches/community/3.3.X/docs/photo_album_app_guide/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/photo_album_app_guide/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -48,7 +48,7 @@ org.richfaces.docs.common-resources </groupId> <artifactId> - ${project.translation} + ${translation} </artifactId> <version> ${project.version} @@ -178,10 +178,6 @@ </plugins> </pluginManagement> </build> - <properties> - <masterTranslation>en</masterTranslation> - </properties> - <modules> <module>en</module> </modules> Modified: branches/community/3.3.X/docs/pom.xml =================================================================== --- branches/community/3.3.X/docs/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -105,6 +105,6 @@ <properties> <xsl_html_single>classpath:/common-resources/xslt/xhtml-single.xsl</xsl_html_single> <xsl_html>classpath:/common-resources/xslt/xhtml.xsl</xsl_html> - <masterTranslation>en</masterTranslation> + <translation>en</translation> </properties> -</project> \ No newline at end of file +</project> Modified: branches/community/3.3.X/docs/userguide/en/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/userguide/en/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -9,7 +9,7 @@ <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.docs.userguide</groupId> - <artifactId>${masterTranslation}</artifactId> + <artifactId>${translation}</artifactId> <version>3.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>Richfaces Manual (${translation})</name> @@ -37,14 +37,6 @@ <artifactId>maven-jdocbook-plugin</artifactId> <extensions>true</extensions> </plugin> - <!-- - <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> \ No newline at end of file +</project> Modified: branches/community/3.3.X/docs/userguide/pom.xml =================================================================== --- branches/community/3.3.X/docs/userguide/pom.xml 2009-05-27 10:57:48 UTC (rev 14363) +++ branches/community/3.3.X/docs/userguide/pom.xml 2009-05-27 11:09:26 UTC (rev 14364) @@ -594,7 +594,7 @@ org.richfaces.docs.common-resources </groupId> <artifactId> - ${masterTranslation} + ${translation} </artifactId> <version> ${project.version} @@ -838,17 +838,11 @@ <version>${project.version}</version> <type>jar</type> </dependency> - <!--dependency> - <groupId>org.richfaces.docs.xslt</groupId> - <artifactId>${translation}</artifactId> - <version>${project.version}</version> - <type>jar</type> - </dependency--> - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>fop</artifactId> - <version>0.95</version> - </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + <version>0.95</version> + </dependency> </dependencies> <configuration> <sourceDirectory>