[ajax4jsf-svn-commits] JBoss Ajax4JSF SVN: r247 - in trunk: cdk/generator/src/main/resources/META-INF/templates and 4 other directories.
ajax4jsf-svn-commits at lists.jboss.org
ajax4jsf-svn-commits at lists.jboss.org
Tue Jun 5 22:17:31 EDT 2007
Author: alexsmirnov
Date: 2007-06-05 22:17:31 -0400 (Tue, 05 Jun 2007)
New Revision: 247
Added:
trunk/faces-config.vm.patch
Modified:
trunk/cdk/generator/src/main/resources/META-INF/templates/faces-config.vm
trunk/cdk/generator/src/main/resources/META-INF/templates12/faces-config.vm
trunk/docs/userguide/pom.xml
trunk/docs/xslt/src/main/resources/en/f.xsl
trunk/pom.xml
trunk/src/main/assembly/distribution.xml
Log:
Generate project documentation by Maven.
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/faces-config.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates/faces-config.vm 2007-06-06 02:05:53 UTC (rev 246)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates/faces-config.vm 2007-06-06 02:17:31 UTC (rev 247)
@@ -1,103 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-<faces-config>
-
-${facesConfig.includeContent}
-
-#foreach( $validator in ${validators})
- <validator>
- <validator-id>${validator.id}</validator-id>
- <validator-class>${validator.classname}</validator-class>
- #if(${validator.description})
- <description>${validator.description}</description>
- #end
- #if(${validator.displayname})
- <display-name>${validator.displayname}</display-name>
- #end
- #if(${validator.icon})
- <icon>${validator.icon}</icon>
- #end
- </validator>
-#end
-
-#foreach( $converter in ${converters})
- <converter>
- <converter-id>${converter.id}</converter-id>
- <converter-class>${converter.classname}</converter-class>
- #if(${converter.description})
- <description>${converter.description}</description>
- #end
- #if(${converter.displayname})
- <display-name>${converter.displayname}</display-name>
- #end
- #if(${converter.icon})
- <icon>${converter.icon}</icon>
- #end
- </converter>
-#end
-
-
-
-#foreach( $component in ${components})
-#if( $component.generate )
- <component>
- #if(${component.description})
- <description>${component.xmlEncodedDescription}</description>
- #end
- #if(${component.displayname})
- <display-name>${component.xmlEncodedDisplayname}</display-name>
- #end
- <component-type>${component.name}</component-type>
- <component-class>${component.classname}</component-class>
-
-#foreach( $facet in $component.facets)
- <facet>
- #if(${facet.description})
- <description>${facet.xmlEncodedDescription}</description>
- #end
- #if(${facet.displayname})
- <display-name>${facet.xmlEncodedDisplayname}</display-name>
- #end
- <facet-name>${facet.name}</facet-name>
- </facet>
-#end
- #if(${component.renderer})
- <component-extension>
- <component-family>${component.family}</component-family>
- <renderer-type>${component.renderer.name}</renderer-type>
- </component-extension>
- #end
- </component>
-#end
-#end
-
-#foreach( $renderkit in $facesConfig.renderKits)
- <render-kit>
- #if(${renderkit.renderkitid})
- <render-kit-id>${renderkit.renderkitid}</render-kit-id>
- #if(${renderkit.renderkitclass})
- <render-kit-class>${renderkit.renderkitclass}</render-kit-class>
- #end
- #end
-#foreach( $component in $components)
- #if($component.renderer)
- #set($rendererClass = $renderkit.rendererClass($component.renderer.classname) )
- #if( $component.renderer.generate || $facesConfig.rendererExists("${rendererClass}"))
- <renderer>
- <component-family>${component.family}</component-family>
- <renderer-type>
- ${component.renderer.name}
- </renderer-type>
- <renderer-class>
- ${rendererClass}
- </renderer-class>
- </renderer>
- #end
- #end
-#end
- </render-kit>
-#end
-
-
-</faces-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+
+${facesConfig.includeContent}
+
+#foreach( $validator in ${validators})
+ <validator>
+ <validator-id>${validator.id}</validator-id>
+ <validator-class>${validator.classname}</validator-class>
+ #if(${validator.description})
+ <description>${validator.description}</description>
+ #end
+ #if(${validator.displayname})
+ <display-name>${validator.displayname}</display-name>
+ #end
+ #if(${validator.icon})
+ <icon>${validator.icon}</icon>
+ #end
+ </validator>
+#end
+
+#foreach( $converter in ${converters})
+ <converter>
+ #if(${converter.id})
+ <converter-id>${converter.id}</converter-id>
+ #end
+ #if(${converter.forclass})
+ <converter-for-class>${converter.forclass}</converter-for-class>
+ #end
+
+ <converter-class>${converter.classname}</converter-class>
+
+ #if(${converter.description})
+ <description>${converter.description}</description>
+ #end
+ #if(${converter.displayname})
+ <display-name>${converter.displayname}</display-name>
+ #end
+ #if(${converter.icon})
+ <icon>${converter.icon}</icon>
+ #end
+ </converter>
+#end
+
+
+
+#foreach( $component in ${components})
+#if( $component.generate )
+ <component>
+ #if(${component.description})
+ <description>${component.xmlEncodedDescription}</description>
+ #end
+ #if(${component.displayname})
+ <display-name>${component.xmlEncodedDisplayname}</display-name>
+ #end
+ <component-type>${component.name}</component-type>
+ <component-class>${component.classname}</component-class>
+
+#foreach( $facet in $component.facets)
+ <facet>
+ #if(${facet.description})
+ <description>${facet.xmlEncodedDescription}</description>
+ #end
+ #if(${facet.displayname})
+ <display-name>${facet.xmlEncodedDisplayname}</display-name>
+ #end
+ <facet-name>${facet.name}</facet-name>
+ </facet>
+#end
+ #if(${component.renderer})
+ <component-extension>
+ <component-family>${component.family}</component-family>
+ <renderer-type>${component.renderer.name}</renderer-type>
+ </component-extension>
+ #end
+ </component>
+#end
+#end
+
+#foreach( $renderkit in $facesConfig.renderKits)
+ <render-kit>
+ #if(${renderkit.renderkitid})
+ <render-kit-id>${renderkit.renderkitid}</render-kit-id>
+ #if(${renderkit.renderkitclass})
+ <render-kit-class>${renderkit.renderkitclass}</render-kit-class>
+ #end
+ #end
+#foreach( $component in $components)
+ #if($component.renderer)
+ #set($rendererClass = $renderkit.rendererClass($component.renderer.classname) )
+ #if( $component.renderer.generate || $facesConfig.rendererExists("${rendererClass}"))
+ <renderer>
+ <component-family>${component.family}</component-family>
+ <renderer-type>
+ ${component.renderer.name}
+ </renderer-type>
+ <renderer-class>
+ ${rendererClass}
+ </renderer-class>
+ </renderer>
+ #end
+ #end
+#end
+ </render-kit>
+#end
+
+
+</faces-config>
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/faces-config.vm
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates12/faces-config.vm 2007-06-06 02:05:53 UTC (rev 246)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates12/faces-config.vm 2007-06-06 02:17:31 UTC (rev 247)
@@ -1,103 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-<faces-config>
-
-${facesConfig.includeContent}
-
-#foreach( $validator in ${validators})
- <validator>
- <validator-id>${validator.id}</validator-id>
- <validator-class>${validator.classname}</validator-class>
- #if(${validator.description})
- <description>${validator.description}</description>
- #end
- #if(${validator.displayname})
- <display-name>${validator.displayname}</display-name>
- #end
- #if(${validator.icon})
- <icon>${validator.icon}</icon>
- #end
- </validator>
-#end
-
-#foreach( $converter in ${converters})
- <converter>
- <converter-id>${converter.id}</converter-id>
- <converter-class>${converter.classname}</converter-class>
- #if(${converter.description})
- <description>${converter.description}</description>
- #end
- #if(${converter.displayname})
- <display-name>${converter.displayname}</display-name>
- #end
- #if(${converter.icon})
- <icon>${converter.icon}</icon>
- #end
- </converter>
-#end
-
-
-
-#foreach( $component in ${components})
-#if( $component.generate )
- <component>
- #if(${component.description})
- <description>${component.xmlEncodedDescription}</description>
- #end
- #if(${component.displayname})
- <display-name>${component.xmlEncodedDisplayname}</display-name>
- #end
- <component-type>${component.name}</component-type>
- <component-class>${component.classname}</component-class>
-
-#foreach( $facet in $component.facets)
- <facet>
- #if(${facet.description})
- <description>${facet.xmlEncodedDescription}</description>
- #end
- #if(${facet.displayname})
- <display-name>${facet.xmlEncodedDisplayname}</display-name>
- #end
- <facet-name>${facet.name}</facet-name>
- </facet>
-#end
- #if(${component.renderer})
- <component-extension>
- <component-family>${component.family}</component-family>
- <renderer-type>${component.renderer.name}</renderer-type>
- </component-extension>
- #end
- </component>
-#end
-#end
-
-#foreach( $renderkit in $facesConfig.renderKits)
- <render-kit>
- #if(${renderkit.renderkitid})
- <render-kit-id>${renderkit.renderkitid}</render-kit-id>
- #if(${renderkit.renderkitclass})
- <render-kit-class>${renderkit.renderkitclass}</render-kit-class>
- #end
- #end
-#foreach( $component in $components)
- #if($component.renderer)
- #set($rendererClass = $renderkit.rendererClass($component.renderer.classname) )
- #if( $component.renderer.generate || $facesConfig.rendererExists("${rendererClass}"))
- <renderer>
- <component-family>${component.family}</component-family>
- <renderer-type>
- ${component.renderer.name}
- </renderer-type>
- <renderer-class>
- ${rendererClass}
- </renderer-class>
- </renderer>
- #end
- #end
-#end
- </render-kit>
-#end
-
-
-</faces-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+
+${facesConfig.includeContent}
+
+#foreach( $validator in ${validators})
+ <validator>
+ <validator-id>${validator.id}</validator-id>
+ <validator-class>${validator.classname}</validator-class>
+ #if(${validator.description})
+ <description>${validator.description}</description>
+ #end
+ #if(${validator.displayname})
+ <display-name>${validator.displayname}</display-name>
+ #end
+ #if(${validator.icon})
+ <icon>${validator.icon}</icon>
+ #end
+ </validator>
+#end
+
+#foreach( $converter in ${converters})
+ <converter>
+ #if(${converter.id})
+ <converter-id>${converter.id}</converter-id>
+ #end
+ #if(${converter.forclass})
+ <converter-for-class>${converter.forclass}</converter-for-class>
+ #end
+
+ <converter-class>${converter.classname}</converter-class>
+
+ #if(${converter.description})
+ <description>${converter.description}</description>
+ #end
+ #if(${converter.displayname})
+ <display-name>${converter.displayname}</display-name>
+ #end
+ #if(${converter.icon})
+ <icon>${converter.icon}</icon>
+ #end
+ </converter>
+#end
+
+
+
+#foreach( $component in ${components})
+#if( $component.generate )
+ <component>
+ #if(${component.description})
+ <description>${component.xmlEncodedDescription}</description>
+ #end
+ #if(${component.displayname})
+ <display-name>${component.xmlEncodedDisplayname}</display-name>
+ #end
+ <component-type>${component.name}</component-type>
+ <component-class>${component.classname}</component-class>
+
+#foreach( $facet in $component.facets)
+ <facet>
+ #if(${facet.description})
+ <description>${facet.xmlEncodedDescription}</description>
+ #end
+ #if(${facet.displayname})
+ <display-name>${facet.xmlEncodedDisplayname}</display-name>
+ #end
+ <facet-name>${facet.name}</facet-name>
+ </facet>
+#end
+ #if(${component.renderer})
+ <component-extension>
+ <component-family>${component.family}</component-family>
+ <renderer-type>${component.renderer.name}</renderer-type>
+ </component-extension>
+ #end
+ </component>
+#end
+#end
+
+#foreach( $renderkit in $facesConfig.renderKits)
+ <render-kit>
+ #if(${renderkit.renderkitid})
+ <render-kit-id>${renderkit.renderkitid}</render-kit-id>
+ #if(${renderkit.renderkitclass})
+ <render-kit-class>${renderkit.renderkitclass}</render-kit-class>
+ #end
+ #end
+#foreach( $component in $components)
+ #if($component.renderer)
+ #set($rendererClass = $renderkit.rendererClass($component.renderer.classname) )
+ #if( $component.renderer.generate || $facesConfig.rendererExists("${rendererClass}"))
+ <renderer>
+ <component-family>${component.family}</component-family>
+ <renderer-type>
+ ${component.renderer.name}
+ </renderer-type>
+ <renderer-class>
+ ${rendererClass}
+ </renderer-class>
+ </renderer>
+ #end
+ #end
+#end
+ </render-kit>
+#end
+
+
+</faces-config>
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2007-06-06 02:05:53 UTC (rev 246)
+++ trunk/docs/userguide/pom.xml 2007-06-06 02:17:31 UTC (rev 247)
@@ -13,6 +13,23 @@
<version>1.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Ajax4jsf user guide</description>
+ <pluginRepositories>
+ <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>
<build>
<pluginManagement>
<plugins>
Modified: trunk/docs/xslt/src/main/resources/en/f.xsl
===================================================================
--- trunk/docs/xslt/src/main/resources/en/f.xsl 2007-06-06 02:05:53 UTC (rev 246)
+++ trunk/docs/xslt/src/main/resources/en/f.xsl 2007-06-06 02:17:31 UTC (rev 247)
@@ -11,7 +11,7 @@
<chapter>
- <title>$title</title>
+ <title><xsl:value-of select="$title"/></title>
<xsl:for-each select="javaee:tag | tag">
<!--xsl:value-of select="./name/text()" /-->
@@ -39,12 +39,14 @@
</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>
Added: trunk/faces-config.vm.patch
===================================================================
--- trunk/faces-config.vm.patch (rev 0)
+++ trunk/faces-config.vm.patch 2007-06-06 02:17:31 UTC (rev 247)
@@ -0,0 +1,20 @@
+Index: .
+===================================================================
+--- . (revision 231)
++++ . (working copy)
+@@ -23,8 +23,15 @@
+
+ #foreach( $converter in ${converters})
+ <converter>
++ #if(${converter.id})
+ <converter-id>${converter.id}</converter-id>
++ #end
++ #if(${converter.forclass})
++ <converter-for-class>${converter.forclass}</converter-for-class>
++ #end
++
+ <converter-class>${converter.classname}</converter-class>
++
+ #if(${converter.description})
+ <description>${converter.description}</description>
+ #end
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-06-06 02:05:53 UTC (rev 246)
+++ trunk/pom.xml 2007-06-06 02:17:31 UTC (rev 247)
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.ajax4jsf</groupId>
<artifactId>master</artifactId>
@@ -126,8 +128,12 @@
</repository>
</repositories>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/ajax4jsf/trunk/</developerConnection>
+ <connection>
+ scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/trunk/
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.jboss.org/repos/ajax4jsf/trunk/
+ </developerConnection>
<url>http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</url>
</scm>
<!--
@@ -261,6 +267,9 @@
</plugin>
</plugins>
</build>
+ <modules>
+ <module>docs</module>
+ </modules>
</profile>
<profile>
<id>clover</id>
Modified: trunk/src/main/assembly/distribution.xml
===================================================================
--- trunk/src/main/assembly/distribution.xml 2007-06-06 02:05:53 UTC (rev 246)
+++ trunk/src/main/assembly/distribution.xml 2007-06-06 02:17:31 UTC (rev 247)
@@ -42,6 +42,16 @@
<unpack>false</unpack>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.ajax4jsf.docs.userguide:en</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>docs</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
</moduleSets>
<fileSets>
<fileSet>
More information about the ajax4jsf-svn-commits
mailing list