[jboss-svn-commits] JBL Code SVN: r28145 - in labs/jbosstm/workspace/whitingjr/trunk: MVCCHibIntegrationJAR/src/main/clj and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 17 10:21:20 EDT 2009
Author: whitingjr
Date: 2009-07-17 10:21:19 -0400 (Fri, 17 Jul 2009)
New Revision: 28145
Modified:
labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/.classpath
labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/pom.xml
labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/clj/update_person.clj
labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/java/uk/ac/ncl/sdia/mvcc/bridge/PersonModifier.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/java/uk/ac/ncl/sdia/mvcc/hibernate/events/AbstractMVCCEvent.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/test/uk/ac/ncl/sdia/mvcc/bridge/JUTestPersonManager.java
labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml
labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/datasource/stm-memory-ds.xml
labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEAR/src/main/resources/META-INF/jboss-app.xml
Log:
Updated configuration to meet v5
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/.classpath
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/.classpath 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/.classpath 2009-07-17 14:21:19 UTC (rev 28145)
@@ -7,6 +7,5 @@
<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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="lib" path="/clojure/clojure-1.1.0-alpha-SNAPSHOT.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/pom.xml 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/pom.xml 2009-07-17 14:21:19 UTC (rev 28145)
@@ -17,10 +17,17 @@
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
-<dependency>
- <groupId>uk.ac.ncl.sdia.a8905943</groupId>
- <artifactId>MVCCSampleEJB</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>uk.ac.ncl.sdia.a8905943</groupId>
+ <artifactId>MVCCSampleEJB</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ </dependency>
+
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/clj/update_person.clj
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/clj/update_person.clj 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/clj/update_person.clj 2009-07-17 14:21:19 UTC (rev 28145)
@@ -1,5 +1,5 @@
; update_person.clj
(ns person)
-(defn increment-age [person]
+(defn complement [person]
(str "What a nice " person "you are"))
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/java/uk/ac/ncl/sdia/mvcc/bridge/PersonModifier.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/java/uk/ac/ncl/sdia/mvcc/bridge/PersonModifier.java 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/java/uk/ac/ncl/sdia/mvcc/bridge/PersonModifier.java 2009-07-17 14:21:19 UTC (rev 28145)
@@ -35,7 +35,7 @@
logger.debug("Executing person modifier method to increment age");
}
RT.loadResourceScript(PERSON_MODIFY);
- Var script = RT.var("person", "increment-age");
+ Var script = RT.var("person", "complement");
Object something = script.invoke(_person);
logger.info("What came back was ["+something+"]");
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/java/uk/ac/ncl/sdia/mvcc/hibernate/events/AbstractMVCCEvent.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/java/uk/ac/ncl/sdia/mvcc/hibernate/events/AbstractMVCCEvent.java 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/java/uk/ac/ncl/sdia/mvcc/hibernate/events/AbstractMVCCEvent.java 2009-07-17 14:21:19 UTC (rev 28145)
@@ -1,9 +1,9 @@
package uk.ac.ncl.sdia.mvcc.hibernate.events;
-import org.codehaus.multiverse.multiversionedstm.MultiversionedStm;
+//import org.codehaus.multiverse.multiversionedstm.MultiversionedStm;
public abstract class AbstractMVCCEvent {
-
+/*
private static MultiversionedStm stm = null;
static{
stm = new MultiversionedStm();
@@ -13,4 +13,5 @@
{
return stm;
}
+ */
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/test/uk/ac/ncl/sdia/mvcc/bridge/JUTestPersonManager.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/test/uk/ac/ncl/sdia/mvcc/bridge/JUTestPersonManager.java 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCHibIntegrationJAR/src/main/test/uk/ac/ncl/sdia/mvcc/bridge/JUTestPersonManager.java 2009-07-17 14:21:19 UTC (rev 28145)
@@ -39,11 +39,5 @@
}
}
- @Ignore
- public void testSeeWhatHappensWithPersistentSet()
- {
-
- }
-
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/build.xml 2009-07-17 14:21:19 UTC (rev 28145)
@@ -9,7 +9,7 @@
<property name="build.dir" value="${basedir}/build"/>
<property name="deployment.artifact.filename" value="MVCCSampleEAR.ear"/>
<property name="M2_HOME" value="${user.home}/.m2"/>
- <property name="MAVEN_ANT_TASK_VERSION" value="$2.0.10"/>
+ <property name="MAVEN_ANT_TASK_VERSION" value="2.0.10"/>
<!-- to download dependencies execute mvn package on this module before calling ant script -->
<path id="maven-ant-tasks.classpath" path="${M2_HOME}/repository/org/apache/maven/maven-ant-tasks/${MAVEN_ANT_TASK_VERSION}/maven-ant-tasks-${MAVEN_ANT_TASK_VERSION}.jar" />
@@ -53,7 +53,7 @@
</target>
<target name="deploy" depends="build">
- <copy file="${basedir}/datasource/stm-memory-ds.xml" todir="${JBOSS_HOME}/server/default/deploy"/>
+ <!--copy file="${basedir}/datasource/stm-memory-ds.xml" todir="${JBOSS_HOME}/server/default/deploy"/-->
<copy file="${basedir}/artifacts/MVCCSampleEAR.ear" todir="${JBOSS_HOME}/server/default/deploy"/>
<echo>would have deployed artifact ${deployment.artifact.filename} to this directory [${JBOSS_HOME}/server/default/deploy]</echo>
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/datasource/stm-memory-ds.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/datasource/stm-memory-ds.xml 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSample-build/datasource/stm-memory-ds.xml 2009-07-17 14:21:19 UTC (rev 28145)
@@ -15,14 +15,14 @@
install into $jboss_install_dir/server/default/deploy
-->
+ <!--
<xa-datasource>
<jndi-name>PersistenceContext/memorypersistence</jndi-name>
- <!-- uncomment to enable interleaving <interleaving/> -->
<isSameRM-override-value>false</isSameRM-override-value>
<xa-datasource-class>uk.ac.ncl.sdia.a8905943.persistence.xa.STMXADatasourceImpl</xa-datasource-class>
<max-pool-size>100</max-pool-size>
<transaction-isolation>TRANSACTION_REPEATABLE_READ</transaction-isolation>
</xa-datasource>
-
+ -->
</datasources>
\ No newline at end of file
Modified: labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEAR/src/main/resources/META-INF/jboss-app.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEAR/src/main/resources/META-INF/jboss-app.xml 2009-07-17 14:09:13 UTC (rev 28144)
+++ labs/jbosstm/workspace/whitingjr/trunk/MVCCSampleEAR/src/main/resources/META-INF/jboss-app.xml 2009-07-17 14:21:19 UTC (rev 28145)
@@ -2,7 +2,13 @@
PUBLIC "-//JBoss//DTD J2EE Application 1.5//EN"
"http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
<jboss-app>
+ <!-- jboss v4
<loader-repository>
mvccsample:app=ejb3
</loader-repository>
+ -->
+ <loader-repository>
+ mvccsample:archive=MVCCSampleEAR.ear
+ </loader-repository>
+
</jboss-app>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list