[richfaces-svn-commits] JBoss Rich Faces SVN: r22720 - in modules/tests/metamer/trunk/application/src/main: resources and 2 other directories.

Author: jpapouse Date: 2011-09-15 07:54:05 -0400 (Thu, 15 Sep 2011) New Revision: 22720 Added: modules/tests/metamer/trunk/application/src/main/resources/audio/ modules/tests/metamer/trunk/application/src/main/resources/audio/alarm.mp3 modules/tests/metamer/trunk/application/src/main/resources/flash/ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementA.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementLink.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementScript.xhtml Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JMediaOutputBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml Log: RFPL-1444 (media output): added pages with other elements and updated flash and audio pages (still not working) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JMediaOutputBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JMediaOutputBean.java 2011-09-14 13:54:42 UTC (rev 22719) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JMediaOutputBean.java 2011-09-15 11:54:05 UTC (rev 22720) @@ -50,7 +50,9 @@ @RequestScoped public class A4JMediaOutputBean implements Serializable { + public static final String CSS_TEXT = "#mediaOutputMarked { color: red }"; public static final String HTML_TEXT = "<span id='htmlText' style='color: red'>SOME RED HTML TEXT</span>"; + public static final String JAVASCRIPT_TEXT = "document.write('<span id=mediaOutputJavascriptText>JAVASCRIPT TEXT</span>')"; public static final String PLAIN_TEXT = "SOME PLAIN TEXT"; private static final long serialVersionUID = -1L; private static Logger logger; @@ -95,22 +97,13 @@ } public void createContentAudioMpeg(OutputStream out, Object data) throws IOException { - InputStream in = null; - try { - in = A4JMediaOutputBean.class.getClassLoader().getResourceAsStream("audio/alarm.mp3"); - byte[] dataBytes = new byte[1000]; - int length; - while((length = in.read(dataBytes)) != 0) { - out.write(dataBytes, 0, length); - } - out.flush(); - } finally { - if (in != null) { - in.close(); - } - } + createContentFromResource(out, data, "audio/alarm.mp3"); } + public void createContentFlash(OutputStream out, Object data) throws IOException { + createContentFromResource(out, data, "flash/text.swf"); + } + public void createContentImagePng(OutputStream out, Object data) throws IOException { if (data instanceof MediaData) { MediaData paintData = (MediaData) data; @@ -134,10 +127,21 @@ } } + public void createContentTextCss(OutputStream out, Object data) throws IOException { + out.write(CSS_TEXT.getBytes()); + out.flush(); + } + public void createContentTextHtml(OutputStream out, Object data) throws IOException { out.write(HTML_TEXT.getBytes()); + out.flush(); } + public void createContentTextJavascript(OutputStream out, Object data) throws IOException { + out.write(JAVASCRIPT_TEXT.getBytes()); + out.flush(); + } + public void createContentTextPlain(OutputStream out, Object data) throws IOException { out.write(PLAIN_TEXT.getBytes()); out.flush(); @@ -152,21 +156,15 @@ } } - public void paintFlash(OutputStream out, Object data) throws IOException { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - - if (loader == null) { - loader = getClass().getClassLoader(); - } - - InputStream stream = loader.getResourceAsStream("resources/flash/text.swf"); - - if (stream != null) { - try { - copy(stream, out); - } finally { - stream.close(); + private void createContentFromResource(OutputStream out, Object data, String resourceName) throws IOException { + InputStream in = null; + try { + in = A4JMediaOutputBean.class.getClassLoader().getResourceAsStream(resourceName); + copy(in, out); + } finally { + if (in != null) { + in.close(); } - } + } } } Added: modules/tests/metamer/trunk/application/src/main/resources/audio/alarm.mp3 =================================================================== (Binary files differ) Property changes on: modules/tests/metamer/trunk/application/src/main/resources/audio/alarm.mp3 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementA.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementA.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementA.xhtml 2011-09-15 11:54:05 UTC (rev 22720) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> + + <!-- +JBoss, Home of Professional Open Source +Copyright 2010-2011, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="head"/> + + <ui:define name="component"> + <a4j:mediaOutput id="mediaOutput" + accesskey="#{a4jMediaOutputBean.attributes['accesskey'].value}" + align="#{a4jMediaOutputBean.attributes['align'].value}" + archive="#{a4jMediaOutputBean.attributes['archive'].value}" + border="#{a4jMediaOutputBean.attributes['border'].value}" + cacheable="#{a4jMediaOutputBean.attributes['cacheable'].value}" + charset="#{a4jMediaOutputBean.attributes['charset'].value}" + classid="#{a4jMediaOutputBean.attributes['classid'].value}" + codebase="#{a4jMediaOutputBean.attributes['codebase'].value}" + codetype="#{a4jMediaOutputBean.attributes['codetype'].value}" + converter="#{a4jMediaOutputBean.attributes['converter'].value}" + coords="#{a4jMediaOutputBean.attributes['coords'].value}" + createContent="#{a4jMediaOutputBean.createContentTextHtml}" + declare="#{a4jMediaOutputBean.attributes['declare'].value}" + dir="#{a4jMediaOutputBean.attributes['dir'].value}" + element="a" + expires="#{a4jMediaOutputBean.attributes['expires'].value}" + hreflang="#{a4jMediaOutputBean.attributes['hreflang'].value}" + hspace="#{a4jMediaOutputBean.attributes['hspace'].value}" + ismap="#{a4jMediaOutputBean.attributes['ismap'].value}" + lang="#{a4jMediaOutputBean.attributes['lang'].value}" + lastModified="#{a4jMediaOutputBean.attributes['lastModified'].value}" + mimeType="text/html" + onblur="#{a4jMediaOutputBean.attributes['onblur'].value}" + onclick="#{a4jMediaOutputBean.attributes['onclick'].value}" + ondblclick="#{a4jMediaOutputBean.attributes['ondblclick'].value}" + onfocus="#{a4jMediaOutputBean.attributes['onfocus'].value}" + onkeydown="#{a4jMediaOutputBean.attributes['onkeydown'].value}" + onkeypress="#{a4jMediaOutputBean.attributes['onkeypress'].value}" + onkeyup="#{a4jMediaOutputBean.attributes['onkeyup'].value}" + onmousedown="#{a4jMediaOutputBean.attributes['onmousedown'].value}" + onmousemove="#{a4jMediaOutputBean.attributes['onmousemove'].value}" + onmouseout="#{a4jMediaOutputBean.attributes['onmouseout'].value}" + onmouseover="#{a4jMediaOutputBean.attributes['onmouseover'].value}" + onmouseup="#{a4jMediaOutputBean.attributes['onmouseup'].value}" + rel="#{a4jMediaOutputBean.attributes['rel'].value}" + rendered="#{a4jMediaOutputBean.attributes['rendered'].value}" + rev="#{a4jMediaOutputBean.attributes['rev'].value}" + shape="#{a4jMediaOutputBean.attributes['shape'].value}" + standby="#{a4jMediaOutputBean.attributes['standby'].value}" + style="#{a4jMediaOutputBean.attributes['style'].value}" + styleClass="#{a4jMediaOutputBean.attributes['styleClass'].value}" + tabindex="#{a4jMediaOutputBean.attributes['tabindex'].value}" + target="#{a4jMediaOutputBean.attributes['target'].value}" + title="#{a4jMediaOutputBean.attributes['title'].value}" + type="#{a4jMediaOutputBean.attributes['type'].value}" + uriAttribute="href" + usemap="#{a4jMediaOutputBean.attributes['usemap'].value}" + value="#{mediaData}" + vspace="#{a4jMediaOutputBean.attributes['vspace'].value}" + > + This is a link + </a4j:mediaOutput> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{a4jMediaOutputBean.attributes}" id="attributes" render="panel"/> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementA.xhtml ___________________________________________________________________ Added: svn:executable + * Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementLink.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementLink.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementLink.xhtml 2011-09-15 11:54:05 UTC (rev 22720) @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> + + <!-- +JBoss, Home of Professional Open Source +Copyright 2010-2011, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="head"/> + + <ui:define name="component"> + <a4j:mediaOutput id="mediaOutput" + accesskey="#{a4jMediaOutputBean.attributes['accesskey'].value}" + align="#{a4jMediaOutputBean.attributes['align'].value}" + archive="#{a4jMediaOutputBean.attributes['archive'].value}" + border="#{a4jMediaOutputBean.attributes['border'].value}" + cacheable="#{a4jMediaOutputBean.attributes['cacheable'].value}" + charset="#{a4jMediaOutputBean.attributes['charset'].value}" + classid="#{a4jMediaOutputBean.attributes['classid'].value}" + codebase="#{a4jMediaOutputBean.attributes['codebase'].value}" + codetype="#{a4jMediaOutputBean.attributes['codetype'].value}" + converter="#{a4jMediaOutputBean.attributes['converter'].value}" + coords="#{a4jMediaOutputBean.attributes['coords'].value}" + createContent="#{a4jMediaOutputBean.createContentTextCss}" + declare="#{a4jMediaOutputBean.attributes['declare'].value}" + dir="#{a4jMediaOutputBean.attributes['dir'].value}" + element="link" + expires="#{a4jMediaOutputBean.attributes['expires'].value}" + hreflang="#{a4jMediaOutputBean.attributes['hreflang'].value}" + hspace="#{a4jMediaOutputBean.attributes['hspace'].value}" + ismap="#{a4jMediaOutputBean.attributes['ismap'].value}" + lang="#{a4jMediaOutputBean.attributes['lang'].value}" + lastModified="#{a4jMediaOutputBean.attributes['lastModified'].value}" + mimeType="text/css" + onblur="#{a4jMediaOutputBean.attributes['onblur'].value}" + onclick="#{a4jMediaOutputBean.attributes['onclick'].value}" + ondblclick="#{a4jMediaOutputBean.attributes['ondblclick'].value}" + onfocus="#{a4jMediaOutputBean.attributes['onfocus'].value}" + onkeydown="#{a4jMediaOutputBean.attributes['onkeydown'].value}" + onkeypress="#{a4jMediaOutputBean.attributes['onkeypress'].value}" + onkeyup="#{a4jMediaOutputBean.attributes['onkeyup'].value}" + onmousedown="#{a4jMediaOutputBean.attributes['onmousedown'].value}" + onmousemove="#{a4jMediaOutputBean.attributes['onmousemove'].value}" + onmouseout="#{a4jMediaOutputBean.attributes['onmouseout'].value}" + onmouseover="#{a4jMediaOutputBean.attributes['onmouseover'].value}" + onmouseup="#{a4jMediaOutputBean.attributes['onmouseup'].value}" + rel="stylesheet" + rendered="#{a4jMediaOutputBean.attributes['rendered'].value}" + rev="#{a4jMediaOutputBean.attributes['rev'].value}" + shape="#{a4jMediaOutputBean.attributes['shape'].value}" + standby="#{a4jMediaOutputBean.attributes['standby'].value}" + style="#{a4jMediaOutputBean.attributes['style'].value}" + styleClass="#{a4jMediaOutputBean.attributes['styleClass'].value}" + tabindex="#{a4jMediaOutputBean.attributes['tabindex'].value}" + target="#{a4jMediaOutputBean.attributes['target'].value}" + title="#{a4jMediaOutputBean.attributes['title'].value}" + type="text/css" + uriAttribute="href" + usemap="#{a4jMediaOutputBean.attributes['usemap'].value}" + value="#{mediaData}" + vspace="#{a4jMediaOutputBean.attributes['vspace'].value}" + /> + <span id="mediaOutputMarked">This text should be red.</span> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{a4jMediaOutputBean.attributes}" id="attributes" render="panel"/> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementLink.xhtml ___________________________________________________________________ Added: svn:executable + * Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementScript.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementScript.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementScript.xhtml 2011-09-15 11:54:05 UTC (rev 22720) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> + + <!-- +JBoss, Home of Professional Open Source +Copyright 2010-2011, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="head"/> + + <ui:define name="component"> + <a4j:mediaOutput id="mediaOutput" + accesskey="#{a4jMediaOutputBean.attributes['accesskey'].value}" + align="#{a4jMediaOutputBean.attributes['align'].value}" + archive="#{a4jMediaOutputBean.attributes['archive'].value}" + border="#{a4jMediaOutputBean.attributes['border'].value}" + cacheable="#{a4jMediaOutputBean.attributes['cacheable'].value}" + charset="#{a4jMediaOutputBean.attributes['charset'].value}" + classid="#{a4jMediaOutputBean.attributes['classid'].value}" + codebase="#{a4jMediaOutputBean.attributes['codebase'].value}" + codetype="#{a4jMediaOutputBean.attributes['codetype'].value}" + converter="#{a4jMediaOutputBean.attributes['converter'].value}" + coords="#{a4jMediaOutputBean.attributes['coords'].value}" + createContent="#{a4jMediaOutputBean.createContentTextJavascript}" + declare="#{a4jMediaOutputBean.attributes['declare'].value}" + dir="#{a4jMediaOutputBean.attributes['dir'].value}" + element="script" + expires="#{a4jMediaOutputBean.attributes['expires'].value}" + hreflang="#{a4jMediaOutputBean.attributes['hreflang'].value}" + hspace="#{a4jMediaOutputBean.attributes['hspace'].value}" + ismap="#{a4jMediaOutputBean.attributes['ismap'].value}" + lang="#{a4jMediaOutputBean.attributes['lang'].value}" + lastModified="#{a4jMediaOutputBean.attributes['lastModified'].value}" + mimeType="text/javascript" + onblur="#{a4jMediaOutputBean.attributes['onblur'].value}" + onclick="#{a4jMediaOutputBean.attributes['onclick'].value}" + ondblclick="#{a4jMediaOutputBean.attributes['ondblclick'].value}" + onfocus="#{a4jMediaOutputBean.attributes['onfocus'].value}" + onkeydown="#{a4jMediaOutputBean.attributes['onkeydown'].value}" + onkeypress="#{a4jMediaOutputBean.attributes['onkeypress'].value}" + onkeyup="#{a4jMediaOutputBean.attributes['onkeyup'].value}" + onmousedown="#{a4jMediaOutputBean.attributes['onmousedown'].value}" + onmousemove="#{a4jMediaOutputBean.attributes['onmousemove'].value}" + onmouseout="#{a4jMediaOutputBean.attributes['onmouseout'].value}" + onmouseover="#{a4jMediaOutputBean.attributes['onmouseover'].value}" + onmouseup="#{a4jMediaOutputBean.attributes['onmouseup'].value}" + rel="#{a4jMediaOutputBean.attributes['rel'].value}" + rendered="#{a4jMediaOutputBean.attributes['rendered'].value}" + rev="#{a4jMediaOutputBean.attributes['rev'].value}" + shape="#{a4jMediaOutputBean.attributes['shape'].value}" + standby="#{a4jMediaOutputBean.attributes['standby'].value}" + style="#{a4jMediaOutputBean.attributes['style'].value}" + styleClass="#{a4jMediaOutputBean.attributes['styleClass'].value}" + tabindex="#{a4jMediaOutputBean.attributes['tabindex'].value}" + target="#{a4jMediaOutputBean.attributes['target'].value}" + title="#{a4jMediaOutputBean.attributes['title'].value}" + type="text/javascript" + uriAttribute="src" + usemap="#{a4jMediaOutputBean.attributes['usemap'].value}" + value="#{mediaData}" + vspace="#{a4jMediaOutputBean.attributes['vspace'].value}" + /> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{a4jMediaOutputBean.attributes}" id="attributes" render="panel"/> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Property changes on: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/elementScript.xhtml ___________________________________________________________________ Added: svn:executable + * Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-09-14 13:54:42 UTC (rev 22719) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/flash.xhtml 2011-09-15 11:54:05 UTC (rev 22720) @@ -42,8 +42,8 @@ <h:outputScript library="script" name="swfobject.js"/> <a4j:outputPanel id="flashPanelDynamic"> - <a4j:mediaOutput element="a" id="swfLink" style="display: none;" cacheable="false" - createContent="#{a4jMediaOutputBean.paintFlash}" value="#{mediaData}" /> + <a4j:mediaOutput element="a" id="swfLink" style="display: none;" mimeType="application/x-shockwave-flash" cacheable="false" + createContent="#{a4jMediaOutputBean.createContentFlash}" value="#{mediaData}" /> <a4j:outputPanel layout="block" id="myFlashContent" style="width: 200px; height: 200px"> <a href="http://www.adobe.com/go/getflashplayer"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml 2011-09-14 13:54:42 UTC (rev 22719) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jMediaOutput/list.xhtml 2011-09-15 11:54:05 UTC (rev 22720) @@ -31,25 +31,37 @@ <ui:define name="links"> + <metamer:testPageLink id="elementA" outcome="elementA" value="Element &lt;a&gt;&lt;/a&gt;"> + Simple page that contains <b>a4j:mediaOutput</b> (a, text/html) and input boxes for all its attributes. + </metamer:testPageLink> + + <metamer:testPageLink id="elementLink" outcome="elementLink" value="Element &lt;link/&gt;"> + Simple page that contains <b>a4j:mediaOutput</b> (link, text/css) and input boxes for all its attributes. + </metamer:testPageLink> + + <metamer:testPageLink id="elementScript" outcome="elementScript" value="Element &lt;script&gt;&lt;/script&gt;"> + Simple page that contains <b>a4j:mediaOutput</b> (script, text/javascript) and input boxes for all its attributes. + </metamer:testPageLink> + <metamer:testPageLink id="imagePng" outcome="imagePng" value="Image Png"> - Simple page that contains <b>a4j:mediaOutput</b> (image/png) and input boxes for all its attributes. + Simple page that contains <b>a4j:mediaOutput</b> (img, image/png) and input boxes for all its attributes. </metamer:testPageLink> <metamer:testPageLink id="textHtml" outcome="textHtml" value="Text HTML"> - Simple page that contains <b>a4j:mediaOutput</b> (text/html) and input boxes for all its attributes. + Simple page that contains <b>a4j:mediaOutput</b> (object, text/html) and input boxes for all its attributes. </metamer:testPageLink> <metamer:testPageLink id="textPlain" outcome="textPlain" value="Text Plain"> - Simple page that contains <b>a4j:mediaOutput</b> (text/plain) and input boxes for all its attributes. + Simple page that contains <b>a4j:mediaOutput</b> (object, text/plain) and input boxes for all its attributes. </metamer:testPageLink> <ui:remove> <metamer:testPageLink id="audioMpeg" outcome="audioMpeg" value="Audio Mpeg"> - Simple page that contains <b>a4j:mediaOutput</b> (audio/mpeg) and input boxes for all its attributes. - </metamer:testPageLink> + Simple page that contains <b>a4j:mediaOutput</b> (object, audio/mpeg) and input boxes for all its attributes. + </metamer:testPageLink> <metamer:testPageLink id="flash" outcome="flash" value="Flash"> Simple page that contains <b>a4j:mediaOutput</b> (flash) and input boxes for all its attributes. - </metamer:testPageLink> + </metamer:testPageLink> </ui:remove> </ui:define>