[jboss-cvs] JBossAS SVN: r97205 - in projects/snowdrop/trunk/documentation/samples/sportsclub: sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 1 03:16:33 EST 2009
Author: lvlcek at redhat.com
Date: 2009-12-01 03:16:32 -0500 (Tue, 01 Dec 2009)
New Revision: 97205
Added:
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationsBean.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/footer.xhtml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/header.xhtml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/index.xhtml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/template.xhtml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/listReservationForm.xhtml
Removed:
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AvailableEquipments.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/start.xhtml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/index.jsp
Modified:
projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Equipment.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/EquipmentType.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateReservationRepository.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/stayfit/service/ReservationService.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/stayfit/service/ReservationServiceImpl.java
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/web.xml
projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml
Log:
working on reservations web and related stuff
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/database/sportsclub-ds.xml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
<datasources>
<local-tx-datasource>
@@ -4,6 +6,9 @@
<jndi-name>SportsClubDS</jndi-name>
<connection-url>jdbc:hsqldb:hsql://localhost/sportsclubdb</connection-url>
+ <!--connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}sportsclubdb</connection-url-->
+ <!--connection-url>jdbc:hsqldb:mem:sportsclub</connection-url-->
+ <!--connection-url>jdbc:hsqldb:.</connection-url-->
<!-- The driver class -->
<driver-class>org.hsqldb.jdbcDriver</driver-class>
@@ -65,4 +70,4 @@
</local-tx-datasource>
-</datasources>
\ No newline at end of file
+</datasources>
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Equipment.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Equipment.java 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Equipment.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -1,8 +1,6 @@
package org.jboss.snowdrop.samples.sportsclub.domain.entity;
-import javax.persistence.Basic;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import javax.persistence.*;
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
@@ -11,13 +9,14 @@
@Entity
public class Equipment
{
- @Id
+ @Id @GeneratedValue
private long id;
private String name;
private String description;
+ @Column(name = "eqp_type_id", nullable = false, updatable = false)
private EquipmentType equipmentType;
@@ -45,4 +44,14 @@
{
this.name = name;
}
+
+ public EquipmentType getEquipmentType()
+ {
+ return equipmentType;
+ }
+
+ public void setEquipmentType(EquipmentType equipmentType)
+ {
+ this.equipmentType = equipmentType;
+ }
}
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/EquipmentType.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/EquipmentType.java 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/EquipmentType.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -5,7 +5,7 @@
*/
public enum EquipmentType
{
- THREADMILL,
+ TREADMILL,
STEPPER,
COURT
}
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/ReservationRepository.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -1,7 +1,6 @@
package org.jboss.snowdrop.samples.sportsclub.domain.repository;
import org.jboss.snowdrop.samples.sportsclub.domain.entity.Reservation;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
import java.util.List;
import java.util.Date;
@@ -11,23 +10,31 @@
*/
public interface ReservationRepository extends Repository<Reservation, Integer> {
- List<Reservation> getReservations(Date fromDate, Date toDate);
-
/**
- * Return all reservations for particular {@link Equipment} within given time period.
- *
- * @param equipment
+ * Return all reservations in given date range.
+ *
+ * @see #getReservationsAfter(java.util.Date)
+ * @see #getReservationsBefore(java.util.Date)
+ *
* @param fromDate
* @param toDate
* @return
*/
-// List<Reservation> getReservations(Equipment equipment, Date fromDate, Date toDate);
+ List<Reservation> getReservations(Date fromDate, Date toDate);
/**
- * Return all free {@link Equipment}s within given time period.
- * @param fromDate
- * @param toDate
+ * Return all reservations before given date.
+ * This means all reservations whose toDate.before(date) is true.
+ * @param date
* @return
*/
-// List<Equipment> getFreeEquipments(Date fromDate, Date toDate);
+ List<Reservation> getReservationsBefore(Date date);
+
+ /**
+ * Return all reservations after given date.
+ * This means all reservations whose fromDate.after(date) is true.
+ * @param date
+ * @return
+ */
+ List<Reservation> getReservationsAfter(Date date);
}
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateReservationRepository.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateReservationRepository.java 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/HibernateReservationRepository.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -22,8 +22,18 @@
{
Criteria cri = getCurrentSession().createCriteria(Reservation.class);
- cri.add( and( ge("fromDate", fromDate), le("toDate", toDate) ) );
+ cri.add( and( le("fromDate", fromDate), ge("toDate", toDate) ) );
return cri.list();
}
+
+ public List<Reservation> getReservationsBefore(Date date)
+ {
+ return getCurrentSession().createCriteria(Reservation.class).add(le("toDate", date)).list();
+ }
+
+ public List<Reservation> getReservationsAfter(Date date)
+ {
+ return getCurrentSession().createCriteria(Reservation.class).add(ge("fromDate", date)).list();
+ }
}
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/stayfit/dao/hibernate/initializer/DatabaseInitializer.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -15,6 +15,8 @@
import java.math.BigDecimal;
import java.util.Date;
+import static org.jboss.snowdrop.samples.sportsclub.domain.entity.EquipmentType.*;
+
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
@@ -77,8 +79,7 @@
person = createPerson("Carrot", "Ironfoundersson", "1 King", "Toronto", "Ontario", "Canada");
save(session, person);
save(session, createAccount(platinumMembership, BillingType.BIWEEKLY, person));
-
-
+
person = createPerson("Magrat", "Garlick", "1 King", "Lancre", "Ramtops", "Canada");
save(session, person);
save(session, createAccount(platinumMembership, BillingType.BIWEEKLY, person));
@@ -108,6 +109,15 @@
save(session, createAccount(platinumMembership, BillingType.BIWEEKLY, person));
+ Equipment equipment = createEquipment("Engage", "95T Engage by LifeFitness", TREADMILL);
+ save(session, equipment);
+
+ equipment = createEquipment("Inclusive", "95T Inclusive by LifeFitness", TREADMILL);
+ save(session, equipment);
+
+ equipment = createEquipment("Omnidirectional", "Cyberwalk", TREADMILL);
+ save(session, equipment);
+
return null;
}
});
@@ -117,6 +127,7 @@
{
session.save(entity);
session.flush();
+ //session.evict(entity);
}
private static Account createAccount(Membership silverMembership, BillingType billingType, Person person)
@@ -152,4 +163,23 @@
membership.setAnnualFee(new BigDecimal(amount));
return membership;
}
+
+ private static Equipment createEquipment(String name, String description, EquipmentType type)
+ {
+ Equipment equipment = new Equipment();
+ equipment.setDescription(description);
+ equipment.setName(name);
+ equipment.setEquipmentType(type);
+ return equipment;
+ }
+
+ private static Reservation createReservation(Date fromDate, Date toDate, Equipment equipment, Account account)
+ {
+ Reservation reservation = new Reservation();
+ reservation.setAccount(account);
+ reservation.setEquipment(equipment);
+ reservation.setFrom(fromDate);
+ reservation.setTo(toDate);
+ return reservation;
+ }
}
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/stayfit/service/ReservationService.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/stayfit/service/ReservationService.java 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/stayfit/service/ReservationService.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -8,7 +8,12 @@
/**
*
*/
-public interface ReservationService {
+public interface ReservationService
+{
List<Reservation> getReservations(Date fromDate, Date toDate);
+ List<Reservation> getReservationBefore(Date date);
+ List<Reservation> getReservationAfter(Date date);
+ List<Reservation> getAllReservation();
+
}
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/stayfit/service/ReservationServiceImpl.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/stayfit/service/ReservationServiceImpl.java 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/stayfit/service/ReservationServiceImpl.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -13,15 +13,33 @@
private ReservationRepository reservationRepository;
- public List<Reservation> getReservations(Date fromDate, Date toDate) {
+ public List<Reservation> getReservations(Date fromDate, Date toDate)
+ {
return getReservationRepository().getReservations(fromDate, toDate);
}
- public ReservationRepository getReservationRepository() {
+ public List<Reservation> getReservationBefore(Date date)
+ {
+ return getReservationRepository().getReservationsBefore(date);
+ }
+
+ public List<Reservation> getReservationAfter(Date date)
+ {
+ return getReservationRepository().getReservationsAfter(date);
+ }
+
+ public List<Reservation> getAllReservation()
+ {
+ return (List<Reservation>) reservationRepository.findAll();
+ }
+
+ public ReservationRepository getReservationRepository()
+ {
return reservationRepository;
}
- public void setReservationRepository(ReservationRepository reservationRepository) {
+ public void setReservationRepository(ReservationRepository reservationRepository)
+ {
this.reservationRepository = reservationRepository;
}
}
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/pom.xml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -55,6 +55,16 @@
</dependency>
<dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
</dependency>
Deleted: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AvailableEquipments.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AvailableEquipments.java 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/AvailableEquipments.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -1,63 +0,0 @@
-package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
-
-import org.jboss.snowdrop.samples.sportsclub.domain.repository.EquipmentRepository;
-import org.jboss.snowdrop.samples.sportsclub.domain.entity.Equipment;
-
-import java.util.List;
-import java.util.Collections;
-import java.util.Date;
-
-/**
- */
-public class AvailableEquipments {
-
- private static String SUCCESS = "success";
-
- private EquipmentRepository equipmentRepository;
-
- private List<Equipment> equipments = Collections.<Equipment>emptyList();
- private Date fromDate = new Date();
- private Date toDate = new Date();
-
- public String getAllEquipments() {
- equipments = (List<Equipment>) equipmentRepository.findAll();
- return SUCCESS;
- }
-
- public String getAvailableEquipments() {
- equipments = equipmentRepository.getAvailableEquipments(fromDate, toDate);
- return SUCCESS;
- }
-
- public EquipmentRepository getEquipmentRepository() {
- return equipmentRepository;
- }
-
- public void setEquipmentRepository(EquipmentRepository equipmentRepository) {
- this.equipmentRepository = equipmentRepository;
- }
-
- public List<Equipment> getEquipments() {
- return equipments;
- }
-
- public void setEquipments(List<Equipment> equipments) {
- this.equipments = equipments;
- }
-
- public Date getFromDate() {
- return fromDate;
- }
-
- public void setFromDate(Date fromDate) {
- this.fromDate = fromDate;
- }
-
- public Date getToDate() {
- return toDate;
- }
-
- public void setToDate(Date toDate) {
- this.toDate = toDate;
- }
-}
Added: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationsBean.java
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationsBean.java (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/ReservationsBean.java 2009-12-01 08:16:32 UTC (rev 97205)
@@ -0,0 +1,78 @@
+package org.jboss.snowdrop.samples.sportsclub.jsf.beans;
+
+import org.jboss.snowdrop.samples.stayfit.service.ReservationService;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Reservation;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ */
+public class ReservationsBean {
+
+ private ReservationService reservationService;
+ private Date fromDate;
+ private Date toDate;
+ private List<Reservation> availableReservations;
+
+ public void populateReservations()
+ {
+ if (fromDate != null && toDate != null)
+ {
+ availableReservations = reservationService.getReservations(fromDate, toDate);
+ }
+ else if (fromDate == null && toDate != null)
+ {
+ availableReservations = reservationService.getReservationBefore(toDate);
+ }
+ else if (fromDate != null && toDate == null)
+ {
+ availableReservations = reservationService.getReservationAfter(fromDate);
+ }
+ else
+ {
+ availableReservations = reservationService.getAllReservation();
+ }
+
+ }
+
+ public ReservationService getReservationService()
+ {
+ return reservationService;
+ }
+
+ public void setReservationService(ReservationService reservationService)
+ {
+ this.reservationService = reservationService;
+ }
+
+ public Date getFromDate()
+ {
+ return fromDate;
+ }
+
+ public void setFromDate(Date fromDate)
+ {
+ this.fromDate = fromDate;
+ }
+
+ public Date getToDate()
+ {
+ return toDate;
+ }
+
+ public void setToDate(Date toDate)
+ {
+ this.toDate = toDate;
+ }
+
+ public List<Reservation> getAvailableReservations()
+ {
+ return availableReservations;
+ }
+
+ public void setAvailableReservations(List<Reservation> availableReservations)
+ {
+ this.availableReservations = availableReservations;
+ }
+}
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/spring-beans.xml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -11,10 +11,10 @@
<import resource="classpath*:infrastructure.xml"/>
- <bean id="availableEquipments" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.AvailableEquipments" scope="request">
- <property name="equipmentRepository" ref="equipmentRepository"/>
+ <bean id="reservationsBean" class="org.jboss.snowdrop.samples.sportsclub.jsf.beans.ReservationsBean" scope="session">
+ <property name="reservationService" ref="reservationService"/>
</bean>
-
+
<context:annotation-config/>
</beans>
\ No newline at end of file
Deleted: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/start.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/start.xhtml 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/start.xhtml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets">
-<head>
- <title>Start Page</title>
-</head>
-<body>
- <rich:panel header="StartBar">
- It is working!
- </rich:panel>
-</body>
-</html>
\ No newline at end of file
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/web.xml 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/web.xml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -76,6 +76,6 @@
</servlet-mapping>
<welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.xhtml</welcome-file>
</welcome-file-list>
</web-app>
Added: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/footer.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/footer.xhtml (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/footer.xhtml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -0,0 +1,10 @@
+<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">
+ <rich:panel>
+ <h:outputText value="Sports Club Reservations"/>
+ </rich:panel>
+</ui:composition>
\ No newline at end of file
Added: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/header.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/header.xhtml (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/header.xhtml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -0,0 +1,10 @@
+<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">
+ <rich:panel>
+ <h:outputText value="Sports Club Reservations"/>
+ </rich:panel>
+</ui:composition>
\ No newline at end of file
Deleted: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/index.jsp
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/index.jsp 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/index.jsp 2009-12-01 08:16:32 UTC (rev 97205)
@@ -1,5 +0,0 @@
-<html>
-<body>
-<jsp:forward page="/WEB-INF/start.xhtml" />
-</body>
-</html>
Copied: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/index.xhtml (from rev 97156, projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/index.xhtml)
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/index.xhtml (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/index.xhtml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -0,0 +1,13 @@
+<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:outputLink value="listReservationForm.jsf"><h:outputText value="List Reservations"/></h:outputLink>
+ <rich:separator/>
+ <h:outputLink value="createReservationForm.jsf"><h:outputText value="Create New Reservation"/></h:outputLink>
+ </ui:define>
+</ui:composition>
\ No newline at end of file
Added: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/template.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/template.xhtml (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/template.xhtml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+<f:view>
+
+
+ <head>
+ <title>Sports Club Reservations Spring Application Demo</title>
+ </head>
+
+
+ <body class="main-body">
+
+ <div style="width: 100%; height: 116px; left: 0px;">
+ <ui:include src="/includes/header.xhtml"/>
+ </div>
+
+ <div style="height: 100%; width: 800px" id="content" class="clearfix">
+ <ui:insert name="content"/>
+ </div>
+
+
+ <div style="width: 100%; height: 82px; left: 0px;">
+ <ui:include src="/includes/footer.xhtml"/>
+ </div>
+
+ </body>
+</f:view>
+</html>
\ No newline at end of file
Added: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/listReservationForm.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/listReservationForm.xhtml (rev 0)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-reservations-web/src/main/webapp/listReservationForm.xhtml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -0,0 +1,67 @@
+<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">
+
+ Display reservations in the following date range (dates are optional):<br/>
+ from: <rich:calendar/>
+ to: <rich:calendar/>
+ <h:commandButton id="submit" value="Display" action="populateReservations"></h:commandButton>
+
+ <rich:separator/>
+
+ <h:dataTable id="reservationTable" value="#{reservationsBean.reservations}" var="reservation">
+
+ <f:facet name="header">
+ <h:outputText value="Available Reseravtions"/>
+ </f:facet>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="id"/>
+ </f:facet>
+ <h:outputText value="#{reservation.id}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Equipment"/>
+ </f:facet>
+ <h:outputText value="#{reservation.equipment.name}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Eqp.Description"/>
+ </f:facet>
+ <h:outputText value="#{reservation.equipment.description}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="From"/>
+ </f:facet>
+ <h:outputText value="#{reservation.fromDate}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="To"/>
+ </f:facet>
+ <h:outputText value="#{reservation.toDate}"/>
+ </h:column>
+
+ <f:facet name="footer">
+ <h:outputText value="The End"/>
+ </f:facet>
+
+ </h:dataTable>
+
+ </ui:define>
+
+</ui:composition>
\ No newline at end of file
Modified: projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml
===================================================================
--- projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml 2009-12-01 08:12:41 UTC (rev 97204)
+++ projects/snowdrop/trunk/documentation/samples/sportsclub/sportsclub-subscriptions-web/src/main/webapp/layout/template.xhtml 2009-12-01 08:16:32 UTC (rev 97205)
@@ -22,7 +22,7 @@
<ui:include src="/includes/header.xhtml"/>
</div>
- <div style="height: 100%; WIDTH: 800px" id="content" class="clearfix">
+ <div style="height: 100%; width: 800px" id="content" class="clearfix">
<ui:insert name="content"/>
</div>
More information about the jboss-cvs-commits
mailing list