[jboss-svn-commits] JBL Code SVN: r27403 - in labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB: .settings and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 1 14:01:19 EDT 2009
Author: whitingjr
Date: 2009-07-01 14:01:19 -0400 (Wed, 01 Jul 2009)
New Revision: 27403
Added:
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.jdt.core.prefs
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/Dog.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/generator/
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/generator/GenDog.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/spec/IPerson.java
Modified:
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.classpath
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.project
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.jst.common.project.facet.core.prefs
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.component
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.project.facet.core.xml
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.maven.ide.eclipse.prefs
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/pom.xml
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/ServiceLocator.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 ejb project
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.classpath
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.classpath 2009-07-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.classpath 2009-07-01 18:01:19 UTC (rev 27403)
@@ -2,8 +2,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" path="src/main/test"/>
<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"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.project
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.project 2009-07-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.project 2009-07-01 18:01:19 UTC (rev 27403)
@@ -3,9 +3,9 @@
<name>MVCCSampleEJB</name>
<comment></comment>
<projects>
+ <project>MVCCSampleEAR</project>
</projects>
<buildSpec>
-
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
@@ -38,7 +38,6 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>org.hibernate.eclipse.console.hibernateNature</nature>
</natures>
</projectDescription>
Added: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.jdt.core.prefs 2009-07-01 18:01:19 UTC (rev 27403)
@@ -0,0 +1,5 @@
+#Mon May 18 17:20:02 BST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.jst.common.project.facet.core.prefs 2009-07-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.jst.common.project.facet.core.prefs 2009-07-01 18:01:19 UTC (rev 27403)
@@ -1,4 +1,3 @@
-#Sun May 10 22:17:43 BST 2009
+#Mon May 18 17:20:50 BST 2009
classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_13/owners=jst.java\:6.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.generic.runtimeTarget\:\:JBoss\ v5.0/owners=jst.ejb\:3.0;jst.ejb\:2.1
eclipse.preferences.version=1
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-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.component 2009-07-01 18:01:19 UTC (rev 27403)
@@ -3,7 +3,6 @@
<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/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-07-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-07-01 18:01:19 UTC (rev 27403)
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="JBoss v5.0"/>
<fixed facet="jst.java"/>
<fixed facet="jst.ejb"/>
<installed facet="jst.java" version="6.0"/>
- <installed facet="wst.jsdt.web" version="1.0"/>
- <installed facet="jst.ejb" version="2.1"/>
+ <installed facet="jst.ejb" version="3.0"/>
</faceted-project>
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.maven.ide.eclipse.prefs 2009-07-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/.settings/org.maven.ide.eclipse.prefs 2009-07-01 18:01:19 UTC (rev 27403)
@@ -1,4 +1,4 @@
-#Sun May 10 20:00:38 BST 2009
+#Mon May 18 17:20:49 BST 2009
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/pom.xml 2009-07-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/pom.xml 2009-07-01 18:01:19 UTC (rev 27403)
@@ -4,7 +4,6 @@
<groupId>uk.ac.ncl.sdia.a8905943</groupId>
<artifactId>MVCCSampleEJB</artifactId>
<packaging>ejb</packaging>
- <version>0.0.1-SNAPSHOT</version>
<parent>
<artifactId>MVCCSample</artifactId>
<groupId>uk.ac.ncl.sdia.a8905943</groupId>
@@ -19,8 +18,6 @@
<scope>test</scope>
</dependency>
-
-
</dependencies>
<build>
<plugins>
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/ServiceLocator.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/ServiceLocator.java 2009-07-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/ServiceLocator.java 2009-07-01 18:01:19 UTC (rev 27403)
@@ -22,13 +22,13 @@
private static final String LOCAL_PROVIDER = "localhost:1099";
private static Logger logger = Logger.getLogger(ServiceLocator.class);
- public static PersonManager findRemotePersonManater()
+ public static PersonManager findRemotePersonManager()
{
PersonManager returnValue = null;
Object reference = findObject(REMOTE_PERSON_MANAGER, LOCAL_PROVIDER);
if (null != reference)
{
- returnValue = (PersonManager)reference;
+ returnValue = (PersonManagerRemote)reference;
}
else
{
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-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/Person.java 2009-07-01 18:01:19 UTC (rev 27403)
@@ -14,13 +14,19 @@
import javax.persistence.Id;
import javax.persistence.Table;
+import dstm2.factory.Factory;
+
+import uk.ac.ncl.sdia.mvcc.spec.IPerson;
+
@Entity
@Table (name="person")
-public class Person implements Serializable
+public class Person implements Serializable, IPerson
{
/** The serialVersionUID */
private static final long serialVersionUID = 4439642429338078684L;
+
+ static Factory<IPerson> factory = dstm2.Thread.makeFactory(IPerson.class);
@Id
@GeneratedValue
Added: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/Dog.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/Dog.java (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/Dog.java 2009-07-01 18:01:19 UTC (rev 27403)
@@ -0,0 +1,7 @@
+package uk.ac.ncl.sdia.mvcc.model.xstm;
+
+public class Dog {
+
+ private Long id;
+ private String name;
+}
Added: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/generator/GenDog.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/generator/GenDog.java (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/model/xstm/generator/GenDog.java 2009-07-01 18:01:19 UTC (rev 27403)
@@ -0,0 +1,16 @@
+package uk.ac.ncl.sdia.mvcc.model.xstm.generator;
+
+import jstm.generator.Structure;
+
+public class GenDog {
+
+ public static void main(String[] args) {
+ GenDog gen = new GenDog();
+ gen.generate();
+ }
+
+ public void generate()
+ {
+
+ }
+}
Added: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/spec/IPerson.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/spec/IPerson.java (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/java/uk/ac/ncl/sdia/mvcc/spec/IPerson.java 2009-07-01 18:01:19 UTC (rev 27403)
@@ -0,0 +1,16 @@
+package uk.ac.ncl.sdia.mvcc.spec;
+
+import dstm2.atomic;
+
+ at atomic
+public interface IPerson {
+
+ public Long getId();
+ public void setId(Long _id);
+
+ public String getName();
+ public void setName(String _name);
+
+ public Long getAge();
+ public void setAge(Long _age);
+}
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-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestPersonManager.java 2009-07-01 18:01:19 UTC (rev 27403)
@@ -8,6 +8,7 @@
import org.apache.log4j.Logger;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import uk.ac.ncl.sdia.mvcc.model.Person;
@@ -16,15 +17,26 @@
public class JITestPersonManager
{
private static final Logger logger = Logger.getLogger(JITestPersonManager.class);
- @Test
+ @Ignore
public void checkPersistentChanges()
{
- PersonManager personManager = ServiceLocator.findRemotePersonManater();
+ PersonManager personManager = ServiceLocator.findRemotePersonManager();
Assert.assertNotNull(personManager);
Person person = personManager.find("Jeremy");
Assert.assertNotNull(person);
- Person person2 = personManager.get(person.getId());
- Assert.assertNotNull(person2);
+ person.setAge(5l);
+ personManager.update(person);
}
+
+ @Test
+ public void triggerLoadEvent()
+ {
+ PersonManager personManager = ServiceLocator.findRemotePersonManager();
+ Assert.assertNotNull(personManager );
+ Person person = personManager.get(1l); // depends on dummy data pre loaded into database
+ Assert.assertNotNull(person);
+ Assert.assertEquals("Jeremy", person.getName());
+ }
+
}
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-01 18:00:14 UTC (rev 27402)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEJB/src/main/test/uk/ac/ncl/sdia/mvcc/ejb/servicelocator/JITestServiceLocator.java 2009-07-01 18:01:19 UTC (rev 27403)
@@ -21,7 +21,7 @@
@Test
public void checkServiceLocatorObtainsEJBReference()
{
- PersonManager personManager = ServiceLocator.findRemotePersonManater();
+ PersonManager personManager = ServiceLocator.findRemotePersonManager();
Assert.assertNotNull(personManager);
Person person = personManager.find("Jeremy");
Assert.assertNotNull(person);
More information about the jboss-svn-commits
mailing list