SONAR-2100 ruby on rails webapp : do not load JDBC datasource from JNDI in ruby on rails

7 files changed, 0 insertions, 29 deletions

diff --git a/sonar-core/src/main/java/org/sonar/jpa/dialect/Derby.java b/sonar-core/src/main/java/org/sonar/jpa/dialect/Derby.java
index b0c0ec5614d..7f17ac50a67 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dialect/Derby.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dialect/Derby.java
@@ -35,10 +35,6 @@ public class Derby implements Dialect {
     return "derby";
   }
 
-  public String getActiveRecordDialectCode() {
-    return "derby";
-  }
-
   public Class<? extends org.hibernate.dialect.Dialect> getHibernateDialectClass() {
     return DerbyWithDecimalDialect.class;
   }
diff --git a/sonar-core/src/main/java/org/sonar/jpa/dialect/Dialect.java b/sonar-core/src/main/java/org/sonar/jpa/dialect/Dialect.java
index 8a265b59430..b2537a36096 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dialect/Dialect.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dialect/Dialect.java
@@ -35,11 +35,6 @@ public interface Dialect {
   Class<? extends org.hibernate.dialect.Dialect> getHibernateDialectClass();
 
   /**
-   * @return the activerecord dialect to be used
-   */
-  String getActiveRecordDialectCode();
-
-  /**
    * Used to autodetect a dialect for a given driver URL
    *
    * @param jdbcConnectionURL a jdbc driver url such as jdbc:mysql://localhost:3306/sonar
diff --git a/sonar-core/src/main/java/org/sonar/jpa/dialect/HsqlDb.java b/sonar-core/src/main/java/org/sonar/jpa/dialect/HsqlDb.java
index b8440a7efa3..e5ffebe4477 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dialect/HsqlDb.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dialect/HsqlDb.java
@@ -31,10 +31,6 @@ public class HsqlDb implements Dialect {
     return "hsqldb";
   }
 
-  public String getActiveRecordDialectCode() {
-    return "hsqldb";
-  }
-
   public Class<? extends org.hibernate.dialect.Dialect> getHibernateDialectClass() {
     return HSQLDialect.class;
   }
diff --git a/sonar-core/src/main/java/org/sonar/jpa/dialect/MsSql.java b/sonar-core/src/main/java/org/sonar/jpa/dialect/MsSql.java
index 8e480719c2a..764e8a57324 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dialect/MsSql.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dialect/MsSql.java
@@ -32,10 +32,6 @@ public class MsSql implements Dialect {
     return "mssql";
   }
 
-  public String getActiveRecordDialectCode() {
-    return "sqlserver";
-  }
-
   public Class<? extends org.hibernate.dialect.Dialect> getHibernateDialectClass() {
     return MsSqlDialect.class;
   }
diff --git a/sonar-core/src/main/java/org/sonar/jpa/dialect/MySql.java b/sonar-core/src/main/java/org/sonar/jpa/dialect/MySql.java
index 694e1335793..e062e61aa4f 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dialect/MySql.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dialect/MySql.java
@@ -34,10 +34,6 @@ public class MySql implements Dialect {
     return "mysql";
   }
 
-  public String getActiveRecordDialectCode() {
-    return "mysql";
-  }
-
   public Class<? extends org.hibernate.dialect.Dialect> getHibernateDialectClass() {
     return MySqlWithDecimalDialect.class;
   }
diff --git a/sonar-core/src/main/java/org/sonar/jpa/dialect/Oracle.java b/sonar-core/src/main/java/org/sonar/jpa/dialect/Oracle.java
index 990e617e1d0..221848bb0a7 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dialect/Oracle.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dialect/Oracle.java
@@ -34,10 +34,6 @@ public class Oracle implements Dialect {
     return "oracle";
   }
 
-  public String getActiveRecordDialectCode() {
-    return "oracle";
-  }
-
   public Class<? extends org.hibernate.dialect.Dialect> getHibernateDialectClass() {
     return Oracle10gWithDecimalDialect.class;
   }
diff --git a/sonar-core/src/main/java/org/sonar/jpa/dialect/PostgreSql.java b/sonar-core/src/main/java/org/sonar/jpa/dialect/PostgreSql.java
index b7741722b9d..65f3436ca33 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/dialect/PostgreSql.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/dialect/PostgreSql.java
@@ -33,10 +33,6 @@ public class PostgreSql implements Dialect {
     return "postgresql";
   }
 
-  public String getActiveRecordDialectCode() {
-    return "postgre";
-  }
-
   public Class<? extends org.hibernate.dialect.Dialect> getHibernateDialectClass() {
     return PostgreSQLWithDecimalDialect.class;
   }