Author: tolusha Date: 2010-12-22 06:55:56 -0500 (Wed, 22 Dec 2010) New Revision: 3708 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/DBCleanerService.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/util/jdbc/TestDBCleanerService.java jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/db-cleaner-service.xml Log: EXOJCR-939: revert: clean data for single workspace in case of multi-db is not supported Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/DBCleanerService.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/DBCleanerService.java 2010-12-22 11:34:50 UTC (rev 3707) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/DBCleanerService.java 2010-12-22 11:55:56 UTC (rev 3708) @@ -65,28 +65,6 @@ security.checkPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION); } - boolean isMultiDb; - try - { - String multiDb = wsEntry.getContainer().getParameterValue(JDBCWorkspaceDataContainer.MULTIDB); - if (multiDb == null) - { - throw new RepositoryConfigurationException("Parameter " + JDBCWorkspaceDataContainer.MULTIDB - + " not found in workspace configuration " + wsEntry.getName()); - } - - isMultiDb = Boolean.parseBoolean(multiDb); - } - catch (RepositoryConfigurationException e) - { - throw new DBCleanerException("Can't define " + JDBCWorkspaceDataContainer.MULTIDB + " parameter", e); - } - - if (isMultiDb) - { - throw new DBCleanerException("Clean of single workspace for multi-db is not supported"); - } - getDBCleaner(wsEntry).clean(); } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/util/jdbc/TestDBCleanerService.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/util/jdbc/TestDBCleanerService.java 2010-12-22 11:34:50 UTC (rev 3707) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/util/jdbc/TestDBCleanerService.java 2010-12-22 11:55:56 UTC (rev 3708) @@ -23,7 +23,6 @@ import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.core.RepositoryImpl; import org.exoplatform.services.jcr.impl.core.SessionImpl; -import org.exoplatform.services.jcr.impl.util.jdbc.cleaner.DBCleanerException; import org.exoplatform.services.jcr.impl.util.jdbc.cleaner.DBCleanerService; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.jcr.util.TesterConfigurationHelper; @@ -250,18 +249,21 @@ Statement statement = conn.createStatement(); ResultSet res = statement.executeQuery("select * from JCR_MITEM where ID='" + id + "'"); assertTrue(res.next()); - statement.close(); // remove workspace data from database + new DBCleanerService().cleanWorkspaceData(repositoryEntry.getWorkspaceEntries().get(0)); + + // check - does JCR_SITEM become empty try { - new DBCleanerService().cleanWorkspaceData(repositoryEntry.getWorkspaceEntries().get(0)); - fail("Exception should be thrown"); + res = statement.executeQuery("select * from JCR_MITEM where ID='" + id + "'"); + fail(); } - catch (DBCleanerException e) + catch (SQLException e) { - + //ok } + statement.close(); service.removeRepository(repositoryName); } Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/db-cleaner-service.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/db-cleaner-service.xml 2010-12-22 11:34:50 UTC (rev 3707) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/db-cleaner-service.xml 2010-12-22 11:55:56 UTC (rev 3708) @@ -62,10 +62,4 @@ </listitem> </itemizedlist></para> </section> - - <section> - <title>Limitation</title> - - <para>Clean of single workspace for multi-db is not supported.</para> - </section> </chapter>