Changeset 1178 for trunk/grails-app/conf/BootStrapStudies.groovy

Timestamp:

Nov 19, 2010, 1:19:00 PM (12 years ago)

Author:

work@…

Message:

• this change is part of #185
• moved object instantes out of Config.groovy (this should only contain configuration)
• moved module specific configuration for SAM and Metabolomics out of BootStrapStudies?.groovy and into Config.groovy

File:

• trunk/grails-app/conf/BootStrapStudies.groovy (modified) (4 diffs)

trunk/grails-app/conf/BootStrapStudies.groovy

@@ -15 +15 @@
 import grails.util.GrailsUtil
 import dbnp.rest.common.CommunicationManager
+import org.codehaus.groovy.grails.commons.*
+
 
 class BootStrapStudies {
@@ -21 +23 @@
          * Add example studies. This function is meant to be called only in development mode
          */
-
         public static void addExampleStudies(dbnp.authentication.SecUser owner, dbnp.authentication.SecUser otherUser ) {
                 "inserting initial studies".grom()
+
+                // get configuration
+                def config = ConfigurationHolder.config
 
                 // Look up the used ontologies which should be in the database by now
@@ -463 +467 @@
                 .with { if (!validate()) { errors.each { println it} } else save()}
 
-                // sam urls are in config.groovy, where they belong...
-                // if that doesn't work for you, make it work... now you're
-                // breaking the other environments....
-                //def samURL = GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION ? 'http://sam.nmcdsp.org' : 'http://localhost:8182/sam'
-                def nmcdspURL = GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION ? 'http://metabolomics.nmcdsp.org' : 'http://localhost:8183/nmcdsp'
-                def samURL = CommunicationManager.SAMServerURL
-
                 // Add SAM assay reference
                 def clinicalModule = new AssayModule(
                         name: 'SAM module for clinical data',
                         platform: 'clinical measurements',
-                        url: samURL
+                        url: config.modules.sam.url
                 ).with { if (!validate()) { errors.each { println it} } else save()}
 
@@ -481 +478 @@
                         name: 'Metabolomics module',
                         platform: 'GCMS/LCMS',
-                        url: nmcdspURL
+                        url: config.modules.metabolomics.url
                 ).with { if (!validate()) { errors.each { println it} } else save()}