Changeset 946


Ignore:
Timestamp:
May 25, 2011, 1:50:46 PM (8 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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/features/purchaseOrders

  • branches/features/purchaseOrders/gnuMims-config.groovy

    r942 r946  
    2020*******************/
    2121def appName = grails.util.Metadata.current.'app.name'
     22def appNameLowerCase = appName.toLowerCase()
    2223println "EXT($appName): External config start."
    2324
     
    4950//             dialect = org.hibernate.dialect.SQLServerDialect // MSSQL 2000+2005 Useful with `grails schema-export`
    5051//             driverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
    51 //             username = "gnumimsadmin"
    52 //             password = "gnumimsadmin"
     52//             username = "${appNameLowerCase}admin"
     53//             password = "${appNameLowerCase}admin"
    5354//             dbCreate = "update"
    54 //             url = "jdbc:sqlserver://gnumimssql01:1433;databaseName=gnumims_prod"
     55//             url = "jdbc:sqlserver://sql01:1433;databaseName=${appNameLowerCase}_prod"
    5556            /** MySQL */
    5657            dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    5758            driverClassName = "com.mysql.jdbc.Driver"
    58             username = "gnumimsadmin"
    59             password = "gnumimsadmin"
     59            username = "${appNameLowerCase}admin"
     60            password = "${appNameLowerCase}admin"
    6061            dbCreate = "update"
    61             url = "jdbc:mysql://gnumimssql01:3306/gnumims_prod?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
     62            url = "jdbc:mysql://sql01:3306/${appNameLowerCase}_prod?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
    6263        }
    6364    }
  • branches/features/purchaseOrders/grails-app/conf/Config.groovy

    r942 r946  
    1717    grails.config.locations = [ "classpath:${appName}-config.groovy" ]
    1818
     19//grails.project.groupId = appName // change this to alter the default package name and Maven publishing destination
     20
    1921// Set false due to acegi security issue.
    2022// See: http://jira.grails.org/browse/GPACEGI-41
    2123// See: http://www.gnumims.org/trac/ticket/98
    2224grails.mime.file.extensions = false // enables the parsing of file extensions from URLs into the request format
    23 
     25//grails.mime.use.accept.header = false
    2426grails.mime.types = [ html: ['text/html','application/xhtml+xml'],
    2527                      xml: ['text/xml', 'application/xml'],
    26                       text: 'text-plain',
     28                      text: 'text/plain',
    2729                      js: 'text/javascript',
    2830                      rss: 'application/rss+xml',
     
    3941                      multipartForm: 'multipart/form-data'
    4042                    ]
     43
     44// URL Mapping Cache Max Size, defaults to 5000
     45//grails.urlmapping.cache.maxsize = 1000
     46
    4147// The default codec used to encode data with ${}
    4248grails.views.default.codec="none" // none, html, base64
     
    5561grails.enable.native2ascii = true
    5662
    57 // whether to install the java.util.logging bridge for sl4j. Disable fo AppEngine!
     63// whether to install the java.util.logging bridge for sl4j. Disable for AppEngine!
    5864grails.logging.jul.usebridge = true
    5965// packages to include in Spring bean scanning
    6066grails.spring.bean.packages = []
     67
     68// request parameters to mask when logging exceptions
     69grails.exceptionresolver.params.exclude = ['password']
    6170
    6271/**
  • branches/features/purchaseOrders/grails-app/conf/DataSource.groovy

    r942 r946  
    1515// If nothing specified then do nothing to database schema.
    1616
     17def appNameLowerCase = appName.toLowerCase()
     18
    1719// Environment specific settings.
    1820// All production config is in external config.
     
    2931//             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    3032//             driverClassName = "com.mysql.jdbc.Driver"
    31 //             username = "gnumimsadmin"
    32 //             password = "gnumimsadmin"
     33//             username = "${appNameLowerCase}admin"
     34//             password = "${appNameLowerCase}admin"
    3335//             dbCreate = "create-drop"
    34 //             url = "jdbc:mysql://host:3306/gnumims_dev?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
     36//             url = "jdbc:mysql://host:3306/${appNameLowerCase}_dev?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
    3537        }
    3638    }
     
    4648//             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    4749//             driverClassName = "com.mysql.jdbc.Driver"
    48 //             username = "gnumimsadmin"
    49 //             password = "gnumimsadmin"
     50//             username = "${appNameLowerCase}admin"
     51//             password = "${appNameLowerCase}admin"
    5052//             dbCreate = "update"
    51 //             url = "jdbc:mysql://host:3306/gnumims_test?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
     53//             url = "jdbc:mysql://host:3306/${appNameLowerCase}_test?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
    5254        }
    5355    }
Note: See TracChangeset for help on using the changeset viewer.