Changeset 1107


Ignore:
Timestamp:
Nov 9, 2010, 6:12:29 PM (6 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/conf/BootStrap.groovy

    r1048 r1107  
    108108
    109109                println "Registering SAM REST methods"
    110                 // register methods for accessing SAM's Rest services
    111                 if (grails.util.GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION) {
    112                         CommunicationManager.SAMServerURL = 'http://sam.nmcdsp.org'
    113                 }
    114                 else {
    115                         CommunicationManager.SAMServerURL = 'http://localhost:8182/sam'
    116                 }
    117110                CommunicationManager.registerRestWrapperMethodsSAMtoGSCF()
    118111
  • trunk/grails-app/conf/BootStrapStudies.groovy

    r1027 r1107  
    1414import org.codehaus.groovy.grails.commons.GrailsApplication
    1515import grails.util.GrailsUtil
     16import dbnp.rest.common.CommunicationManager
    1617
    1718class BootStrapStudies {
     
    473474                println ".adding assay references to mouse example study..."
    474475
    475                 def samURL = GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION ? 'http://sam.nmcdsp.org' : 'http://localhost:8182/sam'
    476                 def nmcdspURL = GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION ? 'http://nmcdsp.nmcdsp.org' : 'http://localhost:8183/nmcdsp'
     476                // sam urls are in config.groovy, where they belong...
     477                // if that doesn't work for you, make it work... now you're
     478                // breaking the other environments....
     479                //def samURL = GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION ? 'http://sam.nmcdsp.org' : 'http://localhost:8182/sam'
     480                //def nmcdspURL = GrailsUtil.environment == GrailsApplication.ENV_PRODUCTION ? 'http://nmcdsp.nmcdsp.org' : 'http://localhost:8183/nmcdsp'
     481                def samURL = CommunicationManager.SAMServerURL
     482                def nmcdspURL = samURL.replace("sam","metabolomics")
     483
    477484
    478485                // Add SAM assay reference
     
    557564                }
    558565
    559 
    560566                humanStudy.addToAssays(glucoseAssayARef)
    561567                humanStudy.addToAssays(glucoseAssayBRef)
  • trunk/grails-app/conf/Config.groovy

    r1106 r1107  
     1import dbnp.rest.common.CommunicationManager
     2
    13/**
    24 * Application Configuration
     
    4951        development {
    5052                grails.serverURL = "http://localhost:8080/${appName}"
     53
     54                CommunicationManager.SAMServerURL = 'http://localhost:8182/sam'
     55                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
    5156        }
    5257        ci {
    5358                // used by build script
    5459                grails.serverURL = "http://ci.gscf.nmcdsp.org"
     60
     61                CommunicationManager.SAMServerURL = 'http://ci.sam.nmcdsp.org'
     62                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
    5563        }
    5664        test {
    5765                // used by build script
    5866                grails.serverURL = "http://test.gscf.nmcdsp.org"
     67
     68                CommunicationManager.SAMServerURL = 'http://test.sam.nmcdsp.org'
     69                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
    5970        }
    6071        production {
    6172                grails.serverURL = "http://www.nmcdsp.org"
     73
     74                CommunicationManager.SAMServerURL = 'http://sam.nmcdsp.org'
     75                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
    6276        }
    6377        www {
    6478                // used by build script
    6579                grails.serverURL = "http://www.nmcdsp.org"
     80
     81                CommunicationManager.SAMServerURL = 'http://sam.nmcdsp.org'
     82                CommunicationManager.registerRestWrapperMethodsGSCFtoSAM()
    6683        }
    6784}
Note: See TracChangeset for help on using the changeset viewer.