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/01/17 19:07:39 UTC

git commit: [KARAF-2686] Add a note in the user guide about the JDBC generic pooled datasource

Updated Branches:
  refs/heads/master be29646d6 -> 39dab21d0


[KARAF-2686] Add a note in the user guide about the JDBC generic pooled datasource


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

Branch: refs/heads/master
Commit: 39dab21d051accf853522acfc51ab4e329c00a27
Parents: be29646
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 17 19:07:02 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 17 19:07:02 2014 +0100

----------------------------------------------------------------------
 manual/src/main/webapp/users-guide/jdbc.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/39dab21d/manual/src/main/webapp/users-guide/jdbc.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/jdbc.conf b/manual/src/main/webapp/users-guide/jdbc.conf
index 7950b31..1e3210f 100644
--- a/manual/src/main/webapp/users-guide/jdbc.conf
+++ b/manual/src/main/webapp/users-guide/jdbc.conf
@@ -57,7 +57,7 @@ OPTIONS
 * the {{name}} argument is required. It's the name of the datasource. The name is used to identify the datasource, and to create the datasource definition file ({{deploy/datasource-[name].xml}}).
 * the {{-u}} option is optional. It defines the database username.
 * the {{-v}} option is optional. It "forces" a given JDBC driver version (only used with the {{-i}} option).
-* the {{-t}} option is required. It defines the JDBC datasource type. Accepted values are: MySQL, Oracle, Postgres, Derby, H2, HSQL, Generic. Generic is a generic configuration file using DBCP. When using generic, it's up to you to install the JDBC driver and configure the {{deploy/datasource-[name].xml}} datasource file.
+* the {{-t}} option is required. It defines the JDBC datasource type. Accepted values are: MySQL, Oracle, Postgres, Derby, H2, HSQL, Generic. Generic is a generic configuration file using DBCP to create a pooled datasource. When using generic, it's up to you to install the JDBC driver and configure the {{deploy/datasource-[name].xml}} datasource file.
 * the {{-url}} option is optional. It defines the JDBC URL to access to the database.
 * the {{-p}} option is optional. It defines the database password.
 * the {{-d}} option is optional. It defines the JDBC driver classname to use (only used with the generic type).