You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/11/29 20:03:12 UTC
svn commit: r1040229 - in /myfaces/commons/branches/jsf_20: ./
myfaces-commons-components/
myfaces-commons-components/src/main/conf/META-INF/
myfaces-commons-converters/
myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/
myf...
Author: lu4242
Date: Mon Nov 29 19:03:11 2010
New Revision: 1040229
URL: http://svn.apache.org/viewvc?rev=1040229&view=rev
Log:
add facelets tlddoc to jsf 2.0 branch
Added:
myfaces/commons/branches/jsf_20/myfaces-commons-components/src/main/conf/META-INF/facelet-tld-base.tld
Modified:
myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertDateTimeTagHandler.java
myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertEnumTagHandler.java
myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConverterBaseTagHandler.java
myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverterTagHandler.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java
myfaces/commons/branches/jsf_20/pom.xml
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml Mon Nov 29 19:03:11 2010
@@ -68,7 +68,7 @@
<params>
<shortname>mc</shortname>
<uri>http://myfaces.apache.org/commons/components</uri>
- <displayname>Myfaces Commons Components Tag Library 1.2.</displayname>
+ <displayname>Myfaces Commons Components Tag Library 2.0.</displayname>
<description>MyFaces subproject that contains non rendering components to be used with any JSF implementation.</description>
</params>
</configuration>
@@ -91,6 +91,24 @@
<goal>make-config</goal>
</goals>
</execution>
+ <execution>
+ <id>make_facelets_tld</id>
+ <configuration>
+ <outputDirectory>${project.build.directory}/tlddoc-facelets</outputDirectory>
+ <xmlFile>mc_facelets.tld</xmlFile>
+ <xmlBaseFile>src/main/conf/META-INF/facelet-tld-base.tld</xmlBaseFile>
+ <templateFile>tld-facelets-tomahawk20.vm</templateFile>
+ <params>
+ <shortname>mc</shortname>
+ <uri>http://myfaces.apache.org/commons/components</uri>
+ <displayname>Myfaces Commons Components Tag Library 2.0.</displayname>
+ <description>MyFaces subproject that contains non rendering components to be used with any JSF implementation.</description>
+ </params>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -233,6 +251,7 @@
<taglibs>
<mcc>http://myfaces.apache.org/commons/components</mcc>
</taglibs>
+ <jsfVersion>2.0</jsfVersion>
</configuration>
<executions>
<execution>
@@ -242,6 +261,39 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- Unfortunately we can't execute the same report twice, so
+ we have to generate this files outside report generation. -->
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tlddoc-facelets</id>
+ <phase>site</phase>
+ <goals>
+ <goal>taglibdoc</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <title>${project.name} Tag library documentation for Facelets</title>
+ <srcDir>${basedir}/target/tlddoc-facelets</srcDir>
+ <tldDocDir>${basedir}/target/site/tlddoc-facelets</tldDocDir>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tlddoc-jsp</id>
+ <phase>site</phase>
+ <goals>
+ <goal>taglibdoc</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <taglib.src.dir>${project.build.directory}/generated-resources/myfaces-builder-plugin/META-INF</taglib.src.dir>
+ <tldDocDir>${project.build.directory}/site/tlddoc</tldDocDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -260,7 +312,7 @@
<artifactId>myfaces-builder-plugin</artifactId>
<configuration>
<taglibs>
- <mcc>http://myfaces.apache.org/commons/components</mcc>
+ <mc>http://myfaces.apache.org/commons/components</mc>
</taglibs>
</configuration>
</plugin>
Added: myfaces/commons/branches/jsf_20/myfaces-commons-components/src/main/conf/META-INF/facelet-tld-base.tld
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-components/src/main/conf/META-INF/facelet-tld-base.tld?rev=1040229&view=auto
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-components/src/main/conf/META-INF/facelet-tld-base.tld (added)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-components/src/main/conf/META-INF/facelet-tld-base.tld Mon Nov 29 19:03:11 2010
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+ version="2.1">
+
+ <function>
+ <description></description>
+ <name>findComponent</name>
+ <function-class>org.apache.myfaces.commons.facelets.util.FaceletsFunctionLibrary</function-class>
+ <function-signature>javax.faces.component.UIComponent findComponent(java.lang.String)</function-signature>
+ </function>
+
+ <function>
+ <description></description>
+ <name>findComponentFrom</name>
+ <function-class>org.apache.myfaces.commons.facelets.util.FaceletsFunctionLibrary</function-class>
+ <function-signature>javax.faces.component.UIComponent findComponentFrom(javax.faces.component.UIComponent, java.lang.String)</function-signature>
+ </function>
+
+ <function>
+ <description></description>
+ <name>outputClientId</name>
+ <function-class>org.apache.myfaces.commons.facelets.util.FaceletsFunctionLibrary</function-class>
+ <function-signature>java.lang.String outputClientId(java.lang.String)</function-signature>
+ </function>
+
+</taglib>
\ No newline at end of file
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml Mon Nov 29 19:03:11 2010
@@ -82,7 +82,7 @@
<params>
<shortname>mcc</shortname>
<uri>http://myfaces.apache.org/commons/converters</uri>
- <displayname>Myfaces Commons Converter Tag Library 1.2.</displayname>
+ <displayname>Myfaces Commons Converter Tag Library 2.0.</displayname>
<description>
MyFaces subproject that contains converters to be used with any JSF implementation.
</description>
@@ -113,6 +113,26 @@
<goal>make-config</goal>
</goals>
</execution>
+ <execution>
+ <id>make_facelets_tld</id>
+ <configuration>
+ <outputDirectory>${project.build.directory}/tlddoc-facelets</outputDirectory>
+ <xmlFile>mcc_facelets.tld</xmlFile>
+ <templateFile>tld-facelets-tomahawk20.vm</templateFile>
+ <params>
+ <jsf20>true</jsf20>
+ <shortname>mcc</shortname>
+ <uri>http://myfaces.apache.org/commons/converters</uri>
+ <displayname>Myfaces Commons Converter Tag Library 2.0.</displayname>
+ <description>
+ MyFaces subproject that contains converters to be used with any JSF implementation.
+ </description>
+ </params>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -240,6 +260,7 @@
<taglibs>
<mcc>http://myfaces.apache.org/commons/converters</mcc>
</taglibs>
+ <jsfVersion>2.0</jsfVersion>
</configuration>
<executions>
<execution>
@@ -249,6 +270,39 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- Unfortunately we can't execute the same report twice, so
+ we have to generate this files outside report generation. -->
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tlddoc-facelets</id>
+ <phase>site</phase>
+ <goals>
+ <goal>taglibdoc</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <title>${project.name} Tag library documentation for Facelets</title>
+ <srcDir>${basedir}/target/tlddoc-facelets</srcDir>
+ <tldDocDir>${basedir}/target/site/tlddoc-facelets</tldDocDir>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tlddoc-jsp</id>
+ <phase>site</phase>
+ <goals>
+ <goal>taglibdoc</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <taglib.src.dir>${project.build.directory}/generated-resources/myfaces-builder-plugin/META-INF</taglib.src.dir>
+ <tldDocDir>${project.build.directory}/site/tlddoc</tldDocDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertDateTimeTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertDateTimeTagHandler.java?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertDateTimeTagHandler.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertDateTimeTagHandler.java Mon Nov 29 19:03:11 2010
@@ -23,6 +23,13 @@ import javax.faces.view.facelets.Convert
import javax.faces.view.facelets.FaceletContext;
import javax.faces.view.facelets.MetaRuleset;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFConverter;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
+
+@JSFFaceletTag(
+ name = "mcc:convertDateTime",
+ bodyContent = "empty",
+ converterClass="org.apache.myfaces.commons.converter.DateTimeConverter")
public class ConvertDateTimeTagHandler extends ConverterHandler
{
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertEnumTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertEnumTagHandler.java?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertEnumTagHandler.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConvertEnumTagHandler.java Mon Nov 29 19:03:11 2010
@@ -25,6 +25,12 @@ import javax.faces.view.facelets.MetaRul
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagAttributeException;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
+
+@JSFFaceletTag(
+ name = "mcc:convertEnum",
+ bodyContent = "empty",
+ converterClass="org.apache.myfaces.commons.converter.EnumConverter")
public class ConvertEnumTagHandler extends ConverterHandler
{
private final TagAttribute targetClass;
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConverterBaseTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConverterBaseTagHandler.java?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConverterBaseTagHandler.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/ConverterBaseTagHandler.java Mon Nov 29 19:03:11 2010
@@ -22,7 +22,9 @@ import javax.faces.view.facelets.Convert
import javax.faces.view.facelets.ConverterHandler;
import javax.faces.view.facelets.MetaRuleset;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
+@JSFFaceletTag
public class ConverterBaseTagHandler extends ConverterHandler
{
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverterTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverterTagHandler.java?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverterTagHandler.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverterTagHandler.java Mon Nov 29 19:03:11 2010
@@ -24,6 +24,12 @@ import javax.faces.view.facelets.MetaRul
import javax.faces.view.facelets.TagAttribute;
import javax.faces.view.facelets.TagAttributeException;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
+
+@JSFFaceletTag(
+ name = "mcc:convertNumber",
+ bodyContent = "empty",
+ converterClass="org.apache.myfaces.commons.converter.TypedNumberConverter")
public class TypedNumberConverterTagHandler extends ConverterBaseTagHandler
{
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml Mon Nov 29 19:03:11 2010
@@ -82,9 +82,9 @@
<params>
<shortname>mcv</shortname>
<uri>http://myfaces.apache.org/commons/validators</uri>
- <displayname>Myfaces Commons Validator Tag Library 1.2.</displayname>
+ <displayname>Myfaces Commons Validator Tag Library 2.0.</displayname>
<description>
- MyFaces subproject that contains validator to be used with any JSF 1.2
+ MyFaces subproject that contains validator to be used with any JSF 2.0
implementation.
</description>
</params>
@@ -114,6 +114,26 @@
<goal>make-config</goal>
</goals>
</execution>
+ <execution>
+ <id>make_facelets_tld</id>
+ <configuration>
+ <outputDirectory>${project.build.directory}/tlddoc-facelets</outputDirectory>
+ <xmlFile>mcv_facelets.tld</xmlFile>
+ <templateFile>tld-facelets-tomahawk20.vm</templateFile>
+ <params>
+ <shortname>mcv</shortname>
+ <uri>http://myfaces.apache.org/commons/validators</uri>
+ <displayname>Myfaces Commons Validator Tag Library 2.0.</displayname>
+ <description>
+ MyFaces subproject that contains validator to be used with any JSF 2.0
+ implementation.
+ </description>
+ </params>
+ </configuration>
+ <goals>
+ <goal>make-config</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -253,6 +273,7 @@
<taglibs>
<mcv>http://myfaces.apache.org/commons/validators</mcv>
</taglibs>
+ <jsfVersion>2.0</jsfVersion>
</configuration>
<executions>
<execution>
@@ -262,6 +283,39 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- Unfortunately we can't execute the same report twice, so
+ we have to generate this files outside report generation. -->
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tlddoc-facelets</id>
+ <phase>site</phase>
+ <goals>
+ <goal>taglibdoc</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <title>${project.name} Tag library documentation for Facelets</title>
+ <srcDir>${basedir}/target/tlddoc-facelets</srcDir>
+ <tldDocDir>${basedir}/target/site/tlddoc-facelets</tldDocDir>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tlddoc-jsp</id>
+ <phase>site</phase>
+ <goals>
+ <goal>taglibdoc</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <taglib.src.dir>${project.build.directory}/generated-resources/myfaces-builder-plugin/META-INF</taglib.src.dir>
+ <tldDocDir>${project.build.directory}/site/tlddoc</tldDocDir>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java Mon Nov 29 19:03:11 2010
@@ -21,7 +21,12 @@ package org.apache.myfaces.commons.valid
import javax.faces.view.facelets.MetaRuleset;
import javax.faces.view.facelets.ValidatorConfig;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
+@JSFFaceletTag(
+ name = "mcv:validateDateRestriction",
+ bodyContent = "empty",
+ validatorClass = "org.apache.myfaces.commons.validator.DateRestrictionValidator")
public class ValidateDateRestrictionTagHandler extends ValidatorBaseTagHandler
{
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java Mon Nov 29 19:03:11 2010
@@ -22,7 +22,9 @@ import javax.faces.view.facelets.MetaRul
import javax.faces.view.facelets.ValidatorConfig;
import javax.faces.view.facelets.ValidatorHandler;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFFaceletTag;
+@JSFFaceletTag
public class ValidatorBaseTagHandler extends ValidatorHandler
{
Modified: myfaces/commons/branches/jsf_20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/pom.xml?rev=1040229&r1=1040228&r2=1040229&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/pom.xml Mon Nov 29 19:03:11 2010
@@ -102,6 +102,11 @@
<version>1.0.8-SNAPSHOT</version>
</plugin>
<plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.1</version>
<configuration>