From e0ce14f97286bc7c3e777f6b1c644817a7be7130 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 17 Jan 2012 12:55:04 +0100 Subject: [PATCH] SONAR-3175 Document the constraint on number of JAR files in jdbc-driver directories --- .../src/main/assembly/extensions/jdbc-driver/derby/README.txt | 1 + .../src/main/assembly/extensions/jdbc-driver/mssql/README.txt | 2 ++ .../src/main/assembly/extensions/jdbc-driver/mysql/README.txt | 2 ++ .../src/main/assembly/extensions/jdbc-driver/oracle/README.txt | 2 ++ .../main/assembly/extensions/jdbc-driver/postgresql/README.txt | 2 ++ .../java/org/sonar/server/platform/DefaultServerFileSystem.java | 2 +- 6 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 sonar-application/src/main/assembly/extensions/jdbc-driver/derby/README.txt create mode 100644 sonar-application/src/main/assembly/extensions/jdbc-driver/mssql/README.txt create mode 100644 sonar-application/src/main/assembly/extensions/jdbc-driver/mysql/README.txt create mode 100644 sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt create mode 100644 sonar-application/src/main/assembly/extensions/jdbc-driver/postgresql/README.txt 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 index 00000000000..803f6979618 --- /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 index 00000000000..e20167aead8 --- /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 index 00000000000..e1852773a89 --- /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 index 00000000000..06f081518f8 --- /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 index 00000000000..93174c9572e --- /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 380a176f5f1..b37b247b01e 100644 --- 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); } -- 2.39.5