You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/04/16 15:45:56 UTC
svn commit: r1587905 [1/2] - in /myfaces/orchestra/trunk/examples22: ./
src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/annotations/
src/main/webapp/ballot/ src/main/webapp/configurator/
src/main/webapp/contracts/ src/main/webapp/contracts/si...
Author: lu4242
Date: Wed Apr 16 13:45:55 2014
New Revision: 1587905
URL: http://svn.apache.org/r1587905
Log:
ORCHESTRA-65 Create artifacts compatible with JSF 2.2
Added:
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page1.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page2.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page3.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/index.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/start.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Hall.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Topic.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/TopicVotes.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/VoteTopic.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Voter.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/index.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Checkout.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/ComponentSelection.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Customer.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/index.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/
myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/
myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/example.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/footer.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/header.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/Form.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/index.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/start.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/images/Thumbs.db (with props)
myfaces/orchestra/trunk/examples22/src/main/webapp/index.html
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/CustomerLogin.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/EditCustomerGroup.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/EditProduct.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/ProductDetail.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/SearchProduct.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/index.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/multiBean/index.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/multiBean/start.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/simple/reservation.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/simple/reservationBook.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/start.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/overview.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/plane.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/terminusSelector/terminusSelector.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/terminusSelector/terminusSelectorDetails.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/train.xhtml
myfaces/orchestra/trunk/examples22/src/main/webapp/versioning/editCompany.xhtml
Removed:
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page1.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page2.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page3.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/index.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/start.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Hall.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Topic.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/TopicVotes.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/VoteTopic.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Voter.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/index.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Checkout.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/ComponentSelection.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Customer.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/index.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/Form.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/index.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/start.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/index.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/CustomerLogin.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/EditCustomerGroup.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/EditProduct.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/ProductDetail.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/SearchProduct.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/mops/index.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/multiBean/index.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/multiBean/start.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/simple/reservation.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/simple/reservationBook.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/start.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/overview.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/plane.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/terminusSelector/terminusSelector.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/terminusSelector/terminusSelectorDetails.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/tripPlanner/train.jsp
myfaces/orchestra/trunk/examples22/src/main/webapp/versioning/editCompany.jsp
Modified:
myfaces/orchestra/trunk/examples22/pom.xml
myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/faces-config.xml
myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/orchestra/trunk/examples22/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/pom.xml?rev=1587905&r1=1587904&r2=1587905&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/pom.xml (original)
+++ myfaces/orchestra/trunk/examples22/pom.xml Wed Apr 16 13:45:55 2014
@@ -351,6 +351,12 @@
<artifactId>tomahawk20</artifactId>
<version>1.1.14</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-converters20</artifactId>
+ <version>1.0.2</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -498,7 +504,7 @@
<properties>
<orchestra.core.version>1.6-SNAPSHOT</orchestra.core.version>
<mojarra.version>2.2.5</mojarra.version>
- <myfaces.version>2.2.1-SNAPSHOT</myfaces.version>
+ <myfaces.version>2.2.2</myfaces.version>
<maven.jetty.plugin.version>6.1.16</maven.jetty.plugin.version>
<cargo.version>1.0</cargo.version>
<htmlunit.version>2.5</htmlunit.version>
Modified: myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/faces-config.xml?rev=1587905&r1=1587904&r2=1587905&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/faces-config.xml Wed Apr 16 13:45:55 2014
@@ -33,40 +33,48 @@
</locale-config>
</application>
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>home</from-outcome>
+ <to-view-id>/start.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
<!--
- Navigation rules for the "simple" example (hotel reservation)
-->
<navigation-rule>
<description>rules leading from the reservationBook view</description>
- <from-view-id>/simple/reservationBook.jsp</from-view-id>
+ <from-view-id>/simple/reservationBook.xhtml</from-view-id>
<navigation-case>
<from-outcome>edit</from-outcome>
- <to-view-id>/simple/reservation.jsp</to-view-id>
+ <to-view-id>/simple/reservation.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>new</from-outcome>
- <to-view-id>/simple/reservation.jsp</to-view-id>
+ <to-view-id>/simple/reservation.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
<navigation-rule>
<description>rules leading from the reservation view</description>
- <from-view-id>/simple/reservation.jsp</from-view-id>
+ <from-view-id>/simple/reservation.xhtml</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
- <to-view-id>/simple/reservationBook.jsp</to-view-id>
+ <to-view-id>/simple/reservationBook.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>save</from-outcome>
- <to-view-id>/simple/reservationBook.jsp</to-view-id>
+ <to-view-id>/simple/reservationBook.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>delete</from-outcome>
- <to-view-id>/simple/reservationBook.jsp</to-view-id>
+ <to-view-id>/simple/reservationBook.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -76,75 +84,75 @@
-->
<navigation-rule>
<description>rules leading from the journey overview</description>
- <from-view-id>/tripPlanner/overview.jsp</from-view-id>
+ <from-view-id>/tripPlanner/overview.xhtml</from-view-id>
<navigation-case>
<from-outcome>addPlane</from-outcome>
- <to-view-id>/tripPlanner/plane.jsp</to-view-id>
+ <to-view-id>/tripPlanner/plane.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>addTrain</from-outcome>
- <to-view-id>/tripPlanner/train.jsp</to-view-id>
+ <to-view-id>/tripPlanner/train.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<description>rules leading from the plane screen</description>
- <from-view-id>/tripPlanner/plane.jsp</from-view-id>
+ <from-view-id>/tripPlanner/plane.xhtml</from-view-id>
<navigation-case>
<from-outcome>overview</from-outcome>
- <to-view-id>/tripPlanner/overview.jsp</to-view-id>
+ <to-view-id>/tripPlanner/overview.xhtml</to-view-id>
</navigation-case>
<!-- navigate to start of flow -->
<navigation-case>
<from-outcome>chooseTerminusFrom</from-outcome>
- <to-view-id>/tripPlanner/terminusSelector/terminusSelector.jsp</to-view-id>
+ <to-view-id>/tripPlanner/terminusSelector/terminusSelector.xhtml</to-view-id>
</navigation-case>
<!-- navigate to start of flow -->
<navigation-case>
<from-outcome>chooseTerminusTo</from-outcome>
- <to-view-id>/tripPlanner/terminusSelector/terminusSelector.jsp</to-view-id>
+ <to-view-id>/tripPlanner/terminusSelector/terminusSelector.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<description>rules leading from the train screen</description>
- <from-view-id>/tripPlanner/train.jsp</from-view-id>
+ <from-view-id>/tripPlanner/train.xhtml</from-view-id>
<navigation-case>
<from-outcome>overview</from-outcome>
- <to-view-id>/tripPlanner/overview.jsp</to-view-id>
+ <to-view-id>/tripPlanner/overview.xhtml</to-view-id>
</navigation-case>
<!-- navigate to start of flow -->
<navigation-case>
<from-outcome>chooseTerminusFrom</from-outcome>
- <to-view-id>/tripPlanner/terminusSelector/terminusSelector.jsp</to-view-id>
+ <to-view-id>/tripPlanner/terminusSelector/terminusSelector.xhtml</to-view-id>
</navigation-case>
<!-- navigate to start of flow -->
<navigation-case>
<from-outcome>chooseTerminusTo</from-outcome>
- <to-view-id>/tripPlanner/terminusSelector/terminusSelector.jsp</to-view-id>
+ <to-view-id>/tripPlanner/terminusSelector/terminusSelector.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<description>rules leading from the terminusSelector screen</description>
- <from-view-id>/tripPlanner/terminusSelector/terminusSelector.jsp</from-view-id>
+ <from-view-id>/tripPlanner/terminusSelector/terminusSelector.xhtml</from-view-id>
<navigation-case>
<from-outcome>details</from-outcome>
- <to-view-id>/tripPlanner/terminusSelector/terminusSelectorDetails.jsp</to-view-id>
+ <to-view-id>/tripPlanner/terminusSelector/terminusSelectorDetails.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<description>rules leading from the terminusSelector details screen</description>
- <from-view-id>/tripPlanner/terminusSelector/terminusSelectorDetails.jsp</from-view-id>
+ <from-view-id>/tripPlanner/terminusSelector/terminusSelectorDetails.xhtml</from-view-id>
<navigation-case>
<from-outcome>overview</from-outcome>
- <to-view-id>/tripPlanner/terminusSelector/terminusSelector.jsp</to-view-id>
+ <to-view-id>/tripPlanner/terminusSelector/terminusSelector.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -156,7 +164,7 @@
<navigation-case>
<from-action>#{configuratorData.checkoutAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/configurator/Checkout.jsp</to-view-id>
+ <to-view-id>/configurator/Checkout.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -166,7 +174,7 @@
<navigation-case>
<from-action>#{configuratorData.buyAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/configurator/ComponentSelection.jsp</to-view-id>
+ <to-view-id>/configurator/ComponentSelection.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -176,7 +184,7 @@
<navigation-case>
<from-action>#{configuratorData.cancelAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/configurator/ComponentSelection.jsp</to-view-id>
+ <to-view-id>/configurator/ComponentSelection.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -185,7 +193,7 @@
<description>edit/create customer</description>
<navigation-case>
<from-outcome>editCustomer</from-outcome>
- <to-view-id>/configurator/Customer.jsp</to-view-id>
+ <to-view-id>/configurator/Customer.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -196,7 +204,7 @@
<navigation-case>
<from-action>#{ballotHall.newTopicAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/ballot/Topic.jsp</to-view-id>
+ <to-view-id>/ballot/Topic.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -206,7 +214,7 @@
<navigation-case>
<from-action>#{ballotTopic.saveAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/ballot/Hall.jsp</to-view-id>
+ <to-view-id>/ballot/Hall.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -216,7 +224,7 @@
<navigation-case>
<from-action>#{ballotHall.showItemsAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/ballot/Topic.jsp?topicId=#{param.topicId}</to-view-id>
+ <to-view-id>/ballot/Topic.xhtml?topicId=#{param.topicId}</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -226,13 +234,13 @@
<navigation-case>
<from-action>#{ballotHall.voteAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/ballot/VoteTopic.jsp?topicId=#{param.topicId}</to-view-id>
+ <to-view-id>/ballot/VoteTopic.xhtml?topicId=#{param.topicId}</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-action>#{ballotHall.topicVotesAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/ballot/TopicVotes.jsp?topicId=#{param.topicId}</to-view-id>
+ <to-view-id>/ballot/TopicVotes.xhtml?topicId=#{param.topicId}</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -242,7 +250,7 @@
<navigation-case>
<from-action>#{ballotVoter.saveAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/ballot/Hall.jsp</to-view-id>
+ <to-view-id>/ballot/Hall.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -251,12 +259,12 @@
<description>various main navigations</description>
<navigation-case>
<from-outcome>ballotHall</from-outcome>
- <to-view-id>/ballot/Hall.jsp</to-view-id>
+ <to-view-id>/ballot/Hall.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>registerVoter</from-outcome>
- <to-view-id>/ballot/Voter.jsp</to-view-id>
+ <to-view-id>/ballot/Voter.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -266,42 +274,42 @@
<description>various main navigations</description>
<navigation-case>
<from-outcome>EditProduct</from-outcome>
- <to-view-id>/mops/EditProduct.jsp</to-view-id>
+ <to-view-id>/mops/EditProduct.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>EditCustomerGroup</from-outcome>
- <to-view-id>/mops/EditCustomerGroup.jsp</to-view-id>
+ <to-view-id>/mops/EditCustomerGroup.xhtml</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>ProductDetails</from-outcome>
- <to-view-id>/mops/ProductDetail.jsp?productId=#{param.productId}</to-view-id>
+ <to-view-id>/mops/ProductDetail.xhtml?productId=#{param.productId}</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>EditSelectedProduct</from-outcome>
- <to-view-id>/mops/EditProduct.jsp?productId=#{param.productId}</to-view-id>
+ <to-view-id>/mops/EditProduct.xhtml?productId=#{param.productId}</to-view-id>
<redirect/>
</navigation-case>
<navigation-case>
<from-outcome>CustomerLogin</from-outcome>
- <to-view-id>/mops/CustomerLogin.jsp</to-view-id>
+ <to-view-id>/mops/CustomerLogin.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/mops/CustomerLogin.jsp</from-view-id>
+ <from-view-id>/mops/CustomerLogin.xhtml</from-view-id>
<navigation-case>
<from-action>#{mopsCustomerLogin.loginAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/mops/SearchProduct.jsp</to-view-id>
+ <to-view-id>/mops/SearchProduct.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{mopsCustomerLogin.saveAction}</from-action>
<from-outcome>success</from-outcome>
- <to-view-id>/mops/SearchProduct.jsp</to-view-id>
+ <to-view-id>/mops/SearchProduct.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Modified: myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/web.xml?rev=1587905&r1=1587904&r2=1587905&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/web.xml Wed Apr 16 13:45:55 2014
@@ -60,6 +60,11 @@
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>client</param-value>
</context-param>
+ <!--
+ <context-param>
+ <param-name>javax.faces.CLIENT_WINDOW_MODE</param-name>
+ <param-value>url</param-value>
+ </context-param>-->
<!--
- JSF works much better with javascript; many components do not function
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page1.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page1.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page1.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page1.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,53 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
+<%--@elvariable id="multiViewController" type="org.apache.myfaces.examples.annotations.MultiViewController"--%>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Page1"/>
+ </t:htmlTag>
+ <h:panelGrid columns="2">
+ <h:outputLink value="Page2.faces">
+ <h:outputText value="GoTo Page2" />
+ </h:outputLink>
+ <h:outputLink value="Page3.faces">
+ <h:outputText value="GoTo Page3" />
+ </h:outputLink>
+ </h:panelGrid>
+
+ <h:panelGrid columns="1">
+ <h:outputText value="InitView called by view: #{multiViewController.initViewId}" />
+ <h:outputText value="Previous InitView: #{multiViewController.prevInitViewId}" />
+ </h:panelGrid>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page2.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page2.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page2.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,60 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
+<%--@elvariable id="multiViewController" type="org.apache.myfaces.examples.annotations.MultiViewController"--%>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Page2"/>
+ </t:htmlTag>
+ <h:panelGrid columns="2">
+ <h:outputLink value="Page1.faces">
+ <h:outputText value="GoTo Page1" />
+ </h:outputLink>
+ <h:outputLink value="Page3.faces">
+ <h:outputText value="GoTo Page3" />
+ </h:outputLink>
+ </h:panelGrid>
+
+ <h:panelGrid columns="1">
+ <h:outputText value="InitView called by view: #{multiViewController.initViewId}" />
+ <h:outputText value="Previous InitView: #{multiViewController.prevInitViewId}" />
+ </h:panelGrid>
+
+ <h:panelGrid columns="1">
+ <h:panelGrid columns="2">
+ <h:commandButton value="end conversation" action="#{multiViewController.endConversationAction}" />
+ <h:outputText value="this should direct you back to page1" />
+ </h:panelGrid>
+ </h:panelGrid>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page3.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page3.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page3.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/Page3.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,60 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
+<%--@elvariable id="multiViewController" type="org.apache.myfaces.examples.annotations.MultiViewController"--%>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Page3"/>
+ </t:htmlTag>
+ <h:panelGrid columns="2">
+ <h:outputLink value="Page1.faces">
+ <h:outputText value="GoTo Page1" />
+ </h:outputLink>
+ <h:outputLink value="Page2.faces">
+ <h:outputText value="GoTo Page2" />
+ </h:outputLink>
+ </h:panelGrid>
+
+ <h:panelGrid columns="1">
+ <h:outputText value="InitView called by view: #{multiViewController.initViewId}" />
+ <h:outputText value="Previous InitView: #{multiViewController.prevInitViewId}" />
+ </h:panelGrid>
+
+ <h:panelGrid columns="1">
+ <h:panelGrid columns="2">
+ <h:commandButton value="end conversation" action="#{multiViewController.endConversationAction}" />
+ <h:outputText value="this should direct you back to page1" />
+ </h:panelGrid>
+ </h:panelGrid>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/index.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/index.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/index.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/index.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,25 @@
+<%--
+ Copyright (c) 2007, Your Corporation. All Rights Reserved.
+ --%>
+
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<% response.sendRedirect(response.encodeURL("start.faces")); %>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/start.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/start.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/start.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/annotations/start.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,51 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+<%@include file="../header.jspf"%>
+
+<h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Annotations Examples" />
+ </t:htmlTag>
+
+ <t:htmlTag value="ul">
+ <t:htmlTag value="li">
+ <h:outputLink value="Page1.faces" >
+ <h:outputText value="The first page" />
+ </h:outputLink>
+ </t:htmlTag>
+ <t:htmlTag value="li">
+ <h:outputLink value="Page2.faces" >
+ <h:outputText value="The second page" />
+ </h:outputLink>
+ </t:htmlTag>
+ </t:htmlTag>
+
+</h:form>
+
+<%@include file="../footer.jspf"%>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Hall.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Hall.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Hall.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Hall.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,139 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+<%@include file="../header.jspf"%>
+
+<h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Ballot Hall" />
+ </t:htmlTag>
+
+ <h:panelGrid columns="1">
+ <h:commandLink
+ value="Register"
+ action="registerVoter"
+ rendered="#{!ballotState.authenticated}"/>
+
+ <h:commandLink
+ value="Edit Voter Data"
+ action="registerVoter"
+ rendered="#{ballotState.authenticated}"/>
+ </h:panelGrid>
+
+ <t:dataTable
+ var="topicInfo"
+ value="#{ballotHall.topics}"
+ rowClasses="TR1,TR2"
+ width="95%">
+
+ <f:facet name="footer">
+ <h:panelGroup>
+ <h:commandButton
+ value="Create new topic"
+ action="#{ballotHall.newTopicAction}"
+ rendered="#{ballotState.authenticated}"/>
+ </h:panelGroup>
+ </f:facet>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Name" />
+ </f:facet>
+ <h:outputText value="#{topicInfo.topic.name}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Description" />
+ </f:facet>
+ <h:outputText value="#{topicInfo.topic.description}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Started" />
+ </f:facet>
+ <h:outputText value="#{topicInfo.topic.started}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Owner" />
+ </f:facet>
+ <h:outputText value="#{topicInfo.topic.owner.name}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Votes#" />
+ </f:facet>
+ <h:outputText value="#{topicInfo.votes}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Action" />
+ </f:facet>
+
+ <h:panelGrid
+ columns="1"
+ columnClasses="nowrap">
+ <h:commandLink
+ value="Show details"
+ action="#{ballotHall.showItemsAction}"
+ rendered="#{!topicInfo.topic.started}">
+
+ <f:param name="topicId" value="#{topicInfo.topic.id}" />
+
+ </h:commandLink>
+
+ <h:commandLink
+ value="Vote"
+ action="#{ballotHall.voteAction}"
+ rendered="#{topicInfo.topic.started}">
+
+ <f:param name="topicId" value="#{topicInfo.topic.id}" />
+
+ </h:commandLink>
+
+ <h:commandLink
+ value="Vote details"
+ action="#{ballotHall.topicVotesAction}"
+ rendered="#{topicInfo.topic.started}">
+
+ <f:param name="topicId" value="#{topicInfo.topic.id}" />
+
+ </h:commandLink>
+ </h:panelGrid>
+ </h:column>
+
+ </t:dataTable>
+
+</h:form>
+
+<%@include file="../footer.jspf"%>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Topic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Topic.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Topic.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Topic.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,215 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Ballot Topic"/>
+ </t:htmlTag>
+
+ <t:subform>
+ <h:commandLink action="ballotHall" value="Back to Hall" />
+ </t:subform>
+
+ <h:panelGrid
+ columns="1"
+ width="100%">
+
+ <f:facet name="footer">
+ <h:panelGrid columns="2">
+
+ <h:commandButton
+ id="save"
+ value="Save"
+ action="#{ballotTopic.saveAction}"
+ rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
+ </h:commandButton>
+
+ <h:commandButton
+ id="cancel"
+ value="Cancel & New"
+ action="#{ballotTopic.newAction}"
+ rendered="#{ballotState.authenticated}"/>
+
+ </h:panelGrid>
+ </f:facet>
+
+ <h:panelGrid
+ columns="2"
+ rowClasses="TR1, TR2"
+ width="40%">
+
+ <f:facet name="header">
+ <h:outputText value="Topic"/>
+ </f:facet>
+
+ <h:outputLabel
+ for="name"
+ value="Name"/>
+ <h:inputText
+ id="name"
+ value="#{ballotTopic.topic.name}"
+ size="80"
+ maxlength="200"
+ rendered="#{ballotTopic.topicEditable && ballotState.authenticated}"/>
+ <h:outputText
+ value="#{ballotTopic.topic.name}"
+ rendered="#{!ballotTopic.topicEditable || !ballotState.authenticated}"/>
+
+ <h:outputLabel
+ for="description"
+ value="Description"/>
+ <h:inputTextarea
+ id="description"
+ value="#{ballotTopic.topic.description}"
+ cols="80"
+ rows="8"
+ rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
+ <f:validateLength maximum="1024" />
+ </h:inputTextarea>
+ <h:outputText
+ value="#{ballotTopic.topic.description}"
+ rendered="#{!ballotTopic.topicEditable || !ballotState.authenticated}"/>
+
+ <h:outputLabel
+ for="minVote"
+ value="Minimum vote choice"/>
+ <h:inputText
+ id="minVote"
+ value="#{ballotTopic.topic.minVote}"
+ size="5"
+ maxlength="5"
+ rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
+ <s:convertNumber
+ minFractionDigits="0"
+ maxFractionDigits="0" />
+ </h:inputText>
+ <h:outputText
+ value="#{ballotTopic.topic.minVote}"
+ rendered="#{!ballotTopic.topicEditable || !ballotState.authenticated}"/>
+
+ <h:outputLabel
+ for="maxVote"
+ value="Maximum vote choice"/>
+ <h:inputText
+ id="maxVote"
+ value="#{ballotTopic.topic.maxVote}"
+ size="5"
+ maxlength="5"
+ rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
+ <s:convertNumber
+ minFractionDigits="0"
+ maxFractionDigits="0" />
+ </h:inputText>
+ <h:outputText
+ value="#{ballotTopic.topic.maxVote}"
+ rendered="#{!ballotTopic.topicEditable || !ballotState.authenticated}"/>
+
+ <h:outputLabel
+ for="maxVoteCount"
+ value="Maximum number of votes per voter"/>
+ <h:inputText
+ id="maxVoteCount"
+ value="#{ballotTopic.topic.maxVoteCount}"
+ size="5"
+ maxlength="5"
+ rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
+ <f:validateLongRange minimum="0" maximum="99999" />
+ <s:convertNumber
+ minFractionDigits="0"
+ maxFractionDigits="0" />
+ </h:inputText>
+ <h:outputText
+ value="#{ballotTopic.topic.maxVoteCount}"
+ rendered="#{!ballotTopic.topicEditable || !ballotState.authenticated}"/>
+
+ <h:outputLabel
+ for="started"
+ value="Started"/>
+ <h:selectBooleanCheckbox
+ id="started"
+ value="#{ballotTopic.topic.started}"
+ readonly="#{!ballotTopic.topicEditable || !ballotState.authenticated}" />
+
+ </h:panelGrid>
+
+ <t:dataTable
+ styleClass="inputTable"
+ var="item"
+ value="#{ballotTopic.topic.items}"
+ rowClasses="TR1,TR2"
+ columnClasses="nowrap,nowrap"
+ width="40%">
+
+ <f:facet name="header">
+ <h:outputText value="Items"/>
+ </f:facet>
+
+ <t:column>
+ <f:facet name="header">
+ <h:outputText value="content"/>
+ </f:facet>
+ <h:outputText value="#{item.content}"/>
+ </t:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Action"/>
+ </f:facet>
+
+ <h:commandLink
+ value="Remove item"
+ action="#{ballotTopic.removeItemAction}"
+ rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
+
+ <t:updateActionListener property="#{ballotTopic.selectedItem}" value="#{item}" />
+
+ </h:commandLink>
+ </h:column>
+
+ </t:dataTable>
+
+ <h:panelGroup
+ rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
+ <t:subform>
+ <h:inputText
+ value="#{ballotTopic.newItem.content}"
+ size="80"
+ maxlength="200"
+ required="true"/>
+
+ <h:commandLink value="Add Item" action="#{ballotTopic.addItemAction}"/>
+ </t:subform>
+ </h:panelGroup>
+
+ </h:panelGrid>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/TopicVotes.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/TopicVotes.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/TopicVotes.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/TopicVotes.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,171 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Ballot - Vote on Topic"/>
+ </t:htmlTag>
+
+ <t:subform>
+ <h:commandLink action="ballotHall" value="Back to Hall"/>
+ </t:subform>
+
+ <h:panelGrid
+ columns="1"
+ width="100%">
+
+ <h:panelGrid
+ columns="2"
+ rowClasses="TR1, TR2"
+ width="40%">
+
+ <f:facet name="header">
+ <h:outputText value="Topic"/>
+ </f:facet>
+
+ <h:outputText
+ value="Name"/>
+
+ <h:outputText
+ value="#{ballotTopicVotes.topic.name}"/>
+
+ <h:outputText
+ value="Description"/>
+ <h:outputText
+ value="#{ballotTopicVotes.topic.description}"/>
+
+ <h:outputText
+ value="Info"/>
+ <h:outputText
+ value="Every voter had to cast '#{ballotTopicVotes.topic.maxVoteCount}' not 0 votes"/>
+
+ </h:panelGrid>
+
+ <h:panelGrid
+ columns="2"
+ width="40%"
+ rowClasses="TR1,TR2">
+
+ <f:facet name="header">
+ <h:outputText value="Select Voter" />
+ </f:facet>
+
+ <f:facet name="footer">
+ <h:commandButton
+ id="voterSelect"
+ action="#{ballotTopicVotes.selectVoterAction}"
+ value="Select Voter"/>
+ </f:facet>
+
+ <h:outputLabel
+ for="voter"
+ value="Voter" />
+ <h:selectOneMenu
+ id="voter"
+ value="#{ballotTopicVotes.selectedVoterId}">
+ <f:selectItems value="#{ballotTopicVotes.voters}"/>
+
+ <s:submitOnEvent
+ for="voterSelect"
+ event="change"/>
+ </h:selectOneMenu>
+
+ </h:panelGrid>
+
+ <t:dataTable
+ styleClass="inputTable"
+ var="itemInfo"
+ value="#{ballotTopicVotes.items}"
+ rowClasses="TR1,TR2"
+ columnClasses="nowrap,nowrap"
+ width="70%">
+
+ <f:facet name="header">
+ <h:outputText value="Items"/>
+ </f:facet>
+
+ <t:column sortable="true">
+ <f:facet name="header">
+ <h:outputText value="content"/>
+ </f:facet>
+ <h:outputText value="#{itemInfo.item.content}"/>
+ </t:column>
+
+ <t:column sortable="true">
+ <f:facet name="header">
+ <h:outputText value="Current Vote"/>
+ </f:facet>
+ <h:outputText value="#{itemInfo.currentVote}"/>
+ </t:column>
+
+ <t:column>
+ <f:facet name="header">
+ <h:outputText value="Vote"/>
+ </f:facet>
+
+ <h:outputText value="#{itemInfo.voteChoice}"/>
+
+ </t:column>
+
+ <t:column sortable="true">
+ <f:facet name="header">
+ <h:outputText value="Created"/>
+ </f:facet>
+
+ <h:outputText value="#{itemInfo.vote.created}">
+ <s:convertDateTime type="both" dateStyle="medium" timeStyle="medium" />
+ </h:outputText>
+ </t:column>
+
+ <t:column sortable="true">
+ <f:facet name="header">
+ <h:outputText value="Changed"/>
+ </f:facet>
+
+ <h:outputText value="#{itemInfo.vote.changed}">
+ <s:convertDateTime type="both" dateStyle="medium" timeStyle="medium" />
+ </h:outputText>
+ </t:column>
+
+ <t:column sortable="true">
+ <f:facet name="header">
+ <h:outputText value="Remote IP"/>
+ </f:facet>
+
+ <h:outputText value="#{itemInfo.vote.remoteIp}" />
+ </t:column>
+
+ </t:dataTable>
+
+ </h:panelGrid>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/VoteTopic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/VoteTopic.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/VoteTopic.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/VoteTopic.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,127 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Ballot - Vote on Topic"/>
+ </t:htmlTag>
+
+ <s:subform>
+ <h:commandLink action="ballotHall" value="Back to Hall" />
+ </s:subform>
+
+ <h:panelGrid
+ columns="1"
+ width="100%">
+
+ <f:facet name="footer">
+ <h:panelGrid columns="2">
+
+ <h:commandButton
+ value="Save"
+ action="#{ballotVoteTopic.saveAction}"/>
+
+ </h:panelGrid>
+ </f:facet>
+
+ <h:panelGrid
+ columns="2"
+ rowClasses="TR1, TR2"
+ width="40%">
+
+ <f:facet name="header">
+ <h:outputText value="Topic"/>
+ </f:facet>
+
+ <h:outputText
+ value="Name"/>
+
+ <h:outputText
+ value="#{ballotVoteTopic.topic.name}"/>
+
+ <h:outputText
+ value="Description"/>
+ <h:outputText
+ value="#{ballotVoteTopic.topic.description}"/>
+
+ <h:outputText
+ value="Info"/>
+ <h:outputText
+ value="You have to cast '#{ballotVoteTopic.topic.maxVoteCount}' not 0 votes"/>
+
+ </h:panelGrid>
+
+ <t:dataTable
+ binding="#{ballotVoteTopicCmp.itemInfoTable}"
+ styleClass="inputTable"
+ var="itemInfo"
+ value="#{ballotVoteTopic.items}"
+ rowClasses="TR1,TR2"
+ columnClasses="nowrap,nowrap"
+ width="40%">
+
+ <f:facet name="header">
+ <h:outputText value="Items"/>
+ </f:facet>
+
+ <t:column>
+ <f:facet name="header">
+ <h:outputText value="content"/>
+ </f:facet>
+ <h:outputText value="#{itemInfo.item.content}"/>
+ </t:column>
+
+ <t:column>
+ <f:facet name="header">
+ <h:outputText value="Current Vote"/>
+ </f:facet>
+ <h:outputText value="#{itemInfo.currentVote}"/>
+ </t:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Vote"/>
+ </f:facet>
+
+ <h:selectOneRadio
+ value="#{itemInfo.vote.choice}"
+ valueChangeListener="#{ballotVoteTopic.voteChanged}">
+ <f:selectItems value="#{ballotVoteTopic.choices}" />
+ </h:selectOneRadio>
+
+ </h:column>
+
+ </t:dataTable>
+
+ </h:panelGrid>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Voter.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Voter.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Voter.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/Voter.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,120 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Ballot - Voter"/>
+ </t:htmlTag>
+
+ <t:subform>
+ <h:commandLink action="ballotHall" value="Back to Hall" />
+ </t:subform>
+
+ <t:subform>
+ <h:panelGrid
+ columns="2"
+ rowClasses="TR1,TR2"
+ styleClass="inputTable"
+ width="40%">
+
+ <f:facet name="header">
+ <h:outputText value="Register New / Edit data"/>
+ </f:facet>
+ <f:facet name="footer">
+
+ <h:commandButton
+ action="#{ballotVoter.saveAction}"
+ value="Save"/>
+
+ </f:facet>
+
+
+ <h:outputLabel
+ for="email"
+ value="E-Mail"/>
+ <h:inputText
+ id="email"
+ value="#{ballotVoter.voter.email}"
+ required="true"
+ size="40"
+ maxlength="200"
+ rendered="#{ballotVoter.newVoter}"/>
+ <h:outputText
+ value="#{ballotVoter.voter.email}"
+ rendered="#{!ballotVoter.newVoter}"/>
+
+ <h:outputLabel
+ for="name"
+ value="Name"/>
+ <h:inputText
+ id="name"
+ value="#{ballotVoter.voter.name}"
+ required="true"
+ size="80"
+ maxlength="200"/>
+
+ </h:panelGrid>
+ </t:subform>
+
+ <h:outputText
+ value="If you are a new voter you'll receive your login url on the provided email address. You have to use this url to being able to vote."/>
+
+ <t:subform>
+ <h:panelGrid
+ columns="2"
+ rowClasses="TR1,TR2"
+ styleClass="inputTable"
+ width="40%">
+ <f:facet name="header">
+ <h:outputText value="Lost Login Url"/>
+ </f:facet>
+ <f:facet name="footer">
+
+ <h:commandButton
+ action="#{ballotVoter.requestCookieAction}"
+ value="Request login url"/>
+
+ </f:facet>
+
+ <h:outputLabel
+ for="email"
+ value="E-Mail"/>
+ <h:inputText
+ id="email"
+ value="#{ballotVoter.requestEmail}"
+ required="true"
+ size="40"
+ maxlength="200"/>
+
+ </h:panelGrid>
+ </t:subform>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/index.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/index.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/index.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/ballot/index.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,21 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<% response.sendRedirect(response.encodeURL("Hall.faces")); %>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Checkout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Checkout.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Checkout.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Checkout.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,104 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Buy your PC"/>
+ </t:htmlTag>
+
+ <t:dataTable
+ var="order"
+ value="#{configuratorData.orderItems}"
+ rowClasses="TR1, TR2">
+
+ <f:facet name="footer">
+ <h:panelGroup>
+ <h:commandButton value="Cancel" action="#{configuratorData.cancelAction}"/>
+ <h:commandButton value="Buy" action="#{configuratorData.buyAction}"/>
+ </h:panelGroup>
+ </f:facet>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="position"/>
+ </f:facet>
+ <h:outputText value="#{order.posnr}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="count"/>
+ </f:facet>
+ <h:inputText value="#{order.amount}">
+ <s:convertNumber
+ groupingUsed="true"
+ minFractionDigits="0"
+ maxFractionDigits="0"/>
+ </h:inputText>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="number"/>
+ </f:facet>
+ <h:outputText value="#{order.piece.number}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="description"/>
+ </f:facet>
+ <h:outputText value="#{order.piece.description}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="price"/>
+ </f:facet>
+ <h:outputText value="#{order.piece.price}">
+ <f:convertNumber
+ groupingUsed="true"
+ minFractionDigits="2"
+ maxFractionDigits="2"/>
+ </h:outputText>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="value"/>
+ </f:facet>
+ <h:outputText value="???"/>
+ </h:column>
+
+ </t:dataTable>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/ComponentSelection.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/ComponentSelection.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/ComponentSelection.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/ComponentSelection.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,120 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+<%@include file="../header.jspf"%>
+
+<h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Assemble your PC" />
+ </t:htmlTag>
+
+ <t:panelGrid columns="1">
+ <h:commandLink
+ action="editCustomer"
+ value="Customer" />
+ </t:panelGrid>
+
+ <t:panelGrid
+ columns="2"
+ columnClasses="fixtext,selection">
+
+ <h:outputLabel
+ for="component"
+ value="Component"/>
+
+ <h:selectOneMenu
+ id="component"
+ value="#{configuratorData.selectedComponent}">
+ <f:selectItems
+ value="#{configuratorData.components}" />
+ <s:submitOnEvent
+ event="change"
+ for="showPieces" />
+ </h:selectOneMenu>
+
+ <h:outputText />
+ <h:commandButton
+ id="showPieces"
+ value="Show pieces"/>
+
+ <h:outputText
+ value="Pieces"/>
+
+ <t:dataTable
+ var="piece"
+ value="#{configuratorData.pieces}"
+ rowClasses="TR1,TR2">
+
+ <f:facet name="footer">
+ <h:panelGroup>
+ <h:commandButton value="Setup Database" action="#{configuratorData.setupDatabaseAction}" />
+ <h:commandButton value="Checkout" action="#{configuratorData.checkoutAction}" />
+ </h:panelGroup>
+ </f:facet>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="number" />
+ </f:facet>
+ <h:outputText value="#{piece.number}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="description" />
+ </f:facet>
+ <h:outputText value="#{piece.description}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="value" />
+ </f:facet>
+ <h:outputText value="???" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="action" />
+ </f:facet>
+ <h:commandLink
+ value="order"
+ action="#{configuratorData.orderItemAction}">
+
+ <t:updateActionListener property="#{configuratorData.selectedPiece}" value="#{piece.id}" />
+
+ </h:commandLink>
+ </h:column>
+
+ </t:dataTable>
+
+ </t:panelGrid>
+
+</h:form>
+
+<%@include file="../footer.jspf"%>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Customer.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Customer.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Customer.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/Customer.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,79 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Enter your data"/>
+ </t:htmlTag>
+
+ <h:panelGrid columns="2">
+ <f:facet name="footer">
+ <h:panelGrid
+ columns="2"
+ columnClasses="tRight, tRight">
+ <h:outputText value="just calls an empty method without @Transactional - should NOT issue any db request" />
+ <h:commandButton value="Check" action="#{configuratorCustomer.checkAction}"/>
+
+ <h:outputText value="persist the entity using entityManager.persist and @Transactional - should issue insert or update db request" />
+ <h:commandButton value="Save" action="#{configuratorCustomer.saveAction}"/>
+
+ <h:outputText value="just calles a @Transactional method; no entityManager involved - should issue an update db request ONLY if you've saved before" />
+ <h:commandButton value="Update" action="#{configuratorCustomer.updateAction}"/>
+ </h:panelGrid>
+ </f:facet>
+
+ <h:outputLabel
+ for="firstname"
+ value="First name" />
+ <h:inputText
+ id="firstname"
+ value="#{configuratorCustomer.customer.firstName}"
+ required="true"/>
+
+ <h:outputLabel
+ for="lastname"
+ value="First name" />
+ <h:inputText
+ id="lastname"
+ value="#{configuratorCustomer.customer.lastName}"
+ required="true"/>
+
+ <h:outputLabel
+ for="email"
+ value="E-Mail" />
+ <h:inputText
+ id="email"
+ value="#{configuratorCustomer.customer.email}"
+ required="true"/>
+ </h:panelGrid>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/index.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/index.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/index.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/configurator/index.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,21 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<% response.sendRedirect(response.encodeURL("ComponentSelection.faces")); %>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/example.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/example.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/example.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/example.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,42 @@
+<?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.
+-->
+<!DOCTYPE html>
+<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:t="http://myfaces.apache.org/tomahawk">
+<h:head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+ <t:stylesheet path="/default.css" media="screen"/>
+ <title>Apache MyFaces Orchestra</title>
+</h:head>
+<h:body>
+ <ui:insert name="header">
+ <ui:include src="/header.xhtml"/>
+ </ui:insert>
+
+ <ui:insert/>
+
+ <ui:insert name="footer">
+ <ui:include src="/footer.xhtml"/>
+ </ui:insert>
+</h:body>
+</html>
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/footer.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/footer.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/footer.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/footer.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,31 @@
+<?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.
+-->
+<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:t="http://myfaces.apache.org/tomahawk">
+<!-- See comments in file header.xhtml -->
+<ui:composition>
+
+<h:messages showDetail="true" />
+
+</ui:composition>
+</html>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/header.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/header.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/header.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/contracts/simple/header.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,61 @@
+<?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.
+-->
+<!--
+ - This is a page that is included into just about every other page in
+ - this webapp, to provide a standard "navigation bar" across the top
+ - of each page. There are other ways to insert common content, such as
+ - Tiles2, or facelets ui:composite, but we want to keep this webapp
+ - as simple as possible.
+ -
+ - Every page that includes this should start an f:view as the first thing
+ - in the page, then include this page as the first element within the f:view.
+ - The page must also include footer.jsp immediately before the end of the
+ - f:view. This file inserts HTML, HEAD and BODY tags into the document and
+ - the footer closes the BODY and HTML. There are JSF tags in this header
+ - (and the footer) file, so must be inside an f:view.
+ -->
+<!DOCTYPE html>
+<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:t="http://myfaces.apache.org/tomahawk"
+ xmlns:o="http://myfaces.apache.org/orchestra">
+<ui:composition>
+
+<h1>Apache MyFaces Orchestra</h1>
+<h2>Bringing Together: JSF, Spring, Persistence</h2>
+<h:form styleClass="navigation">
+ <ul>
+ <li>
+ <h:link value="Home" outcome="home"/>
+ </li>
+ <li> </li>
+ <li>
+ <o:separateConversationContext>
+ <h:link value="Home in new window" outcome="home" target="_blank"/>
+ </o:separateConversationContext>
+ </li>
+ </ul>
+</h:form>
+<hr/>
+
+</ui:composition>
+</html>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/Form.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/Form.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/Form.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/Form.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,50 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
+
+<f:view>
+ <%@ include file="../header.jspf" %>
+
+ <h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="Form"/>
+ </t:htmlTag>
+
+ <h:panelGrid
+ id="entity-layout"
+ columns="2">
+
+ <ox:dynaForm
+ id="entity"
+ uri="org.apache.myfaces.examples.dynaForm.model.SimpleEntity"
+ valueBindingPrefix="simpleForm" />
+
+ </h:panelGrid>
+
+ </h:form>
+
+ <%@ include file="../footer.jspf" %>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/index.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/index.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/index.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/index.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,25 @@
+<%--
+ Copyright (c) 2007, Your Corporation. All Rights Reserved.
+ --%>
+
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<% response.sendRedirect(response.encodeURL("start.faces")); %>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/start.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/start.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/start.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/dynaForm/start.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,46 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+
+<f:view>
+<%@include file="../header.jspf"%>
+
+<h:form>
+
+ <t:htmlTag value="h3">
+ <h:outputText value="DynaForm Examples" />
+ </t:htmlTag>
+
+ <t:htmlTag value="ul">
+ <t:htmlTag value="li">
+ <h:outputLink value="Form.faces" >
+ <h:outputText value="A simple input form" />
+ </h:outputLink>
+ </t:htmlTag>
+ </t:htmlTag>
+
+</h:form>
+
+<%@include file="../footer.jspf"%>
+</f:view>
\ No newline at end of file
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/images/Thumbs.db
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/images/Thumbs.db?rev=1587905&view=auto
==============================================================================
Binary file - no diff available.
Propchange: myfaces/orchestra/trunk/examples22/src/main/webapp/images/Thumbs.db
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/index.html?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/index.html (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/index.html Wed Apr 16 13:45:55 2014
@@ -0,0 +1,31 @@
+<!--
+ 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.
+-->
+<!--
+ - The servlet container will automatically direct urls that specify
+ - no particular page to the "index.html" page. However the faces
+ - servlet will not have been run, so that page cannot use any
+ - jsf features. Therefore this page just redirects to a url that
+ - *will* be handled by the faces servlet.
+ -->
+<html>
+<head>
+ <meta http-equiv="refresh" content="0; URL=start.faces">
+</head>
+</html>
+
Added: myfaces/orchestra/trunk/examples22/src/main/webapp/mops/CustomerLogin.xhtml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/mops/CustomerLogin.xhtml?rev=1587905&view=auto
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/mops/CustomerLogin.xhtml (added)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/mops/CustomerLogin.xhtml Wed Apr 16 13:45:55 2014
@@ -0,0 +1,67 @@
+<%--
+ 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.
+ --%>
+
+<%@ page pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
+<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
+
+<f:view>
+ <%@ include file="/mops/header.jspf" %>
+ <t:div styleClass="login_position">
+ <t:div styleClass="login_content">
+ <h:form>
+
+ <h:outputText
+ value="This is not a real login thing, just create a new customer and press login"/>
+
+ <h:panelGrid columns="1" rowClasses="formData,formAction"
+ styleClass="formInput" width="40%">
+
+ <f:facet name="header">
+ <h:outputText value="Enter your informations"/>
+ </f:facet>
+
+ <h:panelGrid id="customer-layout" columns="2" rowClasses="TR1,TR2"
+ width="100%">
+
+ <ox:dynaForm id="customer"
+ uri="org.apache.myfaces.examples.mops.model.ShopCustomer"
+ valueBindingPrefix="mopsCustomerLogin.shopCustomer"/>
+
+ </h:panelGrid>
+
+ <h:panelGrid columns="1" rowClasses="formAction">
+ <h:commandButton styleClass="btn" value="login"
+ action="#{mopsCustomerLogin.loginAction}"
+ rendered="#{!mopsCustomerLogin.loggedIn}"/>
+ <h:commandButton styleClass="btn" value="save"
+ action="#{mopsCustomerLogin.saveAction}"
+ rendered="#{mopsCustomerLogin.loggedIn}"/>
+ </h:panelGrid>
+
+ </h:panelGrid>
+
+ </h:form>
+ </t:div>
+ </t:div>
+ <%@ include file="/mops/footer.jspf" %>
+</f:view>
\ No newline at end of file