From eccc9be0be99dccdb480e9c793a4ff53fa9c775a Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 17 Jul 2007 15:58:34 +0000 Subject: [PATCH] Warning output to console when HSQL is used as database. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/schema-update.properties | 1 + .../org/alfresco/repo/domain/schema/SchemaBootstrap.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/config/alfresco/messages/schema-update.properties b/config/alfresco/messages/schema-update.properties index e710b749c3..e44cf2a74a 100644 --- a/config/alfresco/messages/schema-update.properties +++ b/config/alfresco/messages/schema-update.properties @@ -9,6 +9,7 @@ schema.update.msg.executing_copied_script=Executing database script {0} (Copied schema.update.msg.executing_statement= Executing statement: {0} schema.update.msg.optional_statement_failed=Optional statement execution failed:\n SQL: {0}\n Error: {1}\n File: {2}\n Line: {3} schema.update.warn.dialect_unsupported=Alfresco should not be used with database dialect {0}. +schema.update.warn.dialect_hsql=Alfresco is using the HSQL default database. Please only use this while evaluating Alfresco, it is NOT recommended for production or deployment! schema.update.err.previous_failed=A previous schema upgrade failed. Revert to the original database before attempting the upgrade again. schema.update.err.statement_failed=Statement execution failed:\n SQL: {0}\n Error: {1}\n File: {2}\n Line: {3} schema.update.err.update_failed=Schema auto-update failed diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java index cb8eba5c9e..309878b0c8 100644 --- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java +++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java @@ -42,6 +42,7 @@ import java.util.List; import java.util.Properties; import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.i18n.I18NUtil; import org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch; import org.alfresco.repo.content.filestore.FileContentWriter; import org.alfresco.service.ServiceRegistry; @@ -61,6 +62,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.connection.UserSuppliedConnectionProvider; import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.MySQL5Dialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; @@ -92,6 +94,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean private static final String MSG_EXECUTING_STATEMENT = "schema.update.msg.executing_statement"; private static final String MSG_OPTIONAL_STATEMENT_FAILED = "schema.update.msg.optional_statement_failed"; private static final String WARN_DIALECT_UNSUPPORTED = "schema.update.warn.dialect_unsupported"; + private static final String WARN_DIALECT_HSQL = "schema.update.warn.dialect_hsql"; private static final String ERR_PREVIOUS_FAILED_BOOTSTRAP = "schema.update.err.previous_failed"; private static final String ERR_STATEMENT_FAILED = "schema.update.err.statement_failed"; private static final String ERR_UPDATE_FAILED = "schema.update.err.update_failed"; @@ -742,6 +745,10 @@ public class SchemaBootstrap extends AbstractLifecycleBean { LogUtil.warn(logger, WARN_DIALECT_UNSUPPORTED, dialectClazz.getName()); } + if (dialectClazz.equals(HSQLDialect.class)) + { + logger.info(I18NUtil.getMessage(WARN_DIALECT_HSQL)); + } // Ensure that our static connection provider is used String defaultConnectionProviderFactoryClass = cfg.getProperty(Environment.CONNECTION_PROVIDER);