Ignore:
Timestamp:
May 22, 2011, 12:29:29 AM (13 years ago)
Author:
gav
Message:

Svn merge -r920:r941 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

    • Property svn:ignore

      •  

        old new  
        11*.log*
        22*.war
         3*.iml
         4*.ipr
         5*.iws
        36target
         7out
        48.directory
        5 
        6 *.iml
    • Property svn:mergeinfo changed
      /trunkmerged: 921-923,​932-936,​939-941

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

    r881 r942  
    1616
    1717// Environment specific settings.
     18// All production config is in external config.
    1819environments {
    1920    development {
    … …  
    5152        }
    5253    }
    53     production {
    54         dataSource {
    55             /* Delete dbCreate line after setup! */
    56             /** HSQLDB - In memory */
    57 //             driverClassName = "org.hsqldb.jdbcDriver"
    58 //             username = "sa"
    59 //             password = ""
    60 //             dbCreate = "create-drop"
    61 //             url = "jdbc:hsqldb:mem:devDb"
    62             /** HSQLDB - In file */
    63 //             driverClassName = "org.hsqldb.jdbcDriver"
    64 //             username = "sa"
    65 //             password = ""
    66 //             dbCreate = "update"
    67 //             url = "jdbc:hsqldb:file:prodDb;shutdown=true"
    68             /** MSSQL */
    69             //For more info see the docs that you downloaded with the driver.
    70 //             dialect = org.hibernate.dialect.SQLServerDialect // MSSQL 2000+2005 Useful with `grails schema-export`
    71 //             driverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
    72 //             username = "gnumimsadmin"
    73 //             password = "gnumimsadmin"
    74 //             dbCreate = "update"
    75 //             url = "jdbc:sqlserver://gnumimssql01:1433;databaseName=gnumims_prod"
    76             /** MySQL */
    77             dialect = org.hibernate.dialect.MySQL5InnoDBDialect
    78             driverClassName = "com.mysql.jdbc.Driver"
    79             username = "gnumimsadmin"
    80             password = "gnumimsadmin"
    81             dbCreate = "update"
    82             url = "jdbc:mysql://gnumimssql01:3306/gnumims_prod?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
    83         }
    84 
    85     }
    8654}
Note: See TracChangeset for help on using the changeset viewer.