db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scotsmat...@apache.org
Subject svn commit: r531651 - in /db/derby/docs/trunk/src: adminguide/cadminappsxawthdriver.dita adminguide/cadminnsdatasources.dita devguide/cdevresman89722.dita devguide/rdevresman79556.dita
Date Mon, 23 Apr 2007 23:25:56 GMT
Author: scotsmatrix
Date: Mon Apr 23 16:25:55 2007
New Revision: 531651

URL: http://svn.apache.org/viewvc?view=rev&rev=531651
Log:
DERBY-2538: Update documentation to describe the expected behavior when a JDBC 4 app creates
a JDBC 3 datasource. Patch derby-2538-4.diff was contributed by Kim Haase.

Modified:
    db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
    db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    db/derby/docs/trunk/src/devguide/cdevresman89722.dita
    db/derby/docs/trunk/src/devguide/rdevresman79556.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?view=diff&rev=531651&r1=531650&r2=531651
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Mon Apr 23 16:25:55 2007
@@ -25,7 +25,17 @@
 </metadata></prolog>
 <conbody>
 <section><p>You can access XA support for the Network Server by using the
-network client driver's XA DataSource interface (<codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>).</p></section>
+network client driver's XA DataSource interface.</p>
+<p>The interface <codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>
is 
+available on all supported Java SE platforms. If your client runs on the 
+Java SE 6 platform, and if you want to use XA DataSource methods specific to 
+the JDBC 4 API, use the DataSource named 
+<codeph>org.apache.derby.jdbc.ClientXADataSource40</codeph>.
+</p><p>
+If your client is running on the Java SE 6 platform, all connection objects 
+returned from the DataSource will be JDBC 4 connection objects, whether or not
+you are using the DataSource whose name ends in "40".
+</p></section>
 <example><p>The following example illustrates how to obtain an XA connection
 with the network client driver:</p><codeblock>import org.apache.derby.jdbc.ClientXADataSource;
 import javax.sql.XAConnection;

Modified: db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?view=diff&rev=531651&r1=531650&r2=531651
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Mon Apr 23 16:25:55 2007
@@ -21,14 +21,20 @@
 <title>Accessing the Network Server by using a DataSource</title>
 <prolog></prolog>
 <conbody>
-<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
+<p>The Network Server supports the 
+<ph conref="../conrefs.dita#prod/productshortname"></ph> Network
 Client driver DataSources
 <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
 <codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph>
-are supported by the Network Server. If your client runs on JDK 1.6
-or higher, the DataSources are, instead:
+on all supported Java SE platforms.</p>
+<p>If your client runs on the Java SE 6 platform, and if you want to use 
+DataSource methods specific to the JDBC 4 API, use the DataSources named
 <codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> and
-<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph>
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph>.</p>
+<p>
+If your client is running on the Java SE 6 platform, all connection objects 
+returned from the DataSource will be JDBC 4 connection objects, whether or not
+you are using a DataSource whose name ends in "40".
 </p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevresman89722.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevresman89722.dita?view=diff&rev=531651&r1=531650&r2=531651
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevresman89722.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevresman89722.dita Mon Apr 23 16:25:55 2007
@@ -20,8 +20,8 @@
 -->
 <concept id="cdevresman89722" xml:lang="en-us">
 <title>Getting a DataSource</title>
-<shortdesc>Normally, you can simply work with the interfaces for <i>javax.sql.DataSource</i>,
<codeph><i>javax.sql.ConnectionPoolDataSource</i></codeph
->, and <codeph><i>javax.sql.XADataSource</i></codeph>, as shown
in the following
+<shortdesc>Normally, you can simply work with the interfaces for <i>javax.sql.DataSource</i>,

+<i>javax.sql.ConnectionPoolDataSource</i>, and <i>javax.sql.XADataSource</i>,
as shown in the following
 examples.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>properties<indexterm>DataSource</indexterm></indexterm>
@@ -30,9 +30,10 @@
 </metadata></prolog>
 <conbody>
 <codeblock>
-<b>//
-// Note that if your application runs on JDK 1.6 or higher, you
-// will use the JDBC4 variants of these classes:
+<b>// If your application is running on the Java SE 6 platform,
+// and if you would like to call DataSource methods specific 
+// to the JDBC 4 API (for example, isWrapperFor), use the
+// JDBC 4 variants of these classes:
 //
 //   org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40
 //   org.apache.derby.jdbc.EmbeddedDataSource40
@@ -50,23 +51,23 @@
 They are:</p>
 <ul>
 <li><i>DatabaseName</i>   <p>This mandatory property must be set.
It identifies
-which database to access. If a database named wombat located at /local1/db/wombat
-is to be accessed, then one should call <i>setDatabaseName</i>("/local1/db/wombat")
+which database to access. To access a database named <i>wombat</i> located at

+<i>/local1/db/wombat</i>, call <i>setDatabaseName("/local1/db/wombat")</i>
 on the data source object. </p></li>
 <li><i>CreateDatabase</i>   <p>Optional. Sets a property to create
a database
 the next time the <i>getConnection</i> method of a data source object is called.
 The string <i>createString</i> is always "create" (or possibly null). (Use
-the method <codeph><i>setDatabaseName()</i></codeph> to define the
name of
+the method <i>setDatabaseName()</i> to define the name of
 the database.)</p></li>
 <li><i>ShutdownDatabase</i>   <p>Optional. Sets a property to shut
down a
 database. The string <i>shutDownString</i> is always "shutdown" (or possibly
-null). Shuts down the database the next time <codeph><i>getConnection</i></codeph>
method
+null). Shuts down the database the next time the <i>getConnection</i> method
 of a data source object is called.</p></li>
-<li><i>DataSourceName</i>   <p>Optional. Name for ConnectionPooledDataSource
-or XADataSource. Not used by the data source object. Used for informational
-purpose only. </p></li>
+<li><i>DataSourceName</i>   <p>Optional. Name for <i>ConnectionPoolDataSource</i>
+or <i>XADataSource</i>. Not used by the data source object. Used for informational
+purposes only. </p></li>
 <li><i>Description</i>   <p>Optional. Description of the data source.
Not
-used by the data source object. Used for informational purpose only. </p></li>
+used by the data source object. Used for informational purposes only. </p></li>
 <li><i>connectionAttributes</i>   <p>Optional. Connection attributes
specific
 to <ph conref="../conrefs.dita#prod/productshortname"></ph>. See the <cite><ph
 conref="../conrefs.dita#pub/citref"></ph></cite> for a more information about

Modified: db/derby/docs/trunk/src/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevresman79556.dita?view=diff&rev=531651&r1=531650&r2=531651
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevresman79556.dita Mon Apr 23 16:25:55 2007
@@ -20,8 +20,8 @@
 -->
 <reference id="rdevresman79556" xml:lang="en-us">
 <title>Classes that pertain to resource managers</title>
-<shortdesc>See the javadoc for each class for more
-information.</shortdesc>
+<shortdesc>Derby provides two variants of each <i>DataSource</i> interface

+defined by the JDBC API.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>EmbeddedDataSource</indexterm>
@@ -35,25 +35,33 @@
 <refbody>
 <section>
 <p>
-Each of these DataSources has two variants. Use the first variant if
-your application run on JDK 1.5 or lower. Use the second variant (the
-one whose class name ends with "40") if your application runs on JDK
-1.6 or higher.
-</p>
+Applications that run on the J2SE 1.4 or 1.5 platform <b>must</b> use the first

+variant. Applications that run on the Java SE 6 platform can use either of the 
+two variants. However, the <i>DataSource</i> methods specific to the JDBC 4 API

+are available only from the second variant (the one whose class name ends with "40").</p>
+<p>
+If an application is running on the Java SE 6 platform, all connection objects 
+returned from the <i>DataSource</i> will be JDBC 4 connection objects, 
+regardless of which <i>DataSource</i> variant is in use.</p>
+<p>
+The Derby implementation classes for the <i>DataSource</i> interfaces are as
+follows:</p>
 <ul>
 <li><i>org.apache.derby.jdbc.EmbeddedDataSource</i>
 and <i>org.apache.derby.jdbc.EmbeddedDataSource40</i> 
-<p>Implements <i>javax.sql.DataSource</i> interface,
+<p>Implements the <i>javax.sql.DataSource</i> interface,
 which a JNDI server can reference. Typically this is the object that you work
-with as a <codeph><i>DataSource</i></codeph>.</p></li>
+with as a <i>DataSource</i>.</p></li>
 <li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i>
 and <i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40</i>
-<p>Implements <i>javax.sql.ConnectionPoolDataSource</i>.
-A factory for <codeph><i>PooledConnection</i></codeph> objects.</p></li>
+<p>Implements the <i>javax.sql.ConnectionPoolDataSource</i> interface.
+A factory for <i>PooledConnection</i> objects.</p></li>
 <li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i>
 and <i>org.apache.derby.jdbc.EmbeddedXADataSource40</i>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph>'s
-implementation of a <i>javax.sql.XADataSource</i>.</p></li>
-</ul></section>
+implementation of the <i>javax.sql.XADataSource</i> interface.</p></li>
+</ul>
+<p>See the javadoc for each class for more information.</p>
+</section>
 </refbody>
 </reference>



Mime
View raw message