aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2011-11-14 19:05:32 +0100
committerSimon Brandhof <simon.brandhof@gmail.com>2011-11-14 19:05:32 +0100
commit4303fe5ba00f46d738ae74c2c0ec10fdc4e776da (patch)
tree4ab44e9b8b7fc3e025d77065970fc488699ead26 /sonar-application/src
parent2570830f0b10b1bcdb15e12a44501a3c7c405055 (diff)
downloadsonarqube-4303fe5ba00f46d738ae74c2c0ec10fdc4e776da.tar.gz
sonarqube-4303fe5ba00f46d738ae74c2c0ec10fdc4e776da.zip
SONAR-2975 Rename the property sonar.hibernate.default_schema to sonar.jdbc.schema
MyBatis mappers are refactored at the same time. Schema is not explicitely used in SQL requests anymore. Schema is automatically handled by the connection pool (commons dbcp) for Oracle and PostgreSQL.
Diffstat (limited to 'sonar-application/src')
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties16
1 files changed, 10 insertions, 6 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index d9735de8cf3..560fab5c1a4 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -57,6 +57,7 @@ sonar.jdbc.driverClassName: org.apache.derby.jdbc.ClientDriver
# uncomment to accept connections from remote hosts. Ba default it only accepts localhost connections.
#sonar.derby.drda.host: 0.0.0.0
+
#----- MySQL 5.x/6.x
# Comment the embedded database and uncomment the following properties to use MySQL. The validation query is optional.
#sonar.jdbc.url: jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8
@@ -76,10 +77,11 @@ sonar.jdbc.driverClassName: org.apache.derby.jdbc.ClientDriver
#sonar.jdbc.driverClassName: oracle.jdbc.OracleDriver
#sonar.jdbc.validationQuery: select 1 from dual
-# Uncomment the following property if multiple Sonar schemas are installed on the same server
-# (for example with different versions).
-# In that case, use the same property during project analysis (-Dsonar.hibernate.default_schema=<schema>)
-#sonar.hibernate.default_schema: sonar
+# Uncomment the following property if the Oracle account has permissions to access multiple schemas,
+# for example sonar schemas with different versions. In that case, use the same property during project analysis
+# (-Dsonar.jdbc.schema=<schema>)
+#sonar.jdbc.schema: sonar
+
#----- PostgreSQL 8.x, 9.x
# Uncomment the following properties to use PostgreSQL. The validation query is optional.
@@ -87,8 +89,10 @@ sonar.jdbc.driverClassName: org.apache.derby.jdbc.ClientDriver
#sonar.jdbc.driverClassName: org.postgresql.Driver
#sonar.jdbc.validationQuery: select 1
-# If the PostgreSql database contains several schemas, the following property must define the schema to be used
-#sonar.jdbc.postgreSearchPath: public
+# Uncomment the following property if the PostgreSQL account has permissions to access multiple schemas,
+# for example sonar schemas with different versions. In that case, use the same property during project analysis
+# (-Dsonar.jdbc.schema=<schema>)
+#sonar.jdbc.schema: public
#----- Microsoft SQLServer