Skip to content

Commit 52ab450

Browse files
author
Arsen A. Gutsal
committed
Upgrade to grails 2.3.5 done closed #5
1 parent 4a06e38 commit 52ab450

File tree

3 files changed

+59
-11
lines changed

3 files changed

+59
-11
lines changed

application.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
app.grails.version=2.2.4
1+
#Grails Metadata file
2+
#Sat Feb 15 14:02:26 EET 2014
3+
app.grails.version=2.3.5
4+
app.servlet.version=2.5

grails-app/conf/BuildConfig.groovy

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,26 @@ String tikaVersion = "1.4"
77
grails.project.source.level = 1.7
88
grails.project.target.level = 1.7
99

10+
grails.project.fork = [
11+
12+
// configure settings for the test-app JVM, uses the daemon by default
13+
14+
test: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, daemon:true],
15+
16+
// configure settings for the run-app JVM
17+
18+
run: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false],
19+
20+
// configure settings for the run-war JVM
21+
22+
war: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256, forkReserve:false],
23+
24+
// configure settings for the Console UI JVM
25+
26+
console: [maxMemory: 768, minMemory: 64, debug: false, maxPerm: 256]
27+
28+
]
29+
1030
grails.project.dependency.resolution = {
1131

1232
inherits('global') {
@@ -21,7 +41,7 @@ grails.project.dependency.resolution = {
2141

2242
dependencies {
2343
compile ("org.apache.camel:camel-http:${camelVersion}") { excludes 'commons-codec' }
24-
compile ("org.apache.camel:camel-jms:${camelVersion}") { excludes 'spring-tx', 'spring-jms','spring-context', 'spring-beans', 'spring-aop', 'spring-core' }
44+
compile ("org.apache.camel:camel-jms:${camelVersion}")
2545
compile ("org.apache.camel:camel-cache:${camelVersion}") { excludes 'xercesImpl', 'xml-apis', 'slf4j-api', 'ehcache' }
2646
compile ("org.apache.camel:camel-tagsoup:${camelVersion}")
2747

@@ -50,9 +70,10 @@ grails.project.dependency.resolution = {
5070
}
5171

5272
plugins {
53-
compile(":routing:1.2.8")
73+
compile(":routing:1.2.9")
74+
runtime ":hibernate:3.6.10.6"
5475

55-
build(":tomcat:$grailsVersion", ':release:2.2.1', ':rest-client-builder:1.0.3') {
76+
build(":tomcat:7.0.47", ':release:3.0.1', ':rest-client-builder:2.0.1') {
5677
export = false
5778
}
5879
}

grails-app/conf/Config.groovy

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ environments {
9292
// Route definition. Should consume from 'direct:publish' and provide some business logic
9393
publish = {
9494
from('direct:publish').
95-
to("file:///home/archer/tmp/gnutch-output")
96-
// setHeader(Exchange.HTTP_URI, constant("${gnutch.solr.coreUrl}/update?commit=true")).
97-
// setHeader(Exchange.HTTP_QUERY, constant('commit=true')).
98-
// setHeader(Exchange.HTTP_METHOD, constant('POST')).
99-
// setHeader(Exchange.CONTENT_TYPE, constant('application/xml')).
100-
// to("http://null")
95+
//to("file:///home/archer/tmp/gnutch-output")
96+
setHeader(Exchange.HTTP_URI, constant("${gnutch.solr.coreUrl}/update?commit=true")).
97+
setHeader(Exchange.HTTP_QUERY, constant('commit=true')).
98+
setHeader(Exchange.HTTP_METHOD, constant('POST')).
99+
setHeader(Exchange.CONTENT_TYPE, constant('application/xml')).
100+
to("http://null")
101101
}
102102
}
103103

@@ -113,7 +113,7 @@ environments {
113113
}
114114

115115
solr {
116-
coreUrl = 'http://92.52.145.2:8983/solr/collection1'
116+
coreUrl = 'http://217.196.165.81:8983/solr/collection1'
117117
}
118118

119119
activemq {
@@ -183,3 +183,27 @@ environments {
183183

184184
}
185185
}
186+
187+
// Uncomment and edit the following lines to start using Grails encoding & escaping improvements
188+
189+
/* remove this line
190+
// GSP settings
191+
grails {
192+
views {
193+
gsp {
194+
encoding = 'UTF-8'
195+
htmlcodec = 'xml' // use xml escaping instead of HTML4 escaping
196+
codecs {
197+
expression = 'html' // escapes values inside null
198+
scriptlet = 'none' // escapes output from scriptlets in GSPs
199+
taglib = 'none' // escapes output from taglibs
200+
staticparts = 'none' // escapes output from static template parts
201+
}
202+
}
203+
// escapes all not-encoded output at final stage of outputting
204+
filteringCodecForContentType {
205+
//'text/html' = 'html'
206+
}
207+
}
208+
}
209+
remove this line */

0 commit comments

Comments
 (0)