diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2011-04-13 12:59:18 +0200 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2011-04-14 16:57:16 +0200 |
| commit | 52381e82419a894011d765f072807ca64719a33f (patch) | |
| tree | b14866d070dc6a5cb6ea086dacf3a3840be34354 /sonar-server/src/main/webapp/WEB-INF/config/database.yml | |
| parent | 8b5731af59ca25207b5da796ff74f92c868a4ac7 (diff) | |
| download | sonarqube-52381e82419a894011d765f072807ca64719a33f.tar.gz sonarqube-52381e82419a894011d765f072807ca64719a33f.zip | |
SONAR-2100 ruby on rails webapp : do not load JDBC datasource from JNDI in ruby on rails
Diffstat (limited to 'sonar-server/src/main/webapp/WEB-INF/config/database.yml')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/config/database.yml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/config/database.yml b/sonar-server/src/main/webapp/WEB-INF/config/database.yml index fe6f5b75f1e..4dd0ad9ca87 100644 --- a/sonar-server/src/main/webapp/WEB-INF/config/database.yml +++ b/sonar-server/src/main/webapp/WEB-INF/config/database.yml @@ -1,16 +1,6 @@ -<% java = Java::OrgSonarServerUi::JRubyFacade.new %> +# JDBC configured is loaded from Sonar development: adapter: jdbc - jndi: <%= java.getConfigurationValue("sonar.jdbc.jndiName") || 'jdbc/sonar' %> - pool: 10 - timeout: 5000 - dialect: <%= java.getDialect().getActiveRecordDialectCode() %> - driver: none production: - adapter: jdbc - jndi: <%= java.getConfigurationValue("sonar.jdbc.jndiName") || 'jdbc/sonar' %> - pool: 10 - timeout: 5000 - dialect: <%= java.getDialect().getActiveRecordDialectCode() %> - driver: none
\ No newline at end of file + adapter: jdbc
\ No newline at end of file |