JBoss Rich Faces SVN: r1645 - trunk/ui/gmap.
by richfaces-svn-commits@lists.jboss.org
Author: SergeySmirnov
Date: 2007-07-16 20:54:29 -0400 (Mon, 16 Jul 2007)
New Revision: 1645
Modified:
trunk/ui/gmap/pom.xml
Log:
rich:virtualEarth has been added. Initial version
Modified: trunk/ui/gmap/pom.xml
===================================================================
--- trunk/ui/gmap/pom.xml 2007-07-16 23:52:45 UTC (rev 1644)
+++ trunk/ui/gmap/pom.xml 2007-07-17 00:54:29 UTC (rev 1645)
@@ -6,8 +6,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui</groupId>
- <artifactId>gmap</artifactId>
- <name>Google map</name>
+ <artifactId>virtualEarth</artifactId>
+ <name>Virtual Earth</name>
<build>
<plugins>
<plugin>
@@ -33,7 +33,7 @@
<library>
<prefix>org.richfaces</prefix>
<taglib>
- <shortName>gmap</shortName>
+ <shortName>virtualEarth</shortName>
</taglib>
</library>
</configuration>
18 years, 2 months
JBoss Rich Faces SVN: r1644 - trunk/samples.
by richfaces-svn-commits@lists.jboss.org
Author: ishabalov
Date: 2007-07-16 19:52:45 -0400 (Mon, 16 Jul 2007)
New Revision: 1644
Modified:
trunk/samples/pom.xml
Log:
Added profiles for tomcat5, tomcat6 and jboss42
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-07-16 23:52:26 UTC (rev 1643)
+++ trunk/samples/pom.xml 2007-07-16 23:52:45 UTC (rev 1644)
@@ -74,23 +74,17 @@
<version>1.1.12</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.0</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>0.9.5</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<scm>
@@ -167,6 +161,16 @@
</build>
<dependencies>
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -228,6 +232,143 @@
</dependencies>
</profile>
<profile>
+ <id>tomcat5</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>tomcat6</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jboss42</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>myfaces</id>
<properties>
<myfaces>1.1.5</myfaces>
18 years, 2 months
JBoss Rich Faces SVN: r1643 - trunk/samples/richfaces-demo.
by richfaces-svn-commits@lists.jboss.org
Author: ishabalov
Date: 2007-07-16 19:52:26 -0400 (Mon, 16 Jul 2007)
New Revision: 1643
Modified:
trunk/samples/richfaces-demo/pom.xml
Log:
Added profiles for tomcat5, tomcat6 and jboss42
Modified: trunk/samples/richfaces-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-demo/pom.xml 2007-07-16 23:12:27 UTC (rev 1642)
+++ trunk/samples/richfaces-demo/pom.xml 2007-07-16 23:52:26 UTC (rev 1643)
@@ -10,28 +10,11 @@
<packaging>war</packaging>
<name>richfaces-demo Maven Webapp</name>
<dependencies>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>0.9.5</version>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>richfaces</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<finalName>richfaces-demo</finalName>
18 years, 2 months
JBoss Rich Faces SVN: r1642 - in trunk/docs: ajaxguide and 6 other directories.
by richfaces-svn-commits@lists.jboss.org
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><<xsl:value-of select="concat($prefix,':', $tag_name)" />></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><<xsl:value-of select="concat('rich:', $tag_name)" />></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><<xsl:value-of select="concat($prefix,':', $tag_name)" />></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>
18 years, 2 months
JBoss Rich Faces SVN: r1641 - in trunk/docs/xslt: en and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-07-16 18:00:15 -0400 (Mon, 16 Jul 2007)
New Revision: 1641
Added:
trunk/docs/xslt/en/
trunk/docs/xslt/en/pom.xml
Log:
refactoring in the documentation build
Added: trunk/docs/xslt/en/pom.xml
===================================================================
--- trunk/docs/xslt/en/pom.xml (rev 0)
+++ trunk/docs/xslt/en/pom.xml 2007-07-16 22:00:15 UTC (rev 1641)
@@ -0,0 +1,16 @@
+<?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.xslt</groupId>
+ <artifactId>en</artifactId>
+ <packaging>jdocbook-style</packaging>
+ <description>Docbook documentation stylesheets for En-Us translation</description>
+</project>
+
Property changes on: trunk/docs/xslt/en/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
18 years, 2 months
JBoss Rich Faces SVN: r1640 - in trunk/docs/xslt/src/main: css/css and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-07-16 17:32:03 -0400 (Mon, 16 Jul 2007)
New Revision: 1640
Added:
trunk/docs/xslt/src/main/css/css/html.css
trunk/docs/xslt/src/main/xslt/f.xsl
trunk/docs/xslt/src/main/xslt/fopdf.xsl
trunk/docs/xslt/src/main/xslt/html.xsl
trunk/docs/xslt/src/main/xslt/html_chunk.xsl
Removed:
trunk/docs/xslt/src/main/resources/
Log:
refactoring in the documentation build
Copied: trunk/docs/xslt/src/main/css/css/html.css (from rev 1621, trunk/docs/xslt/src/main/resources/en/html.css)
===================================================================
--- trunk/docs/xslt/src/main/css/css/html.css (rev 0)
+++ trunk/docs/xslt/src/main/css/css/html.css 2007-07-16 21:32:03 UTC (rev 1640)
@@ -0,0 +1,122 @@
+ * {
+ font-family: "Verdana", "Arial", "Helvetica";
+ font-size: 14px;
+ }
+
+ A {
+ color: #0000CC;
+ }
+
+ A:active {
+ color: #0000CC;
+ }
+
+ A:visited {
+ color: #0000CC;
+ }
+
+ P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
+ color: #000000;
+ }
+
+ TD, TH, SPAN {
+ color: #000000;
+ }
+
+ BLOCKQUOTE {
+ margin-right: 0px;
+ }
+
+
+ H1, H2, H3, H4, H5, H6 {
+ color: #003399;
+ font-weight: 500;
+ margin-top: 10px;
+ padding-top: 5px;
+ }
+
+ H1 { font-size: 150%; }
+ H2 { font-size: 140%; }
+ H3 { font-size: 110%; font-weight: bold; }
+ H4 { font-size: 110%; font-weight: bold;}
+ H5 { font-size: 100%; font-style: italic; }
+ H6 { font-size: 100%; font-style: italic; }
+
+ TABLE {
+ border-collapse: collapse;
+ border-spacing: 0;
+ border: 1px dashed #CCCCCC;
+ empty-cells: hide;
+ width: 100%
+ }
+
+ TD {
+ padding: 4pt;
+ }
+
+
+ TT {
+ font-size: 90%;
+ font-style: monospace;
+ color: #111111;
+ }
+
+ PRE {
+ font-size: 100%;
+ padding: 5px;
+ border-style: solid;
+ border-width: 1px;
+ border-color: #CCCCCC;
+ background-color: #F4F4F4;
+ }
+
+ HR {
+ width: 100%;
+ height: 1px;
+ background-color: #CCCCCC;
+ border-width: 0px;
+ padding: 0px;
+ color: #CCCCCC;
+ }
+
+ .variablelist {
+ padding-top: 10;
+ padding-bottom: 10;
+ margin: 0;
+ }
+
+ .itemizedlist {
+ padding-top: 0;
+ padding-bottom: 0;
+ margin: 0;
+ list-style-type: disc;
+
+ }
+
+ .orderedlist{
+ padding-top: 0;
+ padding-bottom: 0;
+ margin: 0;
+ }
+
+ .term {
+ font-weight: bold;
+ }
+
+ .note
+ {
+ padding-bottom: 5px;
+ padding-left: 5px;
+ padding-right: 5px;
+ background-color: #FFFFCC;
+ }
+
+ .warning
+ {
+ padding-bottom: 5px;
+ padding-left: 5px;
+ padding-right: 5px;
+ background-color: #FBDADA;
+ }
+
+
Copied: trunk/docs/xslt/src/main/xslt/f.xsl (from rev 1636, trunk/docs/xslt/src/main/resources/en/f.xsl)
===================================================================
--- trunk/docs/xslt/src/main/xslt/f.xsl (rev 0)
+++ trunk/docs/xslt/src/main/xslt/f.xsl 2007-07-16 21:32:03 UTC (rev 1640)
@@ -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><<xsl:value-of select="concat($prefix,':', $tag_name)" />></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
Copied: trunk/docs/xslt/src/main/xslt/fopdf.xsl (from rev 1636, trunk/docs/xslt/src/main/resources/en/fopdf.xsl)
===================================================================
--- trunk/docs/xslt/src/main/xslt/fopdf.xsl (rev 0)
+++ trunk/docs/xslt/src/main/xslt/fopdf.xsl 2007-07-16 21:32:03 UTC (rev 1640)
@@ -0,0 +1,543 @@
+<?xml version="1.0"?>
+
+<!--
+ This was originally the XSL FO configuration file for the Hibernate
+ Reference Documentation. It defines a custom titlepage and
+ the parameters for the A4 sized PDF printable output. It is released
+ under the LGPL.
+
+ Modifications were made to better suit the needs of the JBoss documentation.
+-->
+
+<!DOCTYPE xsl:stylesheet [
+ <!ENTITY db_xsl_path "../support/docbook-xsl">
+]>
+
+<xsl:stylesheet version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format" exclude-result-prefixes="#default">
+
+
+ <!-- assume catalog-based resolution... -->
+ <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" />
+
+
+ <!-- ########## XRef -->
+ <!-- this controls whether xrefs have the title in it. We
+ don't want that -->
+ <xsl:param name="xref.with.number.and.title" select="0"/>
+
+ <xsl:template match="processing-instruction('lb')">
+ <fo:block>
+ <xsl:text> </xsl:text>
+ </fo:block>
+ </xsl:template>
+
+ <!--########## Custom Title Page -->
+ <xsl:template name="book.titlepage.recto">
+ <fo:block>
+ <fo:table table-layout="fixed" width="175mm">
+ <fo:table-column column-width="175mm"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell text-align="center">
+ <xsl:if test="bookinfo/mediaobject">
+ <fo:block>
+ <fo:external-graphic>
+ <xsl:attribute name="src">
+ FILE:<xsl:value-of
+ select="bookinfo/mediaobject/imageobject/imagedata/@fileref" />
+ </xsl:attribute>
+ </fo:external-graphic>
+ </fo:block>
+ </xsl:if>
+ <xsl:if test="bookinfo/title">
+ <fo:block font-family="Helvetica" font-size="22pt" padding-before="10mm">
+ <xsl:value-of select="bookinfo/title"/>
+ </fo:block>
+ </xsl:if>
+ <xsl:if test="bookinfo/subtitle">
+ <fo:block font-family="Helvetica" font-size="18pt" padding-before="10mm">
+ <xsl:value-of select="bookinfo/subtitle"/>
+ </fo:block>
+ </xsl:if>
+ <xsl:if test="bookinfo/releaseinfo">
+ <fo:block font-family="Helvetica" font-size="12pt"
+ padding="10mm"><xsl:value-of select="bookinfo/releaseinfo"/>
+ </fo:block>
+ </xsl:if>
+ <xsl:if test="bookinfo/copyright">
+ <fo:block font-family="Helvetica" font-size="12pt"
+ padding="10mm">
+
+ <xsl:apply-templates select="bookinfo/copyright"
+ mode="titlepage.mode"/>
+ </fo:block>
+ </xsl:if>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
+ </xsl:template>
+
+ <!-- Prevent blank pages in output -->
+ <xsl:template name="book.titlepage.before.verso"/>
+ <xsl:template name="book.titlepage.verso"/>
+ <xsl:template name="book.titlepage.separator"/>
+
+
+ <!--###################################################
+ Header
+ ################################################### -->
+ <!-- More space in the center header for long text -->
+ <xsl:attribute-set name="header.content.properties">
+ <xsl:attribute name="font-family">
+ <xsl:value-of select="$body.font.family"/>
+ </xsl:attribute>
+ <xsl:attribute name="margin-left">-5em</xsl:attribute>
+ <xsl:attribute name="margin-right">-5em</xsl:attribute>
+ </xsl:attribute-set>
+
+
+ <!--###################################################
+ Custom Footer
+ ################################################### -->
+ <!-- This footer prints the Hibernate version number on the left side -->
+ <xsl:template name="footer.content">
+ <xsl:param name="pageclass" select="''"/>
+ <xsl:param name="sequence" select="''"/>
+ <xsl:param name="position" select="''"/>
+ <xsl:param name="gentext-key" select="''"/>
+ <xsl:variable name="Version">
+ <xsl:choose>
+ <xsl:when test="//releaseinfo">
+ <xsl:text>JBoss </xsl:text>
+ <xsl:value-of select="//releaseinfo"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- nop -->
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$sequence='blank'">
+ <xsl:choose>
+ <xsl:when test="$double.sided != 0 and $position = 'left'">
+ <xsl:value-of select="$Version"/>
+ </xsl:when>
+ <xsl:when test="$double.sided = 0 and $position = 'center'">
+ <!-- nop -->
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:page-number/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:when test="$pageclass='titlepage'">
+ <!-- nop: other titlepage sequences have no footer -->
+ </xsl:when>
+ <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
+ <fo:page-number/>
+ </xsl:when>
+ <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
+ <fo:page-number/>
+ </xsl:when>
+ <xsl:when test="$double.sided = 0 and $position='right'">
+ <fo:page-number/>
+ </xsl:when>
+ <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'">
+ <xsl:value-of select="$Version"/>
+ </xsl:when>
+ <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'">
+ <xsl:value-of select="$Version"/>
+ </xsl:when>
+ <xsl:when test="$double.sided = 0 and $position='left'">
+ <xsl:value-of select="$Version"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- nop -->
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+
+
+ <!--###################################################
+ Custom Toc Line
+ ################################################### -->
+ <!-- Improve the TOC. -->
+ <xsl:template name="toc.trt">
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+ <xsl:variable name="label">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ </xsl:variable>
+ <fo:block text-align-last="justify" end-indent="{$toc.indent.width}pt" last-line-end-indent="-{$toc.indent.width}pt">
+ <fo:inline keep-with-next.within-line="always">
+ <fo:basic-link internal-destination="{$id}">
+ <!-- Chapter titles should be bold. -->
+ <xsl:choose>
+ <xsl:when test="local-name(.) = 'chapter'">
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:if test="$label != ''">
+ <xsl:copy-of select="$label"/>
+ <xsl:value-of select="$autotoc.label.separator"/>
+ </xsl:if>
+ <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+ </fo:basic-link>
+ </fo:inline>
+ <fo:inline keep-together.within-line="always">
+ <xsl:text/>
+ <fo:leader leader-pattern="dots" leader-pattern-width="3pt"
+ leader-alignment="reference-area" keep-with-next.within-line="always"/>
+ <xsl:text/>
+ <fo:basic-link internal-destination="{$id}">
+ <fo:page-number-citation ref-id="{$id}"/>
+ </fo:basic-link>
+ </fo:inline>
+ </fo:block>
+ </xsl:template>
+
+
+ <!--###################################################
+ Extensions
+ ################################################### -->
+ <!-- These extensions are required for table printing and other stuff -->
+ <xsl:param name="use.extensions">1</xsl:param>
+
+ <xsl:param name="linenumbering.extension">1</xsl:param>
+ <xsl:param name="linenumbering.everyNth">1</xsl:param>
+ <xsl:param name="linenumbering.separator">: </xsl:param>
+
+ <xsl:param name="tablecolumns.extension">0</xsl:param>
+ <!-- FOP provide only PDF Bookmarks at the moment -->
+ <xsl:param name="fop.extensions">1</xsl:param>
+
+
+
+ <!--###################################################
+ Table Of Contents
+ ################################################### -->
+ <!-- Generate the TOCs for named components only -->
+ <xsl:param name="generate.toc"> book toc,title</xsl:param>
+ <!-- ,figure,table,equation -->
+ <!-- Show only Sections up to level 3 in the TOCs -->
+ <xsl:param name="toc.section.depth">3</xsl:param>
+ <!-- Dot and Whitespace as separator in TOC between Label and Title-->
+ <xsl:param name="autotoc.label.separator" select="'. '"/>
+
+
+ <!--###################################################
+ Paper & Page Size
+ ################################################### -->
+ <!-- Paper type, no headers on blank pages, no double sided printing -->
+<!-- <xsl:param name="paper.type" select="'A4'"/>-->
+ <xsl:param name="double.sided">0</xsl:param>
+ <xsl:param name="headers.on.blank.pages">0</xsl:param>
+ <xsl:param name="footers.on.blank.pages">0</xsl:param>
+ <!-- Space between paper border and content (chaotic stuff, don't touch) -->
+ <xsl:param name="page.margin.top">5mm</xsl:param>
+ <xsl:param name="region.before.extent">10mm</xsl:param>
+ <xsl:param name="body.margin.top">10mm</xsl:param>
+ <xsl:param name="body.margin.bottom">15mm</xsl:param>
+ <xsl:param name="region.after.extent">10mm</xsl:param>
+ <xsl:param name="page.margin.bottom">0mm</xsl:param>
+ <xsl:param name="page.margin.outer">18mm</xsl:param>
+ <xsl:param name="page.margin.inner">18mm</xsl:param>
+ <!-- No intendation of Titles -->
+ <xsl:param name="title.margin.left">0pc</xsl:param>
+
+
+ <!--###################################################
+ Fonts & Styles
+ ################################################### -->
+ <!-- Default Font size -->
+ <xsl:param name="body.font.master">11</xsl:param>
+ <!-- Line height in body text -->
+ <xsl:param name="line-height">1.4</xsl:param>
+ <!-- Monospaced fonts are smaller than regular text -->
+ <xsl:attribute-set name="monospace.properties">
+ <xsl:attribute name="font-family">
+ <xsl:value-of select="$monospace.font.family"/>
+ </xsl:attribute>
+ <xsl:attribute name="font-size">0.8em</xsl:attribute>
+ </xsl:attribute-set>
+
+
+ <!--###################################################
+ Tables
+ ################################################### -->
+ <!-- The table width should be adapted to the paper size -->
+ <xsl:param name="default.table.width">17.4cm</xsl:param>
+ <!-- Some padding inside tables -->
+ <xsl:attribute-set name="table.cell.padding">
+ <xsl:attribute name="padding-left">4pt</xsl:attribute>
+ <xsl:attribute name="padding-right">4pt</xsl:attribute>
+ <xsl:attribute name="padding-top">4pt</xsl:attribute>
+ <xsl:attribute name="padding-bottom">4pt</xsl:attribute>
+ </xsl:attribute-set>
+ <!-- Only hairlines as frame and cell borders in tables -->
+ <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
+ <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
+
+
+
+ <!--###################################################
+ Labels
+ ################################################### -->
+ <!-- Label Chapters and Sections (numbering) -->
+ <xsl:param name="chapter.autolabel">1</xsl:param>
+ <xsl:param name="section.autolabel" select="1"/>
+ <xsl:param name="section.label.includes.component.label" select="1"/>
+
+
+ <!--###################################################
+ Titles
+ ################################################### -->
+
+ <xsl:attribute-set name="chapter.titlepage.recto.style">
+ <xsl:attribute name="text-align">right</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 1.8"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ </xsl:attribute-set>
+
+
+ <xsl:attribute-set name="appendix.titlepage.recto.style">
+ <xsl:attribute name="text-align">right</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 1.8"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ </xsl:attribute-set>
+
+ <xsl:template name="appendix.titlepage.before.recto">
+ <xsl:param name="node" select="ancestor-or-self::appendix[1]"/>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ text-align="right"
+ font-size="72pt" font-weight="bold">
+ <xsl:number from="book" format="A"/>
+ </fo:block>
+ </xsl:template>
+
+ <xsl:template name="chapter.titlepage.before.recto">
+ <xsl:param name="node" select="ancestor-or-self::chapter[1]"/>
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ text-align="right"
+ font-size="72pt" font-weight="bold">
+ <xsl:number from="book" format="1"/>
+ </fo:block>
+ </xsl:template>
+
+ <xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
+ <xsl:variable name="titleabbrev">
+ <xsl:apply-templates select="ancestor-or-self::appendix[1]"
+ mode="titleabbrev.markup"/>
+ </xsl:variable>
+
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xsl:use-attribute-sets="appendix.titlepage.recto.style">
+ <xsl:value-of select="$titleabbrev" />
+ </fo:block>
+ </xsl:template>
+
+ <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
+ <xsl:variable name="titleabbrev">
+ <xsl:apply-templates select="ancestor-or-self::chapter[1]"
+ mode="titleabbrev.markup"/>
+ </xsl:variable>
+
+ <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xsl:use-attribute-sets="chapter.titlepage.recto.style">
+ <xsl:value-of select="$titleabbrev" />
+ </fo:block>
+ </xsl:template>
+
+
+ <!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
+ <xsl:attribute-set name="section.title.level1.properties">
+ <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+ <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 1.5"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+ </xsl:attribute-set>
+ <xsl:attribute-set name="section.title.level2.properties">
+ <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+ <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 1.25"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+ </xsl:attribute-set>
+ <xsl:attribute-set name="section.title.level3.properties">
+ <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
+ <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 1.0"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+ </xsl:attribute-set>
+
+ <!-- Titles of formal objects (tables, examples, ...) -->
+ <xsl:attribute-set name="formal.title.properties"
+ use-attribute-sets="normal.para.spacing">
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="hyphenate">false</xsl:attribute>
+ <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
+ <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
+ <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
+ </xsl:attribute-set>
+
+
+
+ <!-- ########## blockquote -->
+ <xsl:attribute-set name="blockquote.properties">
+ <xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+ <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+ <xsl:attribute name="border-color">#444444</xsl:attribute>
+ <xsl:attribute name="border-style">solid</xsl:attribute>
+ <xsl:attribute name="border-width">0.1pt</xsl:attribute>
+ <xsl:attribute name="padding-top">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-left">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-right">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
+ <xsl:attribute name="margin-left">0.5em</xsl:attribute>
+ <xsl:attribute name="margin-right">0.5em</xsl:attribute>
+ <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+ </xsl:attribute-set>
+
+
+
+ <!--###################################################
+ Programlistings
+ ################################################### -->
+ <!-- Verbatim text formatting (programlistings) -->
+ <xsl:attribute-set name="verbatim.properties">
+ <xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+ <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+ <xsl:attribute name="border-color">#444444</xsl:attribute>
+ <xsl:attribute name="border-style">solid</xsl:attribute>
+ <xsl:attribute name="border-width">0.1pt</xsl:attribute>
+ <xsl:attribute name="padding-top">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-left">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-right">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
+ <xsl:attribute name="margin-left">0.5em</xsl:attribute>
+ <xsl:attribute name="margin-right">0.5em</xsl:attribute>
+ </xsl:attribute-set>
+ <!-- Shade (background) programlistings -->
+ <xsl:param name="shade.verbatim">1</xsl:param>
+ <xsl:attribute-set name="shade.verbatim.style">
+ <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+ </xsl:attribute-set>
+
+
+
+ <!--###################################################
+ Callouts
+ ################################################### -->
+ <!-- We want to use callouts... -->
+ <xsl:param name="callout.extensions">1</xsl:param>
+ <!-- Place callout bullets at this column in programmlisting.-->
+ <xsl:param name="callout.defaultcolumn">90</xsl:param>
+ <!--
+ No, don't use crappy graphics for the callout bullets. This setting
+ enables some weird Unicode rendering for some fancy bullet points
+ in callouts. By default, this can only count to 10 and produces
+ strange results if you ever have more than 10 callouts for one
+ programlisting. We will fix that next.
+ -->
+ <xsl:param name="callout.graphics">0</xsl:param>
+ <!--
+ Again, fun with DocBook XSL: The callout bullets are rendered in
+ two places: In the programlisting itself and in the list below
+ the listing, with the actual callout text. The rendering in the
+ programlisting is some XSL transformer extension (e.g. a Saxon
+ extension), so we can't change that without messing with the
+ extensions. We only can turn it off by setting this limit to
+ zero, then, a simple bracket style like "(3)" and "(4)" will
+ be used in the programlisting.
+ -->
+ <xsl:param name="callout.unicode.number.limit" select="'0'"/>
+ <!--
+ The callout bullets in the actual callout list will be rendered
+ with an XSL FO template. The default template is broken: limited to 10
+ nice looking Unicode bullet points and then it doesn't print anything,
+ the fallback doesn't work. We implement our own template, which is not
+ as complicated, more ugly, but works. As always, function is more
+ important than form.
+ -->
+ <xsl:template name="callout-bug">
+ <xsl:param name="conum" select="1"/>
+ <fo:inline color="black" padding-top="0.1em" padding-bottom="0.1em"
+ padding-start="0.2em" padding-end="0.2em" baseline-shift="0.1em"
+ font-family="{$monospace.font.family}" font-weight="bold" font-size="75%">
+ <xsl:text>(</xsl:text>
+ <xsl:value-of select="$conum"/>
+ <xsl:text>)</xsl:text>
+ </fo:inline>
+ </xsl:template>
+
+
+
+ <!--###################################################
+ Misc
+ ################################################### -->
+ <!-- Correct placement of titles for figures and examples. -->
+ <xsl:param name="formal.title.placement"> figure after example before
+ equation before table before procedure before </xsl:param>
+ <!-- Format Variable Lists as Blocks (prevents horizontal overflow). -->
+ <xsl:param name="variablelist.as.blocks">1</xsl:param>
+ <!-- The horrible list spacing problems, this is much better. -->
+ <xsl:attribute-set name="list.block.spacing">
+ <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
+ <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+ <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+ <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+ </xsl:attribute-set>
+ <!-- Newer DocBook XSL apparently thinks that some sections are by
+ default "draft" status, and this idiotic thing is by default
+ also set to "maybe", so it spits out a lot of errors with the
+ latest FOP as the XSL/FO styles have references to some draft
+ watermarks, which you actually don't want in the first place.
+ Turn this crap off. If you have to work with the "status"
+ attribute, don't.
+ -->
+ <xsl:param name="draft.mode" select="'no'"/>
+
+</xsl:stylesheet>
Copied: trunk/docs/xslt/src/main/xslt/html.xsl (from rev 1636, trunk/docs/xslt/src/main/resources/en/html.xsl)
===================================================================
--- trunk/docs/xslt/src/main/xslt/html.xsl (rev 0)
+++ trunk/docs/xslt/src/main/xslt/html.xsl 2007-07-16 21:32:03 UTC (rev 1640)
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!--
+
+ This is the XSL HTML configuration file for the Hibernate
+ Reference Documentation.
+
+ It took me days to figure out this stuff and fix most of
+ the obvious bugs in the DocBook XSL distribution. Some of
+ the workarounds might not be appropriate with a newer version
+ of DocBook XSL. This file is released as part of Hibernate,
+ hence LGPL licensed.
+
+ christian(a)hibernate.org
+-->
+
+<!DOCTYPE xsl:stylesheet [
+ <!ENTITY db_xsl_path "../support/docbook-xsl">
+]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+
+<!--###################################################
+ HTML Settings
+ ################################################### -->
+
+ <xsl:param name="html.stylesheet">css/html.css</xsl:param>
+
+ <!-- These extensions are required for table printing and other stuff -->
+ <xsl:param name="use.extensions">1</xsl:param>
+ <xsl:param name="tablecolumns.extension">0</xsl:param>
+ <xsl:param name="callout.extensions">1</xsl:param>
+ <xsl:param name="graphicsize.extension">0</xsl:param>
+
+<!--###################################################
+ Table Of Contents
+ ################################################### -->
+
+ <!-- Generate the TOCs for named components only -->
+ <xsl:param name="generate.toc">
+ book toc
+ </xsl:param>
+
+ <!-- Show only Sections up to level 3 in the TOCs -->
+ <xsl:param name="toc.section.depth">3</xsl:param>
+
+<!--###################################################
+ Labels
+ ################################################### -->
+
+ <!-- Label Chapters and Sections (numbering) -->
+ <xsl:param name="chapter.autolabel">1</xsl:param>
+ <xsl:param name="section.autolabel" select="1"/>
+ <xsl:param name="section.label.includes.component.label" select="1"/>
+
+<!--###################################################
+ Callouts
+ ################################################### -->
+
+ <!-- Don't use graphics, use a simple number style -->
+ <xsl:param name="callout.graphics">0</xsl:param>
+
+ <!-- Place callout marks at this column in annotated areas -->
+ <xsl:param name="callout.defaultcolumn">90</xsl:param>
+
+<!--###################################################
+ Misc
+ ################################################### -->
+
+ <!-- Placement of titles -->
+ <xsl:param name="formal.title.placement">
+ figure after
+ example before
+ equation before
+ table before
+ procedure before
+ </xsl:param>
+ <xsl:template match="section[@role = 'NotInToc']//*" mode="toc" />
+ <xsl:template match="chapter[@role = 'NotInToc']//section//*" mode="toc" />
+
+</xsl:stylesheet>
Copied: trunk/docs/xslt/src/main/xslt/html_chunk.xsl (from rev 1636, trunk/docs/xslt/src/main/resources/en/html_chunk.xsl)
===================================================================
--- trunk/docs/xslt/src/main/xslt/html_chunk.xsl (rev 0)
+++ trunk/docs/xslt/src/main/xslt/html_chunk.xsl 2007-07-16 21:32:03 UTC (rev 1640)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+
+<!--
+
+ This is the XSL HTML configuration file for the Hibernate
+ Reference Documentation.
+
+ It took me days to figure out this stuff and fix most of
+ the obvious bugs in the DocBook XSL distribution. Some of
+ the workarounds might not be appropriate with a newer version
+ of DocBook XSL. This file is released as part of Hibernate,
+ hence LGPL licensed.
+
+ christian(a)hibernate.org
+-->
+
+<!DOCTYPE xsl:stylesheet [
+ <!ENTITY db_xsl_path "../support/docbook-xsl">
+]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns="http://www.w3.org/TR/xhtml1/transitional"
+ exclude-result-prefixes="#default">
+
+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
+
+<!--###################################################
+ HTML Settings
+ ################################################### -->
+
+ <xsl:param name="chunk.section.depth">'5'</xsl:param>
+ <xsl:param name="use.id.as.filename">'1'</xsl:param>
+ <xsl:param name="html.stylesheet">css/html.css</xsl:param>
+
+ <!-- These extensions are required for table printing and other stuff -->
+ <xsl:param name="use.extensions">1</xsl:param>
+ <xsl:param name="tablecolumns.extension">0</xsl:param>
+ <xsl:param name="callout.extensions">1</xsl:param>
+ <xsl:param name="graphicsize.extension">0</xsl:param>
+
+<!--###################################################
+ Table Of Contents
+ ################################################### -->
+
+ <!-- Generate the TOCs for named components only -->
+ <xsl:param name="generate.toc">
+ book toc
+ </xsl:param>
+
+ <!-- Show only Sections up to level 3 in the TOCs -->
+ <xsl:param name="toc.section.depth">3</xsl:param>
+
+<!--###################################################
+ Labels
+ ################################################### -->
+
+ <!-- Label Chapters and Sections (numbering) -->
+ <xsl:param name="chapter.autolabel">1</xsl:param>
+ <xsl:param name="section.autolabel" select="1"/>
+ <xsl:param name="section.label.includes.component.label" select="1"/>
+
+<!--###################################################
+ Callouts
+ ################################################### -->
+
+ <!-- Don't use graphics, use a simple number style -->
+ <xsl:param name="callout.graphics">0</xsl:param>
+
+ <!-- Place callout marks at this column in annotated areas -->
+ <xsl:param name="callout.defaultcolumn">90</xsl:param>
+
+<!--###################################################
+ Misc
+ ################################################### -->
+
+ <!-- Placement of titles -->
+ <xsl:param name="formal.title.placement">
+ figure after
+ example before
+ equation before
+ table before
+ procedure before
+ </xsl:param>
+ <xsl:template match="section[@role = 'NotInToc']//*" mode="toc" />
+ <xsl:template match="chapter[@role = 'NotInToc']//section//*" mode="toc" />
+
+</xsl:stylesheet>
18 years, 2 months
JBoss Rich Faces SVN: r1638 - in branches/3.0.2/sandbox/tooltip/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: dbiatenia
Date: 2007-07-16 15:41:21 -0400 (Mon, 16 Jul 2007)
New Revision: 1638
Modified:
branches/3.0.2/sandbox/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
branches/3.0.2/sandbox/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
Modified: branches/3.0.2/sandbox/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java
===================================================================
--- branches/3.0.2/sandbox/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-07-16 19:40:06 UTC (rev 1637)
+++ branches/3.0.2/sandbox/tooltip/src/main/java/org/richfaces/renderkit/html/ToolTipRenderer.java 2007-07-16 19:41:21 UTC (rev 1638)
@@ -49,20 +49,20 @@
Map eventOptions = AjaxRendererUtils.buildEventOptions(context, component);
- String refreshTooltipPointerExp = ";" + getJsVarName(context, component) + ".toolTip = $('" + component.getClientId(context) + "');";
+ String refreshTooltipInDOM = ";" + getJsVarName(context, component) + ".toolTip = $('" + component.getClientId(context) + "');";
+ String showNewToolTip = ";" + getJsVarName(context, component) + ".displayDiv();";
if(eventOptions.containsKey("oncomplete")){
JSFunctionDefinition onComplete = (JSFunctionDefinition)eventOptions.get("oncomplete");
- onComplete.addToBody(refreshTooltipPointerExp);
+ onComplete.addToBody(refreshTooltipInDOM + showNewToolTip);
eventOptions.put("oncomplete", onComplete);
} else {
JSFunctionDefinition onComplete = new JSFunctionDefinition();
onComplete.addParameter("request");
onComplete.addParameter("event");
onComplete.addParameter("data");
- onComplete.addToBody(refreshTooltipPointerExp);
+ onComplete.addToBody(refreshTooltipInDOM + showNewToolTip);
eventOptions.put("oncomplete", onComplete);
-
}
function.addParameter(eventOptions);
Modified: branches/3.0.2/sandbox/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
--- branches/3.0.2/sandbox/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-07-16 19:40:06 UTC (rev 1637)
+++ branches/3.0.2/sandbox/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2007-07-16 19:41:21 UTC (rev 1638)
@@ -37,6 +37,11 @@
this.toolTip.style.display = "none";
this.parentAttached = false;
this.hintParentElement = null;
+
+ // mouse could be overed while ajax request is still in process,
+ // so, after DOM-element replaced, we should not display it
+ this.isMouseOvered = false;
+
if(IE){
var toolTipZindex = parseInt(this.toolTip.style.zIndex);
new Insertion.Before(this.toolTip,
@@ -86,33 +91,29 @@
hintNotLeft = this.detectAncestorNode(e.toElement,this.hintParentElement);
hintNotLeft = hintNotLeft || this.detectAncestorNode(e.relatedTarget,this.hintParentElement);
- if (!hintNotLeft)
+ if (!hintNotLeft){
this.doHide(e);
+ this.isMouseOvered = false;
+ }
},
doShow: function(e){
-
+ this.isMouseOvered = true;
if (e.target)
this.hintParentElement = e.target;
if (e.srcElement)
this.hintParentElement = e.srcElement;
+ this.setToolTipPosition(e);
if(this.mode == 'ajax'){
var event = e;
eval(this.ajaxExecuteString);
}
- this.setToolTipPosition(e);
-
- this.toolTip.style.display = "block";
- if(this.iframe){
- this.iframe.style.top = parseInt(this.toolTip.style.top) - this.toolTipBorderHeight;
- this.iframe.style.left = parseInt(this.toolTip.style.left) - this.toolTipBorderWidth;
- this.iframe.style.display = "block";
- }
+ this.displayDiv(e);
},
doHide: function(e){
@@ -122,11 +123,13 @@
if (!fakeEvent) {
+ this.isMouseOvered = false;
this.toolTip.style.display = "none";
if(this.iframe){
this.iframe.style.display = "none";
}
this.hintParentElement = null;
+ this.isMouseOvered = false;
}
},
@@ -213,5 +216,16 @@
wHeight = document.body.clientHeight;
}
return [wWidth,wHeight];
+ },
+
+ displayDiv: function(e){
+ if(this.isMouseOvered){
+ this.toolTip.style.display = "block";
+ if(this.iframe){
+ this.iframe.style.top = parseInt(this.toolTip.style.top) - this.toolTipBorderHeight;
+ this.iframe.style.left = parseInt(this.toolTip.style.left) - this.toolTipBorderWidth;
+ this.iframe.style.display = "block";
+ }
+ }
}
}
\ No newline at end of file
18 years, 2 months
JBoss Rich Faces SVN: r1637 - branches/3.0.2/sandbox/calendar/design/funcspec.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-07-16 15:40:06 -0400 (Mon, 16 Jul 2007)
New Revision: 1637
Modified:
branches/3.0.2/sandbox/calendar/design/funcspec/FuncSpec - RF Calendar Component.doc
Log:
calendar/design/funcspec/FuncSpec - RF Calendar Component.doc updated to 1.6
Modified: branches/3.0.2/sandbox/calendar/design/funcspec/FuncSpec - RF Calendar Component.doc
===================================================================
(Binary files differ)
18 years, 2 months
JBoss Rich Faces SVN: r1636 - in trunk/docs: ajaxguide and 6 other directories.
by richfaces-svn-commits@lists.jboss.org
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><<xsl:value-of select="concat($prefix,':', $tag_name)" />></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.xsl" />
<!-- ########## 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/docbook.xsl"/>
<!--###################################################
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.xsl"/>
<!--###################################################
HTML Settings
18 years, 2 months