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:
5 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/BootStrap.groovy

    r876 r942  
     1import org.codehaus.groovy.grails.commons.ConfigurationHolder as CH
     2
    13class BootStrap
    24{
    … …  
    1517                createDataService.ensureSystemAndAdminAccess()
    1618                createDataService.createBaseData()
     19                CH.config.demoMode.enabled = true
    1720                createDataService.createDemoData()
    1821                createDataService.startSearchableIndex()
    … …  
    2831                createDataService.ensureSystemAndAdminAccess()
    2932                createDataService.createBaseData()
     33                if(CH.config.demoMode.enabled) createDataService.createDemoData()
    3034                createDataService.startSearchableIndex()
    3135            }

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

    r920 r942  
    22grails.project.test.class.dir = "target/test-classes"
    33grails.project.test.reports.dir = "target/test-reports"
    4 
    5 def env = System.getProperty('grails.env')
    6 
    7 switch (env) {
    8     case "production":
    9         //grails.project.war.file = "target/${appName}-${appVersion}.war"
    10         grails.project.war.file = "target/${appName}Live.war"
    11         break
    12     case "development":
    13         grails.project.war.file = "target/${appName}Dev.war"
    14         break
    15     default:
    16         grails.project.war.file = "target/${appName}.war"
    17         break
    18 }
     4//grails.project.war.file = "target/${appName}-${appVersion}.war"
     5grails.project.war.file = "target/${appName}.war"
    196
    207grails.war.resources = { stagingDir, args ->

  • 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 

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