[seam-commits] Seam SVN: r7339 - in trunk/examples/seamdiscs: view and 1 other directory.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sat Feb 2 19:21:37 EST 2008
Author: pete.muir at jboss.org
Date: 2008-02-02 19:21:37 -0500 (Sat, 02 Feb 2008)
New Revision: 7339
Modified:
trunk/examples/seamdiscs/build.xml
trunk/examples/seamdiscs/view/artist.xhtml
trunk/examples/seamdiscs/view/artists.xhtml
trunk/examples/seamdiscs/view/disc.xhtml
trunk/examples/seamdiscs/view/discs.xhtml
trunk/examples/seamdiscs/view/home.xhtml
Log:
JBSEAM-2374
Modified: trunk/examples/seamdiscs/build.xml
===================================================================
--- trunk/examples/seamdiscs/build.xml 2008-02-03 00:04:21 UTC (rev 7338)
+++ trunk/examples/seamdiscs/build.xml 2008-02-03 00:21:37 UTC (rev 7339)
@@ -41,13 +41,13 @@
<target name="copyextradependencies">
<artifact:dependencies filesetId="trinidad.fileset" versionsId="trinidad.versions" sourcesfilesetid="trinidad.sources">
- <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.1">
+ <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.5">
<exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
<exclusion groupId="javax.servlet" artifactId="servlet-api" />
<exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
<exclusion groupId="javax.faces" artifactId="jsf-api"/>
</dependency>
- <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.1">
+ <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.5">
<exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
<exclusion groupId="javax.servlet" artifactId="servlet-api" />
<exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
Modified: trunk/examples/seamdiscs/view/artist.xhtml
===================================================================
--- trunk/examples/seamdiscs/view/artist.xhtml 2008-02-03 00:04:21 UTC (rev 7338)
+++ trunk/examples/seamdiscs/view/artist.xhtml 2008-02-03 00:21:37 UTC (rev 7339)
@@ -13,74 +13,72 @@
<ui:define name="body">
<rich:panel>
- <f:facet name="header"><tr:outputText value="#{artist.name} (#{messages[artist.class.name]})" rendered="#{artist.name ne null}" /></f:facet>
- <tr:panelPartialRoot>
- <h:form>
- <s:validateAll>
- <tr:panelFormLayout>
- <tr:inputText label="Artist" value="#{artist.name}" readOnly="#{not identity.loggedIn}" required="true"/>
- <tr:panelLabelAndMessage label="Band Members" rendered="#{artist.class.simpleName eq 'Band'}">
- <ul>
- <ui:repeat value="#{artist.bandMembers}" var="bandMember">
- <li>
- <tr:inputText simple="true" value="#{bandMember.name}" readOnly="#{not identity.loggedIn}" id="bandMember"/>
- <rich:suggestionbox for="bandMember" selfRendered="true" minChars="3" suggestionAction="#{bandMemberFinder.getBandMembers}" var="bandMember">
- <h:column>
- <h:outputText value="#{bandMember.name}" />
- </h:column>
- </rich:suggestionbox>
- </li>
- </ui:repeat>
- </ul>
- <f:facet name="end">
- <h:commandButton action="#{artistHome.addBandMember}" value="Add Band Member" rendered="#{identity.loggedIn}"/>
- </f:facet>
- </tr:panelLabelAndMessage>
- <tr:panelLabelAndMessage label="Details">
- <tr:inputText simple="true" value="#{artist.description}" rendered="#{identity.loggedIn}" rows="4" columns="60" id="description">
- <a:support event="onkeyup" reRender="description_preview" requestDelay="3000" ignoreDupResponces="true" eventsQueue="previewQueue" />
- </tr:inputText>
- <s:div style="width: 300px" id="description_preview">
-
- <s:formattedText value="#{artist.description}" rendered="#{not empty artist.description}" />
- <tr:outputText value="None known" rendered="#{empty artist.description}" />
+ <f:facet name="header"><tr:outputText value="#{artist.name} (#{messages[artist.class.name]})" rendered="#{artist.name ne null}" /></f:facet>
+ <h:form>
+ <s:validateAll>
+ <tr:panelFormLayout>
+ <tr:inputText label="Artist" value="#{artist.name}" readOnly="#{not identity.loggedIn}" required="true"/>
+ <tr:panelLabelAndMessage label="Band Members" rendered="#{artist.class.simpleName eq 'Band'}">
+ <ul>
+ <ui:repeat value="#{artist.bandMembers}" var="bandMember">
+ <li>
+ <tr:inputText simple="true" value="#{bandMember.name}" readOnly="#{not identity.loggedIn}" id="bandMember"/>
+ <rich:suggestionbox for="bandMember" selfRendered="true" minChars="3" suggestionAction="#{bandMemberFinder.getBandMembers}" var="bandMember">
+ <h:column>
+ <h:outputText value="#{bandMember.name}" />
+ </h:column>
+ </rich:suggestionbox>
+ </li>
+ </ui:repeat>
+ </ul>
+ <f:facet name="end">
+ <h:commandButton action="#{artistHome.addBandMember}" value="Add Band Member" rendered="#{identity.loggedIn}"/>
+ </f:facet>
+ </tr:panelLabelAndMessage>
+ <tr:panelLabelAndMessage label="Details">
+ <tr:inputText simple="true" value="#{artist.description}" rendered="#{identity.loggedIn}" rows="4" columns="60" id="description">
+ <a:support event="onkeyup" reRender="description_preview" requestDelay="3000" ignoreDupResponces="true" eventsQueue="previewQueue" />
+ </tr:inputText>
+ <s:div style="width: 300px" id="description_preview">
+
+ <s:formattedText value="#{artist.description}" rendered="#{not empty artist.description}" />
+ <tr:outputText value="None known" rendered="#{empty artist.description}" />
+ </s:div>
+ </tr:panelLabelAndMessage>
+ <tr:panelLabelAndMessage label="Discs">
+ <tr:table value="#{artist.discs}" var="disc" rows="5" emptyText="None Known">
+ <tr:column>
+ <f:facet name="header">
+ Disc
+ </f:facet>
+ <tr:inputText value="#{disc.name}" readOnly="#{not identity.loggedIn}"/>
+ </tr:column>
+ <tr:column>
+ <f:facet name="header">
+ Released
+ </f:facet>
+ <tr:inputNumberSpinbox label="Release Date" value="#{disc.release}" minimum="1900" maximum="2010" stepSize="1" readOnly="#{not identity.loggedIn}" />
+ </tr:column>
+ <f:facet name="detailStamp">
+ <s:div style="width: 300px;">
+ <s:formattedText value="#{disc.description}" rendered="#{not empty disc.description}" />
+ <tr:outputText value="None known" rendered="#{empty disc.description}" />
</s:div>
- </tr:panelLabelAndMessage>
- <tr:panelLabelAndMessage label="Discs">
- <tr:table value="#{artist.discs}" var="disc" rows="5" emptyText="None Known">
- <tr:column>
- <f:facet name="header">
- Disc
- </f:facet>
- <tr:inputText value="#{disc.name}" readOnly="#{not identity.loggedIn}"/>
- </tr:column>
- <tr:column>
- <f:facet name="header">
- Released
- </f:facet>
- <tr:inputNumberSpinbox label="Release Date" value="#{disc.release}" minimum="1900" maximum="2010" stepSize="1" readOnly="#{not identity.loggedIn}" />
- </tr:column>
- <f:facet name="detailStamp">
- <s:div style="width: 300px;">
- <s:formattedText value="#{disc.description}" rendered="#{not empty disc.description}" />
- <tr:outputText value="None known" rendered="#{empty disc.description}" />
- </s:div>
- </f:facet>
- </tr:table>
- <f:facet name="end">
- <h:commandButton action="#{artistHome.addDisc}" value="Add Disc" rendered="#{identity.loggedIn}"/>
- </f:facet>
- </tr:panelLabelAndMessage>
- </tr:panelFormLayout>
- </s:validateAll>
-
- <tr:panelButtonBar rendered="#{identity.loggedIn}">
- <h:commandButton action="#{artistHome.update}" value="Save" rendered="#{artistHome.managed}" />
- <h:commandButton action="#{artistHome.persist}" value="Save" rendered="#{not artistHome.managed}" />
- <s:button action="cancel" value="Cancel" />
- </tr:panelButtonBar>
- </h:form>
- </tr:panelPartialRoot>
+ </f:facet>
+ </tr:table>
+ <f:facet name="end">
+ <h:commandButton action="#{artistHome.addDisc}" value="Add Disc" rendered="#{identity.loggedIn}"/>
+ </f:facet>
+ </tr:panelLabelAndMessage>
+ </tr:panelFormLayout>
+ </s:validateAll>
+
+ <tr:panelButtonBar rendered="#{identity.loggedIn}">
+ <h:commandButton action="#{artistHome.update}" value="Save" rendered="#{artistHome.managed}" />
+ <h:commandButton action="#{artistHome.persist}" value="Save" rendered="#{not artistHome.managed}" />
+ <s:button action="cancel" value="Cancel" />
+ </tr:panelButtonBar>
+ </h:form>
</rich:panel>
</ui:define>
Modified: trunk/examples/seamdiscs/view/artists.xhtml
===================================================================
--- trunk/examples/seamdiscs/view/artists.xhtml 2008-02-03 00:04:21 UTC (rev 7338)
+++ trunk/examples/seamdiscs/view/artists.xhtml 2008-02-03 00:21:37 UTC (rev 7339)
@@ -14,68 +14,65 @@
<rich:panel>
<f:facet name="header">Artists</f:facet>
- <tr:panelPartialRoot>
+ <tr:form>
+ <tr:inputText value="#{exampleArtist.name}" label="Filter by artist name">
+ <a:support reRender="artists" event="onkeyup" requestDelay="1" />
+ </tr:inputText>
+  
+ <a:status>
+ <f:facet name="start">
+ <h:graphicImage value="/img/spinner.gif" />
+ </f:facet>
+ </a:status>
+ </tr:form>
+
+ <a:outputPanel id="artists">
<tr:form>
- <tr:inputText value="#{exampleArtist.name}" label="Filter by artist name">
- <a:support reRender="artists" event="onkeyup" requestDelay="1" />
- </tr:inputText>
-  
- <a:status>
- <f:facet name="start">
- <h:graphicImage value="/img/spinner.gif" />
+ <tr:table value="#{artists.dataModel}" var="artist"
+ rows="#{artists.maxResults}">
+ <tr:column sortable="true" sortProperty="artist.name">
+ <f:facet name="header">
+ Name
+ </f:facet>
+ <s:link action="artist">
+ <tr:outputText value="#{artist.name}" />
+ <f:param name="artistId" value="#{artist.id}" />
+ </s:link>
+ </tr:column>
+ <tr:column>
+ <f:facet name="header">
+ Band Members
+ </f:facet>
+ <tr:outputText value="Solo performer"
+ rendered="#{artist.class.simpleName eq 'Artist'}" />
+ <tr:outputText value="None"
+ rendered="#{artist.class.simpleName eq 'Band' and empty artist.bandMembers}" />
+ <rich:dataList value="#{artist.bandMembers}" var="bandMember"
+ rendered="#{artist.class.simpleName eq 'Band' and not empty artist.bandMembers}">
+ <tr:outputText value="#{bandMember.name}" />
+ </rich:dataList>
+ </tr:column>
+ <f:facet name="detailStamp">
+ <s:div style="width: 200px">
+ <s:formattedText value="#{artist.description}"
+ rendered="#{not empty artist.description}" />
+ <tr:outputText value="None known"
+ rendered="#{empty artist.description}" />
+ </s:div>
</f:facet>
- </a:status>
+ </tr:table>
</tr:form>
-
- <a:outputPanel id="artists">
- <tr:form>
- <tr:table value="#{artists.dataModel}" var="artist"
- rows="#{artists.maxResults}">
- <tr:column sortable="true" sortProperty="artist.name">
- <f:facet name="header">
- Name
- </f:facet>
- <s:link action="artist">
- <tr:outputText value="#{artist.name}" />
- <f:param name="artistId" value="#{artist.id}" />
- </s:link>
- </tr:column>
- <tr:column>
- <f:facet name="header">
- Band Members
- </f:facet>
- <tr:outputText value="Solo performer"
- rendered="#{artist.class.simpleName eq 'Artist'}" />
- <tr:outputText value="None"
- rendered="#{artist.class.simpleName eq 'Band' and empty artist.bandMembers}" />
- <rich:dataList value="#{artist.bandMembers}" var="bandMember"
- rendered="#{artist.class.simpleName eq 'Band' and not empty artist.bandMembers}">
- <tr:outputText value="#{bandMember.name}" />
- </rich:dataList>
- </tr:column>
- <f:facet name="detailStamp">
- <s:div style="width: 200px">
- <s:formattedText value="#{artist.description}"
- rendered="#{not empty artist.description}" />
- <tr:outputText value="None known"
- rendered="#{empty artist.description}" />
- </s:div>
- </f:facet>
- </tr:table>
- </tr:form>
- </a:outputPanel>
- <tr:panelButtonBar rendered="#{identity.loggedIn}">
- <s:button action="artist" value="Add artist">
- <f:param name="artistId" value="" />
- <f:param name="type" value="artist" />
- </s:button>
- <s:button action="artist" value="Add band">
- <f:param name="artistId" value="" />
- <f:param name="type" value="band" />
- </s:button>
- </tr:panelButtonBar>
-
- </tr:panelPartialRoot>
+ </a:outputPanel>
+ <tr:panelButtonBar rendered="#{identity.loggedIn}">
+ <s:button action="artist" value="Add artist">
+ <f:param name="artistId" value="" />
+ <f:param name="type" value="artist" />
+ </s:button>
+ <s:button action="artist" value="Add band">
+ <f:param name="artistId" value="" />
+ <f:param name="type" value="band" />
+ </s:button>
+ </tr:panelButtonBar>
</rich:panel>
</ui:define>
Modified: trunk/examples/seamdiscs/view/disc.xhtml
===================================================================
--- trunk/examples/seamdiscs/view/disc.xhtml 2008-02-03 00:04:21 UTC (rev 7338)
+++ trunk/examples/seamdiscs/view/disc.xhtml 2008-02-03 00:21:37 UTC (rev 7339)
@@ -19,36 +19,34 @@
<tr:outputText value=" by #{disc.artist.name}" />
</s:fragment>
</f:facet>
- <tr:panelPartialRoot>
- <tr:form>
- <s:validateAll>
- <tr:panelFormLayout>
- <tr:inputText label="Disc" value="#{disc.name}" readOnly="#{not identity.loggedIn}" required="true" />
- <tr:inputNumberSpinbox label="Release Date" value="#{disc.release}" minimum="1900" maximum="2010" stepSize="1" readOnly="#{not identity.loggedIn}" />
- <tr:selectOneChoice value="#{disc.artist}" label="Artist" required="true" readOnly="#{not identity.loggedIn}">
- <s:selectItems value="#{allArtists.resultList}" var="artist" label="#{artist.name}" noSelectionLabel="Please Select..." hideNoSelectionLabel="true" />
- <s:convertEntity />
- </tr:selectOneChoice>
- <tr:panelLabelAndMessage label="Details">
- <tr:inputText simple="true" value="#{disc.description}" rendered="#{identity.loggedIn}" rows="4" columns="60" id="description">
- <a:support event="onkeyup" reRender="description_preview" requestDelay="3000" ignoreDupResponces="true" eventsQueue="previewQueue" />
- </tr:inputText>
- <s:div style="width: 300px;" id="description_preview">
- <s:formattedText value="#{disc.description}" rendered="#{not empty disc.description}" />
- <tr:outputText value="None known" rendered="#{empty disc.description}" />
- </s:div>
- </tr:panelLabelAndMessage>
- </tr:panelFormLayout>
- </s:validateAll>
-
- <tr:panelButtonBar rendered="#{identity.loggedIn}">
- <h:commandButton action="#{discHome.update}" value="Save" rendered="#{discHome.managed}" />
- <h:commandButton action="#{discHome.persist}" value="Save" rendered="#{not discHome.managed}" />
- <h:commandButton action="#{discHome.remove}" value="Delete" rendered="#{discHome.managed}" />
- <s:button action="cancel" value="Cancel" />
- </tr:panelButtonBar>
- </tr:form>
- </tr:panelPartialRoot>
+ <tr:form>
+ <s:validateAll>
+ <tr:panelFormLayout>
+ <tr:inputText label="Disc" value="#{disc.name}" readOnly="#{not identity.loggedIn}" required="true" />
+ <tr:inputNumberSpinbox label="Release Date" value="#{disc.release}" minimum="1900" maximum="2010" stepSize="1" readOnly="#{not identity.loggedIn}" />
+ <tr:selectOneChoice value="#{disc.artist}" label="Artist" required="true" readOnly="#{not identity.loggedIn}">
+ <s:selectItems value="#{allArtists.resultList}" var="artist" label="#{artist.name}" noSelectionLabel="Please Select..." hideNoSelectionLabel="true" />
+ <s:convertEntity />
+ </tr:selectOneChoice>
+ <tr:panelLabelAndMessage label="Details">
+ <tr:inputText simple="true" value="#{disc.description}" rendered="#{identity.loggedIn}" rows="4" columns="60" id="description">
+ <a:support event="onkeyup" reRender="description_preview" requestDelay="3000" ignoreDupResponces="true" eventsQueue="previewQueue" />
+ </tr:inputText>
+ <s:div style="width: 300px;" id="description_preview">
+ <s:formattedText value="#{disc.description}" rendered="#{not empty disc.description}" />
+ <tr:outputText value="None known" rendered="#{empty disc.description}" />
+ </s:div>
+ </tr:panelLabelAndMessage>
+ </tr:panelFormLayout>
+ </s:validateAll>
+
+ <tr:panelButtonBar rendered="#{identity.loggedIn}">
+ <h:commandButton action="#{discHome.update}" value="Save" rendered="#{discHome.managed}" />
+ <h:commandButton action="#{discHome.persist}" value="Save" rendered="#{not discHome.managed}" />
+ <h:commandButton action="#{discHome.remove}" value="Delete" rendered="#{discHome.managed}" />
+ <s:button action="cancel" value="Cancel" />
+ </tr:panelButtonBar>
+ </tr:form>
</rich:panel>
</ui:define>
Modified: trunk/examples/seamdiscs/view/discs.xhtml
===================================================================
--- trunk/examples/seamdiscs/view/discs.xhtml 2008-02-03 00:04:21 UTC (rev 7338)
+++ trunk/examples/seamdiscs/view/discs.xhtml 2008-02-03 00:21:37 UTC (rev 7339)
@@ -12,39 +12,37 @@
<ui:define name="body">
<rich:panel>
- <f:facet name="header">Discs</f:facet>
- <tr:panelPartialRoot>
- <tr:form>
- <tr:table value="#{discs.dataModel}" var="disc" rows="#{discs.maxResults}">
- <tr:column sortable="true" sortProperty="disc.name">
- <f:facet name="header">
- Name
- </f:facet>
- <s:link action="disc">
- <tr:outputText value="#{disc.name}" />
- <f:param name="discId" value="#{disc.id}" />
- </s:link>
- </tr:column>
- <tr:column>
- <f:facet name="header">
- Artist
- </f:facet>
- <tr:outputText value="#{disc.artist.name}" />
- </tr:column>
- <f:facet name="detailStamp">
- <s:div style="width: 200px">
- <s:formattedText value="#{disc.description}" rendered="#{not empty disc.description}" />
- <tr:outputText value="None known" rendered="#{empty disc.description}" />
- </s:div>
- </f:facet>
- </tr:table>
- <tr:panelButtonBar rendered="#{identity.loggedIn}">
- <s:button action="disc" value="Add disc">
- <f:param name="discId" value="" />
- </s:button>
- </tr:panelButtonBar>
- </tr:form>
- </tr:panelPartialRoot>
+ <f:facet name="header">Discs</f:facet>
+ <tr:form>
+ <tr:table value="#{discs.dataModel}" var="disc" rows="#{discs.maxResults}">
+ <tr:column sortable="true" sortProperty="disc.name">
+ <f:facet name="header">
+ Name
+ </f:facet>
+ <s:link action="disc">
+ <tr:outputText value="#{disc.name}" />
+ <f:param name="discId" value="#{disc.id}" />
+ </s:link>
+ </tr:column>
+ <tr:column>
+ <f:facet name="header">
+ Artist
+ </f:facet>
+ <tr:outputText value="#{disc.artist.name}" />
+ </tr:column>
+ <f:facet name="detailStamp">
+ <s:div style="width: 200px">
+ <s:formattedText value="#{disc.description}" rendered="#{not empty disc.description}" />
+ <tr:outputText value="None known" rendered="#{empty disc.description}" />
+ </s:div>
+ </f:facet>
+ </tr:table>
+ <tr:panelButtonBar rendered="#{identity.loggedIn}">
+ <s:button action="disc" value="Add disc">
+ <f:param name="discId" value="" />
+ </s:button>
+ </tr:panelButtonBar>
+ </tr:form>
</rich:panel>
</ui:define>
Modified: trunk/examples/seamdiscs/view/home.xhtml
===================================================================
--- trunk/examples/seamdiscs/view/home.xhtml 2008-02-03 00:04:21 UTC (rev 7338)
+++ trunk/examples/seamdiscs/view/home.xhtml 2008-02-03 00:21:37 UTC (rev 7339)
@@ -33,7 +33,7 @@
<f:facet name="header">
<tr:outputText value="Artists & Discs" />
</f:facet>
- <tr:panelPartialRoot>
+
<tr:form>
<tr:tree value="#{artistHome.tree}" var="var">
<f:facet name="nodeStamp">
@@ -51,7 +51,7 @@
</f:facet>
</tr:tree>
</tr:form>
- </tr:panelPartialRoot>
+
</rich:panel>
</ui:define>
More information about the seam-commits
mailing list