You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/08/07 00:42:52 UTC
svn commit: r983136 - in
/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp:
helloMyFacesCodi.xhtml noCodiPage.xhtml viewAccessBeanPage.xhtml
viewAccessBeanPage2.xhtml
Author: struberg
Date: Fri Aug 6 22:42:52 2010
New Revision: 983136
URL: http://svn.apache.org/viewvc?rev=983136&view=rev
Log:
EXTCDI-38 add sample for cleanup of unused WindowContexts
Added:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/noCodiPage.xhtml
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/helloMyFacesCodi.xhtml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage.xhtml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage2.xhtml
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/helloMyFacesCodi.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/helloMyFacesCodi.xhtml?rev=983136&r1=983135&r2=983136&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/helloMyFacesCodi.xhtml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/helloMyFacesCodi.xhtml Fri Aug 6 22:42:52 2010
@@ -32,9 +32,11 @@
<h:form>
<h:commandLink value="next" action="next"/>
</h:form>
- <h:outputText value="#{conversationDemoBean1.value}"/>
+ <h:outputText value="#{conversationDemoBean1.value}"/><br/>
+
+ <h:link value="ViewAccessScoped example" outcome="viewAccessBeanPage.xhtml"/><br/>
+ <h:outputLink value="noCodiPage.xhtml">Page without Codi scoped beans</h:outputLink>
- <h:link value="ViewAccessScoped example" outcome="viewAccessBeanPage.xhtml"/>
<h:messages globalOnly="true"/>
</body>
</html>
\ No newline at end of file
Added: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/noCodiPage.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/noCodiPage.xhtml?rev=983136&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/noCodiPage.xhtml (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/noCodiPage.xhtml Fri Aug 6 22:42:52 2010
@@ -0,0 +1,34 @@
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+ * 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.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+ <head><title>CODI JSF 2.0 Demo</title></head>
+
+ <body>
+ <h:outputText value="This page doesn't contain a CODI scoped bean!"/>
+ </body>
+</html>
\ No newline at end of file
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage.xhtml?rev=983136&r1=983135&r2=983136&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage.xhtml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage.xhtml Fri Aug 6 22:42:52 2010
@@ -30,22 +30,24 @@
<body>
<f:view>
+
<h:form>
<h3>values of ViewAccessScoped bean 1:</h3>
- value <h:outputText value="#{vaBean1.value}"/><br/>
- createdAt <h:outputText value="#{vaBean1.createdAt}"/><br/>
- sample <h:outputText value="#{vaBean1.sampleField}"/><br/>
- viewParam <h:outputText value="#{vaBean1.viewParam}"/><br/>
-
+ <h:panelGrid columns="2">
+ <h:outputLabel value="value"/> <h:outputText value="#{vaBean1.value}"/>
+ <h:outputLabel value="createdAt"/> <h:outputText value="#{vaBean1.createdAt}"/>
+ <h:outputLabel value="sample"/> <h:outputText value="#{vaBean1.sampleField}"/>
+ <h:outputLabel value="viewParam"/> <h:outputText value="#{vaBean1.viewParam}"/>
+ </h:panelGrid>
<h3>values of ViewAccessScoped bean 2:</h3>
- value <h:outputText value="#{vaBean2.value}"/><br/>
- createdAt <h:outputText value="#{vaBean2.createdAt}"/><br/>
- sample <h:outputText value="#{vaBean2.sampleField}"/><br/>
- viewParam <h:outputText value="#{vaBean2.viewParam}"/><br/>
-
- <br/><br/>
+ <h:panelGrid columns="2">
+ <h:outputLabel value="value"/> <h:outputText value="#{vaBean2.value}"/>
+ <h:outputLabel value="createdAt"/> <h:outputText value="#{vaBean2.createdAt}"/>
+ <h:outputLabel value="sample"/> <h:outputText value="#{vaBean2.sampleField}"/>
+ <h:outputLabel value="viewParam"/> <h:outputText value="#{vaBean2.viewParam}"/>
+ </h:panelGrid>
<h:commandButton value="forward" action="#{vaBean1.forward}"/><br/>
<h:commandButton value="stay on page" action="#{vaBean1.stay}"/>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage2.xhtml?rev=983136&r1=983135&r2=983136&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage2.xhtml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/viewAccessBeanPage2.xhtml Fri Aug 6 22:42:52 2010
@@ -32,10 +32,12 @@
<f:view>
<h:form>
<h3>values of ViewAccessScoped bean 1:</h3>
- value <h:outputText value="#{vaBean1.value}"/><br/>
- createdAt <h:outputText value="#{vaBean1.createdAt}"/><br/>
- sample <h:outputText value="#{vaBean1.sampleField}"/><br/>
- viewParam <h:outputText value="#{vaBean1.viewParam}"/><br/>
+ <h:panelGrid columns="2">
+ <h:outputLabel value="value"/> <h:outputText value="#{vaBean1.value}"/>
+ <h:outputLabel value="createdAt"/> <h:outputText value="#{vaBean1.createdAt}"/>
+ <h:outputLabel value="sample"/> <h:outputText value="#{vaBean1.sampleField}"/>
+ <h:outputLabel value="viewParam"/> <h:outputText value="#{vaBean1.viewParam}"/>
+ </h:panelGrid>
<h3>bean 2 will not get touched on this page</h3>
This means it gets another instance on page 1!