[jboss-cvs] JBossAS SVN: r101019 - in projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main: webapp and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: lvlcek at redhat.com
Date: 2010-02-16 08:38:19 -0500 (Tue, 16 Feb 2010)
New Revision: 101019

Modified:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationCreate.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml
Log:
ReservationCreate moved from request scope to session scope

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationCreate.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationCreate.java	2010-02-16 13:00:01 UTC (rev 101018)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationCreate.java	2010-02-16 13:38:19 UTC (rev 101019)
@@ -68,9 +68,7 @@
 
    public void updateSelectedAccount()
    {
-      System.out.println("Current account = " + reservation.getAccount());
       Account account = accountFilter.getSelectedAccount();
-      System.out.println("setting account " + account.getId());
       reservation.setAccount(account);
    }
 

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml	2010-02-16 13:00:01 UTC (rev 101018)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml	2010-02-16 13:38:19 UTC (rev 101019)
@@ -13,16 +13,23 @@
 
     <import resource="classpath*:spring-converterHelpers.xml"/>
     
-    <!-- Request scoped beans -->
-    <bean id="reservationCreate" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationCreate" scope="request" init-method="init">
+    <!-- Session scoped beans -->
+    <bean id="reservationCreate" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationCreate" scope="session" init-method="init">
         <property name="reservationService" ref="reservationService"/>
         <property name="accountService" ref="accountService"/>
         <property name="accountFilter" ref="accountFilter"/>
         <property name="equipmentFilter" ref="equipmentFilter"/>
     </bean>
 
+    <bean id="accountFilter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.AccountFilter" scope="session">
+        <property name="accountService" ref="accountService"/>
+    </bean>
 
-    <!-- Session scoped beans -->
+    <bean id="equipmentFilter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.EquipmentFilter" scope="session">
+        <property name="equipmentService" ref="equipmentService"/>
+    </bean>
+
+
     <bean id="reservationSearch" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationSearch" scope="session">
         <property name="reservationService" ref="reservationService"/>
         <property name="tableState" ref="reservationSearchTableState"/>
@@ -35,14 +42,7 @@
         <property name="equipmentService" ref="equipmentService"/>
     </bean>
 
-    <bean id="accountFilter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.AccountFilter" scope="session">
-        <property name="accountService" ref="accountService"/>
-    </bean>
-
-    <bean id="equipmentFilter" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.EquipmentFilter" scope="session">
-        <property name="equipmentService" ref="equipmentService"/>
-    </bean>
-
+    
     <!-- Application scoped service -->
     <bean id="referenceData" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReferenceData" init-method="init">
         <property name="equipmentService" ref="equipmentService"/>

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml	2010-02-16 13:00:01 UTC (rev 101018)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml	2010-02-16 13:38:19 UTC (rev 101019)
@@ -47,20 +47,27 @@
                                     <h:outputText value="#{account.subscriber.name.firstName}"/>
                                 </rich:column>
 
-                                <rich:column label="Middle Name">
+                                <rich:column label="Last Name">
                                     <f:facet name="header">
-                                        <h:outputText value="Middle Name"/>
+                                        <h:outputText value="Last Name"/>
                                     </f:facet>
-                                    <h:outputText value="#{account.subscriber.name.middleName}"/>
+                                    <h:outputText value="#{account.subscriber.name.lastName}"/>
                                 </rich:column>
 
-                                <rich:column label="Last Name">
+                                <rich:column label="City">
                                     <f:facet name="header">
-                                        <h:outputText value="Last Name"/>
+                                        <h:outputText value="City"/>
                                     </f:facet>
-                                    <h:outputText value="#{account.subscriber.name.lastName}"/>
+                                    <h:outputText value="#{account.subscriber.address.city}"/>
                                 </rich:column>
 
+                                <rich:column label="Country">
+                                    <f:facet name="header">
+                                        <h:outputText value="Country"/>
+                                    </f:facet>
+                                    <h:outputText value="#{account.subscriber.address.country}"/>
+                                </rich:column>
+
                                 <f:facet name="footer">
                                     <rich:datascroller id="scrollerAccount" for="accountsTable" maxPages="5"
                                                        page="#{accountFilter.currentPage}"/>