inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:

Browse Source 
39969: Merged DEV/BELARUS-V4.1-BUG-FIX-2012_07_09 to V4.0-BUG-FIX:
   		ALF-15273 : Activiti schema updates fail when hibernate.default_schema is set with ORA-00942 The Activiti database is now correctly initialized with the correct "hibernate.default_schema".

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Frederik Heremans
2012-08-01 07:53:43 +00:00
parent d0f253a0b6
commit f6b0569d6c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
View File

@@ -784,7 +784,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
String dialectStr = dialect.getClass().getSimpleName(); String dialectStr = dialect.getClass().getSimpleName();
// Initialise Activiti DB, using an unclosable connection. // Initialise Activiti DB, using an unclosable connection.
initialiseActivitiDBSchema(new UnclosableConnection(connection)); initialiseActivitiDBSchema(new UnclosableConnection(connection), cfg);
if (create) if (create)
{ {
@@ -877,7 +877,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
* *
* @param connection Connection to use the initialise DB schema * @param connection Connection to use the initialise DB schema
*/ */
private void initialiseActivitiDBSchema(Connection connection) private void initialiseActivitiDBSchema(Connection connection, Configuration cfg)
{ {
// create instance of activiti engine to initialise schema // create instance of activiti engine to initialise schema
ProcessEngine engine = null; ProcessEngine engine = null;
@@ -893,7 +893,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
buildProcessEngine(); buildProcessEngine();
// create or upgrade the DB schema // create or upgrade the DB schema
engine.getManagementService().databaseSchemaUpgrade(connection, null, null); engine.getManagementService().databaseSchemaUpgrade(connection, null, cfg.getProperty("hibernate.default_schema"));
} }
finally finally
{ {