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/Config.groovy

    r924 r942  
    1010//    grails.config.locations << "file:" + System.properties["${appName}.config.location"]
    1111// }
     12
     13// Local config file (development) otherwise try the classpath (production).
     14if(new File("${appName}-config.groovy").exists())
     15    grails.config.locations = [ "file:${appName}-config.groovy" ]
     16else
     17    grails.config.locations = [ "classpath:${appName}-config.groovy" ]
    1218
    1319// Set false due to acegi security issue.
    … …  
    8187 * Basic log levels are ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF
    8288 */
    83 
    8489log4j = {
    8590    appenders {
    … …  
    404409    ]
    405410]
    406 
    407 /**
    408  * Custom application global settings.
    409  * @todo: externalise these settings to a config file (along with the database settings) or have them configurable via the web interface+database.
    410  */
    411 taskRecurringScheduleJob.repeatInterval=10
    412 // It is recommended to limit the currencyList to the one that the site uses e.g: currencyList = ['AUD']
    413 currencyList = ['EUR', 'XCD', 'USD', 'XOF', 'NOK', 'AUD', 'XAF', 'NZD', 'MAD', 'DKK', 'GBP', 'CHF', 'XPF', 'ILS', 'ROL', 'TRL']
    414 
Note: See TracChangeset for help on using the changeset viewer.