[jboss-svn-commits] JBL Code SVN: r29178 - in labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB: src/main/java/uk/ac/ncl/sdia/a8905943/showroom/impl and 2 other directories.

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

Author: whitingjr
Date: 2009-09-04 09:44:35 -0400 (Fri, 04 Sep 2009)
New Revision: 29178

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/pom.xml
   labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/java/uk/ac/ncl/sdia/a8905943/showroom/impl/ShowroomBean.java
   labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/java/uk/ac/ncl/sdia/a8905943/showroom/servicelocator/ServiceLocator.java
   labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTestShowRoom.java
Log:
Added changes


Modified: labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/pom.xml	2009-09-04 02:40:40 UTC (rev 29177)
+++ labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/pom.xml	2009-09-04 13:44:35 UTC (rev 29178)
@@ -24,14 +24,7 @@
          <version>0.0.1-SNAPSHOT</version>
          <scope>compile</scope>
       </dependency>
-      
-      <dependency>
-         <groupId>uk.ac.ncl.sdia.a8905943</groupId>
-         <artifactId>STMAnnotationsJAR</artifactId>
-         <version>0.0.1-SNAPSHOT</version>
-         <scope>test</scope>
-      </dependency>
-		
+       
 	</dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/java/uk/ac/ncl/sdia/a8905943/showroom/impl/ShowroomBean.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/java/uk/ac/ncl/sdia/a8905943/showroom/impl/ShowroomBean.java	2009-09-04 02:40:40 UTC (rev 29177)
+++ labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/java/uk/ac/ncl/sdia/a8905943/showroom/impl/ShowroomBean.java	2009-09-04 13:44:35 UTC (rev 29178)
@@ -6,13 +6,17 @@
  */
 package uk.ac.ncl.sdia.a8905943.showroom.impl;
 
+import java.util.List;
+
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
 
 import org.apache.log4j.Logger;
 
 import uk.ac.ncl.sdia.a8905943.carwash.spec.CarWash;
+import uk.ac.ncl.sdia.a8905943.model.BankAccountEntity;
 import uk.ac.ncl.sdia.a8905943.model.LeccyCar;
 import uk.ac.ncl.sdia.a8905943.showroom.servicelocator.ServiceLocator;
 import uk.ac.ncl.sdia.a8905943.showroom.spec.ShowroomLocal;
@@ -54,7 +58,17 @@
    @Override
    public void bookCarWash(Long carId)
    {
-      CarWash carwash = ServiceLocator.findRemoteCarWash();
+      CarWash carwash = ServiceLocator.findRemoteCarWash(); 
       carwash.bookWash(carId);
    }
+   
+   @SuppressWarnings("unchecked")
+   public List<BankAccountEntity> getAllBankAccounts()
+   {
+      String statement = "model/uk.ac.ncl.sdia.a8905943.model.BankAccountEntity[id=1]";
+      Query query = entityManager.createQuery(statement);
+      List<BankAccountEntity> resultList = query.getResultList();
+      return resultList;
+   }
+      
 }

Modified: labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/java/uk/ac/ncl/sdia/a8905943/showroom/servicelocator/ServiceLocator.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/java/uk/ac/ncl/sdia/a8905943/showroom/servicelocator/ServiceLocator.java	2009-09-04 02:40:40 UTC (rev 29177)
+++ labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/java/uk/ac/ncl/sdia/a8905943/showroom/servicelocator/ServiceLocator.java	2009-09-04 13:44:35 UTC (rev 29178)
@@ -26,7 +26,7 @@
    private static final String LOCAL_PROVIDER = "localhost:1099";
    private static Logger logger = Logger.getLogger(ServiceLocator.class);
    
-   public static CarWashRemote findRemoteCarWash()
+   public static CarWashRemote findRemoteCarWash() 
    {
       CarWashRemote returnValue = null;
       Object reference = findObject(REMOTE_CARWASH, LOCAL_PROVIDER);

Modified: labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTestShowRoom.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTestShowRoom.java	2009-09-04 02:40:40 UTC (rev 29177)
+++ labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTestShowRoom.java	2009-09-04 13:44:35 UTC (rev 29178)
@@ -17,7 +17,7 @@
 public class JIntegrationTestShowRoom
 {
 
-   @Ignore
+   @Test
    public void testCheckCarBooking()
    {
       Showroom showRoom = ServiceLocator.findRemoteShowRoom();
@@ -25,11 +25,11 @@
       showRoom.bookCarWash(1L);
    }
    
-   @Test
+   @Ignore
    public void testFindCar()
    {
       Showroom showRoom = ServiceLocator.findRemoteShowRoom();
       Assert.assertNotNull(showRoom);
-      showRoom.checkCarExists(new Long(1));
+      Assert.assertTrue(showRoom.checkCarExists(new Long(1)));
    }
 }