[exo-jcr-commits] exo-jcr SVN: r3804 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: util/jdbc/cleaner and 1 other directory.

Author: dkuleshov Date: 2011-01-13 05:43:01 -0500 (Thu, 13 Jan 2011) New Revision: 3804 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/SingleDBCleaner.java Log: EXOJCR-1154: fixed SingleDbCleaner query scripts, changed unregisteration for repository removal Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2011-01-13 10:39:50 UTC (rev 3803) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2011-01-13 10:43:01 UTC (rev 3804) @@ -422,7 +422,7 @@ repositoryContainer.stop(); repositoryContainers.remove(name); config.getRepositoryConfigurations().remove(repconfig); - parentContainer.unregisterComponentByInstance(repositoryContainer); + parentContainer.unregisterComponent(repositoryContainer.getName()); } catch (RepositoryConfigurationException e) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/SingleDBCleaner.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/SingleDBCleaner.java 2011-01-13 10:39:50 UTC (rev 3803) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/SingleDBCleaner.java 2011-01-13 10:43:01 UTC (rev 3804) @@ -66,7 +66,7 @@ .add("delete from JCR_SVALUE where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='" + containerName + "')"); commonSingleDBCleanScripts - .add("delete from JCR_SVALUE where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='" + .add("delete from JCR_SREF where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SREF.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='" + containerName + "')"); commonSingleDBCleanScripts.addAll(commonDBCleanScripts); }