Author: areshetnyak Date: 2012-03-20 04:54:16 -0400 (Tue, 20 Mar 2012) New Revision: 5903 Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java Log: EXOJCR-1806 : Deprecated "multi-db" parameter was removed. Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2012-03-20 08:17:47 UTC (rev 5902) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2012-03-20 08:54:16 UTC (rev 5903) @@ -1213,8 +1213,22 @@ */ public static DatabaseStructureType getDatabaseType(WorkspaceEntry wsConfig) throws RepositoryConfigurationException { - String dbStructureType = wsConfig.getContainer().getParameterValue(DB_STRUCTURE_TYPE).toUpperCase(); - return JDBCDataContainerConfig.DatabaseStructureType.valueOf(dbStructureType); + try + { + if (wsConfig.getContainer().getParameterBoolean("multi-db")) + { + return JDBCDataContainerConfig.DatabaseStructureType.MULTI; + } + else + { + return JDBCDataContainerConfig.DatabaseStructureType.SINGLE; + } + } + catch (Exception e) + { + String dbStructureType = wsConfig.getContainer().getParameterValue(DB_STRUCTURE_TYPE).toUpperCase(); + return JDBCDataContainerConfig.DatabaseStructureType.valueOf(dbStructureType); + } } /**