SONAR-3175 Document the constraint on number of JAR files in jdbc-driver directories

diff --git a/sonar-application/src/main/assembly/extensions/jdbc-driver/derby/README.txt b/sonar-application/src/main/assembly/extensions/jdbc-driver/derby/README.txt
new file mode 100644 (file)
index 0000000..803f697
--- /dev/null
+++ b/sonar-application/src/main/assembly/extensions/jdbc-driver/derby/README.txt
@@ -0,0 +1 @@
+Please do not touch this directory. No files must be added or changed.
\ No newline at end of file

diff --git a/sonar-application/src/main/assembly/extensions/jdbc-driver/mssql/README.txt b/sonar-application/src/main/assembly/extensions/jdbc-driver/mssql/README.txt
new file mode 100644 (file)
index 0000000..e20167a
--- /dev/null
+++ b/sonar-application/src/main/assembly/extensions/jdbc-driver/mssql/README.txt
@@ -0,0 +1,2 @@
+Please copy a SQLServer JDBC driver in this directory. See compatible versions at http://docs.codehaus.org/display/SONAR/Requirements.
+Note that only a single JAR file is accepted. A failure is raised at startup if multiple JAR files are available.
\ No newline at end of file

diff --git a/sonar-application/src/main/assembly/extensions/jdbc-driver/mysql/README.txt b/sonar-application/src/main/assembly/extensions/jdbc-driver/mysql/README.txt
new file mode 100644 (file)
index 0000000..e185277
--- /dev/null
+++ b/sonar-application/src/main/assembly/extensions/jdbc-driver/mysql/README.txt
@@ -0,0 +1,2 @@
+Please copy a MySQL JDBC driver in this directory. See compatible versions at http://docs.codehaus.org/display/SONAR/Requirements.
+Note that only a single JAR file is accepted. A failure is raised at startup if multiple JAR files are available.
\ No newline at end of file

diff --git a/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt b/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt
new file mode 100644 (file)
index 0000000..06f0815
--- /dev/null
+++ b/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt
@@ -0,0 +1,2 @@
+Please copy an Oracle JDBC driver in this directory. See compatible versions at http://docs.codehaus.org/display/SONAR/Requirements.
+Note that only a single JAR file is accepted. A failure is raised at startup if multiple JAR files are available.
\ No newline at end of file

diff --git a/sonar-application/src/main/assembly/extensions/jdbc-driver/postgresql/README.txt b/sonar-application/src/main/assembly/extensions/jdbc-driver/postgresql/README.txt
new file mode 100644 (file)
index 0000000..93174c9
--- /dev/null
+++ b/sonar-application/src/main/assembly/extensions/jdbc-driver/postgresql/README.txt
@@ -0,0 +1,2 @@
+Please copy a PostgreSQL JDBC driver in this directory. See compatible versions at http://docs.codehaus.org/display/SONAR/Requirements.
+Note that only a single JAR file is accepted. A failure is raised at startup if multiple JAR files are available.
\ No newline at end of file

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java b/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java
index 380a176f5f11f5a7e2820f9f1169975360138af5..b37b247b01ef8e82731491552ad5183a6a2f0893 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java
@@ -131,7 +131,7 @@ public class DefaultServerFileSystem implements ServerFileSystem {
       throw new ServerStartException("No JDBC driver found in " + dir.getAbsolutePath());
     }
     if (jars.size() > 1) {
-      throw new ServerStartException("The directory " + dir.getAbsolutePath() + " accepts only one JAR file");
+      throw new ServerStartException("The directory " + dir.getAbsolutePath() + " accepts only a single JAR file");
     }
     return jars.get(0);
   }