Changeset 946 for branches

Timestamp:

May 25, 2011, 1:50:46 PM (14 years ago)

Author:

gav

Message:

Svn merge -r942:r945 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:

branches/features/purchaseOrders

Files:

• . (modified) (1 prop)
• gnuMims-config.groovy (modified) (2 diffs)
• grails-app/conf/Config.groovy (modified) (3 diffs)
• grails-app/conf/DataSource.groovy (modified) (3 diffs)

branches/features/purchaseOrders/gnuMims-config.groovy

@@ -20 +20 @@
 *******************/
 def appName = grails.util.Metadata.current.'app.name'
+def appNameLowerCase = appName.toLowerCase()
 println "EXT($appName): External config start."
 
@@ -49 +50 @@
 //             dialect = org.hibernate.dialect.SQLServerDialect // MSSQL 2000+2005 Useful with `grails schema-export`
 //             driverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-//             username = "gnumimsadmin"
-//             password = "gnumimsadmin"
+//             username = "${appNameLowerCase}admin"
+//             password = "${appNameLowerCase}admin"
 //             dbCreate = "update"
-//             url = "jdbc:sqlserver://gnumimssql01:1433;databaseName=gnumims_prod"
+//             url = "jdbc:sqlserver://sql01:1433;databaseName=${appNameLowerCase}_prod"
             /** MySQL */
             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
             driverClassName = "com.mysql.jdbc.Driver"
-            username = "gnumimsadmin"
-            password = "gnumimsadmin"
+            username = "${appNameLowerCase}admin"
+            password = "${appNameLowerCase}admin"
             dbCreate = "update"
-            url = "jdbc:mysql://gnumimssql01:3306/gnumims_prod?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
+            url = "jdbc:mysql://sql01:3306/${appNameLowerCase}_prod?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
         }
     }

branches/features/purchaseOrders/grails-app/conf/Config.groovy

@@ -17 +17 @@
     grails.config.locations = [ "classpath:${appName}-config.groovy" ]
 
+//grails.project.groupId = appName // change this to alter the default package name and Maven publishing destination
+
 // Set false due to acegi security issue.
 // See: http://jira.grails.org/browse/GPACEGI-41
 // See: http://www.gnumims.org/trac/ticket/98
 grails.mime.file.extensions = false // enables the parsing of file extensions from URLs into the request format
-
+//grails.mime.use.accept.header = false
 grails.mime.types = [ html: ['text/html','application/xhtml+xml'],
                       xml: ['text/xml', 'application/xml'],
-                      text: 'text-plain',
+                      text: 'text/plain',
                       js: 'text/javascript',
                       rss: 'application/rss+xml',
@@ -39 +41 @@
                       multipartForm: 'multipart/form-data'
                     ]
+
+// URL Mapping Cache Max Size, defaults to 5000
+//grails.urlmapping.cache.maxsize = 1000
+
 // The default codec used to encode data with ${}
 grails.views.default.codec="none" // none, html, base64
@@ -55 +61 @@
 grails.enable.native2ascii = true
 
-// whether to install the java.util.logging bridge for sl4j. Disable fo AppEngine!
+// whether to install the java.util.logging bridge for sl4j. Disable for AppEngine!
 grails.logging.jul.usebridge = true
 // packages to include in Spring bean scanning
 grails.spring.bean.packages = []
+
+// request parameters to mask when logging exceptions
+grails.exceptionresolver.params.exclude = ['password']
 
 /**

branches/features/purchaseOrders/grails-app/conf/DataSource.groovy

@@ -15 +15 @@
 // If nothing specified then do nothing to database schema.
 
+def appNameLowerCase = appName.toLowerCase()
+
 // Environment specific settings.
 // All production config is in external config.
@@ -29 +31 @@
 //             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 //             driverClassName = "com.mysql.jdbc.Driver"
-//             username = "gnumimsadmin"
-//             password = "gnumimsadmin"
+//             username = "${appNameLowerCase}admin"
+//             password = "${appNameLowerCase}admin"
 //             dbCreate = "create-drop"
-//             url = "jdbc:mysql://host:3306/gnumims_dev?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
+//             url = "jdbc:mysql://host:3306/${appNameLowerCase}_dev?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
         }
     }
@@ -46 +48 @@
 //             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
 //             driverClassName = "com.mysql.jdbc.Driver"
-//             username = "gnumimsadmin"
-//             password = "gnumimsadmin"
+//             username = "${appNameLowerCase}admin"
+//             password = "${appNameLowerCase}admin"
 //             dbCreate = "update"
-//             url = "jdbc:mysql://host:3306/gnumims_test?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
+//             url = "jdbc:mysql://host:3306/${appNameLowerCase}_test?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
         }
     }