[jbosstools-commits] JBoss Tools SVN: r20450 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.facelets/templates and 13 other directories.

Author: mareshkau Date: 2010-02-23 13:53:29 -0500 (Tue, 23 Feb 2010) New Revision: 20450 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/jbide5906-on-server.png trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/footer_background.png trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/header_background.png trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/panel_header.png trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-5908 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeInsertTemplate.java 2010-02-23 18:53:29 UTC (rev 20450) @@ -31,9 +31,14 @@ public class VpeInsertTemplate extends VpeAbstractTemplate { + private static final String DEFINE_ELEMENT_NAME_PARAM="defineElementName"; //$NON-NLS-1$ + private String defineElementName=Facelets.TAG_DEFINE; + + @Override protected void init(Element templateElement) { children = true; modify = false; + this.defineElementName = templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM)!=null?templateElement.getAttribute(DEFINE_ELEMENT_NAME_PARAM):Facelets.TAG_DEFINE; initTemplateSections(templateElement, false, true, false, false, false); } @@ -89,7 +94,7 @@ Node child = children.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) { Element childElement = (Element) child; - if (Facelets.TAG_DEFINE.equals(childElement.getLocalName()) + if (this.defineElementName.equals(childElement.getLocalName()) && defineName.equals(childElement .getAttribute(Facelets.ATTR_NAME))) { defineElement = childElement; @@ -113,7 +118,9 @@ Node child = children.item(i); if ((child.getNodeType() == Node.ELEMENT_NODE||child.getNodeType() == Node.TEXT_NODE)) { - if(child.getNodeType() == Node.ELEMENT_NODE&&!Facelets.TAG_DEFINE.equals(child.getLocalName())&&((Element)child).getAttribute("name")==null) { //$NON-NLS-1$ + if(child.getNodeType() == Node.ELEMENT_NODE&&!this.defineElementName.equals(child.getLocalName()) + //&&((Element)child).getAttribute("name")==null + ) { result.add(child); } else if(child.getNodeType() == Node.TEXT_NODE&&((Text)child).getNodeValue()!=null&& Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml 2010-02-23 18:53:29 UTC (rev 20450) @@ -32,7 +32,7 @@ </vpe:tag> <vpe:tag name="ui:insert" case-sensitive="yes" > - <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate"/> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" defineElementName="define"/> </vpe:tag> <vpe:tag name="ui.component" case-sensitive="yes"> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2010-02-23 18:53:29 UTC (rev 20450) @@ -1116,6 +1116,23 @@ <!-- </vpe:if>--> </vpe:tag> + <vpe:tag name="composite:renderFacet"> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" + defineElementName="facet"> + </vpe:template> + </vpe:tag> + + <vpe:tag name="composite:renderFacet"> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" + defineElementName="facet"> + </vpe:template> + </vpe:tag> + <vpe:tag name="composite:insertChildren"> + <vpe:template class="org.jboss.tools.jsf.vpe.facelets.template.VpeInsertTemplate" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" + defineElementName="facet"> + </vpe:template> + </vpe:tag> + <vpe:tag name="composite:interface" case-sensitive="yes"> <!-- Checks for min tld version has been comented, becouse it's not specified correctly in jsf lib, mareshkau --> @@ -1124,6 +1141,7 @@ <!-- </vpe:if> --> </vpe:tag> + <vpe:tag name="composite:attribute" case-sensitive="yes"> <!-- Checks for min tld version has been comented, becouse it's not specified correctly in jsf lib, mareshkau --> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/.settings/org.jboss.tools.jst.web.xml 2010-02-23 18:53:29 UTC (rev 20450) @@ -15,10 +15,6 @@ location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-commons-logging.jar" info="hidden=yes" location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/> - <file-system NAME="lib-jsf-api.jar" info="hidden=yes" - location="%workspace.home%/lib/jsf-api.jar" model-entity="FileSystemJar"/> - <file-system NAME="lib-jsf-impl.jar" info="hidden=yes" - location="%workspace.home%/lib/jsf-impl.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-jstl.jar" info="hidden=yes" location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/> <file-system NAME="lib-standard.jar" info="hidden=yes" @@ -36,6 +32,6 @@ location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/> <web SERVLET_VERSION="2.5" model-entity="JstWeb" model-path="/web.xml"> <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule" - model-path="/faces-config.xml" root="WEB-ROOT" src="src"/> + model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/> </web> </file-systems> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/jbide5906-on-server.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/jbide5906-on-server.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/5908/welcome.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,14 @@ +<!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"> + + <ui:composition template="/templates/main.xhtml" id="jbide5908"> + <ui:define name="body"> + Welcome To RichFaces 4.x Demo + </ui:define> + + </ui:composition> + +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/message.css 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,3 @@ +rich-message{ + color:red; +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/messages.css 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,3 @@ +rich-messages{ + color:red; +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/page.css 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,77 @@ +.rich-page{width:100%;} +.body{ + background: #FFFFFF; + margin:0px; +} +*{ + font-size:11px; +} +.header_bg{ + background-image:url(#{resource['rich/img/header_background.png']}); + border-bottom:1px solid; + border-bottom-color:#FFFFFF; + background-color:#BED6F8; + background-repeat:repeat-x; + background-position:top left; +} + +.footer_bg{ + background-image:url(#{resource['rich/img/footer_background.png']}); + border-top:1px solid; + border-top-color:#FFFFFF; + background-color:#BED6F8; + background-repeat:repeat-x; + background-position:center left; +} + +.menu_col{ + background:#FFFFFF; + vertical-align:top; + border-top:2px solid; + border-top-color:#BED6F8; + border-right:2px solid; + border-right-color:#BED6F8; + border-bottom:2px solid; + border-bottom-color:#BED6F8; +} + +.content_col{ + background:#FFFFFF; + vertical-align:top; + width:100%; + border-top:2px solid; + border-top-color:#BED6F8; + border-bottom:2px solid; + border-bottom-color:#BED6F8; +} +*.menu_col, *.content_col, *.footer_bg{ + font-family:Arial, Verdana, sans-serif ; + color:#000000; + font-size:11px; +} +*.header_content{ + font-family:Arial, Verdana, sans-serif; + color:#000000; + font-size:11px; +} + + +.page_size { + width : 100% + height : 100% +} + + +.header_content { + margin : 0px 0px 0px 0px + height : 95px position : relative +} + +.spacer{font-size : 1px} + + +.footer_bg_content { + margin : 0px 0px 0px 0px + height : 45px + position : relative +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/css/panel.css 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,26 @@ +.rich-panel{ + border-width: 1px; + border-style: solid; + padding : 1px; + color:#000000; + font-family:Arial,Verdana,sans-serif; + font-size:11px; + background-color:#FFFFFF; + border-color:#BED6F8; +} + +.rich-panel-header{ + padding : 2px; + border-width: 1px; + border-style: solid; + background-color:#BED6F8; + border-color:#BED6F8; + font-weight:bold; + background-position:left top; + background-repeat:repeat-x; + background-image: url(#{resource['rich/img/panel_header.png']}) +} + +.rich-panel-body{ + padding : 10px; +} Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/footer_background.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/footer_background.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/header_background.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/header_background.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/panel_header.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/img/panel_header.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/message.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,30 @@ +<!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:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite" + xmlns:a4j="http://richfaces.org/a4j"> +<head> +<title>panel</title> +</head> +<body> + +<composite:interface> + <composite:attribute name="for" required="true" /> + <composite:attribute name="style" required="false" /> + <composite:attribute name="styleClass" required="false" /> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/message.css" /> + <a4j:outputPanel ajaxRendered="true" layout="none"> + <h:message for="#{cc.attrs.for}" showDetail="#{cc.attrs.showDetails}" + showSummary="#{cc.attrs.showSummary}" style="#{cc.attrs.style}" + styleClass="rich-message #{cc.attrs.styleClass}" /> + </a4j:outputPanel> +</composite:implementation> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/messages.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,29 @@ +<!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:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite" + xmlns:a4j="http://richfaces.org/a4j"> +<head> +<title>panel</title> +</head> +<body> + +<composite:interface> + <composite:attribute name="style" required="false" /> + <composite:attribute name="styleClass" required="false" /> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/messages.css" /> + <a4j:outputPanel ajaxRendered="true" layout="none"> + <h:messages layout="#{cc.attrs.layout}" + showSummary="true" style="#{cc.attrs.style}" + styleClass="rich-message #{cc.attrs.styleClass}" /> + </a4j:outputPanel> +</composite:implementation> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/page.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,69 @@ +<!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:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite"> + <head> + <title>page</title> + </head> +<body> + +<composite:interface> + <composite:attribute name="style" /> + <composite:attribute name="styleClass"/> + <composite:attribute name="headerClass"/> + <composite:attribute name="bodyClass"/> + <composite:attribute name="sidebarClass"/> +</composite:interface> +<composite:implementation> +<h:outputText value="&lt;!DOCTYPE html PUBLIC &#34;-//W3C//DTD XHTML 1.0 Transitional//EN&#34; &#34;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&#34;&gt;" escape="false"/> +<html xmlns="http://www.w3.org/1999/xhtml"> +<h:head> + <title>#{cc.attrs.pageTitle}</title> + <composite:renderFacet name="pageHeader"/> +</h:head> +<h:body> + <h:outputStylesheet name="rich/css/page.css" /> + <table border="0" cellpadding="0" cellspacing="0" class="rich-page #{cc.attrs.pageClass}"> + <tbody> + <tr> + <td class="header_bg"> + <div class="header_content rich-page-header #{cc.attrs.headerClass}"> + <composite:renderFacet name="header"/> + </div> + </td> + </tr> + <tr> + <td width="100%" height="100%" class="bg_tabbody"> + <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%" class="rich-page-content #{cc.attrs.contentClass}"> + <tbody> + <tr> + <td class="menu_col rich-page-sidebar #{cc.attrs.sidebarClass}"> + <div class="menu_width spacer" style="width:#{cc.attrs.sidebarWidth}px"></div> + <composite:renderFacet name="sidebar"/> + </td> + <td class="content_col rich-page-body #{cc.attrs.bodyClass}"> + <composite:insertChildren /> + </td> + </tr> + </tbody> + </table> + </td> + </tr> + <tr> + <td class="footer_bg"> + <div class="footer_bg_content rich-page-footer #{cc.attrs.footerClass}"> + <composite:renderFacet name="footer"/> + </div> + </td> + </tr> + </tbody> + </table> +</h:body> +</html> +</composite:implementation> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/resources/rich/panel.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,49 @@ +<!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:c="http://java.sun.com/jsp/jstl/core" + xmlns:composite="http://java.sun.com/jsf/composite"> + <head> + <title>panel</title> + </head> +<body> + +<composite:interface> + <composite:attribute name="style" required="false"/> + <composite:attribute name="styleClass" required="false"/> + <composite:attribute name="headerClass" required="false"/> + <composite:attribute name="bodyClass" required="true"/> +</composite:interface> + +<composite:implementation> + <h:outputStylesheet name="rich/css/panel.css" /> + + <div class="rich-panel #{compositeComponent.attrs.styleClass}" + style="#{compositeComponent.attrs.style}" + onclick="#{compositeComponent.attrs.onclick}" + ondblclick="#{compositeComponent.attrs.ondblclick}" + onkeydown="#{compositeComponent.attrs.onkeydown}" + onkeypress="#{compositeComponent.attrs.onkeypress}" + onkeyup="#{compositeComponent.attrs.onkeyup}" + onmousedown="#{compositeComponent.attrs.onmousedown}" + onmousemove="#{compositeComponent.attrs.onmousemove}" + onmouseout="#{compositeComponent.attrs.onmouseout}" + onmouseover="#{compositeComponent.attrs.onmouseover}" + onmouseup="#{compositeComponent.attrs.onmouseup}"> + + <h:panelGroup rendered="#{not empty cc.facets.header}"> + <div class="rich-panel-header #{compositeComponent.attrs.headerClass}"> + <composite:renderFacet name="header"/> + </div> + </h:panelGroup> + <div class="rich-panel-body #{compositeComponent.attrs.bodyClass}" > + <composite:insertChildren /> + </div> + + </div> +</composite:implementation> +</body> +</html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/includes/navigation.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,32 @@ +<ui:composition 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:rich="http://java.sun.com/jsf/composite/rich"> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Navigation" /> + </f:facet> + <h:panelGrid columns="1"> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/ajax.jsf">a4j:ajax</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/jsFunction.jsf">a4j:jsFunction</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/mediaOutput.jsf">a4j:mediaOutput</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/push.jsf">a4j:push</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/status.jsf">a4j:status</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/outputPanel.jsf">a4j:outputPanel</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/commandButton.jsf">a4j:commandButton</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/commandLink.jsf">a4j:commandLink</h:outputLink> + <h:outputLink + value="#{facesContext.externalContext.requestContextPath}/richfaces/log.jsf">a4j:log</h:outputLink> + </h:panelGrid> + </rich:panel> +</ui:composition> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/templates/main.xhtml 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,26 @@ +<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:rich="http://java.sun.com/jsf/composite/rich"> +<h:head> +</h:head> +<h:body> + <ui:composition> + <rich:page id="page"> + <f:facet name="header"> + <h1>Welcome to RichFaces demo!</h1> + </f:facet> + <f:facet name="sidebar"> + <ui:include src="/templates/includes/navigation.xhtml" /> + </f:facet> + <ui:insert name="body"> + Body content missed + </ui:insert> + <f:facet name="footer"> + footer + </f:facet> + </rich:page> + </ui:composition> +</h:body> +</html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23 18:03:26 UTC (rev 20449) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-23 18:53:29 UTC (rev 20450) @@ -86,6 +86,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693; import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692; import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.RenderFacetAndInsertChildrenTest; import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectAllAndCut_JBIDE4853; import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectWholeElement_JBIDE4713; import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642; @@ -118,6 +119,7 @@ TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$ // $JUnit-BEGIN$ + suite.addTestSuite(RenderFacetAndInsertChildrenTest.class); suite.addTestSuite(EditFontFamilyTest_JBIDE5872.class); suite.addTestSuite(ChangeMessageBundleTest_JBIDE5818.class); suite.addTestSuite(TestForUsingComponentsLibrariesWithDefaultNamespace.class); Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RenderFacetAndInsertChildrenTest.java 2010-02-23 18:53:29 UTC (rev 20450) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.vpe.ui.test.ComponentContentTest; + +/** + * https://jira.jboss.org/jira/browse/JBIDE-5908 + * + * @author mareshkau + * + */ +public class RenderFacetAndInsertChildrenTest extends ComponentContentTest{ + + public RenderFacetAndInsertChildrenTest(String name) { + super(name); + } + public void testRenderFacetAndInsertChildren() throws Throwable { + performContentTest("JBIDE/5908/welcome.xhtml"); //$NON-NLS-1$ + } + @Override + protected String getTestProjectName() { + return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME; + } + +}