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

Legend:

Unmodified
Added
Removed
  • branches/features/purchaseOrders

  • 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.