[jboss-cvs] JBossAS SVN: r97680 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 10 02:04:33 EST 2009
Author: marius.bogoevici
Date: 2009-12-10 02:04:33 -0500 (Thu, 10 Dec 2009)
New Revision: 97680
Removed:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchResult.xhtml
Modified:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Account.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Person.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria/AccountSearchCriteria.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/pom.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateAccountRepository.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/pom.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionService.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/pom.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountSearch.java
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/faces-config.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/index.xhtml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
Log:
Account removal
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Account.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Account.java 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Account.java 2009-12-10 07:04:33 UTC (rev 97680)
@@ -14,7 +14,7 @@
@Id @GeneratedValue
private Long id;
- @OneToOne
+ @OneToOne(cascade = {CascadeType.ALL})
private Person subscriber;
private Date creationDate;
@@ -24,6 +24,10 @@
private BillingType billingType;
+ private boolean closed;
+
+ private Date closeDate;
+
public long getId()
{
return id;
@@ -37,6 +41,7 @@
public void setSubscriber(Person subscriber)
{
this.subscriber = subscriber;
+ subscriber.setAccount(this);
}
public BillingType getBillingType()
@@ -68,4 +73,27 @@
{
this.membership = membership;
}
+
+ public boolean isClosed()
+ {
+ return closed;
+ }
+
+ public void setClosed(boolean closed)
+ {
+ this.closed = closed;
+ }
+
+ public Date getCloseDate()
+ {
+ return closeDate;
+ }
+
+ public void setCloseDate(Date closeDate)
+ {
+ this.closeDate = closeDate;
+ }
+
+
}
+
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Person.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Person.java 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Person.java 2009-12-10 07:04:33 UTC (rev 97680)
@@ -3,10 +3,12 @@
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Address;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Name;
+import javax.persistence.CascadeType;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.OneToOne;
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
@@ -23,6 +25,9 @@
@Embedded
private Address address;
+ @OneToOne(mappedBy = "subscriber")
+ private Account account;
+
public Address getAddress()
{
return address;
@@ -42,4 +47,14 @@
{
this.name = name;
}
+
+ public Account getAccount()
+ {
+ return account;
+ }
+
+ public void setAccount(Account account)
+ {
+ this.account = account;
+ }
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria/AccountSearchCriteria.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria/AccountSearchCriteria.java 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/criteria/AccountSearchCriteria.java 2009-12-10 07:04:33 UTC (rev 97680)
@@ -7,6 +7,8 @@
{
private PersonSearchCriteria personSearchCriteria;
+ private boolean activeOnly;
+
public PersonSearchCriteria getPersonSearchCriteria()
{
return personSearchCriteria;
@@ -17,4 +19,14 @@
this.personSearchCriteria = personSearchCriteria;
}
+ public boolean isActiveOnly()
+ {
+ return activeOnly;
+ }
+
+ public void setActiveOnly(boolean activeOnly)
+ {
+ this.activeOnly = activeOnly;
+ }
+
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/pom.xml 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/pom.xml 2009-12-10 07:04:33 UTC (rev 97680)
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>ejb3-persistence</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateAccountRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateAccountRepository.java 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateAccountRepository.java 2009-12-10 07:04:33 UTC (rev 97680)
@@ -1,7 +1,5 @@
package org.jboss.snowdrop.samples.stayfit.dao.hibernate;
-import static org.hibernate.criterion.Restrictions.eq;
-import static org.hibernate.criterion.Restrictions.eqProperty;
import static org.hibernate.criterion.Restrictions.ilike;
import static org.hibernate.criterion.Restrictions.or;
@@ -10,9 +8,7 @@
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
-import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Projection;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
@@ -52,6 +48,9 @@
private Criteria convert(AccountSearchCriteria accountSearchCriteria)
{
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Account.class);
+ if (accountSearchCriteria.isActiveOnly()) {
+ criteria.add(Restrictions.eq("closed", false));
+ }
if (accountSearchCriteria.getPersonSearchCriteria() != null)
{
PersonSearchCriteria personSearchCriteria = accountSearchCriteria.getPersonSearchCriteria();
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java 2009-12-10 07:04:33 UTC (rev 97680)
@@ -10,8 +10,6 @@
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
-import javax.annotation.PostConstruct;
-import java.lang.reflect.Member;
import java.math.BigDecimal;
import java.util.*;
@@ -146,6 +144,7 @@
account.setCreationDate(new Date());
account.setBillingType(billingType);
account.setMembership(silverMembership);
+ account.setClosed(false);
return account;
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/pom.xml 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/pom.xml 2009-12-10 07:04:33 UTC (rev 97680)
@@ -33,6 +33,11 @@
<artifactId>jboss-ejb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-deployers</artifactId>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionService.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionService.java 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionService.java 2009-12-10 07:04:33 UTC (rev 97680)
@@ -23,4 +23,6 @@
List<String> getMembershipTypes();
Account createAccount(Person person, String membershipCode, BillingType billingType);
+
+ void closeAccount(Account account);
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java 2009-12-10 07:04:33 UTC (rev 97680)
@@ -10,7 +10,6 @@
import org.jboss.annotation.spring.Spring;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.BillingType;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Membership;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Person;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.AccountRepository;
import org.jboss.snowdrop.samples.sportsclub.domain.repository.MembershipRepository;
@@ -44,6 +43,7 @@
personSearchCriteria.setName(name);
AccountSearchCriteria accountSearchCriteria = new AccountSearchCriteria();
accountSearchCriteria.setPersonSearchCriteria(personSearchCriteria);
+ accountSearchCriteria.setActiveOnly(true);
accountSearchCriteria.setRange(new Range(minIndex, maxIndex));
return accountRepository.findByCriteria(accountSearchCriteria);
}
@@ -53,20 +53,20 @@
PersonSearchCriteria personSearchCriteria = new PersonSearchCriteria();
personSearchCriteria.setName(name);
AccountSearchCriteria accountSearchCriteria = new AccountSearchCriteria();
+ accountSearchCriteria.setActiveOnly(true);
accountSearchCriteria.setPersonSearchCriteria(personSearchCriteria);
return accountRepository.countByCriteria(accountSearchCriteria);
}
- @TransactionAttribute
public Account createAccount(Person person, String membershipCode, BillingType billingType)
{
Account account = new Account();
account.setSubscriber(person);
+ account.setClosed(false);
membershipRepository.findById(membershipCode);
account.setMembership(membershipRepository.findById(membershipCode));
account.setBillingType(billingType);
account.setCreationDate(new Date());
- personRepository.save(person);
accountRepository.save(account);
return account;
}
@@ -75,4 +75,16 @@
{
return membershipRepository.findAllMembershipCodes();
}
+
+ public void closeAccount(Account account)
+ {
+ account.setClosed(true);
+ account.setCloseDate(new Date());
+ accountRepository.save(account);
+ }
+
+ public void updateAccount(Account account)
+ {
+ accountRepository.save(account);
+ }
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/pom.xml 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/pom.xml 2009-12-10 07:04:33 UTC (rev 97680)
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -57,6 +57,11 @@
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
</dependency>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountSearch.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountSearch.java 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AccountSearch.java 2009-12-10 07:04:33 UTC (rev 97680)
@@ -4,13 +4,15 @@
import org.ajax4jsf.model.ExtendedDataModel;
import org.ajax4jsf.model.Range;
import org.ajax4jsf.model.SequenceRange;
+import org.richfaces.model.selection.Selection;
+import org.richfaces.model.selection.SimpleSelection;
+
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
import org.jboss.snowdrop.samples.sportsclub.ejb.SubscriptionService;
import javax.ejb.EJB;
import javax.faces.context.FacesContext;
import java.io.IOException;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,7 +33,7 @@
private Map<Long, Account> accountsMap = new HashMap<Long, Account>();
private Integer rowCount;
- private Long selected;
+ private Selection selection;
public String getName()
{
@@ -109,6 +111,8 @@
{
int firstResult = ((SequenceRange) range).getFirstRow();
int maxResults = ((SequenceRange) range).getRows();
+
+
List<Account> list = subscriptionService.findAccountsBySubscriberName(name, firstResult, maxResults);
accountsMap = new HashMap<Long, Account>();
for (Account row : list)
@@ -117,10 +121,7 @@
accountsMap.put(id, row);
visitor.process(context, id, argument);
}
- if (selected != null && !accountsMap.containsKey(selected))
- {
- selected = null;
- }
+
}
@Override
@@ -149,24 +150,40 @@
public Account getCurrentAccount()
{
- if (selected != null)
- return accountsMap.get(selected);
+ if (selection != null && selection.size() > 0)
+ return accountsMap.get(getSelectedKey());
else
return null;
}
+ private Long getSelectedKey()
+ {
+ if (selection == null || selection.size() == 0)
+ return null;
+ else
+ return ((Long) selection.getKeys().next());
+ }
+
public void saveCurrent()
{
}
- public void setSelected(Long selected)
+ public void setSelection(Selection selection)
{
- this.selected = selected;
+ this.selection = selection;
}
- public Long getSelected()
+ public Selection getSelection()
{
- return selected;
+ return selection;
}
+
+ public String delete()
+ {
+ subscriptionService.closeAccount(getCurrentAccount());
+ selection = new SimpleSelection();
+ rowCount = null;
+ return "deleted";
+ }
}
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/faces-config.xml 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/WEB-INF/faces-config.xml 2009-12-10 07:04:33 UTC (rev 97680)
@@ -44,6 +44,7 @@
<navigation-rule>
<from-view-id>/createForm.xhtml</from-view-id>
<navigation-case>
+ <from-action>#{accountCreate.create}</from-action>
<to-view-id>/createResult.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/index.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/index.xhtml 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/index.xhtml 2009-12-10 07:04:33 UTC (rev 97680)
@@ -6,8 +6,8 @@
xmlns:a4j="http://richfaces.org/a4j"
template="layout/template.xhtml">
<ui:define name="content">
- <h:outputLink value="searchForm.jsf"><h:outputText value="Search"/></h:outputLink>
- <rich:separator/>
- <h:outputLink value="createForm.jsf"><h:outputText value="Create"/></h:outputLink>
+ <rich:panel>
+ <h:outputText value="Welcome to the Sportsclub Subscriptions Sample"/>
+ </rich:panel>
</ui:define>
</ui:composition>
\ No newline at end of file
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2009-12-10 07:04:33 UTC (rev 97680)
@@ -21,12 +21,12 @@
<a4j:outputPanel id="searchResults">
<h:form>
<rich:panel header="Search results" rendered="#{accountSearch.searchInfoAvailable}">
- <rich:dataTable id="searchResultsTable" value="#{accountSearch}" var="account" rows="5">
- <a4j:support event="onRowClick" reRender="accountData">
- <f:setPropertyActionListener value="#{account.id}"
- target="#{accountSearch.selected}"/>
- </a4j:support>
- <rich:column>
+ <rich:extendedDataTable id="searchResultsTable" value="#{accountSearch}" var="account" rows="5"
+ selectionMode="single"
+ selection="#{accountSearch.selection}"
+ enableContextMenu="true">
+ <!--<a4j:support event="onselectionchange" reRender="accountData"/>-->
+ <rich:column >
<f:facet name="header">
<h:outputText value="Account #"/>
</f:facet>
@@ -57,16 +57,15 @@
<h:outputText value="#{account.membership.code}"/>
</rich:column>
<rich:column>
- <f:facet name="header">
- <h:outputText value="Billing"/>
- </f:facet>
- <h:outputText value="#{account.billingType}"/>
+ <f:facet name="header"/>
+ <a4j:commandButton id="closeAcctBtn" value="delete" action="#{accountSearch.delete}" reRender="searchResults"/>
</rich:column>
<f:facet name="footer">
<rich:datascroller id="sc2" for="searchResultsTable" maxPages="5"
page="#{accountSearch.currentPage}"/>
</f:facet>
- </rich:dataTable>
+ </rich:extendedDataTable>
+ <rich:componentControl attachTo="closeAcctBtn" event="onclick" operation="selectionchange" for="searchResults"/>
</rich:panel>
</h:form>
@@ -79,24 +78,23 @@
<h:form>
<h:panelGrid columns="2">
<h:outputLabel value="First name"/>
- <h:outputText
- value="#{accountSearch.currentAccount.subscriber.name.firstName}"/>
+ <h:outputText value="#{accountSearch.currentAccount.subscriber.name.firstName}"/>
<h:outputLabel value="Middle name"/>
- <rich:inplaceInput defaultLabel="Click to enter"
- value="#{accountSearch.currentAccount.subscriber.name.middleName}"/>
+ <h:outputText value="#{accountSearch.currentAccount.subscriber.name.middleName}"/>
<h:outputLabel value="Last name"/>
- <h:outputText
- value="#{accountSearch.currentAccount.subscriber.name.lastName}"/>
+ <h:outputText value="#{accountSearch.currentAccount.subscriber.name.lastName}"/>
<h:outputLabel value="Address"/>
- <h:outputText
- value="#{accountSearch.currentAccount.subscriber.address.streetAddress}"/>
+ <h:outputText value="#{accountSearch.currentAccount.subscriber.address.streetAddress}"/>
<h:outputLabel value="City"/>
- <h:outputText
- value="#{accountSearch.currentAccount.subscriber.address.city}"/>
+ <h:outputText value="#{accountSearch.currentAccount.subscriber.address.city}"/>
<h:outputLabel value="Province"/>
- <h:outputText
- value="#{accountSearch.currentAccount.subscriber.address.provinceOrState}"/>
-
+ <h:outputText value="#{accountSearch.currentAccount.subscriber.address.provinceOrState}"/>
+ <h:outputLabel value="Billing"/>
+ <h:outputText value="#{accountSearch.currentAccount.billingType}"/>
+ <h:outputLabel value="Membership"/>
+ <h:outputText value="#{accountSearch.currentAccount.membership.code}"/>
+ <h:outputLabel value="Annual Fee"/>
+ <h:outputText value="#{accountSearch.currentAccount.membership.annualFee}"/>
</h:panelGrid>
</h:form>
</rich:panel>
Deleted: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchResult.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchResult.xhtml 2009-12-10 06:48:12 UTC (rev 97679)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchResult.xhtml 2009-12-10 07:04:33 UTC (rev 97680)
@@ -1,18 +0,0 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:a4j="http://richfaces.org/a4j"
- template="layout/template.xhtml">
- <ui:define name="content">
- <h:dataTable value="#{accountSearch.accounts}" var="account">
- <h:column>
- #{account.subscriber.name.firstName}
- </h:column>
- <h:column>
- #{account.subscriber.name.lastName}
- </h:column>
- </h:dataTable>
- </ui:define>
-</ui:composition>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list