Changeset 1922

Show
Ignore:
Timestamp:
09-06-11 14:10:44 (4 years ago)
Author:
work@…
Message:

- removed all default instance configuration in favor of just one default.properties file. Instance configuration should be on the server side, not within the code. The setup wizard will help you generate a configuration file...
- removed obsolete references to searchable
- removed obsolete references to grails melody

Location:
trunk/grails-app
Files:
9 removed
5 modified
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/conf/Config.groovy

    r1886 r1922  
    1717// 
    1818grails.config.locations = [ 
    19         // the default per-environment configuration 
    20         // (e.g. src/java/config-development.properties) 
    21         "classpath:config-${grails.util.GrailsUtil.environment}.properties", 
     19        // the default configuration properties 
     20        "classpath:default.properties", 
    2221 
    2322        // the external configuration to override the default 

  • trunk/grails-app/conf/dbnp/configuration/DatabaseUpgrade.groovy

    r1786 r1922  
    1 import groovy.sql.Sql 
     1package dbnp.configuration 
     2 
    23import dbnp.studycapturing.Study 
    34import org.codehaus.groovy.grails.commons.ConfigurationHolder 

  • trunk/grails-app/conf/default.properties

    r1705 r1922  
    2020 
    2121# module configuration 
    22 modules.sam.url=http://localhost:8182/sam 
    23 modules.metabolomics.url=http://localhost:8183/nmcdsp 
    24 modules.massSequencing.url=http://localhost:8184/massSequencing 
     22#modules.sam.url=http://localhost:8182/sam 
     23#modules.metabolomics.url=http://localhost:8183/nmcdsp 
     24#modules.massSequencing.url=http://localhost:8184/massSequencing 
    2525 
    2626# Number of seconds to keep rest results from modules in cache 
    27 modules.cacheDuration = 0 
     27modules.cacheDuration=0 
    2828modules.showInMenu=true 
    2929 
    … …  
    3333authentication.users.admin.email=admin@dbnp.org 
    3434authentication.users.admin.administrator=true 
    35 authentication.users.user.username=user 
    36 authentication.users.user.password=useR123! 
    37 authentication.users.user.email=user@dbnp.org 
    38 authentication.users.user.administrator=false 
     35#authentication.users.user.username=user 
     36#authentication.users.user.password=useR123! 
     37#authentication.users.user.email=user@dbnp.org 
     38#authentication.users.user.administrator=false 

  • trunk/grails-app/domain/dbnp/studycapturing/Event.groovy

    r1868 r1922  
    1313 */ 
    1414class Event extends TemplateEntity { 
    15  
    16         // uncommented due to searchable issue 
    17         // @see http://jira.codehaus.org/browse/GRAILSPLUGINS-1577 
    18         // Enabling this causes the error: Trying to marshall a null id [id] for alias [Event] in the study create wizard when you add events 
    19         //static searchable = true 
    20  
    21         static belongsTo = [parent : Study]      
     15        static belongsTo = [parent : Study] 
    2216 
    2317        /** Start time of the event, relative to the start time of the study */ 

  • trunk/grails-app/domain/dbnp/studycapturing/Sample.groovy

    r1794 r1922  
    1313 */ 
    1414class Sample extends TemplateEntity { 
    15         // uncommented due to searchable issue 
    16         // @see http://jira.codehaus.org/browse/GRAILSPLUGINS-1577 
    17         //static searchable = { [only: ['name']] } 
    18  
    1915        static belongsTo = [ 
    2016                // A Sample always belongs to one study. 

  • trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

    r1912 r1922  
    1212 */ 
    1313class Study extends TemplateEntity { 
    14         static searchable = true 
    15  
    1614        def moduleNotificationService 
    1715 

  • trunk/grails-app/domain/dbnp/studycapturing/Subject.groovy

    r1738 r1922  
    1212 */ 
    1313class Subject extends TemplateEntity { 
    14         // uncommented due to searchable issue 
    15         // @see http://jira.codehaus.org/browse/GRAILSPLUGINS-1577 
    16         //static searchable = { [only: ['name']] } 
    17  
    1814        // A Subject always belongs to one Study 
    1915        static belongsTo = [parent: Study]