You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/07/10 11:17:12 UTC

git commit: [KARAF-1545] Fix failover documentation about the installation of the JDBC driver

Repository: karaf
Updated Branches:
  refs/heads/master 9ddc2a751 -> 2cc74ed90


[KARAF-1545] Fix failover documentation about the installation of the JDBC driver


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2cc74ed9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2cc74ed9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2cc74ed9

Branch: refs/heads/master
Commit: 2cc74ed9094f9492245d5d2326febe4a45fefdc3
Parents: 9ddc2a7
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jul 10 11:16:30 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jul 10 11:16:30 2014 +0200

----------------------------------------------------------------------
 manual/src/main/webapp/users-guide/failover.conf | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/2cc74ed9/manual/src/main/webapp/users-guide/failover.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/failover.conf b/manual/src/main/webapp/users-guide/failover.conf
index 12497e7..b35c636 100644
--- a/manual/src/main/webapp/users-guide/failover.conf
+++ b/manual/src/main/webapp/users-guide/failover.conf
@@ -83,8 +83,7 @@ karaf.lock.jdbc.timeout=30
 * {{karaf.lock.jdbc.table}} property contains the database table to use for the lock.
 
 {warning}
-Apache Karaf won't start if the JDBC driver is not present in the {{lib/ext}} folder. In order to be loaded correctly,
-the JDBC driver jar file has to be prefixed with {{karaf-}} (for instance the {{ojdbc14.jar}} has to be renamed as {{karaf-ojdbc14.jar}} in the {{lib/ext}} folder.
+Apache Karaf won't start if the JDBC driver is not present in the {{lib/ext}} folder.
 {warning}
 
 {warning}
@@ -112,7 +111,7 @@ karaf.lock.jdbc.clustername=karaf
 karaf.lock.jdbc.timeout=30
 {code}
 
-The {{ojdbc*.jar}} JDBC driver file has to be copied as {{lib/ext/karaf-ojdbc*.jar}}.
+The Oracle JDBC driver file ({{ojdbc*.jar}}) has to be copied in the {{lib/ext}} folder.
 
 {warning}
 The {{karaf.lock.jdbc.url}} property contains a JDBC URL which requires an active SID. It means that you must manually create the Oracle
@@ -135,7 +134,7 @@ karaf.lock.jdbc.clustername=karaf
 karaf.lock.jdbc.timeout=30
 {code}
 
-The Derby JDBC driver file name has to be copied in the {{lib/ext}} folder with the {{karaf-}} prefix.
+The Derby JDBC driver file name has to be copied in the {{lib/ext}} folder.
 
 h4.Lock on MySQL
 
@@ -153,7 +152,7 @@ karaf.lock.jdbc.clustername=karaf
 karaf.lock.jdbc.timeout=30
 {code}
 
-The MySQL JDBC driver file name has to be copied in {{lib/ext}} folder with the {{karaf-}} prefix.
+The MySQL JDBC driver file name has to be copied in {{lib/ext}} folder.
 
 h4. Lock on PostgreSQL
 
@@ -171,7 +170,7 @@ karaf.lock.jdbc.clustername=karaf
 karaf.lock.jdbc.timeout=0
 {code}
 
-The PostgreSQL JDBC driver file has to be copied in the {{lib/ext}} folder with the {{karaf-}} prefix.
+The PostgreSQL JDBC driver file has to be copied in the {{lib/ext}} folder.
 
 h4. Lock on Microsoft SQLServer
 
@@ -191,7 +190,7 @@ karaf.lock.jdbc.clustername=karaf
 karaf.lock.jdbc.timeout=30
 {code}
 
-The JTDS JDBC driver file has to be copied in the {{lib/ext}} folder with the {{karaf-}} prefix.
+The JTDS JDBC driver file has to be copied in the {{lib/ext}} folder.
 
 h3. Container-level locking