Repository: karaf
Updated Branches:
  refs/heads/karaf-2.3.x 36d9ef5e0 -> 0d59d0615


[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/0d59d061
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0d59d061
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0d59d061

Branch: refs/heads/karaf-2.3.x
Commit: 0d59d06154bd2a693d8b67ec066b76c013fd464f
Parents: 36d9ef5
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Thu Jul 10 11:39:01 2014 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Thu Jul 10 11:46:13 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/0d59d061/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 539a317..63a2aa5 100644
--- a/manual/src/main/webapp/users-guide/failover.conf
+++ b/manual/src/main/webapp/users-guide/failover.conf
@@ -50,8 +50,7 @@ karaf.lock.jdbc.timeout=30
 * If the connection to the database is lost, the master instance tries to 
gracefully shutdown, allowing a slave instance to become master when the 
database service is restored. The former master will require a manual restart.
 
 {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}
 
 h3. JDBC locking on Oracle
@@ -72,13 +71,13 @@ karaf.lock.jdbc.clustername=karaf
 karaf.lock.jdbc.timeout=30
 {noformat}
 
-As with the default JDBC locking setup, the Oracle JDBC driver JAR file must 
be in your classpath. You can ensure this by copying the {{ojdbc14.jar}} into 
Karaf's {{lib/ext}} folder and prefixed with {{karaf-}} before starting Karaf.
+Make sure you have the Oracle JDBC driver in the {{lib/ext}} folder.
 
 *Note*: The {{karaf.lock.jdbc.url}} requires an active SID, which means you 
must manually create a database instance before using this particular lock.
 
 h3. Derby
 
-The same rules apply when using derby.  Make sure you have the driver jar file 
in the Karaf {{lib/ext}} folder and prefixed with {{karaf-}} before starting 
Karaf.
+Make sure you have the driver jar file in the Karaf {{lib/ext}} folder.
 
 Then make you update the properties in {{$KARAF_HOME/etc/system.properties}} 
to look something like this example:
 
@@ -96,7 +95,7 @@ karaf.lock.jdbc.timeout=30
 
 h3. MySQL
 
-Make sure you have the MySQL driver jar file in the Karaf {{lib/ext}} folder 
and prefixed with {{karaf-}} before starting Karaf.
+Make sure you have the MySQL driver jar file in the Karaf {{lib/ext}} folder.
 
 Then make you update the properties in {{$KARAF_HOME/etc/system.properties}} 
to look something like this example:
 
@@ -114,7 +113,7 @@ karaf.lock.jdbc.timeout=30
 
 h3. PostgreSQL
 
-Make sure you have the PostgreSQL driver jar file in the Karaf {{lib/ext}} 
folder and prefixed with {{karaf-}} before starting Karaf.
+Make sure you have the PostgreSQL driver jar file in the Karaf {{lib/ext}} 
folder.
 
 Then make you update the properties in {{$KARAF_HOME/etc/system.properties}} 
to look something like this example:
 

Reply via email to