You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2017/09/17 18:05:36 UTC
[myfaces-trinidad-maven] branch 1.2.6.1-branch created (now 312a344)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git.
at 312a344 Oops. restoring the branches. It was not supposed to be deleted.
This branch includes the following new commits:
new fa40746 a private / testing branch
new 48bc1e4 updated version of private test branch;
new 6d1ea90 TRINIDAD-919
new ae63f0e new metadata-tag
new 611f5bf TRINIDAD-987 add 'scoped-id-holder' and 'multi-scoped-id-holder' to transform.xsl and transform12.xsl
new 7d344b7 Fix for TRINIDAD-1011
new 1422c4b TRINIDAD-1056 - Use a blacklist approach instead of a white list approach for mfp: extension tags to minimize maintenance
new b1016d6 TRINIDAD-1065 - use the mfp:hidden in facets and properties to be able to prevent these from being included in the tag documentation
new 0934d46 TRINIDAD-953 - Support for Code Examples in Trinidad Components, Validators, and Converters tagdocs
new 312a344 Oops. restoring the branches. It was not supposed to be deleted.
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-trinidad-maven] 02/10: updated version of private test
branch;
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 48bc1e43bac7d963d9248e9fe9d968a5db02b5e7
Author: Matthias Wessendorf <ma...@apache.org>
AuthorDate: Tue Jan 22 04:07:20 2008 +0000
updated version of private test branch;
---
maven-faces-plugin/pom.xml | 2 +-
maven-i18n-plugin/pom.xml | 2 +-
maven-javacc-plugin/pom.xml | 2 +-
maven-javascript-plugin/pom.xml | 2 +-
maven-jdev-plugin/pom.xml | 2 +-
maven-tagdoc-plugin/pom.xml | 2 +-
maven-xrts-plugin/pom.xml | 2 +-
pom.xml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/maven-faces-plugin/pom.xml b/maven-faces-plugin/pom.xml
index 1bb79c5..51a8306 100644
--- a/maven-faces-plugin/pom.xml
+++ b/maven-faces-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.6.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-i18n-plugin/pom.xml b/maven-i18n-plugin/pom.xml
index 9a2ff20..38153a9 100644
--- a/maven-i18n-plugin/pom.xml
+++ b/maven-i18n-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.6.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-javacc-plugin/pom.xml b/maven-javacc-plugin/pom.xml
index b1782fe..aa363e1 100644
--- a/maven-javacc-plugin/pom.xml
+++ b/maven-javacc-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.6.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-javascript-plugin/pom.xml b/maven-javascript-plugin/pom.xml
index b953ff2..e3224c5 100644
--- a/maven-javascript-plugin/pom.xml
+++ b/maven-javascript-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.6.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-jdev-plugin/pom.xml b/maven-jdev-plugin/pom.xml
index be7a587..8aa8a1a 100644
--- a/maven-jdev-plugin/pom.xml
+++ b/maven-jdev-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.6.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-tagdoc-plugin/pom.xml b/maven-tagdoc-plugin/pom.xml
index b6bf436..b6d973c 100644
--- a/maven-tagdoc-plugin/pom.xml
+++ b/maven-tagdoc-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.6.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/maven-xrts-plugin/pom.xml b/maven-xrts-plugin/pom.xml
index 92877bf..8469c5a 100644
--- a/maven-xrts-plugin/pom.xml
+++ b/maven-xrts-plugin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.6.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
diff --git a/pom.xml b/pom.xml
index 9d3e2a1..7ea3c32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-plugin-parent</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.6.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Trinidad Maven Plugin Parent</name>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 07/10: TRINIDAD-1056 - Use a blacklist
approach instead of a white list approach for mfp: extension tags to
minimize maintenance
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 1422c4bef67fb71cb907dd3353b063691829d5fb
Author: Andrew Robinson <ar...@apache.org>
AuthorDate: Mon May 5 15:52:26 2008 +0000
TRINIDAD-1056 - Use a blacklist approach instead of a white list
approach for mfp: extension tags to minimize maintenance
Merge of rev 653512
---
.../plugin/faces/resources/transform.xsl | 226 ++++++++-------------
.../plugin/faces/resources/transform12.xsl | 225 ++++++++------------
2 files changed, 164 insertions(+), 287 deletions(-)
diff --git a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
index b16b74d..3b27cbb 100644
--- a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
+++ b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
@@ -313,12 +313,26 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:facet-extension[mfp:facet-metadata|mfp:allowable-children|mfp:preferred-children|mfp:preferred|mfp:unsupported-agents|mfp:deprecated]" >
- <xsl:element name="facet-extension" >
- <xsl:element name="facet-metadata" >
- <xsl:apply-templates/>
+ <xsl:template match="//javaee:facet-extension">
+ <!-- Make sure not empty -->
+ <xsl:if test="*">
+ <xsl:element name="facet-extension">
+ <!-- Check for possible children of the metadata -->
+ <xsl:if test="*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee']">
+ <xsl:element name="facet-metadata">
+ <!-- Select metadata children -->
+ <xsl:apply-templates select="mfp:facet-metadata/*[
+ namespace-uri() != 'http://java.sun.com/xml/ns/javaee']" />
+ <!-- Add non-metadata children under the metadata -->
+ <xsl:apply-templates select="*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee'
+ and (
+ namespace-uri() != 'http://myfaces.apache.org/maven-faces-plugin'
+ or name() != 'mfp:facet-metadata'
+ )]" />
+ </xsl:element>
+ </xsl:if>
</xsl:element>
- </xsl:element>
+ </xsl:if>
</xsl:template>
@@ -397,27 +411,26 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:property-extension[mfp:property-values|mfp:group|mfp:translatable|mfp:scoped-id-holder|mfp:multi-scoped-id-holder|mfp:property-editor|mfp:expert|mfp:unsupported-agents|*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']]" >
- <xsl:element name="property-extension" >
- <xsl:element name="property-metadata" >
- <xsl:apply-templates/>
+ <xsl:template match="//javaee:property-extension">
+ <!-- Make sure not empty -->
+ <xsl:if test="*">
+ <xsl:element name="property-extension">
+ <!-- Check for possible children of the metadata -->
+ <xsl:if test="*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee']">
+ <xsl:element name="property-metadata">
+ <!-- Select metadata children -->
+ <xsl:apply-templates select="mfp:property-metadata/*[
+ namespace-uri() != 'http://java.sun.com/xml/ns/javaee']" />
+ <!-- Add non-metadata children under the metadata -->
+ <xsl:apply-templates select="*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee'
+ and (
+ namespace-uri() != 'http://myfaces.apache.org/maven-faces-plugin'
+ or name() != 'mfp:property-metadata'
+ )]" />
+ </xsl:element>
+ </xsl:if>
</xsl:element>
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//javaee:property-extension[mfp:property-metadata]" priority="1" >
- <xsl:element name="property-extension" >
- <!-- do not copy the property values, but instead let them be picked up in the property-metadata element -->
- <xsl:apply-templates select="*[name() != 'mfp:property-values']" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata" >
- <xsl:element name="property-metadata" >
- <xsl:apply-templates/>
- <!-- pick up any property-values elements from the parent node -->
- <xsl:apply-templates select="../mfp:property-values" />
- </xsl:element>
+ </xsl:if>
</xsl:template>
<!-- this templates grabs the component-family from an ancestor -->
@@ -759,14 +772,15 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:property[javaee:property-extension/mfp:long-description]/javaee:description" priority="1">
+ <xsl:template
+ match="//javaee:property[javaee:property-extension/mfp:long-description]/javaee:description"
+ priority="1">
<xsl:element name="description" >
<xsl:apply-templates select="../javaee:property-extension/mfp:long-description/@*" />
<xsl:value-of select="../javaee:property-extension/mfp:long-description/text()" />
</xsl:element>
</xsl:template>
-
<xsl:template match="//javaee:description/@xml:lang" >
<xsl:attribute name="xml:lang" ><xsl:value-of select="@xml:lang" /></xsl:attribute>
</xsl:template>
@@ -807,32 +821,9 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//mfp:component-family" >
- <xsl:element name="component-family" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:favorite-property" >
- <xsl:element name="favorite-property" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:renderer-type" >
- <xsl:element name="renderer-type" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-values" >
- <xsl:element name="attribute-values" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:unsupported-agents" >
- <xsl:element name="unsupported-agents" >
+ <xsl:template match="//mfp:property-values">
+ <!-- Rename this element -->
+ <xsl:element name="attribute-values">
<xsl:value-of select="text()" />
</xsl:element>
</xsl:template>
@@ -840,111 +831,58 @@
<!-- Handle metadata we do not know about by letting it through. Currently,
just for property-extension and component-metadata, but should be global.
See JIRA issues ADFFACES-358, ADFFACES-361 and ADFFACES-472 -->
- <xsl:template match="javaee:property-extension/*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']">
+ <xsl:template match="javaee:property-extension/*[
+ namespace-uri() != 'http://java.sun.com/xml/ns/javaee'
+ and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
<xsl:value-of select="text()"/>
</xsl:copy>
</xsl:template>
- <xsl:template match="mfp:component-metadata/*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']">
+ <xsl:template match="mfp:component-metadata/*[
+ namespace-uri() != 'http://java.sun.com/xml/ns/javaee'
+ and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
<xsl:value-of select="text()"/>
</xsl:copy>
</xsl:template>
-
- <xsl:template match="//mfp:component-metadata/mfp:group" >
-<!-- Disable component groups for now
- <xsl:element name="group" >
- <xsl:value-of select="text()" />
- </xsl:element>
--->
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata/mfp:group" >
- <xsl:element name="group" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata/mfp:translatable" >
- <xsl:element name="translatable" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata/mfp:scoped-id-holder" >
- <xsl:element name="scoped-id-holder" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata/mfp:multi-scoped-id-holder" >
- <xsl:element name="multi-scoped-id-holder" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:accepts-child-components" >
- <xsl:element name="accepts-child-components" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
-
- <xsl:template match="//mfp:property-editor" >
- <xsl:element name="property-editor" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:expert" >
- <xsl:element name="expert" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:preferred-children" >
- <xsl:element name="preferred-children" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:allowable-children" >
- <xsl:element name="allowable-children" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:preferred" >
- <xsl:element name="preferred" >
- <xsl:value-of select="text()" />
+ <xsl:template match="//*[
+ namespace-uri() = 'http://myfaces.apache.org/maven-faces-plugin']"
+ priority="-1">
+ <xsl:element name="{local-name()}" >
+ <xsl:apply-templates select="@*|node()"/>
+ <xsl:value-of select="text()"/>
</xsl:element>
</xsl:template>
- <xsl:template match="//mfp:deprecated" >
- <xsl:element name="deprecated" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
+ <!-- Blacklisted mfp: that should not be copied over into the faces-config.xml: -->
+ <xsl:template match="//mfp:alternate-class" />
+ <xsl:template match="//mfp:author" />
+ <xsl:template match="//mfp:component-metadata/mfp:group" />
+ <xsl:template match="//mfp:component-superclass" />
+ <xsl:template match="//mfp:component-supertype" />
+ <xsl:template match="//mfp:event" />
+ <xsl:template match="//mfp:example" />
+ <xsl:template match="//mfp:implementation-type" />
+ <xsl:template match="//mfp:java-constructor" />
+ <xsl:template match="//mfp:javadoc-tags" />
+ <xsl:template match="//mfp:javascript-class" />
+ <xsl:template match="//mfp:jsp-property-name" />
+ <xsl:template match="//mfp:long-description" />
+ <xsl:template match="//mfp:method-binding-signature" />
+ <xsl:template match="//mfp:short-description" />
+ <xsl:template match="//mfp:state-holder" />
+ <xsl:template match="//mfp:tag-attribute-excluded" />
+ <xsl:template match="//mfp:tag-class" />
+ <xsl:template match="//mfp:tag-class-modifier" />
+ <xsl:template match="//mfp:tag-name" />
+ <xsl:template match="//mfp:uix2-local-name" />
+ <xsl:template match="//mfp:unsupported-render-kit" />
+ <xsl:template match="//mfp:unsupported-render-kits" />
+ <xsl:template match="//mfp:use-max-time" />
+ <xsl:template match="//mfp:warn-if-not-specified" />
- <xsl:template match="//mfp:initial-value" >
- <xsl:element name="initial-value" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:grouping-element" >
- <xsl:element name="grouping-element" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:is-content-resizable" >
- <xsl:element name="is-content-resizable" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
</xsl:stylesheet>
diff --git a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
index 1493326..3581090 100644
--- a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
+++ b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
@@ -293,12 +293,26 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:facet-extension[mfp:facet-metadata|mfp:allowable-children|mfp:preferred-children|mfp:preferred|mfp:unsupported-agents|mfp:deprecated]" >
- <xsl:element name="facet-extension" >
- <xsl:element name="facet-metadata" >
- <xsl:apply-templates/>
+ <xsl:template match="//javaee:facet-extension">
+ <!-- Make sure not empty -->
+ <xsl:if test="*">
+ <xsl:element name="facet-extension">
+ <!-- Check for possible children of the metadata -->
+ <xsl:if test="*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee']">
+ <xsl:element name="facet-metadata">
+ <!-- Select metadata children -->
+ <xsl:apply-templates select="mfp:facet-metadata/*[
+ namespace-uri() != 'http://java.sun.com/xml/ns/javaee']" />
+ <!-- Add non-metadata children under the metadata -->
+ <xsl:apply-templates select="*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee'
+ and (
+ namespace-uri() != 'http://myfaces.apache.org/maven-faces-plugin'
+ or name() != 'mfp:facet-metadata'
+ )]" />
+ </xsl:element>
+ </xsl:if>
</xsl:element>
- </xsl:element>
+ </xsl:if>
</xsl:template>
@@ -377,27 +391,26 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:property-extension[mfp:property-values|mfp:group|mfp:translatable|mfp:scoped-id-holder|mfp:multi-scoped-id-holder|mfp:property-editor|mfp:expert|mfp:unsupported-agents|*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']]" >
- <xsl:element name="property-extension" >
- <xsl:element name="property-metadata" >
- <xsl:apply-templates/>
+ <xsl:template match="//javaee:property-extension">
+ <!-- Make sure not empty -->
+ <xsl:if test="*">
+ <xsl:element name="property-extension">
+ <!-- Check for possible children of the metadata -->
+ <xsl:if test="*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee']">
+ <xsl:element name="property-metadata">
+ <!-- Select metadata children -->
+ <xsl:apply-templates select="mfp:property-metadata/*[
+ namespace-uri() != 'http://java.sun.com/xml/ns/javaee']" />
+ <!-- Add non-metadata children under the metadata -->
+ <xsl:apply-templates select="*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee'
+ and (
+ namespace-uri() != 'http://myfaces.apache.org/maven-faces-plugin'
+ or name() != 'mfp:property-metadata'
+ )]" />
+ </xsl:element>
+ </xsl:if>
</xsl:element>
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//javaee:property-extension[mfp:property-metadata]" priority="1" >
- <xsl:element name="property-extension" >
- <!-- do not copy the property values, but instead let them be picked up in the property-metadata element -->
- <xsl:apply-templates select="*[name() != 'mfp:property-values']" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata" >
- <xsl:element name="property-metadata" >
- <xsl:apply-templates/>
- <!-- pick up any property-values elements from the parent node -->
- <xsl:apply-templates select="../mfp:property-values" />
- </xsl:element>
+ </xsl:if>
</xsl:template>
<!-- this templates grabs the component-family from an ancestor -->
@@ -739,14 +752,15 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:property[javaee:property-extension/mfp:long-description]/javaee:description" priority="1">
+ <xsl:template
+ match="//javaee:property[javaee:property-extension/mfp:long-description]/javaee:description"
+ priority="1">
<xsl:element name="description" >
<xsl:apply-templates select="../javaee:property-extension/mfp:long-description/@*" />
<xsl:value-of select="../javaee:property-extension/mfp:long-description/text()" />
</xsl:element>
</xsl:template>
-
<xsl:template match="//javaee:description/@xml:lang" >
<xsl:attribute name="xml:lang" ><xsl:value-of select="@xml:lang" /></xsl:attribute>
</xsl:template>
@@ -787,32 +801,9 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//mfp:component-family" >
- <xsl:element name="component-family" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:favorite-property" >
- <xsl:element name="favorite-property" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:renderer-type" >
- <xsl:element name="renderer-type" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-values" >
- <xsl:element name="attribute-values" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:unsupported-agents" >
- <xsl:element name="unsupported-agents" >
+ <xsl:template match="//mfp:property-values">
+ <!-- Rename this element -->
+ <xsl:element name="attribute-values">
<xsl:value-of select="text()" />
</xsl:element>
</xsl:template>
@@ -820,110 +811,58 @@
<!-- Handle metadata we do not know about by letting it through. Currently,
just for property-extension and component-metadata, but should be global.
See JIRA issues ADFFACES-358, ADFFACES-361 and ADFFACES-472 -->
- <xsl:template match="javaee:property-extension/*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']">
+ <xsl:template match="javaee:property-extension/*[
+ namespace-uri() != 'http://java.sun.com/xml/ns/javaee'
+ and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
<xsl:value-of select="text()"/>
</xsl:copy>
</xsl:template>
- <xsl:template match="mfp:component-metadata/*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']">
+ <xsl:template match="mfp:component-metadata/*[
+ namespace-uri() != 'http://java.sun.com/xml/ns/javaee'
+ and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
<xsl:value-of select="text()"/>
</xsl:copy>
</xsl:template>
- <xsl:template match="//mfp:component-metadata/mfp:group" >
-<!-- Disable component groups for now
- <xsl:element name="group" >
- <xsl:value-of select="text()" />
- </xsl:element>
--->
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata/mfp:group" >
- <xsl:element name="group" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata/mfp:translatable" >
- <xsl:element name="translatable" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata/mfp:scoped-id-holder" >
- <xsl:element name="scoped-id-holder" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:property-metadata/mfp:multi-scoped-id-holder" >
- <xsl:element name="multi-scoped-id-holder" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:accepts-child-components" >
- <xsl:element name="accepts-child-components" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
-
- <xsl:template match="//mfp:property-editor" >
- <xsl:element name="property-editor" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:expert" >
- <xsl:element name="expert" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:preferred-children" >
- <xsl:element name="preferred-children" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:allowable-children" >
- <xsl:element name="allowable-children" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:preferred" >
- <xsl:element name="preferred" >
- <xsl:value-of select="text()" />
+ <xsl:template match="//*[
+ namespace-uri() = 'http://myfaces.apache.org/maven-faces-plugin']"
+ priority="-1">
+ <xsl:element name="{local-name()}" >
+ <xsl:apply-templates select="@*|node()"/>
+ <xsl:value-of select="text()"/>
</xsl:element>
</xsl:template>
- <xsl:template match="//mfp:deprecated" >
- <xsl:element name="deprecated" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
+ <!-- Blacklisted mfp: that should not be copied over into the faces-config.xml: -->
+ <xsl:template match="//mfp:alternate-class" />
+ <xsl:template match="//mfp:author" />
+ <xsl:template match="//mfp:component-metadata/mfp:group" />
+ <xsl:template match="//mfp:component-superclass" />
+ <xsl:template match="//mfp:component-supertype" />
+ <xsl:template match="//mfp:event" />
+ <xsl:template match="//mfp:example" />
+ <xsl:template match="//mfp:implementation-type" />
+ <xsl:template match="//mfp:java-constructor" />
+ <xsl:template match="//mfp:javadoc-tags" />
+ <xsl:template match="//mfp:javascript-class" />
+ <xsl:template match="//mfp:jsp-property-name" />
+ <xsl:template match="//mfp:long-description" />
+ <xsl:template match="//mfp:method-binding-signature" />
+ <xsl:template match="//mfp:short-description" />
+ <xsl:template match="//mfp:state-holder" />
+ <xsl:template match="//mfp:tag-attribute-excluded" />
+ <xsl:template match="//mfp:tag-class" />
+ <xsl:template match="//mfp:tag-class-modifier" />
+ <xsl:template match="//mfp:tag-name" />
+ <xsl:template match="//mfp:uix2-local-name" />
+ <xsl:template match="//mfp:unsupported-render-kit" />
+ <xsl:template match="//mfp:unsupported-render-kits" />
+ <xsl:template match="//mfp:use-max-time" />
+ <xsl:template match="//mfp:warn-if-not-specified" />
- <xsl:template match="//mfp:initial-value" >
- <xsl:element name="initial-value" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:grouping-element" >
- <xsl:element name="grouping-element" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//mfp:is-content-resizable" >
- <xsl:element name="is-content-resizable" >
- <xsl:value-of select="text()" />
- </xsl:element>
- </xsl:template>
</xsl:stylesheet>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 10/10: Oops. restoring the branches. It
was not supposed to be deleted.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 312a344af7ea06c7748fc6250c46fc0573b97aed
Author: Scott Bryan <so...@apache.org>
AuthorDate: Thu Dec 22 17:43:30 2011 +0000
Oops. restoring the branches. It was not supposed to be deleted.
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 06/10: Fix for TRINIDAD-1011
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 7d344b70d83635bf0f037b5abae20b36510484b4
Author: Andrew Robinson <ar...@apache.org>
AuthorDate: Tue Mar 18 19:25:24 2008 +0000
Fix for TRINIDAD-1011
Added support for is-content-resizable and grouping-element metadata
---
.../trinidadbuild/plugin/faces/resources/transform.xsl | 13 ++++++++++++-
.../trinidadbuild/plugin/faces/resources/transform12.xsl | 13 ++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
index c8012b0..b16b74d 100644
--- a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
+++ b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
@@ -935,5 +935,16 @@
<xsl:value-of select="text()" />
</xsl:element>
</xsl:template>
-
+
+ <xsl:template match="//mfp:grouping-element" >
+ <xsl:element name="grouping-element" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="//mfp:is-content-resizable" >
+ <xsl:element name="is-content-resizable" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
</xsl:stylesheet>
diff --git a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
index eb3e652..1493326 100644
--- a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
+++ b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
@@ -914,5 +914,16 @@
<xsl:value-of select="text()" />
</xsl:element>
</xsl:template>
-
+
+ <xsl:template match="//mfp:grouping-element" >
+ <xsl:element name="grouping-element" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="//mfp:is-content-resizable" >
+ <xsl:element name="is-content-resizable" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
</xsl:stylesheet>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 03/10: TRINIDAD-919
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 6d1ea90149b53ae3a51e530fe1b5ffc4a48269dd
Author: Matthias Wessendorf <ma...@apache.org>
AuthorDate: Wed Jan 23 21:33:49 2008 +0000
TRINIDAD-919
---
.../plugin/jdeveloper/TldContentHandler.java | 70 ++++++++++++++++++----
1 file changed, 58 insertions(+), 12 deletions(-)
diff --git a/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/TldContentHandler.java b/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/TldContentHandler.java
index fa327bb..afa1a71 100644
--- a/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/TldContentHandler.java
+++ b/maven-jdev-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/jdeveloper/TldContentHandler.java
@@ -6,9 +6,9 @@
* 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
@@ -18,9 +18,11 @@
*/
package org.apache.myfaces.trinidadbuild.plugin.jdeveloper;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -30,6 +32,8 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
public class TldContentHandler
@@ -40,9 +44,9 @@ public class TldContentHandler
public TldContentHandler()
{
}
-
+
/**
- * Parse the .tld file to get the information
+ * Parse the .tld file to get the information
* needed for the .jpr
*/
public void parseTld(File file)
@@ -53,9 +57,15 @@ public class TldContentHandler
// Create a builder factory
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setValidating(false);
-
+
// Create the Builder and parse the file
- Document document = factory.newDocumentBuilder().parse(file);
+ DocumentBuilder docBuilder = factory.newDocumentBuilder();
+
+ // Set Entity Resolver to resolve external entities, i.e.
+ // the "http://...." in the <!DOCTYPE tag
+ EntityResolver entityResolver = new PluginEntityResolver();
+ docBuilder.setEntityResolver(entityResolver);
+ Document document = docBuilder.parse(file);
_processTldNodes(document);
}
@@ -118,13 +128,13 @@ public class TldContentHandler
/**
* Find all the TLD nodes we want, get each node's value
* and set the value on the proper class property.
- *
+ *
* @param document - DOM Document from the TLD file
- */
+ */
private void _processTldNodes(Document document)
{
Node node = null;
-
+
// Get the Nodes first node. We can be specific here
// because we know we want the first node.
NodeList nodeList = document.getElementsByTagName(_TLIB_VERSION);
@@ -168,20 +178,56 @@ public class TldContentHandler
setURI(node.getFirstChild().getNodeValue());
}
}
-
+
//========================================================================
// Private variables
//========================================================================
-
+
private String _version = null; // tlib-version
private String _name = null; // display-name
private String _prefix = null; // short-name
private String _jspVersion = null; // jsp-version
private String _uri = null; // uri
-
+
private final static String _TLIB_VERSION = "tlib-version"; //version NOTRANS
private final static String _DISPLAY_NAME = "display-name"; //name NOTRANS
private final static String _SHORT_NAME = "short-name"; //prefix NOTRANS
private final static String _JSP_VERSION = "jsp-version"; //NOTRANS
private final static String _URI = "uri";
+
+
+ /**
+ * Gary Kind 01/22/2008. This class is used solely to get around a
+ * java.net.NoRouteToHostException that occurs in the tag libs
+ * <!DOCTYPE... tag, which is:
+ *
+ * <!DOCTYPE taglib
+ * PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ * "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+ *
+ * The http URL causes this exception for some unknown reason. I have
+ * searched high and low on the web for a real solution and finally found
+ * this workaround at
+ * http://forum.java.sun.com/thread.jspa?threadID=284209&forumID=34
+ * Apparently a LOT of developers are seeing similar problems and they too
+ * are not able to find a solution. This workaround works perfectly and all
+ * is well.
+ */
+ private class PluginEntityResolver
+ implements EntityResolver
+ {
+ public InputSource resolveEntity(String publicId, String systemId)
+ {
+ if ("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN".equals(publicId))
+ {
+ String xmlStr = "<?xml version='1.0' encoding='UTF-8'?>";
+ byte[] buf = xmlStr.getBytes();
+ ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+ return new InputSource(bais);
+ }
+ else
+ return null;
+ }
+ }
+
} // endclass TldContentHandler
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 09/10: TRINIDAD-953 - Support for Code
Examples in Trinidad Components, Validators, and Converters tagdocs
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 0934d46c117a59b5760914981427ec33b1e0c100
Author: Matthias Wessendorf <ma...@apache.org>
AuthorDate: Thu Jul 3 20:06:10 2008 +0000
TRINIDAD-953 - Support for Code Examples in Trinidad Components, Validators, and Converters tagdocs
ported back to 1.2.6.1 branch.
---
.../plugin/faces/parse/AbstractTagBean.java | 77 +++++++++-
.../plugin/faces/parse/ComponentBean.java | 75 +--------
.../plugin/faces/parse/ExampleBean.java | 91 +++++++++++
.../plugin/faces/parse/FacesConfigParser.java | 168 +++++++++++++++------
.../trinidadbuild/plugin/tagdoc/TagdocReport.java | 64 +++++++-
5 files changed, 349 insertions(+), 126 deletions(-)
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java
index b9ea79b..7ea99f9 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/AbstractTagBean.java
@@ -29,11 +29,27 @@ public class AbstractTagBean extends ObjectBean {
private String _longDescription;
private QName _tagName;
private String _tagClass;
- protected Map _properties;
+ protected Map _properties;
private int _tagClassModifiers;
+ private Map _examples;
+ private int _exampleIdx = 0;
- public AbstractTagBean() {
- _properties = new LinkedHashMap();
+ public AbstractTagBean()
+ {
+ this(false);
+ }
+
+ public AbstractTagBean(boolean isComponentBean)
+ {
+ // Component Bean does its own thing
+ // with properties. The other bean
+ // types, i.e. Converters and Validators
+ // use the same properties.
+ if (!isComponentBean)
+ {
+ _properties = new LinkedHashMap();
+ }
+ _examples = new LinkedHashMap();
}
/**
@@ -164,6 +180,51 @@ public class AbstractTagBean extends ObjectBean {
return _properties.values().iterator();
}
+ /**
+ * Adds a Example to this component.
+ *
+ * @param example the example to add
+ */
+ public void addExample(
+ ExampleBean example)
+ {
+ String key = _generateExampleKey();
+ example.setKey(key);
+ _examples.put(key, example);
+ }
+
+ /**
+ * Returns true if this component has any examples.
+ *
+ * @return true if this component has any examples,
+ * false otherwise
+ */
+ public boolean hasExamples()
+ {
+ return !_examples.isEmpty();
+ }
+
+ /**
+ * Returns the example for this example key.
+ *
+ * @param key the hashmap example key
+ */
+ public ExampleBean findExample(
+ String key)
+ {
+ return (ExampleBean)_examples.get(key);
+ }
+
+ /**
+ * Returns an iterator for all examples on this component only.
+ *
+ * @return the example iterator
+ */
+ public Iterator examples()
+ {
+ return _examples.values().iterator();
+ }
+
public void parseTagClassModifier(
String modifier)
{
@@ -226,4 +287,14 @@ public class AbstractTagBean extends ObjectBean {
{
return _properties.size();
}
+
+ /* Get a generated key to use in storing
+ * this example bean in its hashmap.
+ */
+ private String _generateExampleKey()
+ {
+ String key = "Example" + Integer.toString(_exampleIdx);
+ _exampleIdx++;
+ return key;
+ }
}
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
index 3561e31..98d270b 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ComponentBean.java
@@ -20,7 +20,6 @@ package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
import org.apache.myfaces.trinidadbuild.plugin.faces.util.CompoundIterator;
-import javax.xml.namespace.QName;
import java.lang.reflect.Modifier;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -31,13 +30,14 @@ import java.util.logging.Logger;
* ComponentBean is a Java representation of the faces-config component
* XML element.
*/
-public class ComponentBean extends ObjectBean
+public class ComponentBean extends AbstractTagBean
{
/**
* Creates a new ComponentBean.
*/
public ComponentBean()
{
+ super(true);
_properties = new LinkedHashMap();
_facets = new LinkedHashMap();
_events = new LinkedHashMap();
@@ -206,17 +206,6 @@ public class ComponentBean extends ObjectBean
}
/**
- * Sets the JSP tag handler class for this component.
- *
- * @param tagClass the JSP tag handler class
- */
- public void setTagClass(
- String tagClass)
- {
- _tagClass = tagClass;
- }
-
- /**
* Sets the unsupported agents for this component.
*
* @param unsupportedAgents the unsupported agents
@@ -240,17 +229,6 @@ public class ComponentBean extends ObjectBean
return _unsupportedAgents;
}
-
- /**
- * Returns the JSP tag handler class for this component.
- *
- * @return the JSP tag handler class
- */
- public String getTagClass()
- {
- return _tagClass;
- }
-
/**
* Sets the JSP tag handler superclass for this component.
*
@@ -294,27 +272,6 @@ public class ComponentBean extends ObjectBean
}
/**
- * Returns the JSP tag name for this component.
- *
- * @return the JSP tag name
- */
- public QName getTagName()
- {
- return _tagName;
- }
-
- /**
- * Sets the JSP tag name for this component.
- *
- * @param tagName the JSP tag name
- */
- public void setTagName(
- QName tagName)
- {
- _tagName = tagName;
- }
-
- /**
* Sets the namingContainer flag of this property.
*
* @param namingContainer the component namingContainer flag
@@ -419,7 +376,6 @@ public class ComponentBean extends ObjectBean
_implementationType = implementationType;
}
-
/**
* Adds a property to this component.
*
@@ -652,7 +608,6 @@ public class ComponentBean extends ObjectBean
_children = children;
}
-
/**
* Returns true if the component can have children.
*
@@ -707,23 +662,6 @@ public class ComponentBean extends ObjectBean
addTagClassModifier(_parseModifier(modifier));
}
- private int _parseModifier(
- String text)
- {
- if ("public".equals(text))
- return Modifier.PUBLIC;
- else if ("protected".equals(text))
- return Modifier.PROTECTED;
- else if ("private".equals(text))
- return Modifier.PRIVATE;
- else if ("abstract".equals(text))
- return Modifier.ABSTRACT;
- else if ("final".equals(text))
- return Modifier.FINAL;
-
- throw new IllegalArgumentException("Unrecognized modifier: " + text);
- }
-
/**
* Parses the unsupported agents for this component into a String array
* using space as the separator between values.
@@ -1018,8 +956,9 @@ public class ComponentBean extends ObjectBean
*/
protected String findJspTagClass()
{
- if (_tagClass != null)
- return _tagClass;
+ String tagClass = getTagClass();
+ if (tagClass != null)
+ return tagClass;
ComponentBean parent = resolveSupertype();
return (parent != null) ? parent.findJspTagClass() : null;
@@ -1051,8 +990,6 @@ public class ComponentBean extends ObjectBean
private String _componentSuperclass;
private String _rendererType;
private String _implementationType;
- private QName _tagName;
- private String _tagClass;
private String _tagHandler;
private String _tagSuperclass;
private String _localName;
@@ -1065,7 +1002,7 @@ public class ComponentBean extends ObjectBean
private int _componentClassModifiers;
private int _tagClassModifiers;
private String[] _unsupportedAgents = new String[0];
-
+
static private final String _TRINIDAD_COMPONENT_BASE =
"org.apache.myfaces.trinidad.component.UIXComponentBase";
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ExampleBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ExampleBean.java
new file mode 100644
index 0000000..27906e5
--- /dev/null
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ExampleBean.java
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+/**
+ * ExampleBean is a Java representation of the faces-config component or
+ * renderer Example XML element.
+ */
+public class ExampleBean extends ObjectBean
+{
+ /**
+ * Get source Example Description Text
+ *
+ * @return source Example Description Text
+ */
+ public String getSourceDescription()
+ {
+ return _sourceDescription;
+ }
+
+ /**
+ * Set source example Description Text.
+ *
+ * @param sourceDescription source example Description Text.
+ */
+ public void setSourceDescription( String sourceDescription )
+ {
+ _sourceDescription = sourceDescription;
+ }
+
+ /**
+ * Returns source Example.
+ *
+ * @return source Example
+ */
+ public String getSourceCode()
+ {
+ return _source;
+ }
+
+ /**
+ * Set source example.
+ *
+ * @param source source example to be added to the list.
+ */
+ public void setSourceCode( String source )
+ {
+ _source = source;
+ }
+
+ /**
+ * Returns Example hashmap key.
+ *
+ * @return Example hashmap key
+ */
+ public String getKey()
+ {
+ return _key;
+ }
+
+ /**
+ * Set source example.
+ *
+ * @param key Set key for this example put in
+ * ComponentBean _examples hashmap.
+ */
+ protected void setKey( String key )
+ {
+ _key = key;
+ }
+
+ private String _sourceDescription = null;
+ private String _source = null;
+ private String _key = null;
+}
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
index 5c19ebf..362b0e4 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
@@ -6,9 +6,9 @@
* 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
@@ -83,7 +83,7 @@ public class FacesConfigParser
// spf.setXIncludeAware(true);
Digester digester = new Digester(spf.newSAXParser());
digester.setNamespaceAware(true);
-
+
return digester;
}
@@ -118,7 +118,7 @@ public class FacesConfigParser
"defaultValue");
digester.addSetNext("faces-config/component/property", "addProperty",
PropertyBean.class.getName());
-
+
// faces-config/component/facet
digester.addObjectCreate("faces-config/component/facet", FacetBean.class);
@@ -134,6 +134,16 @@ public class FacesConfigParser
// faces-config/component/facet/facet-extension
digester.addBeanPropertySetter("faces-config/component/facet/facet-extension/hidden");
+ // faces-config/component/facet/example
+ digester.addObjectCreate("faces-config/component/facet/example",
+ ExampleBean.class);
+ digester.addBeanPropertySetter("faces-config/component/facet/example/source-description",
+ "sourceDescription");
+ digester.addBeanPropertySetter("faces-config/component/facet/example/source-code",
+ "sourceCode");
+ digester.addSetNext("faces-config/component/facet/example",
+ "addExample", ExampleBean.class.getName());
+
// faces-config/component/component-extension
digester.addBeanPropertySetter("faces-config/component/component-extension/long-description",
"longDescription");
@@ -174,6 +184,16 @@ public class FacesConfigParser
digester.addBeanPropertySetter("faces-config/component/component-extension/uix2-node-class",
"nodeClass");
+ // faces-config/component/component-extension/example
+ digester.addObjectCreate("faces-config/component/component-extension/example",
+ ExampleBean.class);
+ digester.addBeanPropertySetter("faces-config/component/component-extension/example/source-description",
+ "sourceDescription");
+ digester.addBeanPropertySetter("faces-config/component/component-extension/example/source-code",
+ "sourceCode");
+ digester.addSetNext("faces-config/component/component-extension/example",
+ "addExample", ExampleBean.class.getName());
+
// faces-config/component/component-extension/event
digester.addObjectCreate("faces-config/component/component-extension/event", EventRefBean.class);
digester.addBeanPropertySetter("faces-config/component/component-extension/event/event-type",
@@ -228,7 +248,7 @@ public class FacesConfigParser
MethodSignatureBean.class.getName());
// faces-config/component/property/property-extension/property-metada
digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/use-max-time",
- "useMaxTime");
+ "useMaxTime");
// XInclude rules
@@ -237,15 +257,9 @@ public class FacesConfigParser
ComponentIncludeFactory.class);
}
- protected Digester createDigester() throws ParserConfigurationException, SAXException
+ protected static void addConverterDigesterRules(Digester digester)
{
- Digester digester = createEmptyDigester();
-
- addComponentDigesterRules(digester, true);
-
- // Java Enterprise 5.0
digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee");
- //digester.addObjectCreate("faces-config", FacesConfigBean.class);
// faces-config/converter
digester.addObjectCreate("faces-config/converter", ConverterBean.class);
@@ -269,6 +283,40 @@ public class FacesConfigParser
digester.addSetNext("faces-config/converter/property", "addProperty",
PropertyBean.class.getName());
+ // Maven Faces Plugin
+ digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
+
+ // faces-config/converter/converter-extension
+ digester.addBeanPropertySetter("faces-config/converter/converter-extension/long-description",
+ "longDescription");
+ digester.addBeanPropertySetter("faces-config/converter/converter-extension/tag-class",
+ "tagClass");
+ digester.addRule("faces-config/converter/converter-extension/tag-name",
+ new BeanPropertySetterRule("tagName"));
+ digester.addCallMethod("faces-config/converter/converter-extension/tag-class-modifier",
+ "parseTagClassModifier", 1);
+ digester.addCallParam("faces-config/converter/converter-extension/tag-class-modifier", 0);
+
+ // faces-config/converter/converter-extension/example
+ digester.addObjectCreate("faces-config/converter/converter-extension/example",
+ ExampleBean.class);
+ digester.addBeanPropertySetter("faces-config/converter/converter-extension/example/source-description",
+ "sourceDescription");
+ digester.addBeanPropertySetter("faces-config/converter/converter-extension/example/source-code",
+ "sourceCode");
+ digester.addSetNext("faces-config/converter/converter-extension/example",
+ "addExample", ExampleBean.class.getName());
+
+ // faces-config/converter/property/property-extension
+ digester.addBeanPropertySetter("faces-config/converter/property/property-extension/tag-attribute-excluded",
+ "tagAttributeExcluded");
+ }
+
+ protected static void addValidatorDigesterRules(Digester digester)
+ {
+ // Java Enterprise 5.0
+ digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee");
+
// faces-config/validator
digester.addObjectCreate("faces-config/validator", ValidatorBean.class);
digester.addBeanPropertySetter("faces-config/validator/validator-id",
@@ -291,6 +339,42 @@ public class FacesConfigParser
digester.addSetNext("faces-config/validator/property", "addProperty",
PropertyBean.class.getName());
+ // Maven Faces Plugin
+ digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
+
+ // faces-config/validator/validator-extension
+ digester.addBeanPropertySetter("faces-config/validator/validator-extension/long-description",
+ "longDescription");
+ digester.addBeanPropertySetter("faces-config/validator/validator-extension/tag-class",
+ "tagClass");
+ digester.addRule("faces-config/validator/validator-extension/tag-name",
+ new BeanPropertySetterRule("tagName"));
+ digester.addCallMethod("faces-config/validator/validator-extension/tag-class-modifier",
+ "parseTagClassModifier", 1);
+ digester.addCallParam("faces-config/validator/validator-extension/tag-class-modifier", 0);
+
+ // faces-config/validator/validator-extension/example
+ digester.addObjectCreate("faces-config/validator/validator-extension/example",
+ ExampleBean.class);
+ digester.addBeanPropertySetter("faces-config/validator/validator-extension/example/source-description",
+ "sourceDescription");
+ digester.addBeanPropertySetter("faces-config/validator/validator-extension/example/source-code",
+ "sourceCode");
+ digester.addSetNext("faces-config/validator/validator-extension/example",
+ "addExample", ExampleBean.class.getName());
+
+ // faces-config/validator/property/property-extension
+ digester.addBeanPropertySetter("faces-config/validator/property/property-extension/tag-attribute-excluded",
+ "tagAttributeExcluded");
+ // faces-config/validator/property/property-extension/property-metada
+ digester.addBeanPropertySetter("faces-config/validator/property/property-extension/property-metadata/use-max-time",
+ "useMaxTime");
+ }
+
+ protected static void addRenderKitDigesterRules(Digester digester)
+ {
+ // Java Enterprise 5.0
+ digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee");
// faces-config/render-kit
digester.addObjectCreate("faces-config/render-kit", RenderKitBean.class);
@@ -311,9 +395,20 @@ public class FacesConfigParser
digester.addSetNext("faces-config/render-kit/renderer", "addRenderer",
RendererBean.class.getName());
+ // Maven Faces Plugin
+ digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
- // TBD: JSR-276 metadata (ask Jeff Stephenson)
+ // faces-config/render-kit/renderer/renderer-extension
+ digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/component-type",
+ "componentType");
+ digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/renderer-superclass",
+ "rendererSuperclass");
+ }
+ protected static void addEventDigesterRules(Digester digester)
+ {
+ // Java Enterprise 5.0
+ // digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee");
// Maven Faces Plugin
digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
@@ -331,45 +426,22 @@ public class FacesConfigParser
"eventSourceInterface");
digester.addSetNext("faces-config/faces-config-extension/event", "addEvent",
EventBean.class.getName());
+ }
- // faces-config/converter/converter-extension
- digester.addBeanPropertySetter("faces-config/converter/converter-extension/long-description",
- "longDescription");
- digester.addBeanPropertySetter("faces-config/converter/converter-extension/tag-class",
- "tagClass");
- digester.addRule("faces-config/converter/converter-extension/tag-name",
- new BeanPropertySetterRule("tagName"));
- digester.addCallMethod("faces-config/converter/converter-extension/tag-class-modifier",
- "parseTagClassModifier", 1);
- digester.addCallParam("faces-config/converter/converter-extension/tag-class-modifier", 0);
+ protected Digester createDigester() throws ParserConfigurationException, SAXException
+ {
+ Digester digester = createEmptyDigester();
- // faces-config/converter/property/property-extension
- digester.addBeanPropertySetter("faces-config/converter/property/property-extension/tag-attribute-excluded",
- "tagAttributeExcluded");
+ addComponentDigesterRules(digester, true);
- // faces-config/validator/validator-extension
- digester.addBeanPropertySetter("faces-config/validator/validator-extension/long-description",
- "longDescription");
- digester.addBeanPropertySetter("faces-config/validator/validator-extension/tag-class",
- "tagClass");
- digester.addRule("faces-config/validator/validator-extension/tag-name",
- new BeanPropertySetterRule("tagName"));
- digester.addCallMethod("faces-config/validator/validator-extension/tag-class-modifier",
- "parseTagClassModifier", 1);
- digester.addCallParam("faces-config/validator/validator-extension/tag-class-modifier", 0);
+ //digester.addObjectCreate("faces-config", FacesConfigBean.class);
- // faces-config/validator/property/property-extension
- digester.addBeanPropertySetter("faces-config/validator/property/property-extension/tag-attribute-excluded",
- "tagAttributeExcluded");
- // faces-config/validator/property/property-extension/property-metada
- digester.addBeanPropertySetter("faces-config/validator/property/property-extension/property-metadata/use-max-time",
- "useMaxTime");
+ addConverterDigesterRules(digester);
+ addValidatorDigesterRules(digester);
+ addRenderKitDigesterRules(digester);
+ addEventDigesterRules(digester);
- // faces-config/render-kit/renderer/renderer-extension
- digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/component-type",
- "componentType");
- digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/renderer-superclass",
- "rendererSuperclass");
+ // TBD: JSR-276 metadata (ask Jeff Stephenson)
return digester;
}
@@ -400,4 +472,4 @@ public class FacesConfigParser
return included;
}
}
-}
+}
\ No newline at end of file
diff --git a/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java b/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
index 0ce723d..cb9d0f0 100644
--- a/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
+++ b/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
@@ -52,10 +52,12 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenMultiPageReport;
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.reporting.sink.SinkFactory;
+import org.apache.myfaces.trinidadbuild.plugin.faces.parse.AbstractTagBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ComponentBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ConverterBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.EventBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.EventRefBean;
+import org.apache.myfaces.trinidadbuild.plugin.faces.parse.ExampleBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.FacesConfigBean;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.FacesConfigParser;
import org.apache.myfaces.trinidadbuild.plugin.faces.parse.FacetBean;
@@ -399,6 +401,9 @@ public class TagdocReport extends AbstractMavenMultiPageReport
out.write(" <p>\n");
_writeComponentSummary(out, component);
out.write(" </p>\n");
+ out.write(" <p>\n");
+ _writeExamples(out, component);
+ out.write(" </p>\n");
out.write(" </section>\n");
if (component.hasEvents(true))
@@ -464,6 +469,9 @@ public class TagdocReport extends AbstractMavenMultiPageReport
out.write(" <p>\n");
_writeConverterSummary(out, converter);
out.write(" </p>\n");
+ out.write(" <p>\n");
+ _writeExamples(out, converter);
+ out.write(" </p>\n");
out.write(" </section>\n");
out.write(" <section name=\"Attributes\">\n");
@@ -511,6 +519,9 @@ public class TagdocReport extends AbstractMavenMultiPageReport
out.write(" <p>\n");
_writeValidatorSummary(out, validator);
out.write(" </p>\n");
+ out.write(" <p>\n");
+ _writeExamples(out, validator);
+ out.write(" </p>\n");
out.write(" </section>\n");
out.write(" <section name=\"Attributes\">\n");
@@ -629,7 +640,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
return in;
}
-
+
static private final String _platformAgnosticPath(String path) {
return path.replace('/', File.separatorChar);
}
@@ -973,7 +984,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
{
if (i > 0)
out.write(",<br/>");
- out.write((String) phases[i]);
+ out.write(phases[i]);
}
out.write("</td>");
@@ -985,9 +996,6 @@ public class TagdocReport extends AbstractMavenMultiPageReport
}
-
-
-
private void _writeComponentFacets(Writer out, ComponentBean bean) throws IOException
{
// Sort the facets
@@ -1026,6 +1034,50 @@ public class TagdocReport extends AbstractMavenMultiPageReport
+ private void _writeExamples(Writer out, AbstractTagBean bean) throws IOException
+ {
+ if (!bean.hasExamples())
+ return;
+
+ ExampleBean exBean = null;
+
+ // Write header
+ out.write(" <b>Example(s):</b> ");
+ out.write(" <br/>\n");
+ out.write(" <html>\n");
+
+ // Go through each example, write its description
+ // followed by the example source code.
+ Iterator iter = bean.examples();
+ while (iter.hasNext())
+ {
+ exBean = (ExampleBean) iter.next();
+ String desc = exBean.getSourceDescription();
+ String source = exBean.getSourceCode();
+
+ if (desc != null)
+ {
+ desc = desc.replaceAll("<", "<");
+ desc = desc.replaceAll(">", ">");
+
+ if (!"".equals(desc))
+ out.write(" <p>" + desc + "</p>");
+ }
+
+ if (source != null)
+ {
+ source = source.replaceAll("<", "<");
+ source = source.replaceAll(">", ">");
+ if (!"".equals(source))
+ {
+ out.write(" <div class=\'source\'>\n");
+ out.write(" <pre>\n" + source + "</pre>\n");
+ out.write(" </div>\n");
+ }
+ }
+ }
+ out.write(" </html>\n");
+ }
protected MavenProject getProject()
{
@@ -1187,7 +1239,7 @@ public class TagdocReport extends AbstractMavenMultiPageReport
List classpathElements = project.getCompileClasspathElements();
if (!classpathElements.isEmpty())
{
- String[] entries = (String[])classpathElements.toArray(new String[0]);
+ String[] entries = (String[]) classpathElements.toArray(new String[0]);
URL[] urls = new URL[entries.length];
for (int i=0; i < urls.length; i++)
{
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 08/10: TRINIDAD-1065 - use the mfp:hidden
in facets and properties to be able to prevent these from being included in
the tag documentation
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit b1016d6ea3788e80f341fca330850186b4b926f2
Author: Andrew Robinson <ar...@apache.org>
AuthorDate: Mon May 5 19:56:51 2008 +0000
TRINIDAD-1065 - use the mfp:hidden in facets and properties to be able
to prevent these from being included in the tag documentation
---
.../plugin/faces/parse/FacesConfigParser.java | 4 ++++
.../trinidadbuild/plugin/faces/parse/FacetBean.java | 19 +++++++++++++++++++
.../plugin/faces/parse/PropertyBean.java | 19 +++++++++++++++++++
.../trinidadbuild/plugin/tagdoc/TagdocReport.java | 11 ++++++++++-
4 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
index 5c720f7..5c19ebf 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
@@ -130,6 +130,9 @@ public class FacesConfigParser
// Maven Faces Plugin
digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
+
+ // faces-config/component/facet/facet-extension
+ digester.addBeanPropertySetter("faces-config/component/facet/facet-extension/hidden");
// faces-config/component/component-extension
digester.addBeanPropertySetter("faces-config/component/component-extension/long-description",
@@ -202,6 +205,7 @@ public class FacesConfigParser
"alternateClass");
digester.addBeanPropertySetter("faces-config/component/property/property-extension/tag-attribute-excluded",
"tagAttributeExcluded");
+ digester.addBeanPropertySetter("faces-config/component/property/property-extension/hidden");
digester.addCallMethod("faces-config/component/property/property-extension/property-values",
"parsePropertyValues", 1);
digester.addCallParam("faces-config/component/property/property-extension/property-values", 0);
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java
index efe1b1f..c9cbf05 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java
@@ -87,7 +87,26 @@ public class FacetBean extends ObjectBean
return _required;
}
+ /**
+ * If the facet should be hidden from documentation
+ * @return If the facet should be hidden
+ */
+ public boolean isHidden()
+ {
+ return _hidden;
+ }
+
+ /**
+ * Set if this facet should be hidden from documentation
+ * @param hidden If the facet should be hidden
+ */
+ public void setHidden(boolean hidden)
+ {
+ this._hidden = hidden;
+ }
+
private String _description;
private String _facetName;
private boolean _required;
+ private boolean _hidden;
}
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
index 3e7cb93..60391c9 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/PropertyBean.java
@@ -428,6 +428,24 @@ public class PropertyBean extends AttributeBean
return _fieldPropertyName;
}
+
+ /**
+ * If the property should be hidden from documentation
+ * @return If the facet should be hidden
+ */
+ public boolean isHidden()
+ {
+ return _hidden;
+ }
+
+ /**
+ * Set if this facet should be hidden from documentation
+ * @param hidden If the facet should be hidden
+ */
+ public void setHidden(boolean hidden)
+ {
+ this._hidden = hidden;
+ }
private String _aliasOf;
private String _jspPropertyName;
@@ -440,6 +458,7 @@ public class PropertyBean extends AttributeBean
private boolean _tagAttributeExcluded;
private boolean _enum;
private boolean _useMaxTime;
+ private boolean _hidden;
private String[] _propertyValues;
private String[] _unsupportedAgents = _EMPTY_ARRAY;
private String[] _unsupportedRenderKits = _EMPTY_ARRAY;
diff --git a/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java b/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
index 19eb3a4..0ce723d 100644
--- a/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
+++ b/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
@@ -795,6 +795,11 @@ public class TagdocReport extends AbstractMavenMultiPageReport
while (attributes.hasNext())
{
PropertyBean attr = (PropertyBean) attributes.next();
+
+ if (attr.isHidden())
+ {
+ continue;
+ }
/*
if ((group == null) || "Ungrouped".equals(group))
@@ -990,7 +995,11 @@ public class TagdocReport extends AbstractMavenMultiPageReport
Iterator iter = bean.facets(true);
while (iter.hasNext())
{
- facetNames.add(((FacetBean) iter.next()).getFacetName());
+ FacetBean facetBean = (FacetBean)iter.next();
+ if (!facetBean.isHidden())
+ {
+ facetNames.add(facetBean.getFacetName());
+ }
}
out.write("<table>\n");
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 01/10: a private / testing branch
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit fa40746a0e55593da47f9c5ea411b5121db64a33
Author: Matthias Wessendorf <ma...@apache.org>
AuthorDate: Mon Jan 21 19:51:10 2008 +0000
a private / testing branch
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 04/10: new metadata-tag
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit ae63f0e0f9ac1722c890bd2e7c9b2025e9bbfe55
Author: Matthias Wessendorf <ma...@apache.org>
AuthorDate: Wed Jan 30 13:18:52 2008 +0000
new metadata-tag
---
.../trinidadbuild/plugin/faces/resources/transform.xsl | 9 ++++++++-
.../trinidadbuild/plugin/faces/resources/transform12.xsl | 16 +++++++++++-----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
index ca998bf..d06e7f5 100644
--- a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
+++ b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
@@ -53,6 +53,7 @@
<!ELEMENT initial-value (#PCDATA)>
<!ELEMENT preferred (#PCDATA)>
<!ELEMENT preferred-children (#PCDATA)>
+ <!ELEMENT allowable-children (#PCDATA)>
<!ELEMENT preferred-component-types (#PCDATA)>
<!ELEMENT property-editor (#PCDATA)>
<!ELEMENT short-description (#PCDATA)>
@@ -310,7 +311,7 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:facet-extension[mfp:facet-metadata|mfp:preferred-children|mfp:preferred|mfp:unsupported-agents|mfp:deprecated]" >
+ <xsl:template match="//javaee:facet-extension[mfp:facet-metadata|mfp:allowable-children|mfp:preferred-children|mfp:preferred|mfp:unsupported-agents|mfp:deprecated]" >
<xsl:element name="facet-extension" >
<xsl:element name="facet-metadata" >
<xsl:apply-templates/>
@@ -897,6 +898,12 @@
</xsl:element>
</xsl:template>
+ <xsl:template match="//mfp:allowable-children" >
+ <xsl:element name="allowable-children" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
+
<xsl:template match="//mfp:preferred" >
<xsl:element name="preferred" >
<xsl:value-of select="text()" />
diff --git a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
index 049c761..70916ef 100644
--- a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
+++ b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
@@ -293,7 +293,7 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:facet-extension[mfp:facet-metadata|mfp:preferred-children|mfp:preferred|mfp:unsupported-agents|mfp:deprecated]" >
+ <xsl:template match="//javaee:facet-extension[mfp:facet-metadata|mfp:allowable-children|mfp:preferred-children|mfp:preferred|mfp:unsupported-agents|mfp:deprecated]" >
<xsl:element name="facet-extension" >
<xsl:element name="facet-metadata" >
<xsl:apply-templates/>
@@ -438,8 +438,8 @@
<xsl:apply-templates select="javaee:display-name"/>
<xsl:apply-templates select="javaee:converter-id"/>
<xsl:apply-templates select="javaee:converter-for-class"/>
- <xsl:apply-templates select="javaee:converter-class"/>
- <xsl:apply-templates select="javaee:property"/>
+ <xsl:apply-templates select="javaee:converter-class"/>
+ <xsl:apply-templates select="javaee:property"/>
</xsl:element>
</xsl:template>
@@ -715,8 +715,8 @@
<!-- xsl:apply-templates/ TODO use this instead -->
<xsl:apply-templates select="javaee:display-name"/>
<xsl:apply-templates select="javaee:validator-id"/>
- <xsl:apply-templates select="javaee:validator-class"/>
- <xsl:apply-templates select="javaee:property"/>
+ <xsl:apply-templates select="javaee:validator-class"/>
+ <xsl:apply-templates select="javaee:property"/>
</xsl:element>
</xsl:template>
@@ -878,6 +878,12 @@
</xsl:element>
</xsl:template>
+ <xsl:template match="//mfp:allowable-children" >
+ <xsl:element name="allowable-children" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
+
<xsl:template match="//mfp:preferred" >
<xsl:element name="preferred" >
<xsl:value-of select="text()" />
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-trinidad-maven] 05/10: TRINIDAD-987 add 'scoped-id-holder'
and 'multi-scoped-id-holder' to transform.xsl and transform12.xsl
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.6.1-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad-maven.git
commit 611f5bf4388334312859d6c3d2557c4dc74a481e
Author: Jeanne Waldman <jw...@apache.org>
AuthorDate: Tue Mar 4 19:17:25 2008 +0000
TRINIDAD-987 add 'scoped-id-holder' and 'multi-scoped-id-holder' to transform.xsl and transform12.xsl
---
.../trinidadbuild/plugin/faces/resources/transform.xsl | 16 +++++++++++++++-
.../trinidadbuild/plugin/faces/resources/transform12.xsl | 15 ++++++++++++++-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
index d06e7f5..c8012b0 100644
--- a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
+++ b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform.xsl
@@ -58,6 +58,8 @@
<!ELEMENT property-editor (#PCDATA)>
<!ELEMENT short-description (#PCDATA)>
<!ELEMENT translatable (#PCDATA)>
+ <!ELEMENT scoped-id-holder (#PCDATA)>
+ <!ELEMENT multi-scoped-id-holder (#PCDATA)>
<!ELEMENT unsupported-agents (#PCDATA)>
<!ATTLIST component-metadata component-type CDATA #IMPLIED>
]>
@@ -395,7 +397,7 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:property-extension[mfp:property-values|mfp:group|mfp:translatable|mfp:property-editor|mfp:expert|mfp:unsupported-agents|*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']]" >
+ <xsl:template match="//javaee:property-extension[mfp:property-values|mfp:group|mfp:translatable|mfp:scoped-id-holder|mfp:multi-scoped-id-holder|mfp:property-editor|mfp:expert|mfp:unsupported-agents|*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']]" >
<xsl:element name="property-extension" >
<xsl:element name="property-metadata" >
<xsl:apply-templates/>
@@ -872,6 +874,18 @@
<xsl:value-of select="text()" />
</xsl:element>
</xsl:template>
+
+ <xsl:template match="//mfp:property-metadata/mfp:scoped-id-holder" >
+ <xsl:element name="scoped-id-holder" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="//mfp:property-metadata/mfp:multi-scoped-id-holder" >
+ <xsl:element name="multi-scoped-id-holder" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
<xsl:template match="//mfp:accepts-child-components" >
<xsl:element name="accepts-child-components" >
diff --git a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
index 70916ef..eb3e652 100644
--- a/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
+++ b/maven-faces-plugin/src/main/resources/org/apache/myfaces/trinidadbuild/plugin/faces/resources/transform12.xsl
@@ -377,7 +377,7 @@
</xsl:element>
</xsl:template>
- <xsl:template match="//javaee:property-extension[mfp:property-values|mfp:group|mfp:translatable|mfp:property-editor|mfp:expert|mfp:unsupported-agents|*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']]" >
+ <xsl:template match="//javaee:property-extension[mfp:property-values|mfp:group|mfp:translatable|mfp:scoped-id-holder|mfp:multi-scoped-id-holder|mfp:property-editor|mfp:expert|mfp:unsupported-agents|*[namespace-uri() != 'http://java.sun.com/xml/ns/javaee' and namespace-uri() !='http://myfaces.apache.org/maven-faces-plugin']]" >
<xsl:element name="property-extension" >
<xsl:element name="property-metadata" >
<xsl:apply-templates/>
@@ -853,6 +853,19 @@
<xsl:value-of select="text()" />
</xsl:element>
</xsl:template>
+
+ <xsl:template match="//mfp:property-metadata/mfp:scoped-id-holder" >
+ <xsl:element name="scoped-id-holder" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="//mfp:property-metadata/mfp:multi-scoped-id-holder" >
+ <xsl:element name="multi-scoped-id-holder" >
+ <xsl:value-of select="text()" />
+ </xsl:element>
+ </xsl:template>
+
<xsl:template match="//mfp:accepts-child-components" >
<xsl:element name="accepts-child-components" >
<xsl:value-of select="text()" />
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.