[richfaces-svn-commits] JBoss Rich Faces SVN: r5682 - in branches/3.1.x: samples/seamPortletEar and 2 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: alexsmirnov
Date: 2008-01-28 19:12:38 -0500 (Mon, 28 Jan 2008)
New Revision: 5682

Modified:
   branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
   branches/3.1.x/samples/seamPortletEar/pom.xml
   branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml
   branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/web.xml
   branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/hotel.xhtml
Log:
merge seam booking portlet from trunk. Fix http://jira.jboss.com/jira/browse/RF-1460

Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java	2008-01-29 00:12:38 UTC (rev 5682)
@@ -282,7 +282,7 @@
 													+ ". Restore last saved state");
 								}
 								restoredState = (Object[]) logicalStates
-										.get(logicalStates.firstKey());
+										.get(logicalStates.lastKey());
 							}
 						} else {
 							if (_log.isDebugEnabled()) {
@@ -290,7 +290,7 @@
 										.debug("No version Id for a saved view state in request. Restore last saved state");
 							}
 							restoredState = (Object[]) logicalStates
-									.get(logicalStates.firstKey());
+									.get(logicalStates.lastKey());
 						}
 					} else if (_log.isDebugEnabled()) {
 						_log

Modified: branches/3.1.x/samples/seamPortletEar/pom.xml
===================================================================
--- branches/3.1.x/samples/seamPortletEar/pom.xml	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/samples/seamPortletEar/pom.xml	2008-01-29 00:12:38 UTC (rev 5682)
@@ -14,7 +14,7 @@
 	<packaging>pom</packaging>
 	<name>seam EAR portlet project</name>
         <properties>
-          <seam>2.0.1.CR2</seam>
+          <seam>2.0.0.GA</seam>
         </properties>
 	<modules>
 		<module>seamBookingPortlet</module>

Modified: branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml	2008-01-29 00:12:38 UTC (rev 5682)
@@ -6,7 +6,10 @@
     <portlet>
          <portlet-name>seamBookingPortlet</portlet-name>
           <header-content>
-            <link rel="stylesheet" type="text/css" href="/css/screen.css" media="screen"/>
+           <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script>
+           <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script>
+           <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> 
+           <link rel="stylesheet" type="text/css" href="/css/screen.css" media="screen"/>
          </header-content>
     </portlet>
 </portlet-app>         
\ No newline at end of file

Modified: branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/web.xml	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/WEB-INF/web.xml	2008-01-29 00:12:38 UTC (rev 5682)
@@ -19,10 +19,29 @@
 	</context-param>
 	<context-param>
 		<param-name>javax.portlet.faces.renderPolicy</param-name>
-		<param-value>
-			ALWAYS_DELEGATE
-		</param-value>
+		<param-value>ALWAYS_DELEGATE</param-value>
 	</context-param>
+	<context-param>
+      <param-name>javax.portlet.faces.preserveActionParams</param-name>
+      <param-value>true</param-value>
+	</context-param>
+	<context-param>
+		<param-name>javax.faces.LIFECYCLE_ID</param-name>
+		<param-value>SEAM_PORTLET</param-value>
+	</context-param>
+	<context-param>
+		<param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name>
+		<param-value>rfRes</param-value>
+	</context-param>
+   <context-param>
+      <param-name>org.richfaces.LoadStyleStrategy</param-name>
+      <param-value>NONE</param-value>
+   </context-param>
+   <context-param>
+      <param-name>org.richfaces.LoadScriptStrategy</param-name>
+      <param-value>NONE</param-value>
+   </context-param>
+
 	<!-- Seam -->
 
 	<listener>

Modified: branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/hotel.xhtml
===================================================================
--- branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/hotel.xhtml	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webapp/hotel.xhtml	2008-01-29 00:12:38 UTC (rev 5682)
@@ -19,7 +19,7 @@
 
 	<div class="buttonBox">
 		<h:form id="hotel">
-			<a:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>
+			<h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>
 			&#160;
 			<a:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/>
 		</h:form>