Skip to content
Snippets Groups Projects
Commit d41a3fac authored by Nikolaus Krismer's avatar Nikolaus Krismer
Browse files

using db pool (since websockets can work asynchronously)

copying changes in build.xml from isochrone-web (how to use config files
in testing)
parent 4228229f
No related branches found
No related tags found
No related merge requests found
...@@ -292,6 +292,21 @@ task javadocJar(type: Jar, dependsOn: javadoc) { ...@@ -292,6 +292,21 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
classifier 'javadoc' classifier 'javadoc'
} }
task processResourcesTest << {
if (!isRelease) {
// we add a config-test.xml for SNAPSHOT releases (so that the cfg.tablePrefix is defined)
// otherwise testing and stable version would collide on testsystem
// and testing in jenkins would search for geoserver/postgis on jenkins-server
// (since localhost is default value in config-files -> needed for development)
copy {
from('src/test/resources') {
include '*-test.xml'
}
into "${project.buildDir}/resources/main"
}
}
}
task sourcesJar(type: Jar, dependsOn: classes) { task sourcesJar(type: Jar, dependsOn: classes) {
description = 'Builds a jar file including sources' description = 'Builds a jar file including sources'
from sourceSets.main.allSource from sourceSets.main.allSource
...@@ -357,5 +372,6 @@ task release ...@@ -357,5 +372,6 @@ task release
tasks.cleanAfterDaily.dependsOn cleanNodeModules tasks.cleanAfterDaily.dependsOn cleanNodeModules
tasks.daily.finalizedBy cleanAfterDaily tasks.daily.finalizedBy cleanAfterDaily
tasks.daily.mustRunAfter clean tasks.daily.mustRunAfter clean
tasks.processResources.finalizedBy processResourcesTest
tasks.test.finalizedBy cleanTestResults tasks.test.finalizedBy cleanTestResults
tasks.vagrantUp.dependsOn vagrantPrepare tasks.vagrantUp.dependsOn vagrantPrepare
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<properties> <properties>
<!-- Global database settings --> <!-- Global database settings -->
<entry key="db.maxConnections">50</entry> <entry key="db.maxConnections">50</entry>
<entry key="db.pooling">false</entry> <entry key="db.pooling">true</entry>
<!-- Postgres database --> <!-- Postgres database -->
<entry key="org.postgresql.servername">localhost</entry> <entry key="org.postgresql.servername">localhost</entry>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment