[jboss-svn-commits] JBL Code SVN: r28147 - in labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB: .settings and 3 other directories.

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

Author: whitingjr
Date: 2009-07-17 10:22:23 -0400 (Fri, 17 Jul 2009)
New Revision: 28147

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.classpath
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.component
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/impl/PersonManagerBean.java
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/Person.java
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestPersonManager.java
   labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestServiceLocator.java
Log:
Updated test cases and domain objects.

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.classpath
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.classpath	2009-07-17 14:21:59 UTC (rev 28146)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.classpath	2009-07-17 14:22:23 UTC (rev 28147)
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="bin" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/test"/>
+	<classpathentry excluding="**" kind="src" output="bin" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 5.0 Runtime"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.component
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.component	2009-07-17 14:21:59 UTC (rev 28146)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.component	2009-07-17 14:22:23 UTC (rev 28147)
@@ -3,6 +3,7 @@
     <wb-module deploy-name="MVCCSampleEJB-0.0.1-SNAPSHOT">
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/src/main/test"/>
         <property name="java-output-path"/>
     </wb-module>
 </project-modules>

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/impl/PersonManagerBean.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/impl/PersonManagerBean.java	2009-07-17 14:21:59 UTC (rev 28146)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/impl/PersonManagerBean.java	2009-07-17 14:22:23 UTC (rev 28147)
@@ -16,11 +16,12 @@
  */
 @Stateless(name = "PersonManager")
 public class PersonManagerBean implements PersonManagerRemote, PersonManagerLocal {
-
-   private static final Logger logger = Logger.getLogger(PersonManagerBean.class);
-   @PersistenceContext (unitName="mvccsample") 
+   
+   @PersistenceContext (unitName="mvccsample")  
    private EntityManager entityManager;
    
+   private static final Logger logger = Logger.getLogger(PersonManagerBean.class);
+   
     /**
      * Default constructor. 
      */

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/Person.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/Person.java	2009-07-17 14:21:59 UTC (rev 28146)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/Person.java	2009-07-17 14:22:23 UTC (rev 28147)
@@ -66,5 +66,13 @@
       this.age = age;
    }
    
-   
+   @Override
+   public Object clone() throws CloneNotSupportedException
+   {
+      Person returnValue = new Person();
+      returnValue.setAge(this.getAge());
+      returnValue.setId(this.getId());
+      returnValue.setName(this.getName());
+      return returnValue;
+   }
 }

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestPersonManager.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestPersonManager.java	2009-07-17 14:21:59 UTC (rev 28146)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestPersonManager.java	2009-07-17 14:22:23 UTC (rev 28147)
@@ -17,14 +17,15 @@
 public class JITestPersonManager
 {
    private static final Logger logger = Logger.getLogger(JITestPersonManager.class);
-   @Ignore
+   @Test
    public void checkPersistentChanges()
    {
       PersonManager personManager = ServiceLocator.findRemotePersonManager();
       Assert.assertNotNull(personManager);
       Person person = personManager.find("Jeremy");
       Assert.assertNotNull(person);
-      person.setAge(5l);
+      Person detatched = (Person)person.clone();
+      
       personManager.update(person);
    }
    

Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestServiceLocator.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestServiceLocator.java	2009-07-17 14:21:59 UTC (rev 28146)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestServiceLocator.java	2009-07-17 14:22:23 UTC (rev 28147)
@@ -27,7 +27,7 @@
       Assert.assertNotNull(person);
       Assert.assertNotNull(person.getId());
       Assert.assertTrue(StringUtils.isNumeric( person.getId().toString()));
-      
+       
    }