Changeset 1107 for trunk

Timestamp:

Nov 9, 2010, 6:12:29 PM (11 years ago)

Author:

work@…

Message:

• changed SAM url configuration
• guys, bootstrap is a terrible mess... let's make a ticket for that to clean this shite up...

Location:

trunk/grails-app/conf

Files:

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

trunk/grails-app/conf/BootStrap.groovy

@@ -108 +108 @@
 
                 println "Registering SAM REST methods"
-                // register methods for accessing SAM's Rest services 
-                if (grails.util.GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION) {
-                        CommunicationManager.SAMServerURL = 'http://sam.nmcdsp.org'
-                }
-                else {
-                        CommunicationManager.SAMServerURL = 'http://localhost:8182/sam'
-                }
                 CommunicationManager.registerRestWrapperMethodsSAMtoGSCF()
 

trunk/grails-app/conf/BootStrapStudies.groovy

@@ -14 +14 @@
 import org.codehaus.groovy.grails.commons.GrailsApplication
 import grails.util.GrailsUtil
+import dbnp.rest.common.CommunicationManager
 
 class BootStrapStudies {
@@ -473 +474 @@
                 println ".adding assay references to mouse example study..."
 
-                def samURL = GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION ? 'http://sam.nmcdsp.org' : 'http://localhost:8182/sam'
-                def nmcdspURL = GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION ? 'http://nmcdsp.nmcdsp.org' : 'http://localhost:8183/nmcdsp' 
+                // 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://nmcdsp.nmcdsp.org' : 'http://localhost:8183/nmcdsp'
+                def samURL = CommunicationManager.SAMServerURL
+                def nmcdspURL = samURL.replace("sam","metabolomics")
+
 
                 // Add SAM assay reference
@@ -557 +564 @@
                 }
 
-
                 humanStudy.addToAssays(glucoseAssayARef)
                 humanStudy.addToAssays(glucoseAssayBRef)

trunk/grails-app/conf/Config.groovy

@@ +1 @@
+import dbnp.rest.common.CommunicationManager
+
 /**
  * Application Configuration
@@ -49 +51 @@
         development {
                 grails.serverURL = "http://localhost:8080/${appName}"
+
+                CommunicationManager.SAMServerURL = 'http://localhost:8182/sam'
+                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
         }
         ci {
                 // used by build script
                 grails.serverURL = "http://ci.gscf.nmcdsp.org"
+
+                CommunicationManager.SAMServerURL = 'http://ci.sam.nmcdsp.org'
+                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
         }
         test {
                 // used by build script
                 grails.serverURL = "http://test.gscf.nmcdsp.org"
+
+                CommunicationManager.SAMServerURL = 'http://test.sam.nmcdsp.org'
+                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
         }
         production {
                 grails.serverURL = "http://www.nmcdsp.org"
+
+                CommunicationManager.SAMServerURL = 'http://sam.nmcdsp.org'
+                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
         }
         www {
                 // used by build script
                 grails.serverURL = "http://www.nmcdsp.org"
+
+                CommunicationManager.SAMServerURL = 'http://sam.nmcdsp.org'
+                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
         }
 }