diff options
author | GAUDIN <gaudol@gmail.com> | 2011-09-30 16:31:22 +0200 |
---|---|---|
committer | GAUDIN <gaudol@gmail.com> | 2011-09-30 16:31:22 +0200 |
commit | b5016f504b3a7a29654e41c19ca78da2c8fa3be6 (patch) | |
tree | c61c40da1dd802fc974ee7cb441d7924236faf01 /sonar-server/src/dev | |
parent | 43f27118331e8395365562c3859986489e38fb0a (diff) | |
parent | 520ebfd35bc581fa12c8e8267a548dc4d56317c6 (diff) | |
download | sonarqube-2.11.tar.gz sonarqube-2.11.zip |
Merge branch Release-2.112.11
Diffstat (limited to 'sonar-server/src/dev')
-rw-r--r-- | sonar-server/src/dev/derby/conf/sonar.properties | 6 | ||||
-rw-r--r-- | sonar-server/src/dev/oracle/sonar.properties | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sonar-server/src/dev/derby/conf/sonar.properties b/sonar-server/src/dev/derby/conf/sonar.properties index 033e2f27587..978f79ef7eb 100644 --- a/sonar-server/src/dev/derby/conf/sonar.properties +++ b/sonar-server/src/dev/derby/conf/sonar.properties @@ -1,8 +1,8 @@ # Derby -sonar.jdbc.url: jdbc:derby://localhost:1523/sonar;create=true +sonar.jdbc.url: jdbc:derby://localhost:1527/sonar;create=true sonar.jdbc.driverClassName: org.apache.derby.jdbc.ClientDriver sonar.jdbc.defaultTransactionIsolation: 1 -sonar.jdbc.username: sonar +sonar.jdbc.username: sonar sonar.jdbc.password: sonar sonar.jdbc.maxActive: 30 sonar.jdbc.maxIdle: 10 @@ -13,5 +13,5 @@ sonar.jdbc.timeBetweenEvictionRunsMillis: 30000 sonar.runtime.mode: development -sonar.derby.drda.portNumber: 1523 +sonar.derby.drda.portNumber: 1527 sonar.derby.drda.host: localhost
\ No newline at end of file diff --git a/sonar-server/src/dev/oracle/sonar.properties b/sonar-server/src/dev/oracle/sonar.properties index 8ebce5e28e5..b5125aa551f 100644 --- a/sonar-server/src/dev/oracle/sonar.properties +++ b/sonar-server/src/dev/oracle/sonar.properties @@ -1,7 +1,7 @@ # Oracle sonar.jdbc.url: jdbc:oracle:thin:@192.168.1.99/XE sonar.jdbc.driverClassName: oracle.jdbc.driver.OracleDriver -sonar.jdbc.username: sonar +sonar.jdbc.username: sonar sonar.jdbc.password: sonar sonar.jdbc.maxActive: 30 sonar.jdbc.maxIdle: 10 |