[portletswap-commits] JBoss PortletSwap SVN: r228 - in portlets/src/framework/SeamBookingPortlet: ear and 5 other directories.

portletswap-commits at lists.jboss.org portletswap-commits at lists.jboss.org
Tue Feb 5 15:13:37 EST 2008


Author: wesleyhales
Date: 2008-02-05 15:13:36 -0500 (Tue, 05 Feb 2008)
New Revision: 228

Added:
   portlets/src/framework/SeamBookingPortlet/ear/src/main/resources/application.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/components.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-app.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/error.xhtml
Modified:
   portlets/src/framework/SeamBookingPortlet/ear/pom.xml
   portlets/src/framework/SeamBookingPortlet/ejb/pom.xml
   portlets/src/framework/SeamBookingPortlet/pom.xml
   portlets/src/framework/SeamBookingPortlet/web/pom.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/faces-config.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-web.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml
   portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml
Log:
updated changes for booking demo

Modified: portlets/src/framework/SeamBookingPortlet/ear/pom.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ear/pom.xml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/ear/pom.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -27,7 +27,7 @@
 
       <dependency>
          <groupId>org.jboss.portal.example</groupId>
-         <artifactId>PortletWeb</artifactId>
+         <artifactId>seamBookingPortlet</artifactId>
          <version>${project.version}</version>
          <type>war</type>
       </dependency>
@@ -44,17 +44,18 @@
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.seam</groupId>
-         <artifactId>jboss-el</artifactId>
+         <groupId>org.jboss.el</groupId>
+        <artifactId>jboss-el</artifactId>
          <exclusions>
             <exclusion>
                <groupId>javax.el</groupId>
                <artifactId>el-api</artifactId>
             </exclusion>
          </exclusions>
-         <type>jar</type>
+          <type>jar</type>
       </dependency>
 
+
       <dependency>
          <groupId>org.drools</groupId>
          <artifactId>drools-core</artifactId>
@@ -136,8 +137,8 @@
 
                   <webModule>
                      <groupId>org.jboss.portal.example</groupId>
-                     <artifactId>PortletWeb</artifactId>
-                     <contextRoot>/SeamBookingPortletWeb-${version}</contextRoot>
+                     <artifactId>seamBookingPortlet</artifactId>
+                     <contextRoot>/seamBookingPortlet</contextRoot>
                   </webModule>
 
                   <ejbModule>
@@ -152,9 +153,10 @@
                   </jarModule>
 
                   <jarModule>
-                     <groupId>org.jboss.seam</groupId>
-                     <artifactId>jboss-el</artifactId>
-                     <!--<includeInApplicationXml>true</includeInApplicationXml>-->
+
+                     <groupId>org.jboss.el</groupId>
+                    <artifactId>jboss-el</artifactId>
+
                      <bundleDir>lib</bundleDir>
                   </jarModule>
 

Added: portlets/src/framework/SeamBookingPortlet/ear/src/main/resources/application.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ear/src/main/resources/application.xml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/ear/src/main/resources/application.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4">
+  <description>JBoss Portal Seam Booking Portlet Example EAR</description>
+  <display-name>SeamBookingPortlet</display-name>
+  <!--<module>-->
+    <!--<web>-->
+      <!--<web-uri>seamBookingPortlet-1.0.war</web-uri>-->
+      <!--<context-root>/seamBookingPortlet</context-root>-->
+    <!--</web>-->
+  <!--</module>-->
+  <module>
+    <java>drools-core-4.0.0.jar</java>
+  </module>
+  <module>
+    <java>drools-compiler-4.0.0.jar</java>
+  </module>
+  <module>
+    <java>janino-2.4.3.jar</java>
+  </module>
+  <module>
+    <java>mvel14-1.2rc4rv908.jar</java>
+  </module>
+  <module>
+    <java>antlr-2.7.7.jar</java>
+  </module>
+  <module>
+    <java>mvel14-1.2rc4rv908.jar</java>
+  </module>
+   <module>
+    <java>jboss-seam-2.0.1-SNAPSHOT.jar</java>
+  </module><module id="EJB"><ejb>PortletEjb-1.0.jar</ejb></module><module id="Web"><web><web-uri>seamBookingPortlet-1.0.war</web-uri></web></module>
+   </application>
\ No newline at end of file

Modified: portlets/src/framework/SeamBookingPortlet/ejb/pom.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/ejb/pom.xml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/ejb/pom.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -19,10 +19,66 @@
       <dependency>
          <groupId>org.jboss.seam</groupId>
          <artifactId>jboss-seam</artifactId>
-         <scope>provided</scope>
+         <exclusions>
+            <exclusion>
+               <groupId>javax.el</groupId>
+               <artifactId>el-api</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
 
       <dependency>
+         <groupId>org.jboss.el</groupId>
+        <artifactId>jboss-el</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>javax.el</groupId>
+               <artifactId>el-api</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+
+      <dependency>
+         <groupId>org.drools</groupId>
+         <artifactId>drools-core</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.drools</groupId>
+         <artifactId>drools-compiler</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>xml-apis</groupId>
+               <artifactId>xml-apis</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>xerces</groupId>
+               <artifactId>xercesImpl</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+
+      <dependency>
+         <groupId>janino</groupId>
+         <artifactId>janino</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.mvel</groupId>
+         <artifactId>mvel14</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>antlr</groupId>
+         <artifactId>antlr</artifactId>
+      </dependency>
+
+      <dependency>
+         <groupId>org.mvel</groupId>
+         <artifactId>mvel14</artifactId>
+      </dependency>
+
+      <!--<dependency>
          <groupId>org.jboss.seam</groupId>
          <artifactId>jboss-seam-ui</artifactId>
          <scope>provided</scope>
@@ -51,7 +107,7 @@
          <groupId>org.jboss.seam</groupId>
          <artifactId>jboss-seam-ioc</artifactId>
          <scope>provided</scope>
-      </dependency>
+      </dependency>-->
 
 
       <dependency>
@@ -60,11 +116,11 @@
          <scope>provided</scope>
       </dependency>
 
-      <dependency>
+      <!--<dependency>
          <groupId>org.jboss.seam</groupId>
          <artifactId>jboss-el</artifactId>
          <scope>provided</scope>
-      </dependency>
+      </dependency>-->
 
 
 

Modified: portlets/src/framework/SeamBookingPortlet/pom.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/pom.xml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/pom.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.seam</groupId>
       <artifactId>root</artifactId>
-      <version>2.0.0.GA</version>
+      <version>2.0.1-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.jboss.portal.example</groupId>

Modified: portlets/src/framework/SeamBookingPortlet/web/pom.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/pom.xml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/pom.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -8,7 +8,7 @@
       <version>1.0</version>
    </parent>
    <groupId>org.jboss.portal.example</groupId>
-   <artifactId>PortletWeb</artifactId>
+   <artifactId>seamBookingPortlet</artifactId>
    <packaging>war</packaging>
    <version>1.0</version>
    <name>JBoss Portal Seam Booking Portlet Example WAR</name>
@@ -17,7 +17,7 @@
    <build>
       <defaultGoal>install</defaultGoal>
       <!--this will be the name of your war file-->
-      <finalName>${artifactId}-${version}</finalName>
+      <finalName>seamBookingPortlet</finalName>
 
       <resources>
 
@@ -304,28 +304,50 @@
 
 
       <dependency>
-          <groupId>org.apache.myfaces.portlet-bridge</groupId>
-          <artifactId>portlet-bridge-impl</artifactId>
-          <version>1.0.0-SNAPSHOT</version>
-          <exclusions>
-            <exclusion>
-               <groupId>org.apache.myfaces.core</groupId>
-               <artifactId>myfaces-api</artifactId>
-            </exclusion>
-          </exclusions>
-       </dependency>
+			<groupId>org.richfaces.extensions.portletbridge</groupId>
+			<artifactId>portletbridge-api</artifactId>
+			<version>3.2.0-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.faces</groupId>
+					<artifactId>jsf-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.faces</groupId>
+					<artifactId>jsf-impl</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.richfaces.extensions.portletbridge</groupId>
+			<artifactId>portletbridge-impl</artifactId>
+			<version>3.2.0-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.faces</groupId>
+					<artifactId>jsf-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.faces</groupId>
+					<artifactId>jsf-impl</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
-       <dependency>
-          <groupId>org.apache.myfaces.portlet-bridge</groupId>
-          <artifactId>portlet-bridge-api</artifactId>
-          <version>1.0.0-SNAPSHOT</version>
-          <exclusions>
-            <exclusion>
-               <groupId>org.apache.myfaces.core</groupId>
-               <artifactId>myfaces-api</artifactId>
-            </exclusion>
-          </exclusions>
-       </dependency>
+		<!--<dependency>-->
+			<!--<groupId>javax.faces</groupId>-->
+			<!--<artifactId>jsf-api</artifactId>-->
+			<!--<version>1.2_07</version>-->
+			<!--<scope>provided</scope>-->
+		<!--</dependency>-->
+		<!--<dependency>-->
+			<!--<groupId>javax.faces</groupId>-->
+			<!--<artifactId>jsf-impl</artifactId>-->
+			<!--<version>1.2_07</version>-->
+			<!--<scope>provided</scope>-->
+		<!--</dependency>-->
+
+
       <dependency>
          <groupId>commons-lang</groupId>
          <artifactId>commons-lang</artifactId>
@@ -459,8 +481,8 @@
             </dependency>
 
             <dependency>
-               <groupId>org.jboss.seam</groupId>
-               <artifactId>jboss-el</artifactId>
+               <groupId>org.jboss.el</groupId>
+              <artifactId>jboss-el</artifactId>
                <exclusions>
                   <exclusion>
                      <groupId>javax.el</groupId>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/components.xml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/components.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+            xmlns:core="http://jboss.com/products/seam/core"
+            xmlns:drools="http://jboss.com/products/seam/drools"
+            xmlns:persistence="http://jboss.com/products/seam/persistence"
+            xmlns:security="http://jboss.com/products/seam/security"
+            xmlns:web="http://jboss.com/products/seam/web"
+            xmlns:mail="http://jboss.com/products/seam/mail"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:transaction="http://jboss.com/products/seam/transaction"
+            xsi:schemaLocation=
+                    "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
+                 http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
+                 http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
+                 http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
+                 http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.0.xsd
+                 http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
+                 http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+
+    <core:init jndi-pattern="SeamBookingPortlet-1.0/#{ejbName}/local"/>
+
+    <core:manager auto-create="true" conversation-timeout="120000"
+                  concurrent-request-timeout="500"
+                  conversation-id-parameter="cid"/>
+
+    <persistence:managed-persistence-context name="entityManager"
+                                             auto-create="true"
+                                             persistence-unit-jndi-name="java:/seamtestappEntityManagerFactory"/>
+
+
+    <!--<transaction:ejb-transaction/>-->
+
+    <security:identity authenticate-method="#{authenticator.authenticate}"/>
+
+
+</components>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/faces-config.xml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/faces-config.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -1,22 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE faces-config PUBLIC
-          "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
-          "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-<!--suppress ALL -->
-<faces-config>
-   <application>
-      <!--<view-handler>
-         org.ajax4jsf.portlet.application.PortletViewHandler
-      </view-handler>
-      <state-manager>
-         org.ajax4jsf.portlet.application.PortalStateManager
-      </state-manager>-->
-         <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
-   </application>
-   <factory>
-      <!--<faces-context-factory>
-         org.ajax4jsf.portlet.context.FacesContextFactoryImpl
-      </faces-context-factory>-->
-   </factory>
-   
+<faces-config version="1.2"
+              xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+
+	<application>
+		<view-handler>
+			org.ajax4jsf.portlet.application.PortletViewHandler
+		</view-handler>
+	</application>
+	<factory>
+		<faces-context-factory>
+			org.ajax4jsf.portlet.context.FacesContextFactoryImpl
+		</faces-context-factory>
+	</factory>
+
 </faces-config>

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-app.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-app.xml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-app.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -0,0 +1,3 @@
+<jboss-app>
+	<app-name>seamBookingPortletApp</app-name>
+</jboss-app>
\ No newline at end of file

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-web.xml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/jboss-web.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -1,8 +1,12 @@
-<jboss-web>  
-  <class-loading java2ClassLoadingCompliance="false">
-    <loader-repository>
-      seam.jboss.org:loader=seamtestapp
-      <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
-    </loader-repository>
-  </class-loading>
-</jboss-web>
+<!DOCTYPE jboss-web PUBLIC
+   "-//JBoss//DTD Web Application 4.2//EN"
+   "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+
+  <jboss-web>
+   <class-loading java2ClassLoadingCompliance="false">
+       <loader-repository>
+           seam.jboss.org:loader=seamBookingPortlet
+           <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+       </loader-repository>
+   </class-loading>
+  </jboss-web>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/pages.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -2,10 +2,11 @@
 <pages xmlns="http://jboss.com/products/seam/pages"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
-
-       no-conversation-view-id="/main.xhtml"
-                 login-view-id="/home.xhtml">
-
+	   no-conversation-view-id="/main.xhtml"
+       login-view-id="/home.xhtml">
+       <!--
+no-conversation-view-id="/main.xhtml"
+    -->
     <page view-id="/register.xhtml">
 
         <action if="#{validation.failed}"
@@ -13,17 +14,20 @@
 
         <navigation>
             <rule if="#{register.registered}">
-                <redirect view-id="/home.xhtml"/>
+                <render view-id="/home.xhtml"/>
             </rule>
         </navigation>
 
     </page>
 
     <page view-id="/home.xhtml">
-
+    	<action execute="#{identity.login}" if="#{identity.loggedIn}"/>
+        <navigation from-action="#{identity.login}">
+            <render  view-id="/main.xhtml"/>
+        </navigation>
         <navigation>
             <rule if="#{identity.loggedIn}">
-                <redirect view-id="/main.xhtml"/>
+                <render view-id="/main.xhtml"/>
             </rule>
         </navigation>
 
@@ -34,7 +38,7 @@
 
         <navigation>
             <rule if="#{changePassword.changed}">
-                <redirect view-id="/main.xhtml"/>
+                <render view-id="/main.xhtml"/>
             </rule>
         </navigation>
 
@@ -44,49 +48,49 @@
           login-required="true">
 
         <navigation from-action="#{hotelBooking.selectHotel(hot)}">
-            <redirect view-id="/hotel.xhtml"/>
+            <render view-id="/hotel.xhtml"/>
         </navigation>
 
         <navigation from-action="#{bookingList.cancel}">
-            <redirect/>
+            <render/>
         </navigation>
 
     </page>
 
-   <page view-id="/hotel.xhtml"
-         conversation-required="true"
-         login-required="true">
+	<page view-id="/hotel.xhtml"
+	      conversation-required="true"
+	      login-required="true">
 
         <description>View hotel: #{hotel.name}</description>
 
         <navigation from-action="#{hotelBooking.bookHotel}">
-            <redirect view-id="/book.xhtml"/>
+            <render view-id="/book.xhtml"/>
         </navigation>
 
     </page>
 
-   <page view-id="/book.xhtml"
-         conversation-required="true"
-         login-required="true">
+	<page view-id="/book.xhtml"
+	      conversation-required="true"
+	      login-required="true">
 
         <description>Book hotel: #{hotel.name}</description>
 
         <navigation from-action="#{hotelBooking.setBookingDetails}">
             <rule if="#{hotelBooking.bookingValid}">
-                <redirect view-id="/confirm.xhtml"/>
+                <render view-id="/confirm.xhtml"/>
             </rule>
         </navigation>
 
     </page>
 
-   <page view-id="/confirm.xhtml"
-         conversation-required="true"
-         login-required="true">
+	<page view-id="/confirm.xhtml"
+	      conversation-required="true"
+	      login-required="true">
 
         <description>Confirm booking: #{booking.description}</description>
 
         <navigation from-action="#{hotelBooking.confirm}">
-            <redirect view-id="/main.xhtml"/>
+            <render view-id="/main.xhtml"/>
         </navigation>
 
     </page>
@@ -94,15 +98,27 @@
     <page view-id="*">
 
         <navigation from-action="#{identity.logout}">
-            <redirect view-id="/home.xhtml"/>
+            <render view-id="/home.xhtml"/>
         </navigation>
 
         <navigation from-action="#{hotelBooking.cancel}">
-            <redirect view-id="/main.xhtml"/>
+            <render view-id="/main.xhtml"/>
         </navigation>
 
     </page>
 
+   <exception class="java.lang.Exception">
+        <redirect view-id="/help.xhtml">
+            <message severity="warn">There was an Error processing register.</message>
+        </redirect>
+    </exception>
+
+   <exception class="javax.el.PropertyNotFoundException">
+        <redirect view-id="/error.xhtml">
+            <message severity="warn">There was an Error with your expression.</message>
+        </redirect>
+    </exception>
+
     <exception class="org.jboss.seam.security.NotLoggedInException">
         <redirect view-id="/home.xhtml">
             <message severity="warn">You must be logged in to use this feature</message>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/WEB-INF/web.xml	2008-02-05 20:13:36 UTC (rev 228)
@@ -1,109 +1,105 @@
-<?xml version="1.0"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
-   <description>JbossPortalSeamBookingPortlet</description>
+	<display-name>Seam Booking Example</display-name>
 
+	<context-param>
+		<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+		<param-value>
+			org.ajax4jsf.portlet.application.FaceletPortletViewHandler
+		</param-value>
+	</context-param>
+	<context-param>
+		<param-name>org.ajax4jsf.portlet.ExceptionHandler</param-name>
+		<param-value>
+			org.ajax4jsf.portlet.SeamExceptionHandlerImpl
+		</param-value>
+	</context-param>
+	<context-param>
+		<param-name>javax.portlet.faces.renderPolicy</param-name>
+		<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>javax.portlet.faces.BridgeImplClass</param-name>
-     <param-value>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</param-value>
+      <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>
 
-   <!-- <context-param>
-     <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
-     <param-value>org.ajax4jsf.portlet.application.FaceletPortletViewHandler</param-value>
-    </context-param>
-   <filter>
-     <display-name>Ajax4jsf Filter</display-name>
-     <filter-name>ajax4jsf</filter-name>
-     <filter-class>org.ajax4jsf.Filter</filter-class>
-    </filter>
+	<!-- Seam -->
 
-    <filter-mapping>
-     <filter-name>ajax4jsf</filter-name>
-     <servlet-name>Faces Servlet</servlet-name>
-     <dispatcher>FORWARD</dispatcher>
-     <dispatcher>REQUEST</dispatcher>
-     <dispatcher>INCLUDE</dispatcher>
-    </filter-mapping>-->
-    <!-- Seam -->
+	<listener>
+		<listener-class>
+			org.jboss.seam.servlet.SeamListener
+		</listener-class>
+	</listener>
 
-   <listener>
-      <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
-   </listener>
+	<servlet>
+		<servlet-name>Seam Resource Servlet</servlet-name>
+		<servlet-class>
+			org.jboss.seam.servlet.SeamResourceServlet
+		</servlet-class>
+	</servlet>
 
+	<servlet-mapping>
+		<servlet-name>Seam Resource Servlet</servlet-name>
+		<url-pattern>/seam/resource/*</url-pattern>
+	</servlet-mapping>
 
-   <servlet>
-      <servlet-name>Seam Resource Servlet</servlet-name>
-      <servlet-class>org.jboss.seam.servlet.ResourceServlet</servlet-class>
-   </servlet>
+	<filter>
+		<filter-name>Seam Filter</filter-name>
+		<filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+	</filter>
 
-   <servlet-mapping>
-      <servlet-name>Seam Resource Servlet</servlet-name>
-      <url-pattern>/seam/resource/*</url-pattern>
-   </servlet-mapping>
+	<filter-mapping>
+		<filter-name>Seam Filter</filter-name>
+		<servlet-name>FacesServlet</servlet-name>
+		<dispatcher>FORWARD</dispatcher>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>INCLUDE</dispatcher>
+	</filter-mapping>
 
+	<!-- JSF -->
 
-   <filter>
-      <filter-name>Seam Filter</filter-name>
-      <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
-   </filter>
+	<context-param>
+		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+		<param-value>.xhtml</param-value>
+	</context-param>
 
-   <filter-mapping>
-      <filter-name>Seam Filter</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>
+	<context-param>
+		<param-name>facelets.DEVELOPMENT</param-name>
+		<param-value>true</param-value>
+	</context-param>
 
+	<servlet>
+		<servlet-name>FacesServlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
 
-   <!-- JSF -->
-   <!--<context-param>
-     <param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
-     <param-value>NEKO,TIDY,NONE</param-value>
-   </context-param>-->
-   <!--<context-param>
-     <param-name>org.ajax4jsf.xmlparser.TIDY</param-name>
-     <param-value>/pages/repeater.xhtml,/pages/tabs.xhtml</param-value>
-   </context-param>-->
+	<servlet-mapping>
+		<servlet-name>FacesServlet</servlet-name>
+		<url-pattern>/faces/*</url-pattern>
+	</servlet-mapping>
 
-   <context-param>
-      <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-      <param-value>server</param-value>
-   </context-param>
+	<session-config>
+		<session-timeout>10</session-timeout>
+	</session-config>
 
-   <context-param>
-      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-      <param-value>.xhtml</param-value>
-   </context-param>
-
-   <context-param>
-      <param-name>facelets.DEVELOPMENT</param-name>
-      <param-value>false</param-value>
-   </context-param>
-
-   <servlet>
-      <servlet-name>Faces Servlet</servlet-name>
-      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-      <load-on-startup>1</load-on-startup>
-   </servlet>
-
-   <servlet-mapping>
-      <servlet-name>Faces Servlet</servlet-name>
-      <url-pattern>*.seam</url-pattern>
-   </servlet-mapping>
-
-   <listener>
-      <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
-   </listener>
-
-   <session-config>
-      <session-timeout>30</session-timeout>
-   </session-config>
-
-   <welcome-file-list>
-      <welcome-file>index.html</welcome-file>
-   </welcome-file-list>
-
-
-</web-app>
\ No newline at end of file
+</web-app>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml	2008-02-05 20:13:36 UTC (rev 228)
@@ -58,14 +58,14 @@
             <s:decorate id="creditCardDecorate" template="edit.xhtml">
                <ui:define name="label">Credit Card #:</ui:define>
                <h:inputText id="creditCard" value="#{booking.creditCard}" required="true">
-                  <ui:remove><a:support event="onblur" reRender="creditCardDecorate"/></ui:remove>
+                  <a:support event="onblur" reRender="creditCardDecorate"/>
                </h:inputText>
             </s:decorate>
 
             <s:decorate id="creditCardNameDecorate" template="edit.xhtml">
                <ui:define name="label">Credit Card Name:</ui:define>
                <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true">
-                  <ui:remove><a:support event="onblur" reRender="creditCardNameDecorate"/></ui:remove>
+                  <a:support event="onblur" reRender="creditCardNameDecorate"/>
                </h:inputText>
             </s:decorate>
 

Added: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/error.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/error.xhtml	                        (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/error.xhtml	2008-02-05 20:13:36 UTC (rev 228)
@@ -0,0 +1,14 @@
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:a4j="http://richfaces.org/a4j"
+      xmlns:rich="http://richfaces.org/rich"
+   xmlns:s="http://jboss.com/products/seam/taglib">
+   <s:message styleClass="error errors"/>
+   <h:form>
+   <h:messages/>
+   Error :(
+   </h:form>
+</ui:composition>
\ No newline at end of file

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/help.xhtml	2008-02-05 20:13:36 UTC (rev 228)
@@ -4,7 +4,9 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:h="http://java.sun.com/jsf/html"
       xmlns:a4j="http://richfaces.org/a4j"
-      xmlns:rich="http://richfaces.org/rich">
+      xmlns:rich="http://richfaces.org/rich"
+   xmlns:s="http://jboss.com/products/seam/taglib">
 
+   <h:messages/>
    Help Mode
 </ui:composition>
\ No newline at end of file

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml	2008-02-05 20:13:36 UTC (rev 228)
@@ -21,7 +21,7 @@
    <h:form id="searchCriteria">
    <fieldset>
       <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;">
-         <ui:remove><a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /></ui:remove>
+         <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" />
        </h:inputText>
        &#160;
       <h:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}"/>

Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml	2008-02-01 13:28:54 UTC (rev 227)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml	2008-02-05 20:13:36 UTC (rev 228)
@@ -59,14 +59,14 @@
                <s:decorate id="usernameDecorate" template="edit.xhtml">
                   <ui:define name="label">Username:</ui:define>
                   <h:inputText id="username" value="#{user.username}" required="true">
-                     <ui:remove><a:support event="onblur" reRender="usernameDecorate"/></ui:remove>
+                     <a:support event="onblur" reRender="usernameDecorate"/>
                   </h:inputText>
                </s:decorate>
 
                <s:decorate id="nameDecorate" template="edit.xhtml">
                   <ui:define name="label">Real Name:</ui:define>
                   <h:inputText id="name" value="#{user.name}" required="true">
-                     <ui:remove><a:support event="onblur" reRender="nameDecorate"/></ui:remove>
+                     <a:support event="onblur" reRender="nameDecorate"/>
                   </h:inputText>
                </s:decorate>
 




More information about the portletswap-commits mailing list