Added mysql lib dependency and updated functional-test plugin to remo…

…ve dependency on commons-codec-1.3 (which should finally fix issue #21)
annotationsatharvard · Feb 28, 2014 · 14b0ed7 · 14b0ed7
1 parent 64554dd
commit 14b0ed7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/Catch/grails-app/conf/BuildConfig.groovy b/Catch/grails-app/conf/BuildConfig.groovy
@@ -17,7 +17,7 @@ grails.project.dependency.resolution = {
         // excludes 'ehcache'
         excludes 'commons-codec'
     }
-    log "error" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
+    log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
     checksums true // Whether to verify checksums on resolve
 
     repositories {
@@ -36,6 +36,7 @@ grails.project.dependency.resolution = {
         //mavenRepo "http://repository.jboss.com/maven2/"
 		mavenRepo "http://repo.aduna-software.org/maven2/releases/"
 		mavenRepo "https://repository.jboss.org/nexus/content/repositories/thirdparty-releases"
+        mavenRepo 'http://repo.spring.io/milestone'
     }
     dependencies {
         // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.

diff --git a/Catch/grails-app/conf/Config.groovy b/Catch/grails-app/conf/Config.groovy
@@ -135,13 +135,6 @@ log4j = {
     */
 }
 
-// Tomcat deploy properties
-tomcat.deploy.username="tomcat"
-tomcat.deploy.password="brux6spa"
-tomcat.deploy.url="http://162.242.217.241:8080/manager/text"
-
-
-
 // -------------------------------------------------------------------------------------------------------------------------------------------
 // database-migration
 

diff --git a/Catch/grails-app/conf/DataSource.groovy b/Catch/grails-app/conf/DataSource.groovy
@@ -37,12 +37,21 @@ environments {
     }
     test {
         dataSource {
+            /*
             pooled = true
             driverClassName = "org.h2.Driver"
             username = "sa"
             password = ""
             dbCreate = "update"
             url = "jdbc:h2:mem:testDb;MVCC=TRUE"
+            */
+            pooled = true
+            //dbCreate = "create-drop"
+            driverClassName = "com.mysql.jdbc.Driver"
+            dialect = org.hibernate.dialect.MySQL5InnoDBDialect
+            url = "jdbc:mysql://localhost:3306/catch?useUnicode=yes&characterEncoding=UTF-8&autoReconnect=true"
+            username = "catch"
+            password = "catch"
 
         }
     }