From richfaces-svn-commits at lists.jboss.org Mon Jan 28 19:12:41 2008
Content-Type: multipart/mixed; boundary="===============3009216490425562863=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r5682 - in
 branches/3.1.x: samples/seamPortletEar and 2 other directories.
Date: Mon, 28 Jan 2008 19:12:38 -0500
Message-ID: <E1JJe5e-0005JR-RB@committer01.frg.pub.inap.atl.jboss.com>

--===============3009216490425562863==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/Aja=
xStateManager.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/brows=
e/RF-1460

Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/applicat=
ion/AjaxStateManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/Aj=
axStateManager.java	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/application/Aj=
axStateManager.java	2008-01-29 00:12:38 UTC (rev 5682)
@@ -282,7 +282,7 @@
 													+ ". Restore last saved state");
 								}
 								restoredState =3D (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 =3D (Object[]) logicalStates
-									.get(logicalStates.firstKey());
+									.get(logicalStates.lastKey());
 						}
 					} else if (_log.isDebugEnabled()) {
 						_log

Modified: branches/3.1.x/samples/seamPortletEar/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webap=
p/WEB-INF/jboss-portlet.xml	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webap=
p/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=3D"stylesheet" type=3D"text/css" href=3D"/css/screen=
.css" media=3D"screen"/>
+           <script src=3D"/faces/rfRes/org/ajax4jsf/framework.pack.js" typ=
e=3D"text/javascript" ></script>
+           <script src=3D"/faces/rfRes/org/richfaces/ui.pack.js" type=3D"t=
ext/javascript" ></script>
+           <link rel=3D"stylesheet" type=3D"text/css" href=3D"/faces/rfRes=
/org/richfaces/skin.xcss" /> =

+           <link rel=3D"stylesheet" type=3D"text/css" href=3D"/css/screen.=
css" media=3D"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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webap=
p/WEB-INF/web.xml	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webap=
p/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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webap=
p/hotel.xhtml	2008-01-29 00:11:21 UTC (rev 5681)
+++ branches/3.1.x/samples/seamPortletEar/seamBookingPortlet/src/main/webap=
p/hotel.xhtml	2008-01-29 00:12:38 UTC (rev 5682)
@@ -19,7 +19,7 @@
 =

 	<div class=3D"buttonBox">
 		<h:form id=3D"hotel">
-			<a:commandButton id=3D"bookHotel" action=3D"#{hotelBooking.bookHotel}" =
value=3D"Book Hotel"/>
+			<h:commandButton id=3D"bookHotel" action=3D"#{hotelBooking.bookHotel}" =
value=3D"Book Hotel"/>
 			&#160;
 			<a:commandButton id=3D"cancel" action=3D"#{hotelBooking.cancel}" value=
=3D"Back to Search"/>
 		</h:form>


--===============3009216490425562863==--