Author: dkulp Date: Fri Jun 15 19:50:51 2012 New Revision: 1350757 URL: http://svn.apache.org/viewvc?rev=1350757&view=rev Log: Merged revisions 1350749 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1350749 | dkulp | 2012-06-15 15:36:29 -0400 (Fri, 15 Jun 2012) | 10 lines Merged revisions 1350617 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1350617 | ay | 2012-06-15 09:41:58 -0400 (Fri, 15 Jun 2012) | 2 lines cleanup DBTables at the beginning in ws-rm systests ........ ........ Modified: cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Modified: cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java?rev=1350757&r1=1350756&r2=1350757&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutClientPersistenceTest.java Fri Jun 15 19:50:51 2012 @@ -34,6 +34,8 @@ public class CachedOutClientPersistenceT @BeforeClass public static void startServers() throws Exception { + RMTxStore.deleteDatabaseFiles("cocpt-server", true); + RMTxStore.deleteDatabaseFiles("cocpt-client", true); startServers(PORT, "cocpt"); CachedOutputStream.setDefaultThreshold(16); } @@ -41,8 +43,8 @@ public class CachedOutClientPersistenceT @AfterClass public static void cleanup() throws Exception { CachedOutputStream.setDefaultThreshold(-1); - RMTxStore.deleteDatabaseFiles("cocpt-server", true); - RMTxStore.deleteDatabaseFiles("cocpt-client", true); + RMTxStore.deleteDatabaseFiles("cocpt-server", false); + RMTxStore.deleteDatabaseFiles("cocpt-client", false); } @Test Modified: cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java?rev=1350757&r1=1350756&r2=1350757&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java Fri Jun 15 19:50:51 2012 @@ -35,6 +35,8 @@ public class CachedOutServerPersistenceT @BeforeClass public static void setProperties() throws Exception { + RMTxStore.deleteDatabaseFiles("cospt-recovery", true); + RMTxStore.deleteDatabaseFiles("cospt-server", true); startServers(PORT, "cospt"); CachedOutputStream.setDefaultThreshold(16); } @@ -42,8 +44,8 @@ public class CachedOutServerPersistenceT @AfterClass public static void cleanup() throws Exception { CachedOutputStream.setDefaultThreshold(-1); - RMTxStore.deleteDatabaseFiles("cospt-recovery", true); - RMTxStore.deleteDatabaseFiles("cospt-server", true); + RMTxStore.deleteDatabaseFiles("cospt-recovery", false); + RMTxStore.deleteDatabaseFiles("cospt-server", false); } @Test Modified: cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java?rev=1350757&r1=1350756&r2=1350757&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java Fri Jun 15 19:50:51 2012 @@ -35,14 +35,16 @@ public class ClientPersistenceTest exten @BeforeClass public static void startServers() throws Exception { + RMTxStore.deleteDatabaseFiles("cpt-server", true); + RMTxStore.deleteDatabaseFiles("cpt-client", true); startServers(PORT, "cpt"); } @AfterClass public static void cleanup() throws Exception { CachedOutputStream.setDefaultThreshold(-1); - RMTxStore.deleteDatabaseFiles("cpt-server", true); - RMTxStore.deleteDatabaseFiles("cpt-client", true); + RMTxStore.deleteDatabaseFiles("cpt-server", false); + RMTxStore.deleteDatabaseFiles("cpt-client", false); } @Test Modified: cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=1350757&r1=1350756&r2=1350757&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Fri Jun 15 19:50:51 2012 @@ -38,13 +38,15 @@ public class ServerPersistenceTest exten } @BeforeClass public static void startServers() throws Exception { + RMTxStore.deleteDatabaseFiles("spt-recovery", true); + RMTxStore.deleteDatabaseFiles("spt-rmdb", true); startServers(PORT, "spt"); } @AfterClass public static void cleanup() throws Exception { - RMTxStore.deleteDatabaseFiles("spt-recovery", true); - RMTxStore.deleteDatabaseFiles("spt-rmdb", true); + RMTxStore.deleteDatabaseFiles("spt-recovery", false); + RMTxStore.deleteDatabaseFiles("spt-rmdb", false); } public String getPrefix() {
