[jboss-svn-commits] JBoss PortletSwap SVN: r151 - in portlets/src/framework/SeamBookingPortlet/web/src/main: webapp and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 12 18:16:09 EST 2007
Author: wesleyhales
Date: 2007-11-12 18:16:09 -0500 (Mon, 12 Nov 2007)
New Revision: 151
Added:
portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/seamportlet-object.xml
Removed:
portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/ajaxportlet-object.xml
portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/about.xhtml
Modified:
portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml
portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml
portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml
Log:
cleanup and remove RichFaces/A4J support
Deleted: portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/ajaxportlet-object.xml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/ajaxportlet-object.xml 2007-11-12 21:31:27 UTC (rev 150)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/ajaxportlet-object.xml 2007-11-12 23:16:09 UTC (rev 151)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
- <deployment>
- <parent-ref>default</parent-ref>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-name>SeamPortletInstance</instance-name>
- <component-ref>seamPortletApp.seamPortlet</component-ref>
- </instance>
- </deployment>
- <!--
- <deployment>
- <parent-ref>default</parent-ref>
- <if-exists>overwrite</if-exists>
- <page>
- <page-name>ajaxPortlet</page-name>
- <window>
- <window-name>ajaxportletWindow</window-name>
- <instance-ref>AjaxPortletInstance</instance-ref>
- <default>true</default>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>ajaxportletSecondWindow</window-name>
- <instance-ref>AjaxPortletSecondInstance</instance-ref>
- <default>true</default>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>
- -->
- <deployment>
- <if-exists>overwrite</if-exists>
- <parent-ref>default.default</parent-ref>
- <window>
- <window-name>otherSeamportletWindow</window-name>
- <instance-ref>SeamPortletInstance</instance-ref>
- <default>true</default>
- <region>center</region>
- <height>0</height>
- </window>
- </deployment><!--
- <deployment>
- <parent-ref>default</parent-ref>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-name>AjaxPortletSecondInstance</instance-name>
- <component-ref>ajaxPortletApp.ajaxPortlet</component-ref>
- </instance>
- </deployment>
---></deployments>
Copied: portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/seamportlet-object.xml (from rev 147, portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/ajaxportlet-object.xml)
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/seamportlet-object.xml (rev 0)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/resources/portal/seamportlet-object.xml 2007-11-12 23:16:09 UTC (rev 151)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+ <deployment>
+ <parent-ref>default</parent-ref>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-name>SeamPortletInstance</instance-name>
+ <component-ref>seamPortletApp.seamPortlet</component-ref>
+ </instance>
+ </deployment>
+ <!--
+ <deployment>
+ <parent-ref>default</parent-ref>
+ <if-exists>overwrite</if-exists>
+ <page>
+ <page-name>ajaxPortlet</page-name>
+ <window>
+ <window-name>ajaxportletWindow</window-name>
+ <instance-ref>AjaxPortletInstance</instance-ref>
+ <default>true</default>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>ajaxportletSecondWindow</window-name>
+ <instance-ref>AjaxPortletSecondInstance</instance-ref>
+ <default>true</default>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ </page>
+ </deployment>
+ -->
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <parent-ref>default.default</parent-ref>
+ <window>
+ <window-name>otherSeamportletWindow</window-name>
+ <instance-ref>SeamPortletInstance</instance-ref>
+ <default>true</default>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ </deployment><!--
+ <deployment>
+ <parent-ref>default</parent-ref>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-name>AjaxPortletSecondInstance</instance-name>
+ <component-ref>ajaxPortletApp.ajaxPortlet</component-ref>
+ </instance>
+ </deployment>
+--></deployments>
Deleted: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/about.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/about.xhtml 2007-11-12 21:31:27 UTC (rev 150)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/about.xhtml 2007-11-12 23:16:09 UTC (rev 151)
@@ -1,162 +0,0 @@
-<ui:composition
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:s="http://jboss.com/products/seam/taglib">
-
-
-
-<div class="community-menu-container float-left third-width">
- <div class="community-menu-header"/>
- <div class="community-menu-main align-center">
- <br/>
- <h:form id="form">
-
- <rich:panelMenu style="width:200px" styleClass="align-center-margin" mode="ajax"
- iconExpandedGroup="disc" iconCollapsedGroup="disc"
- iconExpandedTopGroup="chevronUp" iconGroupTopPosition="right"
- iconCollapsedTopGroup="chevronDown" iconCollapsedTopPosition="right" itemClass="white" hoveredItemClass="blue">
-
- <rich:panelMenuGroup label="items" expanded="true">
- <rich:panelMenuItem label="item1">
- <f:param name="current" value="item1"/>
- <s:conversationPropagation type="none"/>
- </rich:panelMenuItem>
- <rich:panelMenuItem label="item2">
- <f:param name="current" value="item2"/>
- <s:conversationPropagation type="none"/>
- </rich:panelMenuItem>
- <rich:panelMenuItem label="item3">
- <f:param name="current" value="item3"/>
- <s:conversationPropagation type="none"/>
- </rich:panelMenuItem>
-
- </rich:panelMenuGroup>
-
- </rich:panelMenu>
-
-
- </h:form>
- <br/>
- </div>
- <div class="community-menu-footer"/>
-</div>
-
-<div class="community-about float-right" style="width:65%">
-
-<rich:panel>
-
-<a4j:outputPanel ajaxRendered="true">
-
-
-
-
-
-<rich:dataTable onRowMouseOver="this.style.backgroundColor='#F1F1F1'" rendered="#{param.current == 'item1'}"
- onRowMouseOut="this.style.backgroundColor='#{a4jSkin.tableBackgroundColor}'"
- cellpadding="0" cellspacing="0" width="100%" border="0" var="none" value="">
-
- <f:facet name="header">
- <rich:columnGroup>
- <rich:column colspan="2">
- <div class="float-left half-width align-left">
- <h3>item1</h3>
-
- </div>
- <div class="float-right half-width">
- <rich:subTable
- onRowMouseOver="this.style.backgroundColor='#F8F8F8'"
- onRowMouseOut="this.style.backgroundColor='#{a4jSkin.tableBackgroundColor}'" var="traddnsactions"
- value="">
- <rich:column colspan="2">
- item1
- </rich:column>
-
- <rich:columnGroup>
-
- <rich:column>
- <h3 class="bold-black">item</h3>
- </rich:column>
- <rich:column styleClass="yellow">
- <h3 class="bold-black">item</h3>
- </rich:column>
- </rich:columnGroup>
- <rich:columnGroup>
-
- <rich:column>
- <h3 class="bold-black">item</h3>
- </rich:column>
- <rich:column styleClass="green">
- <h3 class="bold-black">item</h3>
- </rich:column>
- </rich:columnGroup>
- <rich:columnGroup>
-
- <rich:column>
- <h3 class="bold-black">item</h3>
- </rich:column>
- <rich:column styleClass="blue">
- <h3 class="bold-black">item</h3>
- </rich:column>
- </rich:columnGroup>
- </rich:subTable>
- </div>
- </rich:column>
- <rich:column breakBefore="true">
-
- <h3> <h:outputText value="item"/></h3>
-
- </rich:column>
-
- <rich:column>
-
- <h3> <h:outputText value="item"/></h3>
-
- </rich:column>
-
-
- </rich:columnGroup>
- </f:facet>
-
- <rich:column colspan="2" style="background-color:#ececec">
- <h3 class="bold-black">item</h3>
- </rich:column>
- <rich:columnGroup>
- <rich:column>
- item
- </rich:column>
- <rich:column styleClass="blue">
- item
- </rich:column>
- </rich:columnGroup>
- <rich:columnGroup>
- <rich:column>
- item
- </rich:column>
- <rich:column styleClass="blue">
- item
- </rich:column>
- </rich:columnGroup>
- <rich:columnGroup>
- <rich:column>
- item
- </rich:column>
- <rich:column styleClass="blue">
- item
- </rich:column>
- </rich:columnGroup>
-
-
-</rich:dataTable>
-
-
-</a4j:outputPanel>
-</rich:panel>
-
- </div>
-
-
-</ui:composition>
Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml 2007-11-12 21:31:27 UTC (rev 150)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/book.xhtml 2007-11-12 23:16:09 UTC (rev 151)
@@ -1,122 +1,127 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:a="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
- template="template.xhtml">
+ template="template.xhtml">
<!-- content -->
<ui:define name="content">
-<div class="section">
- <h1>Book Hotel</h1>
-</div>
-<div class="section">
- <div class="entry errors">
- <h:messages globalOnly="true"/>
+ <div class="section">
+ <h1>Book Hotel</h1>
</div>
+ <div class="section">
+ <div class="entry errors">
+ <h:messages globalOnly="true"/>
+ </div>
- <ui:include src="hotelview.xhtml"/>
+ <ui:include src="hotelview.xhtml"/>
- <div style="clear:both"/>
+ <div style="clear:both"/>
- <h:form id="booking">
- <fieldset>
+ <h:form id="booking">
+ <fieldset>
- <s:decorate id="checkinDateDecorate" template="edit.xhtml">
- <ui:define name="label">Check In Date:</ui:define>
- <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" />
- </s:decorate>
+ <s:decorate id="checkinDateDecorate" template="edit.xhtml">
+ <ui:define name="label">Check In Date:</ui:define>
+ <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy"
+ event="onblur" reRender="checkinDateDecorate"/>
+ </s:decorate>
- <s:decorate id="checkoutDateDecorate" template="edit.xhtml">
- <ui:define name="label">Check Out Date:</ui:define>
- <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" />
- </s:decorate>
+ <s:decorate id="checkoutDateDecorate" template="edit.xhtml">
+ <ui:define name="label">Check Out Date:</ui:define>
+ <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy"
+ event="onblur" reRender="checkoutDateDecorate"/>
+ </s:decorate>
- <s:decorate id="bedsDecorate" template="edit.xhtml">
- <ui:define name="label">Room Preference:</ui:define>
- <h:selectOneMenu id="beds" value="#{booking.beds}">
- <f:selectItem itemLabel="One king-size bed" itemValue="1"/>
- <f:selectItem itemLabel="Two double beds" itemValue="2"/>
- <f:selectItem itemLabel="Three beds" itemValue="3"/>
- </h:selectOneMenu>
- </s:decorate>
+ <s:decorate id="bedsDecorate" template="edit.xhtml">
+ <ui:define name="label">Room Preference:</ui:define>
+ <h:selectOneMenu id="beds" value="#{booking.beds}">
+ <f:selectItem itemLabel="One king-size bed" itemValue="1"/>
+ <f:selectItem itemLabel="Two double beds" itemValue="2"/>
+ <f:selectItem itemLabel="Three beds" itemValue="3"/>
+ </h:selectOneMenu>
+ </s:decorate>
- <s:decorate id="smokingDecorate" template="edit.xhtml">
- <ui:define name="label">Smoking Preference:</ui:define>
- <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection" styleClass="radio">
- <f:selectItem itemLabel="Smoking" itemValue="true"/>
- <f:selectItem itemLabel="Non Smoking" itemValue="false"/>
- </h:selectOneRadio>
- </s:decorate>
+ <s:decorate id="smokingDecorate" template="edit.xhtml">
+ <ui:define name="label">Smoking Preference:</ui:define>
+ <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection" styleClass="radio">
+ <f:selectItem itemLabel="Smoking" itemValue="true"/>
+ <f:selectItem itemLabel="Non Smoking" itemValue="false"/>
+ </h:selectOneRadio>
+ </s:decorate>
- <s:decorate id="creditCardDecorate" template="edit.xhtml">
- <ui:define name="label">Credit Card #:</ui:define>
- <h:inputText id="creditCard" value="#{booking.creditCard}" required="true">
- <a:support event="onblur" reRender="creditCardDecorate"/>
- </h:inputText>
- </s:decorate>
+ <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>
+ </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">
- <a:support event="onblur" reRender="creditCardNameDecorate"/>
- </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>
+ </h:inputText>
+ </s:decorate>
- <s:decorate id="creditCardExpiryDecorate" template="edit.xhtml">
- <ui:define name="label">Credit Card Expiry:</ui:define>
- <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}">
- <f:selectItem itemLabel="Jan" itemValue="1"/>
- <f:selectItem itemLabel="Feb" itemValue="2"/>
- <f:selectItem itemLabel="Mar" itemValue="3"/>
- <f:selectItem itemLabel="Apr" itemValue="4"/>
- <f:selectItem itemLabel="May" itemValue="5"/>
- <f:selectItem itemLabel="Jun" itemValue="6"/>
- <f:selectItem itemLabel="Jul" itemValue="7"/>
- <f:selectItem itemLabel="Aug" itemValue="8"/>
- <f:selectItem itemLabel="Sep" itemValue="9"/>
- <f:selectItem itemLabel="Oct" itemValue="10"/>
- <f:selectItem itemLabel="Nov" itemValue="11"/>
- <f:selectItem itemLabel="Dec" itemValue="12"/>
- </h:selectOneMenu>
- <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}">
- <f:selectItem itemLabel="2005" itemValue="2005"/>
- <f:selectItem itemLabel="2006" itemValue="2006"/>
- <f:selectItem itemLabel="2007" itemValue="2007"/>
- <f:selectItem itemLabel="2008" itemValue="2008"/>
- <f:selectItem itemLabel="2009" itemValue="2009"/>
- </h:selectOneMenu>
- </s:decorate>
+ <s:decorate id="creditCardExpiryDecorate" template="edit.xhtml">
+ <ui:define name="label">Credit Card Expiry:</ui:define>
+ <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}">
+ <f:selectItem itemLabel="Jan" itemValue="1"/>
+ <f:selectItem itemLabel="Feb" itemValue="2"/>
+ <f:selectItem itemLabel="Mar" itemValue="3"/>
+ <f:selectItem itemLabel="Apr" itemValue="4"/>
+ <f:selectItem itemLabel="May" itemValue="5"/>
+ <f:selectItem itemLabel="Jun" itemValue="6"/>
+ <f:selectItem itemLabel="Jul" itemValue="7"/>
+ <f:selectItem itemLabel="Aug" itemValue="8"/>
+ <f:selectItem itemLabel="Sep" itemValue="9"/>
+ <f:selectItem itemLabel="Oct" itemValue="10"/>
+ <f:selectItem itemLabel="Nov" itemValue="11"/>
+ <f:selectItem itemLabel="Dec" itemValue="12"/>
+ </h:selectOneMenu>
+ <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}">
+ <f:selectItem itemLabel="2005" itemValue="2005"/>
+ <f:selectItem itemLabel="2006" itemValue="2006"/>
+ <f:selectItem itemLabel="2007" itemValue="2007"/>
+ <f:selectItem itemLabel="2008" itemValue="2008"/>
+ <f:selectItem itemLabel="2009" itemValue="2009"/>
+ </h:selectOneMenu>
+ </s:decorate>
- <div class="buttonBox">
- <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>
-  
- <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
- </div>
+ <div class="buttonBox">
+ <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>
+  
+ <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
+ </div>
- </fieldset>
- </h:form>
-</div>
+ </fieldset>
+ </h:form>
+ </div>
</ui:define>
<!-- sidebar -->
<ui:define name="sidebar">
-<h1>Workspace management</h1>
-<p>
- As you can see, Seam makes it easy to work in multiple windows or multiple browser
- tabs. But you can even switch between multiple tasks inside a single browser tab!
- The "Workspaces" section showcases this advanced feature.
-</p>
-<p>
- <a href="#" onclick="window.open('exp/workspaceExp.html','exp','width=752,height=500,scrollbars=yes');">
- How does the workspace list work?
- </a>
-</p>
+ <h1>Workspace management</h1>
+ <p>
+ As you can see, Seam makes it easy to work in multiple windows or multiple browser
+ tabs. But you can even switch between multiple tasks inside a single browser tab!
+ The "Workspaces" section showcases this advanced feature.
+ </p>
+
+ <p>
+ <a href="#" onclick="window.open('exp/workspaceExp.html','exp','width=752,height=500,scrollbars=yes');">
+ How does the workspace list work?
+ </a>
+ </p>
+
</ui:define>
</ui:composition>
Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml 2007-11-12 21:31:27 UTC (rev 150)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/main.xhtml 2007-11-12 23:16:09 UTC (rev 151)
@@ -21,10 +21,10 @@
<h:form id="searchCriteria">
<fieldset>
<h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;">
- <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" />
+ <ui:remove><a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /></ui:remove>
</h:inputText>
 
- <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/>
+ <h:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}"/>
 
<a:status>
<f:facet name="start">
Modified: portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml
===================================================================
--- portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml 2007-11-12 21:31:27 UTC (rev 150)
+++ portlets/src/framework/SeamBookingPortlet/web/src/main/webapp/register.xhtml 2007-11-12 23:16:09 UTC (rev 151)
@@ -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">
- <a:support event="onblur" reRender="usernameDecorate"/>
+ <ui:remove><a:support event="onblur" reRender="usernameDecorate"/></ui:remove>
</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">
- <a:support event="onblur" reRender="nameDecorate"/>
+ <ui:remove><a:support event="onblur" reRender="nameDecorate"/></ui:remove>
</h:inputText>
</s:decorate>
More information about the jboss-svn-commits
mailing list