Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

58756: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58733: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58696: MNT-9111 : MS SQL Server 2008 R2 where user's default schema is not 'dbo', schema validator fails on subsequent restarts and application fails startup
         Fixed SchemaBootstrap to use the required schema from db.schema.name property if set.
         58712: MNT-9111 : MS SQL Server 2008 R2 where user's default schema is not 'dbo', schema validator fails on subsequent restarts and application fails startup
         Corrected the fix from r58696.
         Added the db.schema.name to repository.properties.
         Corrected property handling.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:08:16 +00:00
parent 14a5cdfddb
commit e3762b0173
7 changed files with 75 additions and 24 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2013 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -41,7 +41,8 @@ public class DbToXML
private ApplicationContext context;
private File outputFile;
private String namePrefix = "alf_";
private String dbSchemaName;
/**
* Constructor. Uses a default name prefix of 'alf_' during the export.
*/
@@ -61,12 +62,22 @@ public class DbToXML
this(context, outputFile);
this.namePrefix = namePrefix;
}
/**
* Set an optional default schema name
*
* @param dbSchemaName
*/
public void setDbSchemaName(String dbSchemaName)
{
this.dbSchemaName = dbSchemaName;
}
public void execute()
{
ExportDb exporter = new ExportDb(context);
exporter.setNamePrefix(namePrefix);
exporter.setDbSchemaName(dbSchemaName);
exporter.execute();
Schema schema = exporter.getSchema();
// Write to a string buffer and then write the results to a file