Author: lfryc(a)redhat.com Date: 2010-09-20 11:21:11 -0400 (Mon, 20 Sep 2010) New Revision: 19266 Modified: modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml Log: replaced ui:include with ui:decorate (MYFACES-2925) Modified: modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/index.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -60,7 +60,7 @@ </h:panelGroup> </h:panelGrid> - <ui:include src="/templates/footer.xhtml" /> + <ui:decorate template="/templates/footer.xhtml" /> </h:form> </h:body> </html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat1.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -29,7 +29,7 @@ <ul> <a4j:repeat value="#{templateBean.dataTableModel}" var="item" id="containerA4JRepeat1"> <li><h:panelGroup columns="1" rendered="#{item == 'row 1'}"> - <ui:include src="#{templateBean.nextTemplate}.xhtml" /> + <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> <h:outputText value="#{item}" rendered="#{item != 'row 1'}" /></li> </a4j:repeat> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/a4jRepeat2.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -29,7 +29,7 @@ <ul> <a4j:repeat value="#{templateBean.dataTableModel}" var="item" id="containerA4JRepeat2"> <li><h:panelGroup columns="1" rendered="#{item == 'row 2'}"> - <ui:include src="#{templateBean.nextTemplate}.xhtml" /> + <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> <h:outputText value="#{item}" rendered="#{item != 'row 2'}" /></li> </a4j:repeat> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/blueDiv.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -25,8 +25,8 @@ <ui:composition> - <div style="border: 2px blue dotted; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:include - src="#{templateBean.nextTemplate}.xhtml" /></div> + <div style="border: 2px blue dotted; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:decorate + template="#{templateBean.nextTemplate}.xhtml" /></div> </ui:composition> </html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable1.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -32,7 +32,7 @@ <h:outputText value="JSF Data Table" /> </f:facet> <h:panelGroup columns="1" rendered="#{item == 'row 1'}"> - <ui:include src="#{templateBean.nextTemplate}.xhtml" /> + <ui:decorate template=="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> <h:outputText value="#{item}" rendered="#{item != 'row 1'}" /> </h:column> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/hDataTable2.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -32,7 +32,7 @@ <h:outputText value="JSF Data Table" /> </f:facet> <h:panelGroup columns="1" rendered="#{item == 'row 2'}"> - <ui:include src="#{templateBean.nextTemplate}.xhtml" /> + <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> <h:outputText value="#{item}" rendered="#{item != 'row 2'}" /> </h:column> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/list.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -47,6 +47,6 @@ <ui:insert name="links">Insert some links to pages here</ui:insert> </h:panelGroup> - <ui:include src="/templates/footer.xhtml" /> + <ui:decorate template="/templates/footer.xhtml" /> </h:body> </html> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/redDiv.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -25,8 +25,8 @@ <ui:composition> - <div style="border: 2px red solid; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:include - src="#{templateBean.nextTemplate}.xhtml" /></div> + <div style="border: 2px red solid; padding: 10px; margin-top: 10px; margin-bottom: 10px;"><ui:decorate + template="#{templateBean.nextTemplate}.xhtml" /></div> </ui:composition> </html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable1.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -32,7 +32,7 @@ <h:outputText value="Rich Data Table" /> </f:facet> <h:panelGroup columns="1" rendered="#{item == 'row 1'}"> - <ui:include src="#{templateBean.nextTemplate}.xhtml" /> + <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> <h:outputText value="#{item}" rendered="#{item != 'row 1'}" /> </rich:column> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/richDataTable2.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -32,7 +32,7 @@ <h:outputText value="Rich Data Table" /> </f:facet> <h:panelGroup columns="1" rendered="#{item == 'row 2'}"> - <ui:include src="#{templateBean.nextTemplate}.xhtml" /> + <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> <h:outputText value="#{item}" rendered="#{item != 'row 2'}" /> </rich:column> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -34,7 +34,7 @@ </h:head> <h:body> - <div class="header"><ui:include src="/templates/header.xhtml" /></div> + <div class="header"><ui:decorate template="/templates/header.xhtml" /></div> <div class="content"> <div class="messages"><h:messages /></div> @@ -43,14 +43,14 @@ <c:choose> <c:when test="#{dontRenderForm}"> <div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div> - <ui:include src="/templates/#{templateBean.firstTemplate}.xhtml" /> + <ui:decorate template="/templates/#{templateBean.firstTemplate}.xhtml" /> <div style="margin-top: 20px;"><ui:insert name="outOfTemplateAfter" /></div> </c:when> <c:otherwise> <h:form id="form"> <div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div> - <ui:include src="/templates/#{templateBean.firstTemplate}.xhtml" /> + <ui:decorate template="/templates/#{templateBean.firstTemplate}.xhtml" /> <div style="margin-top: 20px;"><ui:insert name="outOfTemplateAfter" /></div> </h:form> </c:otherwise> @@ -67,7 +67,7 @@ <div class="footer"> <ui:insert name="footer"> - <ui:include src="/templates/footer.xhtml" /> + <ui:decorate template="/templates/footer.xhtml" /> </ui:insert> </div> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat1.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -29,7 +29,7 @@ <ol> <ui:repeat value="#{templateBean.dataTableModel}" var="item" id="containerUiRepeat1"> <li><h:panelGroup columns="1" rendered="#{item == 'row 1'}"> - <ui:include src="#{templateBean.nextTemplate}.xhtml" /> + <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> <h:outputText value="#{item}" rendered="#{item != 'row 1'}" /></li> </ui:repeat> Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-09-20 15:20:19 UTC (rev 19265) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/uiRepeat2.xhtml 2010-09-20 15:21:11 UTC (rev 19266) @@ -29,7 +29,7 @@ <ol> <ui:repeat value="#{templateBean.dataTableModel}" var="item" id="containerUiRepeat2"> <li><h:panelGroup columns="1" rendered="#{item == 'row 2'}"> - <ui:include src="#{templateBean.nextTemplate}.xhtml" /> + <ui:decorate template="#{templateBean.nextTemplate}.xhtml" /> </h:panelGroup> <h:outputText value="#{item}" rendered="#{item != 'row 2'}" /></li> </ui:repeat>