You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2010/10/01 02:17:52 UTC

svn commit: r1003336 - in /myfaces/trinidad/trunk: trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ trinidad-examples/trinidad-demo...

Author: mcooper
Date: Fri Oct  1 00:17:51 2010
New Revision: 1003336

URL: http://svn.apache.org/viewvc?rev=1003336&view=rev
Log:
TRINIDAD-1930 Ability to easily create a meta tag

Added a new trh:meta tag so that you can generate an html meta tag for things like reloading the page or configuring viewport characteristics like these:

<meta name="viewport" content="width=device-width, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta http-equiv="refresh" content="2;url=./test/index.jspx">

from component tags like these:

<tr:document ...>
  <f:facet name="metaContainer">
    <tr:group id="metaContainer">
      <trh:meta name="viewport" content="width=device-width, user-scalable=no"/>
      <trh:meta name="apple-mobile-web-app-capable" content="yes"/>
      <trh:meta type="httpEquiv" name="refresh" content="2;url=./test/index.jspx"/>
    </tr:group>
  </f:facet>
</tr:document>

It is also important to note that a meta HTML tag cannot have an ID so the component ID will not be rendered into the browser source.

Added:
    myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlMeta.xml
    myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Meta.xml
    myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/components/html/meta.jspx
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/MetaRenderer.java   (with props)
    myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/metadata/icons/meta.gif   (with props)
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimal-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIE-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIERtl-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalInacc-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalPPC-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalSaf-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalScrRdr-golden.xml
    myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/meta.xml
Modified:
    myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/componentDemos.jspx

Added: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlMeta.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlMeta.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlMeta.xml (added)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/html/HtmlMeta.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    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.
+
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+	      xmlns:trh="http://myfaces.apache.org/trinidad/html"
+	      xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:fmd="http://java.sun.com/xml/ns/javaee/faces/design-time-metadata">
+  <component>
+    <description><![CDATA[The meta component supports generating an html meta tag for things like reloading the page or configuring viewport characteristics.  It is also important to note that a meta HTML tag cannot have an ID so the component ID will not be seen in the browser source.]]></description>
+    <icon>
+      <small-icon>/org/apache/myfaces/trinidadinternal/metadata/icons/meta.gif</small-icon>
+    </icon>
+    <component-type>org.apache.myfaces.trinidad.HtmlMeta</component-type>
+    <component-class>org.apache.myfaces.trinidad.component.html.HtmlMeta</component-class>
+    <property>
+      <description><![CDATA[the	name or the http-equiv attribute for the meta tag (see the type attribute for further configuration)]]></description>
+      <property-name>name</property-name>
+      <property-class>java.lang.String</property-class>
+      <property-extension>
+	<mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
+      </property-extension>
+    </property>
+    <property>
+      <description><![CDATA[<html>how the name attribute is used.  Options are:
+              <ul><li>name - for "name" which is the most common use for meta tags
+                </li><li>httpEquiv - for "http-equiv" which is the used in some legacy meta tags
+                </li></ul>
+              </html>]]></description>
+      <property-name>type</property-name>
+      <property-class>java.lang.String</property-class>
+      <default-value>name</default-value>
+      <property-extension>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+          <fmd:required>false</fmd:required>
+          <fmd:property-values>name httpEquiv</fmd:property-values>
+        </fmd:property-metadata>
+      </property-extension>
+    </property>
+    <property>
+      <description><![CDATA[the	content for the meta tag]]></description>
+      <property-name>content</property-name>
+      <property-class>java.lang.String</property-class>
+      <property-extension>
+	<mfp:property-metadata/>
+        <fmd:property-metadata>
+          <fmd:preferred>true</fmd:preferred>
+        </fmd:property-metadata>
+      </property-extension>
+    </property>
+    <component-extension>
+      <mfp:component-family>org.apache.myfaces.trinidad.Meta</mfp:component-family>
+      <mfp:component-supertype>org.apache.myfaces.trinidad.ComponentBase</mfp:component-supertype>
+      <mfp:renderer-type>org.apache.myfaces.trinidad.Meta</mfp:renderer-type>
+      <mfp:tag-name>trh:meta</mfp:tag-name>
+      <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.html.HtmlMetaTag</mfp:tag-class>
+      <mfp:long-description><![CDATA[<html:p>
+            The meta component supports generating an html meta tag for things like reloading the page or configuring viewport characteristics like these:
+            <html:ul>
+              <html:li><html:pre>&lt;meta name="viewport" content="width=device-width, user-scalable=no"&gt;</html:pre></html:li>
+              <html:li><html:pre>&lt;meta name="apple-mobile-web-app-capable" content="yes"&gt;</html:pre></html:li>
+              <html:li><html:pre>&lt;meta http-equiv="refresh" content="2;url=./test/index.jspx"&gt;</html:pre></html:li>
+            </html:ul>
+            It is also important to note that a meta HTML tag cannot have an ID so the component ID will not be seen in the browser source.
+	  </html:p>]]>
+      </mfp:long-description>
+      <mfp:example>
+	<mfp:source-description>Example	of three meta tags in a tr:document.</mfp:source-description>
+	<mfp:source-code>
+	  <![CDATA[
+<tr:document ...>
+  <f:facet name="metaContainer">
+    <tr:group id="metaContainer">
+      <trh:meta name="viewport" content="width=device-width, user-scalable=no"/>
+      <trh:meta name="apple-mobile-web-app-capable" content="yes"/>
+      <trh:meta type="httpEquiv" name="refresh" content="2;url=./test/index.jspx"/>
+    </tr:group>
+  </f:facet>
+</tr:document>
+	  ]]>
+	</mfp:source-code>
+      </mfp:example>
+      <mfp:author>Apache MyFaces Trinidad</mfp:author>
+      <mfp:component-metadata/>
+      <fmd:component-metadata>
+        <fmd:default-property>name</fmd:default-property>
+        <fmd:hidden>false</fmd:hidden>
+      </fmd:component-metadata>
+    </component-extension>
+  </component>
+</faces-config>

Added: myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Meta.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Meta.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Meta.xml (added)
+++ myfaces/trinidad/trunk/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/Meta.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    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.
+	   
+-->
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
+  <render-kit>
+    <render-kit-id>org.apache.myfaces.trinidadinternal.core</render-kit-id>
+    <renderer>
+      <component-family>org.apache.myfaces.trinidad.Meta</component-family>
+      <renderer-type>org.apache.myfaces.trinidad.Meta</renderer-type>
+      <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.html.MetaRenderer</renderer-class>
+      <renderer-extension>
+        <mfp:component-type>org.apache.myfaces.trinidad.HtmlMeta</mfp:component-type>
+      </renderer-extension>
+    </renderer>
+  </render-kit>
+</faces-config>

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1003336&r1=1003335&r2=1003336&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml Fri Oct  1 00:17:51 2010
@@ -2224,6 +2224,12 @@
     </navigation-case>
 
     <navigation-case>
+      <from-outcome>guide.meta</from-outcome>
+      <to-view-id>/components/html/meta.jspx</to-view-id>
+      <redirect/>
+    </navigation-case>
+
+    <navigation-case>
       <from-outcome>guide.navigationTree</from-outcome>
       <to-view-id>/components/navigationTree.jspx</to-view-id>
       <redirect/>

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/componentDemos.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/componentDemos.jspx?rev=1003336&r1=1003335&r2=1003336&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/componentDemos.jspx (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/componentDemos.jspx Fri Oct  1 00:17:51 2010
@@ -56,6 +56,7 @@
                 <tr:commandLink text="cellFormat" action="guide.cellFormat"/>
                 <tr:outputFormatted value="frame - see FrameBorderLayout" styleUsage="instruction"/>
                 <tr:commandLink text="frameBorderLayout" action="guide.frameBorderLayout"/>
+                <tr:commandLink text="meta" action="guide.meta"/>
                 <tr:commandLink text="html" action="guide.html"/>
                 <tr:commandLink text="rowLayout" action="guide.rowLayout"/>
                 <tr:commandLink text="tableLayout" action="guide.tableLayout"/>

Added: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/components/html/meta.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/components/html/meta.jspx?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/components/html/meta.jspx (added)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/webapp/components/html/meta.jspx Fri Oct  1 00:17:51 2010
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+    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.
+	   
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+          xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+          xmlns:trh="http://myfaces.apache.org/trinidad/html"
+          xmlns:tr="http://myfaces.apache.org/trinidad">
+  <jsp:directive.page contentType="text/html;charset=utf-8"/>
+  <f:view>
+    <tr:document title="Meta Demo">
+      <f:facet name="metaContainer">
+        <trh:meta binding="#{editor.component}" name="refresh" type="httpEquiv" content="20;url=./../../componentDemos.jspx"/>
+      </f:facet>
+      <tr:form>
+        <tr:panelGroupLayout layout="vertical">
+          <f:facet name="separator">
+            <tr:separator/>
+          </f:facet>
+          <tr:panelGroupLayout layout="horizontal">
+            <tr:commandLink immediate="true" text="Component Guide" action="guide"/>
+            <tr:spacer width="10"/>
+            <tr:goLink destination="http://myfaces.apache.org/trinidad/trinidad-api/tagdoc/trh_meta.html"
+                       text="Tag Documentation"/>
+          </tr:panelGroupLayout>
+          <tr:outputFormatted styleUsage="instruction" value="&lt;b>meta&lt;/b>"/>
+          <tr:outputText id="ot1" value="This page has a meta tag on it."/>
+          <tr:inputDate id="id1" readOnly="true" simple="true" label="Date" value="#{date.currentDate}">
+             <tr:convertDateTime type="both" dateStyle="full" timeStyle="full"/>
+          </tr:inputDate>
+          <jsp:directive.include file="../editor.jspf"/>
+        </tr:panelGroupLayout>
+      </tr:form>
+    </tr:document>
+  </f:view>
+</jsp:root>

Added: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/MetaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/MetaRenderer.java?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/MetaRenderer.java (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/MetaRenderer.java Fri Oct  1 00:17:51 2010
@@ -0,0 +1,113 @@
+/*
+ *  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.trinidadinternal.renderkit.html;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.apache.myfaces.trinidad.bean.FacesBean;
+import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.html.HtmlMeta;
+
+import org.apache.myfaces.trinidad.context.RenderingContext;
+
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
+
+public class MetaRenderer extends XhtmlRenderer
+{
+  public MetaRenderer()
+  {
+    super(HtmlMeta.TYPE);
+  }
+
+  @Override
+  protected void findTypeConstants(FacesBean.Type type)
+  {
+    super.findTypeConstants(type);
+    _nameKey = type.findKey("name");
+    _typeKey = type.findKey("type");
+    _contentKey = type.findKey("content");
+  }
+
+  @Override
+  public boolean getRendersChildren()
+  {
+    return true;
+  }
+
+  @Override
+  protected void encodeAll(
+    FacesContext     context,
+    RenderingContext rc,
+    UIComponent      component,
+    FacesBean        bean)
+    throws IOException
+  {
+    ResponseWriter rw = context.getResponseWriter();
+
+    rw.startElement("meta", component);
+    // Important, it is invalid HTML to render an ID so we will omit it: renderId(context, component);
+
+    String name = getName(bean);
+    if (name != null)
+    {
+      String type = getType(bean);
+      if (type != null && HtmlMeta.TYPE_HTTP_EQUIV.equals(type))
+      {
+        rw.writeAttribute("http-equiv", name, null);
+      }
+      else // by default use "name"
+      {
+        rw.writeAttribute("name", name, null);
+      }
+    }
+
+    String content = getContent(bean);
+    if (content != null)
+    {
+      rw.writeAttribute("content", content, null);
+    }
+
+    encodeAllChildren(context, component);
+
+    rw.endElement("meta");
+  }
+
+  protected String getName(FacesBean bean)
+  {
+    return toString(bean.getProperty(_nameKey));
+  }
+
+  protected String getType(FacesBean bean)
+  {
+    return toString(bean.getProperty(_typeKey));
+  }
+
+  protected String getContent(FacesBean bean)
+  {
+    return toString(bean.getProperty(_contentKey));
+  }
+
+  private PropertyKey _nameKey;
+  private PropertyKey _typeKey;
+  private PropertyKey _contentKey;
+}

Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/MetaRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/metadata/icons/meta.gif
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/metadata/icons/meta.gif?rev=1003336&view=auto
==============================================================================
Binary file - no diff available.

Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/resources/org/apache/myfaces/trinidadinternal/metadata/icons/meta.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimal-golden.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimal-golden.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimal-golden.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,63 @@
+<results>
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[name,sampleName]-->
+
+      <meta
+           name="sampleName"
+          >
+        
+      </meta>
+<!--AttributeTest[content,sampleContent]-->
+
+      <meta
+           content="sampleContent"
+          >
+        
+      </meta>
+<!--AttributeTest[type,sampleType]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[type,httpEquiv,AttributeTest[name,refresh]]-->
+
+      <meta
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[name,viewport,AttributeTest[content,width=device-width, user-scalable=no]]-->
+
+      <meta
+           content="width=device-width, user-scalable=no"
+           name="viewport"
+          >
+        
+      </meta>
+<!--AttributeTest[name,refresh,AttributeTest[type,httpEquiv,AttributeTest[content,2;url=./test/index.jspx]]]-->
+
+      <meta
+           content="2;url=./test/index.jspx"
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[id,myid]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+      <meta
+          >
+        
+      </meta>
+</results>

Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIE-golden.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIE-golden.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIE-golden.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,63 @@
+<results>
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[name,sampleName]-->
+
+      <meta
+           name="sampleName"
+          >
+        
+      </meta>
+<!--AttributeTest[content,sampleContent]-->
+
+      <meta
+           content="sampleContent"
+          >
+        
+      </meta>
+<!--AttributeTest[type,sampleType]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[type,httpEquiv,AttributeTest[name,refresh]]-->
+
+      <meta
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[name,viewport,AttributeTest[content,width=device-width, user-scalable=no]]-->
+
+      <meta
+           content="width=device-width, user-scalable=no"
+           name="viewport"
+          >
+        
+      </meta>
+<!--AttributeTest[name,refresh,AttributeTest[type,httpEquiv,AttributeTest[content,2;url=./test/index.jspx]]]-->
+
+      <meta
+           content="2;url=./test/index.jspx"
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[id,myid]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+      <meta
+          >
+        
+      </meta>
+</results>

Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIERtl-golden.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIERtl-golden.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalIERtl-golden.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,63 @@
+<results>
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[name,sampleName]-->
+
+      <meta
+           name="sampleName"
+          >
+        
+      </meta>
+<!--AttributeTest[content,sampleContent]-->
+
+      <meta
+           content="sampleContent"
+          >
+        
+      </meta>
+<!--AttributeTest[type,sampleType]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[type,httpEquiv,AttributeTest[name,refresh]]-->
+
+      <meta
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[name,viewport,AttributeTest[content,width=device-width, user-scalable=no]]-->
+
+      <meta
+           content="width=device-width, user-scalable=no"
+           name="viewport"
+          >
+        
+      </meta>
+<!--AttributeTest[name,refresh,AttributeTest[type,httpEquiv,AttributeTest[content,2;url=./test/index.jspx]]]-->
+
+      <meta
+           content="2;url=./test/index.jspx"
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[id,myid]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+      <meta
+          >
+        
+      </meta>
+</results>

Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalInacc-golden.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalInacc-golden.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalInacc-golden.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,63 @@
+<results>
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[name,sampleName]-->
+
+      <meta
+           name="sampleName"
+          >
+        
+      </meta>
+<!--AttributeTest[content,sampleContent]-->
+
+      <meta
+           content="sampleContent"
+          >
+        
+      </meta>
+<!--AttributeTest[type,sampleType]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[type,httpEquiv,AttributeTest[name,refresh]]-->
+
+      <meta
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[name,viewport,AttributeTest[content,width=device-width, user-scalable=no]]-->
+
+      <meta
+           content="width=device-width, user-scalable=no"
+           name="viewport"
+          >
+        
+      </meta>
+<!--AttributeTest[name,refresh,AttributeTest[type,httpEquiv,AttributeTest[content,2;url=./test/index.jspx]]]-->
+
+      <meta
+           content="2;url=./test/index.jspx"
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[id,myid]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+      <meta
+          >
+        
+      </meta>
+</results>

Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalPPC-golden.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalPPC-golden.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalPPC-golden.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,63 @@
+<results>
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[name,sampleName]-->
+
+      <meta
+           name="sampleName"
+          >
+        
+      </meta>
+<!--AttributeTest[content,sampleContent]-->
+
+      <meta
+           content="sampleContent"
+          >
+        
+      </meta>
+<!--AttributeTest[type,sampleType]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[type,httpEquiv,AttributeTest[name,refresh]]-->
+
+      <meta
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[name,viewport,AttributeTest[content,width=device-width, user-scalable=no]]-->
+
+      <meta
+           content="width=device-width, user-scalable=no"
+           name="viewport"
+          >
+        
+      </meta>
+<!--AttributeTest[name,refresh,AttributeTest[type,httpEquiv,AttributeTest[content,2;url=./test/index.jspx]]]-->
+
+      <meta
+           content="2;url=./test/index.jspx"
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[id,myid]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+      <meta
+          >
+        
+      </meta>
+</results>

Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalSaf-golden.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalSaf-golden.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalSaf-golden.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,63 @@
+<results>
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[name,sampleName]-->
+
+      <meta
+           name="sampleName"
+          >
+        
+      </meta>
+<!--AttributeTest[content,sampleContent]-->
+
+      <meta
+           content="sampleContent"
+          >
+        
+      </meta>
+<!--AttributeTest[type,sampleType]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[type,httpEquiv,AttributeTest[name,refresh]]-->
+
+      <meta
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[name,viewport,AttributeTest[content,width=device-width, user-scalable=no]]-->
+
+      <meta
+           content="width=device-width, user-scalable=no"
+           name="viewport"
+          >
+        
+      </meta>
+<!--AttributeTest[name,refresh,AttributeTest[type,httpEquiv,AttributeTest[content,2;url=./test/index.jspx]]]-->
+
+      <meta
+           content="2;url=./test/index.jspx"
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[id,myid]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+      <meta
+          >
+        
+      </meta>
+</results>

Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalScrRdr-golden.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalScrRdr-golden.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/meta-minimalScrRdr-golden.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,63 @@
+<results>
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[name,sampleName]-->
+
+      <meta
+           name="sampleName"
+          >
+        
+      </meta>
+<!--AttributeTest[content,sampleContent]-->
+
+      <meta
+           content="sampleContent"
+          >
+        
+      </meta>
+<!--AttributeTest[type,sampleType]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[type,httpEquiv,AttributeTest[name,refresh]]-->
+
+      <meta
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[name,viewport,AttributeTest[content,width=device-width, user-scalable=no]]-->
+
+      <meta
+           content="width=device-width, user-scalable=no"
+           name="viewport"
+          >
+        
+      </meta>
+<!--AttributeTest[name,refresh,AttributeTest[type,httpEquiv,AttributeTest[content,2;url=./test/index.jspx]]]-->
+
+      <meta
+           content="2;url=./test/index.jspx"
+           http-equiv="refresh"
+          >
+        
+      </meta>
+<!--AttributeTest[id,myid]-->
+
+      <meta
+          >
+        
+      </meta>
+<!--AttributeTest[rendered,false]-->
+
+<!--AttributeTest[rendered,true]-->
+
+      <meta
+          >
+        
+      </meta>
+</results>

Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/meta.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/meta.xml?rev=1003336&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/meta.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/meta.xml Fri Oct  1 00:17:51 2010
@@ -0,0 +1,25 @@
+<test xmlns="http://myfaces.apache.org/trinidad/test"
+      xmlns:tr="http://myfaces.apache.org/trinidad">
+      
+  <base-component tr:type="org.apache.myfaces.trinidad.HtmlMeta"/>
+  
+  <!-- ungrouped attributes -->
+  <attribute-test name="name" value="sampleName"/>
+  <attribute-test name="content" value="sampleContent"/>
+  <attribute-test name="type" value="sampleType" matchesBase="true"/>
+  <attribute-test name="type" value="httpEquiv">
+    <attribute-test name="name" value="refresh"/>
+  </attribute-test>
+  <attribute-test name="name" value="viewport">
+    <attribute-test name="content" value="width=device-width, user-scalable=no"/>
+  </attribute-test>
+  <attribute-test name="name" value="refresh">
+    <attribute-test name="type" value="httpEquiv">
+      <attribute-test name="content" value="2;url=./test/index.jspx"/>
+    </attribute-test>
+  </attribute-test>
+  
+  <!-- core attributes -->
+  <attribute-test name="id" value="myid" matchesBase="true"/>
+  <boolean-test name="rendered"/>
+</test>