[jboss-cvs] JBossAS SVN: r97965 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository and 4 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2009-12-17 12:24:05 -0500 (Thu, 17 Dec 2009)
New Revision: 97965

Modified:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Equipment.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/EquipmentRepository.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateEquipmentRepository.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentService.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentServiceImpl.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/pom.xml
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelper.java
Log:
fixes to pass the test

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Equipment.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Equipment.java	2009-12-17 17:04:20 UTC (rev 97964)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/entity/Equipment.java	2009-12-17 17:24:05 UTC (rev 97965)
@@ -13,7 +13,7 @@
 public class Equipment
 {
    @Id @GeneratedValue
-   private long id;
+   private Long id;
 
    private String name;
 

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/EquipmentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/EquipmentRepository.java	2009-12-17 17:04:20 UTC (rev 97964)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-domain/src/main/java/org/jboss/snowdrop/samples/sportsclub/domain/repository/EquipmentRepository.java	2009-12-17 17:24:05 UTC (rev 97965)
@@ -9,7 +9,7 @@
 /**
  *
  */
-public interface EquipmentRepository extends Repository<Equipment, Integer>
+public interface EquipmentRepository extends Repository<Equipment, Long>
 {
    public List<Equipment> getAvailableEquipments(Date fromDate, Date toDate);
 

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateEquipmentRepository.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateEquipmentRepository.java	2009-12-17 17:04:20 UTC (rev 97964)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-hibernate-dao/src/main/java/org/jboss/snowdrop/samples/sportsclub/dao/hibernate/HibernateEquipmentRepository.java	2009-12-17 17:24:05 UTC (rev 97965)
@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.Date;
 
-public class HibernateEquipmentRepository extends HibernateRepository<Equipment, Integer> implements EquipmentRepository
+public class HibernateEquipmentRepository extends HibernateRepository<Equipment, Long> implements EquipmentRepository
 {
 
    public HibernateEquipmentRepository()

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentService.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentService.java	2009-12-17 17:04:20 UTC (rev 97964)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentService.java	2009-12-17 17:24:05 UTC (rev 97965)
@@ -10,5 +10,5 @@
 {
    public EquipmentType[] getEquipmentTypes();
 
-   public Equipment findEquipmentById(int id);
+   public Equipment findEquipmentById(long id);
 }

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentServiceImpl.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentServiceImpl.java	2009-12-17 17:04:20 UTC (rev 97964)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-spring/src/main/java/org/jboss/snowdrop/samples/sportsclub/service/EquipmentServiceImpl.java	2009-12-17 17:24:05 UTC (rev 97965)
@@ -18,7 +18,7 @@
       return equipmentRepository.getEquipmentTypes();
    }
 
-   public Equipment findEquipmentById(int id)
+   public Equipment findEquipmentById(long id)
    {
       return equipmentRepository.findById(id);
    }

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/pom.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/pom.xml	2009-12-17 17:04:20 UTC (rev 97964)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/pom.xml	2009-12-17 17:24:05 UTC (rev 97965)
@@ -43,11 +43,11 @@
             </exclusions>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.jboss.snowdrop.samples.sportsclub</groupId>-->
-            <!--<artifactId>sportsclub-test-infrastructure</artifactId>-->
-            <!--<scope>test</scope>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.jboss.snowdrop.samples.sportsclub</groupId>
+            <artifactId>sportsclub-test-infrastructure</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
@@ -104,6 +104,18 @@
           <classifier>jdk15</classifier>
         </dependency>
 
+       <dependency>
+          <groupId>commons-dbcp</groupId>
+          <artifactId>commons-dbcp</artifactId>
+       </dependency>
+
+
+       <dependency>
+          <groupId>hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+       </dependency>
+
+       
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelper.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelper.java	2009-12-17 17:04:20 UTC (rev 97964)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/java/org/jboss/snowdrop/samples/sportsclub/jsf/beans/converter/EquipmentConverterHelper.java	2009-12-17 17:24:05 UTC (rev 97965)
@@ -20,7 +20,7 @@
    public Equipment getAsEquipment(String s) throws RuntimeException
    {
       String[] items = s.split(" ",2);
-      Equipment e = getEquipmentService().findEquipmentById(Integer.parseInt(items[0]));
+      Equipment e = getEquipmentService().findEquipmentById(Long.valueOf(items[0]));
       return e;
    }