[jboss-svn-commits] JBL Code SVN: r28576 - in labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src: test/java/uk/ac/ncl/sdia/a8905943/showroom/impl and 1 other directory.

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

Author: whitingjr
Date: 2009-07-29 12:54:19 -0400 (Wed, 29 Jul 2009)
New Revision: 28576

Added:
   labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTestShowRoom.java
Removed:
   labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTest.java
Modified:
   labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/resources/META-INF/persistence.xml
Log:


Modified: labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/resources/META-INF/persistence.xml	2009-07-29 16:53:43 UTC (rev 28575)
+++ labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/main/resources/META-INF/persistence.xml	2009-07-29 16:54:19 UTC (rev 28576)
@@ -13,16 +13,20 @@
    </persistence-unit>
    -->
    <persistence-unit name="carshowroom" transaction-type="JTA">
-      <!-- 
       <provider>uk.ac.ncl.sdia.a8905943.stm.persistence.STMPersistenceProviderImpl</provider>
       <jta-data-source>java:/XAstmDS</jta-data-source>
-       -->
-      <provider>org.hibernate.ejb.HibernatePersistence</provider>
+       <properties>
+         <property name="jboss.entity.manager.factory.jndi.name" value="java:/STMEMFactory"/>
+       </properties>
+       
+      <!-- provider>org.hibernate.ejb.HibernatePersistence</provider>
       <jta-data-source>java:/XADerbyDS</jta-data-source>
       <properties>
          <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-      </properties>
+         <property name="org.hibernate.SQL" value="false"/>
+         <property name="hibernate.show_sql" value="false"/>
+      </properties-->
    </persistence-unit>
    <!-- 
    <persistence-unit name="carwash" transaction-type="JTA">

Deleted: labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTest.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTest.java	2009-07-29 16:53:43 UTC (rev 28575)
+++ labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTest.java	2009-07-29 16:54:19 UTC (rev 28576)
@@ -1,26 +0,0 @@
-/*
- * JBoss, the OpenSource J2EE webOS
- * 
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package uk.ac.ncl.sdia.a8905943.showroom.impl;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-import uk.ac.ncl.sdia.a8905943.showroom.servicelocator.ServiceLocator;
-import uk.ac.ncl.sdia.a8905943.showroom.spec.Showroom;
-
-public class JIntegrationTest
-{
-
-   @Test
-   public void testCheckCarBooking()
-   {
-      Showroom showRoom = ServiceLocator.findRemoteShowRoom();
-      Assert.assertNotNull(showRoom);
-      showRoom.bookCarWash(1L);
-   }
-}

Copied: labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTestShowRoom.java (from rev 28396, labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTest.java)
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTestShowRoom.java	                        (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/ShowRoomEJB/src/test/java/uk/ac/ncl/sdia/a8905943/showroom/impl/JIntegrationTestShowRoom.java	2009-07-29 16:54:19 UTC (rev 28576)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ * 
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package uk.ac.ncl.sdia.a8905943.showroom.impl;
+
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import uk.ac.ncl.sdia.a8905943.showroom.servicelocator.ServiceLocator;
+import uk.ac.ncl.sdia.a8905943.showroom.spec.Showroom;
+
+public class JIntegrationTestShowRoom
+{
+
+   @Ignore
+   public void testCheckCarBooking()
+   {
+      Showroom showRoom = ServiceLocator.findRemoteShowRoom();
+      Assert.assertNotNull(showRoom);
+      showRoom.bookCarWash(1L);
+   }
+   
+   @Test
+   public void testFindCar()
+   {
+      Showroom showRoom = ServiceLocator.findRemoteShowRoom();
+      Assert.assertNotNull(showRoom);
+      showRoom.checkCarExists(new Long(1));
+   }
+}