Forgot these files during H2 migration

diff --git a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb b/sonar-server/src/main/webapp/WEB-INF/config/environment.rb
index fa5caee27e73e91bea442f30d3f2b6048ae234ac..f70f92d15c370ca046051df765afe50610744d1b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/config/environment.rb
@@ -80,8 +80,8 @@ class ActiveRecord::Migration
       execute "ALTER TABLE #{tablename} ALTER COLUMN id TYPE bigint"
     when "mysql"
       execute "ALTER TABLE #{tablename} CHANGE id id BIGINT AUTO_INCREMENT"
-    when "derby"
-      # do nothing as alter can not do the job in Derby
+    when "h2"
+      # not needed?
     when "oracle"
       # do nothing, oracle integer are big enough
     when "sqlserver"

diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb b/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
index 16307e73596dafb4dea822571570fe37a35c85f3..2f4870706d401e504d7472e30725a9a473834a14 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
@@ -106,7 +106,7 @@ class DatabaseVersion
   def self.production?
     @@production ||=
       begin
-        dialect()!='derby'
+        dialect()!='h2'
       end
   end
 end

diff --git a/start-mac-derby.sh b/start-mac-derby.sh
deleted file mode 100755 (executable)
index a26c7b1..0000000
--- a/start-mac-derby.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-#
-# NOTE: sonar must be built
-#
-cd sonar-application/target/
-unzip sonar-*.zip
-cd sonar-*
-bin/macosx-universal-64/sonar.sh console

diff --git a/start-mac-h2.sh b/start-mac-h2.sh
new file mode 100755 (executable)
index 0000000..a26c7b1
--- /dev/null
+++ b/start-mac-h2.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#
+# NOTE: sonar must be built
+#
+cd sonar-application/target/
+unzip sonar-*.zip
+cd sonar-*
+bin/macosx-universal-64/sonar.sh console