svn commit: r1567747 - in /commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src: changes/changes.xml site/xdoc/guide/jndi-howto.xml

[markt]

Author: markt
Date: Wed Feb 12 20:04:46 2014
New Revision: 1567747

URL: http://svn.apache.org/r1567747
Log:
Fix DBCP-309
Improve example for JNDI with BasicDataSource

Modified:
    commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml
    
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/site/xdoc/guide/jndi-howto.xml

Modified: commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml?rev=1567747&r1=1567746&r2=1567747&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml 
(original)
+++ commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml Wed 
Feb 12 20:04:46 2014
@@ -103,6 +103,9 @@ The <action> type attribute can be add,u
         Using batchUpdate() should not invalidate the PreparedStatement when it
         is returned to the pool.
       </action>
+      <action dev="markt" issue="DBCP-309" type="fix">
+        Improve documentation for JNDI example using BasicDataSource. 
+      </action>
     </release>
     <release version="1.4.1" date="TBD" description="TBD">
       <action dev="psteitz" issue="DBCP-367" type="fix" due-to="Ken 
Tatsushita">

Modified: 
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/site/xdoc/guide/jndi-howto.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/site/xdoc/guide/jndi-howto.xml?rev=1567747&r1=1567746&r2=1567747&view=diff
==============================================================================
--- 
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/site/xdoc/guide/jndi-howto.xml
 (original)
+++ 
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/site/xdoc/guide/jndi-howto.xml
 Wed Feb 12 20:04:46 2014
@@ -52,15 +52,15 @@
   System.setProperty(Context.PROVIDER_URL, "file:///tmp");
   InitialContext ic = new InitialContext();
 
-  // Construct BasicDataSource reference
-  Reference ref = new Reference("javax.sql.DataSource",
-    "org.apache.commons.dbcp.BasicDataSourceFactory", null);
-  ref.add(new StringRefAddr("driverClassName", 
"org.apache.commons.dbcp.TesterDriver"));
-  ref.add(new StringRefAddr("url", "jdbc:apache:commons:testdriver"));
-  ref.add(new StringRefAddr("username", "username"));
-  ref.add(new StringRefAddr("password", "password"));
-  ic.rebind("jdbc/basic", ref);
-   
+  // Construct BasicDataSource
+  BasicDataSource bds = new BasicDataSource();
+  bds.setDriverClassName("org.apache.commons.dbcp2.TesterDriver");
+  bds.setUrl("jdbc:apache:commons:testdriver");
+  bds.setUsername("username");
+  bds.setPassword("password");
+
+  ic.rebind("jdbc/basic", bds);
+      
   // Use
   InitialContext ic2 = new InitialContext();
   DataSource ds = (DataSource) ic2.lookup("jdbc/basic");