diff options
| author | David Gageot <david@gageot.net> | 2012-07-02 10:10:27 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2012-07-03 10:57:02 +0200 |
| commit | 25e954167dc467546cc555e78b607423afbaaa48 (patch) | |
| tree | a764e082f2b79a1178ddade993d6090aa82c50f1 /sonar-application | |
| parent | c8e75f24ad4cecedc7227cbda85e8989487aff28 (diff) | |
| download | sonarqube-25e954167dc467546cc555e78b607423afbaaa48.tar.gz sonarqube-25e954167dc467546cc555e78b607423afbaaa48.zip | |
Replacing Derby with H2
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/assembly.xml | 6 | ||||
| -rw-r--r-- | sonar-application/pom.xml | 4 | ||||
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 17 |
3 files changed, 12 insertions, 15 deletions
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index cb8bcdf6e46..f1be3c02ec1 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -13,7 +13,7 @@ <excludes> <exclude>org.codehaus.sonar:sonar-server</exclude> <exclude>mysql:mysql-connector-java</exclude> - <exclude>org.apache.derby:derbyclient</exclude> + <exclude>com.h2database:h2</exclude> <exclude>postgresql:postgresql</exclude> <exclude>net.sourceforge.jtds:jtds</exclude> <exclude>org.codehaus.sonar.plugins:*</exclude> @@ -45,9 +45,9 @@ <scope>runtime</scope> </dependencySet> <dependencySet> - <outputDirectory>extensions/jdbc-driver/derby/</outputDirectory> + <outputDirectory>extensions/jdbc-driver/h2/</outputDirectory> <includes> - <include>org.apache.derby:derbyclient</include> + <include>com.h2database:h2</include> </includes> <unpack>false</unpack> <scope>runtime</scope> diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 1fba0b0bfd6..50300a5d649 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -93,8 +93,8 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> <scope>runtime</scope> </dependency> <dependency> diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 9bf7f10b465..e48cda0d6d5 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -26,7 +26,7 @@ #----------------------------------------------------------------------- # DATABASE # -# IMPORTANT : the embedded database Derby is used by default. +# IMPORTANT : the embedded database H2 is used by default. # It is recommended for tests only. Please use an external database # for production environment (MySQL, Oracle, Postgresql, SQLServer) # @@ -38,22 +38,19 @@ sonar.jdbc.username: sonar sonar.jdbc.password: sonar -#----- Embedded database Derby +#----- Embedded database H2 # Note : it does not accept connections from remote hosts, so the # sonar server and the maven plugin must be executed on the same host. # Comment the following line to deactivate the default embedded database. -sonar.jdbc.url: jdbc:derby://localhost:1527/sonar;create=true -#sonar.jdbc.driverClassName: org.apache.derby.jdbc.ClientDriver +sonar.jdbc.url: jdbc:h2:tcp://localhost:9092/sonar +#sonar.jdbc.driverClassName: org.h2.Driver #sonar.jdbc.validationQuery: values(1) -# directory containing Derby database files. By default it's the /data directory in the sonar installation. +# directory containing H2 database files. By default it's the /data directory in the sonar installation. #sonar.embeddedDatabase.dataDir: -# derby embedded database server listening port, defaults to 1527 -#sonar.derby.drda.portNumber: 1527 - -# uncomment to accept connections from remote hosts. Ba default it only accepts localhost connections. -#sonar.derby.drda.host: 0.0.0.0 +# H2 embedded database server listening port, defaults to 9092 +#sonar.embeddedDatabase.port: 9092 #----- MySQL 5.x/6.x |