Changeset 1178 for trunk/grails-app/conf

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

Location:

trunk/grails-app/conf

Files:

• BootStrap.groovy (modified) (4 diffs)
• BootStrapStudies.groovy (modified) (4 diffs)
• Config.groovy (modified) (1 diff)

trunk/grails-app/conf/BootStrap.groovy

@@ -9 +9 @@
 import dbnp.studycapturing.Sample
 import dbnp.rest.common.CommunicationManager
+import org.codehaus.groovy.grails.commons.*
 
 /**
@@ -28 +29 @@
                 "bootstrapping application".grom()
 
+                // get configuration
+                def config = ConfigurationHolder.config
+
                 // define timezone
                 System.setProperty('user.timezone', 'CET')
@@ -33 +37 @@
                 // set up authentication (if required)
                 if (!SecRole.count() || !SecUser.count()) BootStrapAuthentication.initDefaultAuthentication(springSecurityService)
+
+                // set up the SAM communication manager
+                // this should probably more dynamic and put into the modules
+                // section instead of the bootstrap as not all instances will
+                // probably run WITH sam. GSCF should be able to run independently
+                // from other modules. Part of gscf ticket #185
+                if (config.modules?.sam) {
+                        // register SAM REST methods
+                        "Registering SAM REST methods".grom()
+                        CommunicationManager.SAMServerURL = config.modules.sam.url
+                        CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
+                }
 
                 // developmental bootstrapping:
@@ -57 +73 @@
                 TemplateEntity.getField(Subject.domainFields, 'species').ontologies = [Ontology.getOrCreateOntologyByNcboId(1132)]
                 TemplateEntity.getField(Sample.domainFields, 'material').ontologies = [Ontology.getOrCreateOntologyByNcboId(1005)]
-
-                // register SAM REST methods
-                "Registering SAM REST methods".grom()
-                CommunicationManager.registerRestWrapperMethodsSAMtoGSCF()
         }
 

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()}
 

trunk/grails-app/conf/Config.groovy

@@ -51 +51 @@
         development {
                 grails.serverURL = "http://localhost:8080/${appName}"
-
-                CommunicationManager.SAMServerURL = 'http://localhost:8182/sam'
-                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
+                modules {
+                        sam {
+                                url = "http://localhost:8182/sam"
+                        }
+                        metabolomics {
+                                url = "http://localhost:8183/nmcdsp"
+                        }
+                }
         }
         ci {
                 // used by build script
                 grails.serverURL = "http://ci.gscf.nmcdsp.org"
-
-                CommunicationManager.SAMServerURL = 'http://ci.sam.nmcdsp.org'
-                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
+                modules {
+                        sam {
+                                url = "http://ci.sam.nmcdsp.org"
+                        }
+                        metabolomics {
+                                url = "http://ci.metabolomics.nmcdsp.org"
+                        }
+                }
         }
         test {
                 // used by build script
                 grails.serverURL = "http://test.gscf.nmcdsp.org"
-
-                CommunicationManager.SAMServerURL = 'http://test.sam.nmcdsp.org'
-                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
+                modules {
+                        sam {
+                                url = "http://test.sam.nmcdsp.org"
+                        }
+                        metabolomics {
+                                url = "http://test.metabolomics.nmcdsp.org"
+                        }
+                }
         }
         dbnptest {
                 // used by build script
                 grails.serverURL = "http://test.dbnp.org"
-
-                CommunicationManager.SAMServerURL = 'http://test.sam.dbnp.org'
-                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
+                modules {
+                        sam {
+                                url = "http://test.sam.dbnp.org"
+                        }
+                        metabolomics {
+                                url = "http://test.metabolomics.dbnp.org"
+                        }
+                }
         }
         dbnpdemo {
                 // used by build script
                 grails.serverURL = "http://demo.dbnp.org"
-
-                CommunicationManager.SAMServerURL = 'http://demo.sam.dbnp.org'
-                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
+                modules {
+                        sam {
+                                url = "http://demo.sam.dbnp.org"
+                        }
+                        metabolomics {
+                                url = "http://demo.metabolomics.dbnp.org"
+                        }
+                }
         }
         production {
                 grails.serverURL = "http://www.nmcdsp.org"
-
-                CommunicationManager.SAMServerURL = 'http://sam.nmcdsp.org'
-                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
+                modules {
+                        sam {
+                                url = "http://sam.nmcdsp.org"
+                        }
+                        metabolomics {
+                                url = "http://metabolomics.nmcdsp.org"
+                        }
+                }
         }
         www {
                 // used by build script
                 grails.serverURL = "http://www.nmcdsp.org"
-
-                CommunicationManager.SAMServerURL = 'http://sam.nmcdsp.org'
-                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
+                modules {
+                        sam {
+                                url = "http://sam.nmcdsp.org"
+                        }
+                        metabolomics {
+                                url = "http://metabolomics.nmcdsp.org"
+                        }
+                }
         }
 }