[jboss-svn-commits] JBL Code SVN: r30023 - in labs/jbosstm/trunk/ArjunaCore/arjuna: classes/com/arjuna/ats/internal/arjuna/objectstore and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 5 10:45:35 EST 2009
Author: mmusgrov
Date: 2009-11-05 10:45:35 -0500 (Thu, 05 Nov 2009)
New Revision: 30023
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
Log:
Calls to setupStore should pass in the LocalOSRoot rather than the ObjectStoreDir.
https://jira.jboss.org/jira/browse/JBTM-615
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2009-11-05 15:30:12 UTC (rev 30022)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2009-11-05 15:45:35 UTC (rev 30023)
@@ -102,11 +102,13 @@
</fileset>
</tests>
</run.tests.macro>
- <run.tests.macro script="recovery.txt">
+ <!--
+ <run.tests.macro script="recovery.txt" showoutput="true">
<tests>
<fileset dir="tests/classes" includes="**/recovery/RecoveryManagerStartStopTest.java"/>
</tests>
</run.tests.macro>
+ -->
</target>
</project>
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java 2009-11-05 15:30:12 UTC (rev 30022)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java 2009-11-05 15:45:35 UTC (rev 30023)
@@ -269,7 +269,7 @@
try
{
setupStore(arjPropertyManager.getObjectStoreEnvironmentBean()
- .getObjectStoreDir());
+ .getLocalOSRoot());
}
catch (ObjectStoreException e)
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2009-11-05 15:30:12 UTC (rev 30022)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/FileSystemStore.java 2009-11-05 15:45:35 UTC (rev 30023)
@@ -603,7 +603,7 @@
try
{
- setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
+ setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
catch (ObjectStoreException e)
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java 2009-11-05 15:30:12 UTC (rev 30022)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedActionStore.java 2009-11-05 15:45:35 UTC (rev 30023)
@@ -88,7 +88,7 @@
try
{
- setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
+ setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
catch (ObjectStoreException e)
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2009-11-05 15:30:12 UTC (rev 30022)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/HashedStore.java 2009-11-05 15:45:35 UTC (rev 30023)
@@ -211,7 +211,7 @@
try
{
- setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
+ setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
catch (ObjectStoreException e)
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2009-11-05 15:30:12 UTC (rev 30022)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2009-11-05 15:45:35 UTC (rev 30023)
@@ -721,7 +721,7 @@
try
{
- setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
+ setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
catch (ObjectStoreException e)
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java 2009-11-05 15:30:12 UTC (rev 30022)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/NullActionStore.java 2009-11-05 15:45:35 UTC (rev 30023)
@@ -134,7 +134,7 @@
try
{
- setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir());
+ setupStore(arjPropertyManager.getObjectStoreEnvironmentBean().getLocalOSRoot());
}
catch (ObjectStoreException e)
{
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2009-11-05 15:30:12 UTC (rev 30022)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java 2009-11-05 15:45:35 UTC (rev 30023)
@@ -921,7 +921,7 @@
try
{
setupStore(arjPropertyManager.getObjectStoreEnvironmentBean()
- .getObjectStoreDir());
+ .getLocalOSRoot());
}
catch (ObjectStoreException e)
{
More information about the jboss-svn-commits
mailing list