From 709b21a30c63872ed19e7961be3cf6299d46747d Mon Sep 17 00:00:00 2001
From: July Antonicheva <july.antonicheva@jcatalog.com>
Date: Fri, 28 Nov 2014 00:26:28 +0300
Subject: [PATCH] (WCM-903) Preparing to release

---
 grails-app/conf/BuildConfig.groovy            |  5 ++--
 grails-app/conf/Config.groovy                 | 15 +++++++++++-
 grails-app/conf/DataSource.groovy             |  1 +
 .../domain/org/weceem/auth/CMSUser.groovy     |  2 +-
 .../dialect/ImprovedH2Dialect.groovy          | 24 +++++++++++++++++++
 5 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 src/groovy/com/jcatalog/hibernate/dialect/ImprovedH2Dialect.groovy

diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
index e9eb586..7a8f646 100644
--- a/grails-app/conf/BuildConfig.groovy
+++ b/grails-app/conf/BuildConfig.groovy
@@ -9,6 +9,7 @@ grails.war.resources = { stagingDir, args ->
 }
 
 grails.tomcat.jvmArgs = ["-Xmx1024m", "-XX:MaxPermSize=256m", '-verbose:class']
+
 grails.project.dependency.resolver = "maven" // or ivy
 grails.project.dependency.resolution = {
 	// inherit Grails' default dependencies
@@ -40,9 +41,9 @@ grails.project.dependency.resolution = {
         compile ':cache:1.1.8'
         compile ':scaffolding:2.1.2'
 
-        // plugins needed at runtime but not for compilation
-        runtime ':hibernate4:4.3.5.5'
+        runtime ":hibernate4:4.3.5.5" // or ":hibernate:3.6.10.17"
         runtime ":database-migration:1.4.0"
+
         runtime ':elasticsearch:0.0.3.6'
         runtime ":jquery:1.11.1"
         compile ":jquery-ui:1.10.4"
diff --git a/grails-app/conf/Config.groovy b/grails-app/conf/Config.groovy
index 99876c1..9a85c38 100644
--- a/grails-app/conf/Config.groovy
+++ b/grails-app/conf/Config.groovy
@@ -68,6 +68,15 @@ grails {
 // enabled native2ascii conversion of i18n properties files
 grails.enable.native2ascii = true
 
+// configure auto-caching of queries by default (if false you can cache individual queries with 'cache: true')
+grails.hibernate.cache.queries = false
+
+// configure passing transaction's read-only attribute to Hibernate session, queries and criterias
+// set "singleSession = false" OSIV mode in hibernate configuration after enabling
+grails.hibernate.pass.readonly = false
+// configure passing read-only to OSIV session by default, requires "singleSession = false" OSIV mode
+grails.hibernate.osiv.readonly = false
+
 
 weceem.profile.url = [controller:'userProfile', action:'edit']
 weceem.logout.url = [controller:'logout']
@@ -201,6 +210,8 @@ if (config?.elasticSearch) {
     elasticSearch.datastoreImpl = 'hibernateDatastore'
     elasticSearch.bulkIndexOnStartup = true
     elasticSearch.disableAutoIndex = false
+    elasticSearch.client.mode = 'local'
+    elasticSearch.index.store.type = 'memory' // store local node in memory and not on disk
 }
 
 environments {
@@ -239,7 +250,9 @@ environments {
    test {
    }
    production {
-
+       if (config?.elasticSearch) {
+           elasticSearch.client.mode = 'local'
+       }
        log4j = {
            appenders {
                rollingFile name: 'fileLog',
diff --git a/grails-app/conf/DataSource.groovy b/grails-app/conf/DataSource.groovy
index b8c9a16..bbe6dbf 100644
--- a/grails-app/conf/DataSource.groovy
+++ b/grails-app/conf/DataSource.groovy
@@ -4,6 +4,7 @@ dataSource {
     driverClassName = "org.h2.Driver"
     username = "sa"
     password = ""
+    dialect = com.jcatalog.hibernate.dialect.ImprovedH2Dialect
 }
 
 hibernate {
diff --git a/grails-app/domain/org/weceem/auth/CMSUser.groovy b/grails-app/domain/org/weceem/auth/CMSUser.groovy
index 0d0074f..2eecc4a 100644
--- a/grails-app/domain/org/weceem/auth/CMSUser.groovy
+++ b/grails-app/domain/org/weceem/auth/CMSUser.groovy
@@ -43,7 +43,7 @@ class CMSUser {
     /** plain password to create a MD5 password */
     String pass = "secret"
 
-    static mappingRole = {
+    static mapping = {
         cache usage: 'read-write'
         username index: 'userName_Idx'
     }
diff --git a/src/groovy/com/jcatalog/hibernate/dialect/ImprovedH2Dialect.groovy b/src/groovy/com/jcatalog/hibernate/dialect/ImprovedH2Dialect.groovy
new file mode 100644
index 0000000..3c0214b
--- /dev/null
+++ b/src/groovy/com/jcatalog/hibernate/dialect/ImprovedH2Dialect.groovy
@@ -0,0 +1,24 @@
+package com.jcatalog.hibernate.dialect
+
+import org.hibernate.dialect.H2Dialect
+/**
+ * Workaround.
+ *
+ * @see https://hibernate.onjira.com/browse/HHH-7002
+ *
+ */
+public class ImprovedH2Dialect extends H2Dialect {
+    @Override
+    public String getDropSequenceString(String sequenceName) {
+        // Adding the "if exists" clause to avoid warnings
+        return "drop sequence if exists " + sequenceName;
+    }
+
+    @Override
+    public boolean dropConstraints() {
+        // We don't need to drop constraints before dropping tables, that just
+        // leads to error messages about missing tables when we don't have a
+        // schema in the database
+        return false;
+    }
+}
\ No newline at end of file