aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src/main
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2011-09-06 18:04:17 +0200
committerSimon Brandhof <simon.brandhof@gmail.com>2011-09-06 18:09:03 +0200
commita760c4d2d1fbee12406fe111a2be938ca534d6fa (patch)
treea964d545791fe5fa62d6316fb13e6e536070fdc7 /sonar-application/src/main
parent5838b8b4364e9ef0a8c8966206fd45c5099a21f8 (diff)
downloadsonarqube-a760c4d2d1fbee12406fe111a2be938ca534d6fa.tar.gz
sonarqube-a760c4d2d1fbee12406fe111a2be938ca534d6fa.zip
SONAR-2587 SONAR-2549 Fix schema conflicts on Oracle and PostgreSQL
Diffstat (limited to 'sonar-application/src/main')
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties11
1 files changed, 8 insertions, 3 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 0947968e054..a68b53670ca 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -66,14 +66,19 @@ sonar.jdbc.driverClassName: org.apache.derby.jdbc.ClientDriver
#----- Oracle 10g/11g
# To use Oracle database :
-# - Copy the JDBC driver to extensions/jdbc-driver/oracle.
+#
+# - Download the latest version of the JDBC driver (either ojdbc6.jar for Java 6 or ojdbc5.jar for Java 5)
+# from http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html
+# - Copy the driver to the directory extensions/jdbc-driver/oracle/
# - Comment the embedded database and uncomment the following properties. The validation query is optional.
+#
#sonar.jdbc.url: jdbc:oracle:thin:@localhost/XE
#sonar.jdbc.driverClassName: oracle.jdbc.driver.OracleDriver
#sonar.jdbc.validationQuery: select 1 from dual
-# Activate if more than one Sonar Oracle schemas on the data server (for example different versions installed).
-# In that case, use the same property during maven analysis (-Dsonar.hibernate.default_schema=xxx)
+# 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
#----- PostgreSQL 8.x, 9.x