From 52ab45088d0aeb3f82fa0833886b2728ee142091 Mon Sep 17 00:00:00 2001
From: "Arsen A. Gutsal" <gutsal.arsen@softsky.com.ua>
Date: Sat, 15 Feb 2014 14:53:51 +0200
Subject: [PATCH] Upgrade to grails 2.3.5 done closed #5

---
 application.properties             |  5 +++-
 grails-app/conf/BuildConfig.groovy | 27 ++++++++++++++++++---
 grails-app/conf/Config.groovy      | 38 ++++++++++++++++++++++++------
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/application.properties b/application.properties
index 5988a34..261f47c 100644
--- a/application.properties
+++ b/application.properties
@@ -1 +1,4 @@
-app.grails.version=2.2.4
+#Grails Metadata file
+#Sat Feb 15 14:02:26 EET 2014
+app.grails.version=2.3.5
+app.servlet.version=2.5
diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
index 9d5dbb1..797b4ee 100644
--- a/grails-app/conf/BuildConfig.groovy
+++ b/grails-app/conf/BuildConfig.groovy
@@ -7,6 +7,26 @@ String tikaVersion  = "1.4"
 grails.project.source.level = 1.7
 grails.project.target.level = 1.7
 
+grails.project.fork = [
+
+  // configure settings for the test-app JVM, uses the daemon by default
+
+test: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, daemon:true],
+
+// configure settings for the run-app JVM
+
+run: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false],
+
+// configure settings for the run-war JVM
+
+war: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false],
+
+// configure settings for the Console UI JVM
+
+console: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256]
+
+]
+
 grails.project.dependency.resolution = {
 
   inherits('global') {
@@ -21,7 +41,7 @@ grails.project.dependency.resolution = {
 
   dependencies {
     compile ("org.apache.camel:camel-http:${camelVersion}") { excludes 'commons-codec' }
-    compile ("org.apache.camel:camel-jms:${camelVersion}") { excludes 'spring-tx', 'spring-jms','spring-context', 'spring-beans', 'spring-aop', 'spring-core' }
+    compile ("org.apache.camel:camel-jms:${camelVersion}")
     compile ("org.apache.camel:camel-cache:${camelVersion}") { excludes 'xercesImpl', 'xml-apis', 'slf4j-api', 'ehcache'  }
     compile ("org.apache.camel:camel-tagsoup:${camelVersion}")
 
@@ -50,9 +70,10 @@ grails.project.dependency.resolution = {
   }
 
   plugins {
-    compile(":routing:1.2.8")
+    compile(":routing:1.2.9")    
+    runtime ":hibernate:3.6.10.6"
 
-    build(":tomcat:$grailsVersion", ':release:2.2.1', ':rest-client-builder:1.0.3') {
+    build(":tomcat:7.0.47", ':release:3.0.1', ':rest-client-builder:2.0.1') {
       export = false
     }
   }
diff --git a/grails-app/conf/Config.groovy b/grails-app/conf/Config.groovy
index 9835006..88a5666 100644
--- a/grails-app/conf/Config.groovy
+++ b/grails-app/conf/Config.groovy
@@ -92,12 +92,12 @@ environments {
         // Route definition. Should consume from 'direct:publish' and provide some business logic
         publish = {
           from('direct:publish').
-          to("file:///home/archer/tmp/gnutch-output")
-          // setHeader(Exchange.HTTP_URI, constant("${gnutch.solr.coreUrl}/update?commit=true")).
-          // setHeader(Exchange.HTTP_QUERY, constant('commit=true')).
-          // setHeader(Exchange.HTTP_METHOD, constant('POST')).
-          // setHeader(Exchange.CONTENT_TYPE, constant('application/xml')).
-          // to("http://null")
+          //to("file:///home/archer/tmp/gnutch-output")
+          setHeader(Exchange.HTTP_URI, constant("${gnutch.solr.coreUrl}/update?commit=true")).
+          setHeader(Exchange.HTTP_QUERY, constant('commit=true')).
+          setHeader(Exchange.HTTP_METHOD, constant('POST')).
+          setHeader(Exchange.CONTENT_TYPE, constant('application/xml')).
+          to("http://null")
         }
       }
 
@@ -113,7 +113,7 @@ environments {
       }
 
       solr {
-        coreUrl = 'http://92.52.145.2:8983/solr/collection1'
+        coreUrl = 'http://217.196.165.81:8983/solr/collection1'
       }
 
       activemq {
@@ -183,3 +183,27 @@ environments {
 
   }
 }
+
+// Uncomment and edit the following lines to start using Grails encoding & escaping improvements
+
+/* remove this line 
+// GSP settings
+grails {
+    views {
+        gsp {
+            encoding = 'UTF-8'
+            htmlcodec = 'xml' // use xml escaping instead of HTML4 escaping
+            codecs {
+                expression = 'html' // escapes values inside null
+                scriptlet = 'none' // escapes output from scriptlets in GSPs
+                taglib = 'none' // escapes output from taglibs
+                staticparts = 'none' // escapes output from static template parts
+            }
+        }
+        // escapes all not-encoded output at final stage of outputting
+        filteringCodecForContentType {
+            //'text/html' = 'html'
+        }
+    }
+}
+remove this line */