From 4ef2afcd9192c9649a2e65b16e99f0053d12b7b5 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Mon, 30 Jun 2008 21:18:27 +0000 Subject: [PATCH] factored out the hotel search into independent bundle --- .../.classpath | 10 + .../.project | 30 +++ ...m.springsource.platform.ide.jdt.core.prefs | 14 ++ .../.settings/org.eclipse.jdt.core.prefs | 7 + ...clipse.jst.common.project.facet.core.prefs | 3 + ....eclipse.wst.common.project.facet.core.xml | 6 + .../.springBeans | 15 ++ .../build.xml | 10 + .../ivy.xml | 27 +++ .../springtravel/hotel/search/Hotel.java | 106 +++++++++ .../hotel/search/HotelSearchAgent.java | 28 +++ .../hotel/search/SearchCriteria.java | 70 ++++++ .../search/impl/JpaHotelSearchAgent.java | 51 +++++ .../src/main/resources/META-INF/MANIFEST.MF | 14 ++ .../main/resources/META-INF/persistence.xml | 16 ++ .../META-INF/spring/module-context.xml | 35 +++ .../META-INF/spring/osgi-context.xml | 15 ++ .../build.xml | 7 +- .../ivy.xml | 14 +- .../hotel/booking/HotelBooking.java | 206 ++++++++++++++++++ .../hotel/booking/HotelBookingAgent.java | 41 ++++ .../hotel/booking/ReferenceData.java | 83 +++++++ .../springtravel/hotel/booking/User.java | 62 ++++++ .../booking/impl/JpaHotelBookingAgent.java | 69 ++++++ .../main/resources/META-INF/persistence.xml | 18 ++ .../src/main/resources/import.sql | 27 +++ .../src/main/webapp/META-INF/MANIFEST.MF | 14 +- .../{hotel-context.xml => flow-context.xml} | 12 +- .../webapp/META-INF/spring/module-context.xml | 10 +- .../webapp/META-INF/spring/osgi-context.xml | 5 +- .../META-INF/spring/persistance-context.xml | 27 +++ .../META-INF/spring/security-context.xml | 4 +- .../controllers/hotel/booking/booking.xml | 34 +++ .../hotel/booking/enterBookingDetails.xhtml | 136 ++++++++++++ .../hotel/booking/messages.properties | 2 + .../hotel/booking/reviewBooking.xhtml | 76 +++++++ .../hotel/search/enterSearchCriteria.xhtml | 91 ++++++++ .../hotel/search/reviewHotel.xhtml | 56 +++++ .../hotel/search/reviewHotels.xhtml | 51 +++++ .../controllers/hotel/search/search.xml | 61 ++++++ .../build.xml | 2 +- 41 files changed, 1539 insertions(+), 26 deletions(-) create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.classpath create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.project create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/com.springsource.platform.ide.jdt.core.prefs create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.jdt.core.prefs create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.jst.common.project.facet.core.prefs create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.springBeans create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/build.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/ivy.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/Hotel.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/HotelSearchAgent.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/SearchCriteria.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/impl/JpaHotelSearchAgent.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/MANIFEST.MF create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/persistence.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/spring/module-context.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/spring/osgi-context.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/HotelBooking.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/HotelBookingAgent.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/ReferenceData.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/User.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/impl/JpaHotelBookingAgent.java create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/resources/META-INF/persistence.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/resources/import.sql rename spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/{hotel-context.xml => flow-context.xml} (77%) create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/persistance-context.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/booking.xml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/enterBookingDetails.xhtml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/messages.properties create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/reviewBooking.xhtml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/enterSearchCriteria.xhtml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/reviewHotel.xhtml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/reviewHotels.xhtml create mode 100644 spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/search.xml diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.classpath b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.classpath new file mode 100644 index 00000000..c32daf65 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.project b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.project new file mode 100644 index 00000000..2a2b78c1 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.project @@ -0,0 +1,30 @@ + + + org.springframework.samples.springtravel.hotel.search + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + + com.springsource.platform.ide.facet.core.bundlenature + org.springframework.ide.eclipse.core.springnature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/com.springsource.platform.ide.jdt.core.prefs b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/com.springsource.platform.ide.jdt.core.prefs new file mode 100644 index 00000000..796543a7 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/com.springsource.platform.ide.jdt.core.prefs @@ -0,0 +1,14 @@ +#Thu Jun 26 15:49:03 EDT 2008 +com.springsource.platform.ide.jdt.core.source.attachment-com.springsource.javax.persistence-1.0.0.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/ext/com.springsource.javax.persistence-sources-1.0.0.jar +com.springsource.platform.ide.jdt.core.source.attachment-com.springsource.javax.servlet-2.5.0.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/ext/com.springsource.javax.servlet-sources-2.5.0.jar +com.springsource.platform.ide.jdt.core.source.attachment-com.springsource.org.apache.myfaces.javax.faces-1.2.2.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/com.springsource.org.apache.myfaces.javax.faces-sources-1.2.2.jar +com.springsource.platform.ide.jdt.core.source.attachment-com.springsource.org.hibernate-3.2.6.ga.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/com.springsource.org.hibernate-sources-3.2.6.ga.jar +com.springsource.platform.ide.jdt.core.source.attachment-com.springsource.org.hibernate.annotations-3.3.0.ga.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/com.springsource.org.hibernate.annotations-sources-3.3.0.ga.jar +com.springsource.platform.ide.jdt.core.source.attachment-com.springsource.org.hibernate.annotations.common-3.3.0.ga.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/com.springsource.org.hibernate.annotations.common-sources-3.3.0.ga.jar +com.springsource.platform.ide.jdt.core.source.attachment-com.springsource.org.hibernate.ejb-3.3.1.ga.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/com.springsource.org.hibernate.ejb-sources-3.3.1.ga.jar +com.springsource.platform.ide.jdt.core.source.attachment-com.springsource.org.hsqldb-1.8.0.9.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/com.springsource.org.hsqldb-sources-1.8.0.9.jar +com.springsource.platform.ide.jdt.core.source.attachment-org.springframework.faces-2.0.3.BUILD-20080626134159.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/org.springframework.faces-sources-2.0.3.BUILD-20080626134159.jar +com.springsource.platform.ide.jdt.core.source.attachment-org.springframework.faces-2.0.3.BUILD-20080626184449.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/org.springframework.faces-sources-2.0.3.BUILD-20080626184449.jar +com.springsource.platform.ide.jdt.core.source.attachment-org.springframework.faces-2.0.3.BUILD-20080626190601.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/org.springframework.faces-sources-2.0.3.BUILD-20080626190601.jar +com.springsource.platform.ide.jdt.core.source.attachment-org.springframework.security-2.0.0.A.jar=/Users/scott/development/springsource-ap-1.0.0.beta6/repository/bundles/usr/org.springframework.security-sources-2.0.0.A.jar +eclipse.preferences.version=1 diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..cdc8c2a3 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +#Wed Apr 30 14:04:29 BST 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.jst.common.project.facet.core.prefs b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.jst.common.project.facet.core.prefs new file mode 100644 index 00000000..13fc2d20 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.jst.common.project.facet.core.prefs @@ -0,0 +1,3 @@ +#Wed May 07 10:35:56 BST 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 +eclipse.preferences.version=1 diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 00000000..c525c05d --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.springBeans b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.springBeans new file mode 100644 index 00000000..f54b2155 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/.springBeans @@ -0,0 +1,15 @@ + + + 1 + + + + + + + src/main/resources/META-INF/spring/module-context.xml + src/main/resources/META-INF/spring/osgi-context.xml + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/build.xml new file mode 100644 index 00000000..a9e9a4fd --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/build.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/ivy.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/ivy.xml new file mode 100644 index 00000000..e6505eb4 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/ivy.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/Hotel.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/Hotel.java new file mode 100644 index 00000000..081b77a3 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/Hotel.java @@ -0,0 +1,106 @@ +package org.springframework.samples.springtravel.hotel.search; + +import java.io.Serializable; +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * A hotel where users may book stays. + */ +@Entity +public class Hotel implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + private String name; + + private String address; + + private String city; + + private String state; + + private String zip; + + private String country; + + private BigDecimal price; + + @Id + @GeneratedValue + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getZip() { + return zip; + } + + public void setZip(String zip) { + this.zip = zip; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + @Column(precision = 6, scale = 2) + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } + + @Override + public String toString() { + return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; + } +} diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/HotelSearchAgent.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/HotelSearchAgent.java new file mode 100644 index 00000000..8880a9fd --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/HotelSearchAgent.java @@ -0,0 +1,28 @@ +package org.springframework.samples.springtravel.hotel.search; + +import java.util.List; + +/** + * A service interface for retrieving hotels from a backing repository. + */ +public interface HotelSearchAgent { + + /** + * Find hotels available for booking by some criteria. + * + * @param criteria + * the search criteria + * @return a list of hotels meeting the criteria + */ + public List findHotels(SearchCriteria criteria); + + /** + * Find hotels by their identifier. + * + * @param id + * the hotel id + * @return the hotel + */ + public Hotel findHotelById(Long id); + +} diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/SearchCriteria.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/SearchCriteria.java new file mode 100644 index 00000000..4b76aee2 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/SearchCriteria.java @@ -0,0 +1,70 @@ +package org.springframework.samples.springtravel.hotel.search; + +import java.io.Serializable; + +/** + * A backing bean for the main hotel search form. Encapsulates the criteria + * needed to perform a hotel search. + * + * It is expected a future milestone of Spring Web Flow 2.0 will allow + * flow-scoped beans like this one to hold references to transient services that + * are restored automatically when the flow is resumed on subsequent requests. + * This would allow this SearchCriteria object to delegate to the + * {@link HotelSearchAgent} directly, for example, eliminating the need for the + * actions in {@link MainActions}. + */ +public class SearchCriteria implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * The user-provided search criteria for finding Hotels. + */ + private String searchString; + + /** + * The maximum page size of the Hotel result list + */ + private int pageSize; + + /** + * The current page of the Hotel result list. + */ + private int page; + + public String getSearchString() { + return searchString; + } + + public void setSearchString(String searchString) { + this.searchString = searchString; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public void nextPage() { + page++; + } + + public void previousPage() { + page--; + } + + public void resetPage() { + page = 0; + } +} \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/impl/JpaHotelSearchAgent.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/impl/JpaHotelSearchAgent.java new file mode 100644 index 00000000..339b4bf7 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/impl/JpaHotelSearchAgent.java @@ -0,0 +1,51 @@ +package org.springframework.samples.springtravel.hotel.search.impl; + +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.springframework.samples.springtravel.hotel.search.Hotel; +import org.springframework.samples.springtravel.hotel.search.HotelSearchAgent; +import org.springframework.samples.springtravel.hotel.search.SearchCriteria; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +/** + * A JPA-based implementation of the Search Agent. Delegates to a JPA entity + * manager to issue data access calls against the backing repository. The + * EntityManager reference is provided by the managing container (Spring) + * automatically. + */ +@Repository +public class JpaHotelSearchAgent implements HotelSearchAgent { + + private EntityManager em; + + @PersistenceContext + public void setEntityManager(EntityManager em) { + this.em = em; + } + + @Transactional(readOnly = true) + @SuppressWarnings("unchecked") + public List findHotels(SearchCriteria criteria) { + String pattern = "%" + criteria.getSearchString() + "%"; + List hotels = em.createQuery( + "select h from Hotel h where lower(h.name) like :pattern" + + " or lower(h.city) like :pattern" + + " or lower(h.zip) like :pattern" + + " or lower(h.address) like :pattern") + .setParameter("pattern", pattern) + .setMaxResults(criteria.getPageSize()).setFirstResult( + criteria.getPage() * criteria.getPageSize()) + .getResultList(); + return hotels; + } + + @Transactional(readOnly = true) + public Hotel findHotelById(Long id) { + return em.find(Hotel.class, id); + } + +} \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/MANIFEST.MF b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 00000000..bb655660 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,14 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Spring Travel Hotel Module +Bundle-SymbolicName: org.springframework.samples.springtravel.hotel.search +Bundle-Vendor: SpringSource +Export-Package: + org.springframework.samples.springtravel.hotel.search +Import-Package: + javax.sql +Import-Bundle: + com.springsource.org.hsqldb;version="[1.8.0, 2.0.0)" +Import-Library: + org.springframework.spring;version="[2.5.4,3.0.0)", + org.hibernate.ejb;version="[3.3.1.ga, 3.3.1.ga]" \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/persistence.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/persistence.xml new file mode 100644 index 00000000..e691ef90 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,16 @@ + + + + org.hibernate.ejb.HibernatePersistence + org.springframework.samples.springtravel.hotel.search.Hotel + + + + + + + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/spring/module-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/spring/module-context.xml new file mode 100644 index 00000000..c2f82777 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/spring/module-context.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/spring/osgi-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/spring/osgi-context.xml new file mode 100644 index 00000000..dfa34d11 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/resources/META-INF/spring/osgi-context.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml index ebbfcf51..052dd536 100644 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/build.xml @@ -1,8 +1,11 @@ - + + + + - + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml index 660eec3e..432ff502 100644 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/ivy.xml @@ -19,7 +19,19 @@ - + + + + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/HotelBooking.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/HotelBooking.java new file mode 100644 index 00000000..665b6b3f --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/HotelBooking.java @@ -0,0 +1,206 @@ +package org.springframework.samples.springtravel.hotel.booking; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.util.Calendar; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.springframework.binding.message.MessageBuilder; +import org.springframework.binding.message.MessageContext; + +import org.springframework.samples.springtravel.hotel.search.Hotel; + +/** + * A Hotel Booking made by a User. + */ +@Entity +public class HotelBooking implements Serializable { + private Long id; + + private User user; + + private Hotel hotel; + + private Date checkinDate; + + private Date checkoutDate; + + private String creditCard; + + private String creditCardName; + + private int creditCardExpiryMonth; + + private int creditCardExpiryYear; + + private boolean smoking; + + private int beds; + + public HotelBooking() { + Calendar calendar = Calendar.getInstance(); + setCheckinDate(calendar.getTime()); + calendar.add(Calendar.DAY_OF_MONTH, 1); + setCheckoutDate(calendar.getTime()); + } + + public HotelBooking(Hotel hotel, User user) { + this(); + this.hotel = hotel; + this.user = user; + } + + @Transient + public BigDecimal getTotal() { + return hotel.getPrice().multiply(new BigDecimal(getNights())); + } + + @Transient + public int getNights() { + if (checkinDate == null || checkoutDate == null) { + return 0; + } else { + return (int) (checkoutDate.getTime() - checkinDate.getTime()) + / 1000 / 60 / 60 / 24; + } + } + + @Id + @GeneratedValue(strategy = GenerationType.TABLE) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @Basic + @Temporal(TemporalType.DATE) + public Date getCheckinDate() { + return checkinDate; + } + + public void setCheckinDate(Date datetime) { + this.checkinDate = datetime; + } + + @ManyToOne + public Hotel getHotel() { + return hotel; + } + + public void setHotel(Hotel hotel) { + this.hotel = hotel; + } + + @ManyToOne + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + @Basic + @Temporal(TemporalType.DATE) + public Date getCheckoutDate() { + return checkoutDate; + } + + public void setCheckoutDate(Date checkoutDate) { + this.checkoutDate = checkoutDate; + } + + public String getCreditCard() { + return creditCard; + } + + public void setCreditCard(String creditCard) { + this.creditCard = creditCard; + } + + @Transient + public String getDescription() { + DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); + return hotel == null ? null : hotel.getName() + ", " + + df.format(getCheckinDate()) + " to " + + df.format(getCheckoutDate()); + } + + public boolean isSmoking() { + return smoking; + } + + public void setSmoking(boolean smoking) { + this.smoking = smoking; + } + + public int getBeds() { + return beds; + } + + public void setBeds(int beds) { + this.beds = beds; + } + + public String getCreditCardName() { + return creditCardName; + } + + public void setCreditCardName(String creditCardName) { + this.creditCardName = creditCardName; + } + + public int getCreditCardExpiryMonth() { + return creditCardExpiryMonth; + } + + public void setCreditCardExpiryMonth(int creditCardExpiryMonth) { + this.creditCardExpiryMonth = creditCardExpiryMonth; + } + + public int getCreditCardExpiryYear() { + return creditCardExpiryYear; + } + + public void setCreditCardExpiryYear(int creditCardExpiryYear) { + this.creditCardExpiryYear = creditCardExpiryYear; + } + + public void validateEnterBookingDetails(MessageContext context) { + if (checkinDate.before(today())) { + context.addMessage(new MessageBuilder().error().source( + "checkinDate").code("booking.checkinDate.beforeToday") + .build()); + } else if (checkoutDate.before(checkinDate)) { + context.addMessage(new MessageBuilder().error().source( + "checkoutDate").code( + "booking.checkoutDate.beforeCheckinDate").build()); + } + } + + private Date today() { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_MONTH, -1); + return calendar.getTime(); + } + + @Override + public String toString() { + return "Booking(" + user + "," + hotel + ")"; + } + +} diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/HotelBookingAgent.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/HotelBookingAgent.java new file mode 100644 index 00000000..56d6131c --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/HotelBookingAgent.java @@ -0,0 +1,41 @@ +package org.springframework.samples.springtravel.hotel.booking; + +import java.util.List; + +import org.springframework.samples.springtravel.hotel.search.Hotel; + +/** + * A service interface for retrieving bookings from a backing + * repository. Also supports the ability to cancel a booking. + */ +public interface HotelBookingAgent { + + /** + * Find bookings made by the given user + * + * @param username + * the user's name + * @return their bookings + */ + public List findBookings(String username); + + /** + * Create a new, transient hotel booking instance for the given user. + * + * @param hotel + * the hotel + * @param userName + * the user name + * @return the new transient booking instance + */ + public HotelBooking createBooking(Hotel hotel, String userName); + + /** + * Cancel an existing booking. + * + * @param id + * the booking id + */ + public void cancelBooking(Long id); + +} diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/ReferenceData.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/ReferenceData.java new file mode 100644 index 00000000..c0d546fa --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/ReferenceData.java @@ -0,0 +1,83 @@ +package org.springframework.samples.springtravel.hotel.booking; + +import java.util.ArrayList; +import java.util.List; + +import javax.faces.model.SelectItem; + +import org.springframework.stereotype.Service; + +@Service +public class ReferenceData { + + private List bedOptions; + + private List smokingOptions; + + private List creditCardExpMonths; + + private List creditCardExpYears; + + private List pageSizeOptions; + + public List getBedOptions() { + if (bedOptions == null) { + bedOptions = new ArrayList(); + bedOptions.add(new SelectItem(new Integer(1), "One king-size bed")); + bedOptions.add(new SelectItem(new Integer(2), "Two double beds")); + bedOptions.add(new SelectItem(new Integer(3), "Three beds")); + } + return bedOptions; + } + + public List getSmokingOptions() { + if (smokingOptions == null) { + smokingOptions = new ArrayList(); + smokingOptions.add(new SelectItem(Boolean.TRUE, "Smoking")); + smokingOptions.add(new SelectItem(Boolean.FALSE, "Non-Smoking")); + } + return smokingOptions; + } + + public List getCreditCardExpMonths() { + if (creditCardExpMonths == null) { + creditCardExpMonths = new ArrayList(); + creditCardExpMonths.add(new SelectItem(new Integer(1), "Jan")); + creditCardExpMonths.add(new SelectItem(new Integer(2), "Feb")); + creditCardExpMonths.add(new SelectItem(new Integer(3), "Mar")); + creditCardExpMonths.add(new SelectItem(new Integer(4), "Apr")); + creditCardExpMonths.add(new SelectItem(new Integer(5), "May")); + creditCardExpMonths.add(new SelectItem(new Integer(6), "Jun")); + creditCardExpMonths.add(new SelectItem(new Integer(7), "Jul")); + creditCardExpMonths.add(new SelectItem(new Integer(8), "Aug")); + creditCardExpMonths.add(new SelectItem(new Integer(9), "Sep")); + creditCardExpMonths.add(new SelectItem(new Integer(10), "Oct")); + creditCardExpMonths.add(new SelectItem(new Integer(11), "Nov")); + creditCardExpMonths.add(new SelectItem(new Integer(12), "Dec")); + } + return creditCardExpMonths; + } + + public List getCreditCardExpYears() { + if (creditCardExpYears == null) { + creditCardExpYears = new ArrayList(); + creditCardExpYears.add(new SelectItem(new Integer(2008), "2008")); + creditCardExpYears.add(new SelectItem(new Integer(2009), "2009")); + creditCardExpYears.add(new SelectItem(new Integer(2010), "2010")); + creditCardExpYears.add(new SelectItem(new Integer(2010), "2011")); + creditCardExpYears.add(new SelectItem(new Integer(2010), "2012")); + } + return creditCardExpYears; + } + + public List getPageSizeOptions() { + if (pageSizeOptions == null) { + pageSizeOptions = new ArrayList(); + pageSizeOptions.add(new SelectItem(new Integer(5), "5")); + pageSizeOptions.add(new SelectItem(new Integer(10), "10")); + pageSizeOptions.add(new SelectItem(new Integer(20), "20")); + } + return pageSizeOptions; + } + +} diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/User.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/User.java new file mode 100644 index 00000000..2554374b --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/User.java @@ -0,0 +1,62 @@ +package org.springframework.samples.springtravel.hotel.booking; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +/** + * A user who can book hotels. + */ +@Entity +@Table(name = "Customer") +public class User implements Serializable { + + private static final long serialVersionUID = -3652559447682574722L; + + private String username; + + private String password; + + private String name; + + public User() { + } + + public User(String username, String password, String name) { + this.username = username; + this.password = password; + this.name = name; + } + + @Id + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return "User(" + username + ")"; + } +} diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/impl/JpaHotelBookingAgent.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/impl/JpaHotelBookingAgent.java new file mode 100644 index 00000000..b2ccb8d9 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/java/org/springframework/samples/springtravel/hotel/booking/impl/JpaHotelBookingAgent.java @@ -0,0 +1,69 @@ +package org.springframework.samples.springtravel.hotel.booking.impl; + +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.springframework.samples.springtravel.hotel.booking.HotelBooking; +import org.springframework.samples.springtravel.hotel.booking.HotelBookingAgent; +import org.springframework.samples.springtravel.hotel.booking.User; +import org.springframework.samples.springtravel.hotel.search.Hotel; +import org.springframework.samples.springtravel.hotel.search.SearchCriteria; +import org.springframework.stereotype.Repository; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +/** + * A JPA-based implementation of the Hotel Booking Agent. Delegates to a JPA entity + * manager to issue data access calls against the backing repository. The + * EntityManager reference is provided by the managing container (Spring) + * automatically. + */ +@Repository +public class JpaHotelBookingAgent implements HotelBookingAgent { + + private EntityManager em; + + @PersistenceContext + public void setEntityManager(EntityManager em) { + this.em = em; + } + + @Transactional(readOnly = true) + @SuppressWarnings("unchecked") + public List findBookings(String username) { + if (username != null) { + return em + .createQuery( + "select b from HotelBooking b where b.user.username = :username order by b.checkinDate") + .setParameter("username", username).getResultList(); + } else { + return null; + } + } + + @Transactional(readOnly = true) + public HotelBooking createBooking(Hotel hotel, String username) { + User user = findUser(username); + return new HotelBooking(hotel, user); + } + + @Transactional + public void cancelBooking(Long id) { + HotelBooking booking = em.find(HotelBooking.class, id); + if (booking != null) { + em.remove(booking); + } + } + + // helpers + + private User findUser(String username) { + return (User) em.createQuery( + "select u from User u where u.username = :username") + .setParameter("username", username).getSingleResult(); + } + +} \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/resources/META-INF/persistence.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/resources/META-INF/persistence.xml new file mode 100644 index 00000000..5049fd1d --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,18 @@ + + + + org.hibernate.ejb.HibernatePersistence + org.springframework.samples.springtravel.hotel.booking.User + org.springframework.samples.springtravel.hotel.booking.HotelBooking + org.springframework.samples.springtravel.hotel.search.Hotel + + + + + + + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/resources/import.sql b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/resources/import.sql new file mode 100644 index 00000000..e3211aac --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/resources/import.sql @@ -0,0 +1,27 @@ +insert into Customer (username, name) values ('keith', 'Keith') +insert into Customer (username, name) values ('erwin', 'Erwin') +insert into Customer (username, name) values ('jeremy', 'Jeremy') +insert into Customer (username, name) values ('scott', 'Scott') +insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 199, 'Westin Diplomat', '3555 S. Ocean Drive', 'Hollywood', 'FL', '33019', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 60, 'Jameson Inn', '890 Palm Bay Rd NE', 'Palm Bay', 'FL', '32905', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 199, 'Chilworth Manor', 'The Cottage, Southampton Business Park', 'Southampton', 'Hants', 'SO16 7JF', 'UK') +insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (7, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 130, 'Hotel Beaulac', ' Esplanade Léopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (22, 250, 'Meliá White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (23, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/MANIFEST.MF b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/MANIFEST.MF index 11230e66..7d2263c4 100644 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/MANIFEST.MF +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.samples.springtravel.webapp Bundle-Name: Spring Travel Web Application Module Import-Package: - org.springframework.samples.springtravel.hotel, - org.springframework.samples.springtravel.hotel.booking, - org.springframework.samples.springtravel.hotel.search + org.springframework.samples.springtravel.hotel.search, + javax.sql Import-Bundle: org.springframework.webflow;version="[2.0.3,3.0.0)", org.springframework.js;version="[2.0.3,3.0)", org.springframework.faces;version="[2.0.3,3.0)", - com.springsource.org.apache.myfaces;version="[1.2.0,2.0.0)", - com.springsource.org.apache.myfaces.javax.faces;version="[1.2.0,2.0.0)", + org.springframework.binding;version="[2.0.3,3.0)", com.springsource.com.sun.facelets;version="[1.1.14,1.2.0)", org.springframework.security;version="[2.0.0,2.1.0)", - com.springsource.org.jboss.el;version="[2.0.0,3.0.0)" + com.springsource.org.jboss.el;version="[2.0.0,3.0.0)", + com.springsource.org.hsqldb;version="[1.8.0, 2.0.0)" Import-Library: org.springframework.spring;version="[2.5.4,3.0.0)", - org.hibernate.ejb;version="[3.3.1.ga, 3.3.1.ga]" + org.hibernate.ejb;version="[3.3.1.ga, 3.3.1.ga]", + org.apache.myfaces;version="[1.2.0,2.0.0)" Platform-ModuleType: Web Web-ContextPath: springtravel-faces Web-DispatcherServletUrlPatterns: /spring/* diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/flow-context.xml similarity index 77% rename from spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml rename to spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/flow-context.xml index c362e3b6..6123fd8f 100644 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/hotel-context.xml +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/flow-context.xml @@ -1,23 +1,17 @@ - + /hotel/search=flowController @@ -42,8 +36,8 @@ - - + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/module-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/module-context.xml index f0e3da31..2f84dcfe 100644 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/module-context.xml +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/module-context.xml @@ -1,9 +1,17 @@ + http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/osgi-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/osgi-context.xml index a39b0ca6..eea93df9 100644 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/osgi-context.xml +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/osgi-context.xml @@ -8,8 +8,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - - - + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/persistance-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/persistance-context.xml new file mode 100644 index 00000000..292bf7f6 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/persistance-context.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/security-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/security-context.xml index 517a7322..48747a14 100644 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/security-context.xml +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/META-INF/spring/security-context.xml @@ -10,7 +10,7 @@ - + @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/booking.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/booking.xml new file mode 100644 index 00000000..42d69b28 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/booking.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/enterBookingDetails.xhtml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/enterBookingDetails.xhtml new file mode 100644 index 00000000..2e3ebfda --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/enterBookingDetails.xhtml @@ -0,0 +1,136 @@ + + + + + +
+

Book Hotel

+ +
+ +
+ + +
+
+
Name:
+
#{booking.hotel.name}
+
+
+
Address:
+
#{booking.hotel.address}
+
+
+
City, State:
+
#{booking.hotel.city}, #{booking.hotel.state}
+
+
+
Zip:
+
#{booking.hotel.zip}
+
+
+
Country:
+
#{booking.hotel.country}
+
+
+
Nightly rate:
+
+ + + +
+
+
+
+ Check In Date: +
+
+ + + + + +
+
+
+
+ Check Out Date: +
+
+ + + + + +
+
+
+
+ Room Preference: +
+
+ + + +
+
+
+
+ Smoking Preference: +
+
+ + + +
+
+
+
+ Credit Card #: +
+
+ + + +
+
+
+
+ Credit Card Name: +
+
+ + + +
+
+
+
+ Expiration Date: +
+
+ + + + + + +
+
+
+ +   + + +
+
+ +
+ + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/messages.properties b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/messages.properties new file mode 100644 index 00000000..cbae4eb3 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/messages.properties @@ -0,0 +1,2 @@ +booking.checkinDate.beforeToday=The Check In Date must be a future date +booking.checkoutDate.beforeCheckinDate=The Check Out Date must be later than the Check In Date diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/reviewBooking.xhtml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/reviewBooking.xhtml new file mode 100644 index 00000000..c224fcd6 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/booking/reviewBooking.xhtml @@ -0,0 +1,76 @@ + + + + + +
+

Confirm Hotel Booking

+
+ +
+ +
+
+
Name:
+
#{booking.hotel.name}
+
+
+
Address:
+
#{booking.hotel.address}
+
+
+
City, State:
+
#{booking.hotel.city}, #{booking.hotel.state}
+
+
+
Zip:
+
#{booking.hotel.zip}
+
+
+
Country:
+
#{booking.hotel.country}
+
+
+
Total payment:
+
+ + + +
+
+
+
Check In Date:
+
+ + + +
+
+
+
Check Out Date:
+
+ + + +
+
+
+
Credit Card #:
+
#{booking.creditCard}
+
+
+   +   + +
+
+ +
+ + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/enterSearchCriteria.xhtml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/enterSearchCriteria.xhtml new file mode 100644 index 00000000..daf31531 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/enterSearchCriteria.xhtml @@ -0,0 +1,91 @@ + + + + + + +
+ + + +

Search Hotels

+ +
+
+
+ Search String: +
+
+ + + +
+
+
+
+ Maximum results: +
+
+ + + +
+
+
+ +
+
+ +
+ + + +
+ +

Current Hotel Bookings

+ + + + Name + #{booking.hotel.name} + + + Address + #{booking.hotel.address} + + + City, State + #{booking.hotel.city}, #{booking.hotel.state} + + + Check in date + + + + + + Check out date + + + + + + Confirmation number + #{booking.id} + + + Action + + + + +
+ + + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/reviewHotel.xhtml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/reviewHotel.xhtml new file mode 100644 index 00000000..1511f6c0 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/reviewHotel.xhtml @@ -0,0 +1,56 @@ + + + + + +
+

View Hotel

+ +
+
+
Name:
+
#{hotel.name}
+
+
+
Address:
+
#{hotel.address}
+
+
+
City:
+
#{hotel.city}
+
+
+
State:
+
#{hotel.state}
+
+
+
Zip:
+
#{hotel.zip}
+
+
+
Country:
+
#{hotel.country}
+
+
+
Nightly rate:
+
+ + + +
+
+
+   + +
+
+ +
+ + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/reviewHotels.xhtml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/reviewHotels.xhtml new file mode 100644 index 00000000..c6544b73 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/reviewHotels.xhtml @@ -0,0 +1,51 @@ + + + + + + +
+

Hotel Results

+

+ +

+ +
+ + + + Name + #{h.name} + + + Address + #{h.address} + + + City, State + #{h.city}, #{h.state}, #{h.country} + + + Zip + #{h.zip} + + + Action + + + +
+ + +
+
+ +
+ + + \ No newline at end of file diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/search.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/search.xml new file mode 100644 index 00000000..cff9aec4 --- /dev/null +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.webapp/src/main/webapp/WEB-INF/controllers/hotel/search/search.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml index 5be69208..1746b347 100644 --- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml +++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel/build.xml @@ -3,7 +3,7 @@ - +