Author: tolusha Date: 2012-01-17 10:21:04 -0500 (Tue, 17 Jan 2012) New Revision: 5473 Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/usecase/TestBackupRestore.java jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml Log: EXOJCR-1707: Refactoring DBCleanService, Fix configuration Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/usecase/TestBackupRestore.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/usecase/TestBackupRestore.java 2012-01-17 15:20:29 UTC (rev 5472) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/usecase/TestBackupRestore.java 2012-01-17 15:21:04 UTC (rev 5473) @@ -713,9 +713,11 @@ // clean and rollback first repositoryDBCleaner.clean(); + conn.rollback(); repositoryDBCleaner.rollback(); + conn.commit(); checkConent(repositoryName); @@ -723,6 +725,7 @@ // clean repositoryDBCleaner.clean(); repositoryDBCleaner.commit(); + conn.commit(); } else @@ -769,9 +772,11 @@ { // clean and rollback first workspaceDBCleaner.clean(); + conn.rollback(); workspaceDBCleaner.rollback(); + conn.commit(); checkConent(repositoryName); @@ -779,6 +784,7 @@ // clean workspaceDBCleaner.clean(); workspaceDBCleaner.commit(); + conn.commit(); } finally Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2012-01-17 15:20:29 UTC (rev 5472) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2012-01-17 15:21:04 UTC (rev 5473) @@ -234,7 +234,7 @@ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr6" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr8" /> <property name="jbosscache-shareable" value="true" /> </properties> </lock-manager>