db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1445699 - in /db/derby/docs/trunk/src: adminguide/ devguide/ ref/
Date Wed, 13 Feb 2013 16:04:40 GMT
Author: chaase3
Date: Wed Feb 13 16:04:40 2013
New Revision: 1445699

URL: http://svn.apache.org/r1445699
Log:
DERBY-6059  Document Derby usage running on Java 8 JEP 161 Compact Profiles

Modified one Dev Guide topic, four Admin Guide topics, and seven Reference Manual topics; added three Reference Manual topics and modified the map file.

Patch: DERBY-6059.diff

Added:
    db/derby/docs/trunk/src/ref/rrefjdbc4_1datasource.dita   (with props)
    db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita   (with props)
    db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita   (with props)
Modified:
    db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
    db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
    db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
    db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    db/derby/docs/trunk/src/devguide/rdevresman79556.dita
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefapi1003363.dita
    db/derby/docs/trunk/src/ref/rrefattribtracelevel.dita
    db/derby/docs/trunk/src/ref/rrefjdbc4_0dataSource.dita
    db/derby/docs/trunk/src/ref/rrefjdbc4_0summary.dita
    db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita
    db/derby/docs/trunk/src/ref/rrefjta16677.dita
    db/derby/docs/trunk/src/ref/rrefjta18596.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Wed Feb 13 16:04:40 2013
@@ -81,5 +81,15 @@ the Diffie-Hellman algorithm with a publ
 </tbody>
 </tgroup>
 </table>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides three
+ClientDataSource implementations. You can use the
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on
+Java SE 5 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 3 or JDBC 4.0 methods. You can use the
+<codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> class on
+Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 4.1 or JDBC 4.2 methods. You must use the
+<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> class on
+Java SE 8 Compact Profile 2 or 3.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Wed Feb 13 16:04:40 2013
@@ -45,7 +45,18 @@ and set the <codeph>PrintWriter</codeph>
 <li>Use the <codeph>setTraceDirectory(String dirname)</codeph> method of ClientDataSource
 to trace each connection flow in its own file for programs that have multiple
 connections.</li>
-</ul></p></section>
+</ul></p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides three
+ClientDataSource implementations. You can use the
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on
+Java SE 5 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 3 or JDBC 4.0 methods. You can use the
+<codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> class on
+Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 4.1 or JDBC 4.2 methods. You must use the
+<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph>class on
+Java SE 8 Compact Profile 2 or 3.</p>
+</section>
 <section><title>Implementing DriverManager tracing</title><p>Use one of the
 following two options to enable and collect tracing information while obtaining
 connections using the DriverManager:<ul>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Wed Feb 13 16:04:40 2013
@@ -26,15 +26,18 @@ limitations under the License.
 <conbody>
 <section><p>You can access XA support for the Network Server by using the
 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>You can use the <codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>
+class on Java SE 5 and above (except Java SE 8 Compact Profiles), in
+applications that call JDBC 3 or JDBC 4.0 methods. You can use the
+<codeph>org.apache.derby.jdbc.ClientXADataSource40</codeph> class on
+Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 4.1 or JDBC 4.2 methods. You must use the
+<codeph>org.apache.derby.jdbc.BasicClientXADataSource40</codeph> class on
+Java SE 8 Compact Profile 2 or 3.</p>
+<p>
+If your client is running on the Java SE 6 platform or higher, 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></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;

Modified: db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Wed Feb 13 16:04:40 2013
@@ -19,28 +19,30 @@ limitations under the License.
 -->
 <concept id="cadminnsdatasources" xml:lang="en-us">
 <title>Accessing the Network Server by using a DataSource object</title>
-<shortdesc>The Network Server supports the 
+<shortdesc>The Network Server supports a set of 
 <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
-Client driver <codeph>DataSource</codeph> classes
-<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
-<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph>
-on all supported Java SE platforms.
-</shortdesc>
+Client driver <codeph>DataSource</codeph> classes.</shortdesc>
 <prolog><metadata><keywords>
 <indexterm>DataSource objects<indexterm>and Network Server</indexterm></indexterm>
 <indexterm>Network Server<indexterm>using DataSource objects</indexterm></indexterm>
 </keywords></metadata></prolog>
 <conbody>
-<p>If your client runs on the Java SE 6 platform, and if you want to use 
-<codeph>DataSource</codeph> methods specific to the JDBC 4 API, use the
-<codeph>DataSource</codeph> classes named
+<p>You can use the <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph> classes
+on Java SE 5 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 3 or JDBC 4.0 methods. You can use the
 <codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> and
-<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph>.</p>
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph> classes
+on Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 4.1 or JDBC 4.2 methods. You must use the
+<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> and
+<codeph>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</codeph>
+classes on Java SE 8 Compact Profile 2 or 3.</p>
 <p>
-If your client is running on the Java SE 6 platform, all connection objects 
-returned from the <codeph>DataSource</codeph> will be JDBC 4 connection objects,
-whether or not you are using a <codeph>DataSource</codeph> whose name ends in
-"40".
+If your client is running on the Java SE 6 platform or higher, all connection
+objects returned from the <codeph>DataSource</codeph> will be JDBC 4 connection
+objects, whether or not you are using a <codeph>DataSource</codeph> whose name
+ends in "40".
 </p>
 <section><title>Using statement caching</title>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports JDBC
@@ -50,9 +52,10 @@ objects. Statement caching avoids the pe
 the network from the client to the server to prepare a statement that has
 already been prepared on the same connection.</p>
 <p>To use statement caching, you must use an
-<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph> or an
-<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph> object.
-After you instantiate this object, perform these steps:</p>
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph>,
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph>, or
+<codeph>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</codeph>
+object. After you instantiate this object, perform these steps:</p>
 <ol>
 <li>Specify the desired size of your statement cache by calling the
 <codeph>setMaxStatements</codeph> method on the <codeph>DataSource</codeph>

Modified: db/derby/docs/trunk/src/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevresman79556.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevresman79556.dita Wed Feb 13 16:04:40 2013
@@ -20,49 +20,58 @@ limitations under the License.
 -->
 <reference id="rdevresman79556" xml:lang="en-us">
 <title>Classes that pertain to resource managers</title>
-<shortdesc>Derby provides two variants of each <i>DataSource</i> interface 
-defined by the JDBC API.</shortdesc>
+<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> provides
+three embedded variants of each <i>DataSource</i> interface defined by the JDBC
+API.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>EmbeddedDataSource</indexterm>
 <indexterm>EmbeddedDataSource40</indexterm>
+<indexterm>BasicEmbeddedDataSource40</indexterm>
 <indexterm>EmbeddedConnectionPoolDataSource</indexterm>
 <indexterm>EmbeddedConnectionPoolDataSource40</indexterm>
+<indexterm>BasicEmbeddedConnectionPoolDataSource40</indexterm>
 <indexterm>EmbeddedXADataSource</indexterm>
 <indexterm>EmbeddedXADataSource40</indexterm>
+<indexterm>BasicEmbeddedXADataSource40</indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
 <section>
 <p>
 Applications that run on the Java SE 5 platform <b>must</b> use the first 
-variant. Applications that run on platforms later than Java SE 5 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>
+variant. Applications that run on the Java SE 6 platform or higher (except
+Java SE 8 Compact Profiles) can use either of the first two variants. However,
+the <i>DataSource</i> methods specific to JDBC 4.1 and 4.2 are available only
+from the second and third variants (the ones whose class name ends with "40").</p>
+<p>Applications that run on Java SE 8 Compact Profile 2 or 3 <b>must</b> use the
+third variant (the ones whose class name begins with "Basic"). Compact profiles
+do not support the Java Naming and Directory Interface (JNDI) API.</p>
 <p>
-If an application is running a platform later than Java SE 5, all connection objects 
-returned from the <i>DataSource</i> will be JDBC 4 connection objects, 
+If an application is running on the Java SE 6 platform or higher, 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>
+The <ph conref="../conrefs.dita#prod/productshortname"></ph> 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 the <i>javax.sql.DataSource</i> interface,
-which a JNDI server can reference. Typically this is the object that you work
-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 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 the <i>javax.sql.XADataSource</i> interface.</p></li>
+<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i>, 
+<i>org.apache.derby.jdbc.EmbeddedDataSource40</i>,
+and <i>org.apache.derby.jdbc.BasicEmbeddedDataSource40</i> 
+<p>These classes implement the <i>javax.sql.DataSource</i> interface, which a 
+JNDI server can reference (except in the case of the third variant). Typically,
+this is the object that you work with as a <i>DataSource</i>.</p></li>
+<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i>,
+<i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40</i>,
+and <i>org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40</i>
+<p>These classes implement the <i>javax.sql.ConnectionPoolDataSource</i>
+interface and provide a factory for <i>PooledConnection</i> objects.</p></li>
+<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i>,
+<i>org.apache.derby.jdbc.EmbeddedXADataSource40</i>,
+and <i>org.apache.derby.jdbc.BasicEmbeddedXADataSource40</i>
+<p>These classes implement the <i>javax.sql.XADataSource</i> interface.</p></li>
 </ul>
-<p>See the javadoc for each class for more information.</p>
+<p>See the API documentation for each class for more information.</p>
 </section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Wed Feb 13 16:04:40 2013
@@ -1091,7 +1091,7 @@ URL syntax"></topicref>
 </topicref>
 <topicref href="rrefjdbcjsr169.dita" navtitle="JDBC Package for Connected Device Configuration/Foundation Profile
 (JSR169)"></topicref>
-<topicref collection-type="family" href="rrefjdbc4_0summary.dita" navtitle="JDBC 4.0 and 4.1 features ">
+<topicref collection-type="family" href="rrefjdbc4_0summary.dita" navtitle="Features supported on all JDBC 4 releases">
 <topicref href="rrefjdbc4_0sqlexception.dita" navtitle="Refined subclasses of SQLException">
 </topicref>
 <topicref href="rrefjdbc4_0connection.dita" navtitle="java.sql.Connection interface: JDBC 4.0 features">
@@ -1100,14 +1100,19 @@ URL syntax"></topicref>
 </topicref>
 <topicref href="rrefjdbc4_0statement.dita" navtitle="java.sql.Statement interface: JDBC 4.0 features">
 </topicref>
-<topicref href="rrefjdbc4_0dataSource.dita" navtitle="javax.sql.DataSource interface: JDBC 4.0 features">
+<topicref href="rrefjdbc4_0dataSource.dita" navtitle="javax.sql.DataSource interface: JDBC 3 and JDBC 4.0 features">
 </topicref>
 <topicref href="rrefjdbcrefsqlxml.dita" navtitle="java.sql.SQLXML interface">
 </topicref>
 </topicref>
-<topicref collection-type="family" href="rrefjdbc4_1summary.dita" navtitle="JDBC 4.1-only features ">
+<topicref collection-type="family" href="rrefjdbc4_1summary.dita" navtitle="Features supported on JDBC 4.1 and above">
 <topicref href="rrefjdbc4_1connection.dita" navtitle="java.sql.Connection interface: JDBC 4.1 features">
 </topicref>
+<topicref href="rrefjdbc4_1datasource.dita" navtitle="java.sql.DataSource interface: JDBC 4.1 features">
+</topicref>
+</topicref>
+<topicref collection-type="family" href="rrefjdbc4_2summary.dita" navtitle="Features supported on JDBC 4.2">
+<topicref href="rrefjdbc4_2compactprofiles.dita" navtitle="JDBC DataSource support for Java SE 8 Compact Profiles"></topicref>
 </topicref>
 <topicref collection-type="family" href="rrefjdbc1020262.dita" navtitle="JDBC escape syntax ">
 <topicref href="rrefjdbc70824.dita" navtitle="JDBC escape keyword for call statements">

Modified: db/derby/docs/trunk/src/ref/rrefapi1003363.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefapi1003363.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefapi1003363.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefapi1003363.dita Wed Feb 13 16:04:40 2013
@@ -18,42 +18,79 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefapi1003363" xml:lang="en-us">
-<title>Data Source Classes</title>
+<title>DataSource classes</title>
 <prolog><metadata>
 <keywords>
-<indexterm>org.apache.derby.jdbc. EmbeddedConnection PoolDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc. EmbeddedXADataSource</indexterm>
-<indexterm>org.apache.derby.jdbc. EmbeddedDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc. ClientConnection PoolDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc. ClientXADataSource</indexterm>
-<indexterm>org.apache.derby.jdbc. ClientDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc. EmbeddedConnection40 PoolDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc. EmbeddedXADataSource40</indexterm>
-<indexterm>org.apache.derby.jdbc. EmbeddedDataSource40</indexterm>
-<indexterm>org.apache.derby.jdbc. ClientConnection40 PoolDataSource</indexterm>
-<indexterm>org.apache.derby.jdbc. ClientXADataSource40</indexterm>
-<indexterm>org.apache.derby.jdbc. ClientDataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</indexterm>
+<indexterm>org.apache.derby.jdbc.EmbeddedXADataSource</indexterm>
+<indexterm>org.apache.derby.jdbc.EmbeddedDataSource</indexterm>
+<indexterm>org.apache.derby.jdbc.ClientConnectionPoolDataSource</indexterm>
+<indexterm>org.apache.derby.jdbc.ClientXADataSource</indexterm>
+<indexterm>org.apache.derby.jdbc.ClientDataSource</indexterm>
+<indexterm>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.EmbeddedXADataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.EmbeddedDataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.ClientXADataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.ClientDataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.BasicEmbeddedXADataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.BasicEmbeddedDataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.BasicClientXADataSource40</indexterm>
+<indexterm>org.apache.derby.jdbc.BasicClientDataSource40</indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>These classes are all related to <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
-implementation of <i>javax.sql.DataSource</i> and related APIs. For more information,
-see the <cite><ph
-conref="../conrefs.dita#pub/citdevelop"></ph></cite>.   </p>
-<p>
-Each of these classes has two variants. Use the first variant if your
-application runs on JDK 5. Use the second variant (the one
-ending in "40") if your application runs on JDK 6 or higher.
-</p>
-<p>Embedded
-environment:<ul>
-<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i> and <i>org.apache.derby.jdbc.EmbeddedDataSource40</i></li>
-<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i> and <i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40</i></li>
-<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i> and <i>org.apache.derby.jdbc.EmbeddedXADataSource40</i></li>
-</ul></p><p>Client-server environment<ul>
-<li><i>org.apache.derby.jdbc.ClientDataSource</i> and <i>org.apache.derby.jdbc.ClientDataSource40</i></li>
-<li><i>org.apache.derby.jdbc.ClientConnectionPoolDataSource</i> and <i>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</i></li>
-<li><i>org.apache.derby.jdbc.ClientXADataSource</i> and <i>org.apache.derby.jdbc.ClientXADataSource40</i></li>
-</ul></p></section>
+<section><p>These classes are all related to
+<ph conref="../conrefs.dita#prod/productshortname"></ph>'s implementation of
+<i>javax.sql.DataSource</i> and related APIs. For more information, see
+<xref href="crefjdbc12657.dita#crefjdbc12657"></xref>, "Classes that pertain to
+resource managers" in the <ph conref="../conrefs.dita#pub/citdevelop"></ph>, and
+"Accessing the Network Server by using a DataSource object" in the
+<ph conref="../conrefs.dita#pub/citadmin"></ph>.</p>
+<p>Embedded environment, for applications running on JDK 5 or higher and
+using JDBC 3 and JDBC 4.0 methods:</p>
+<ul>
+<li><i>org.apache.derby.jdbc.EmbeddedDataSource</i></li>
+<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</i></li>
+<li><i>org.apache.derby.jdbc.EmbeddedXADataSource</i></li>
+</ul>
+<p>Embedded environment, for applications running on JDK 6 or higher and using
+methods specific to JDBC 4.1 or JDBC 4.2:</p>
+<ul>
+<li><i>org.apache.derby.jdbc.EmbeddedDataSource40</i></li>
+<li><i>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40</i></li>
+<li><i>org.apache.derby.jdbc.EmbeddedXADataSource40</i></li>
+</ul>
+<p>Embedded environment, for applications using Java SE 8 Compact Profile 2
+or 3:</p>
+<ul>
+<li><i>org.apache.derby.jdbc.BasicEmbeddedDataSource40</i></li>
+<li><i>org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40</i></li>
+<li><i>org.apache.derby.jdbc.BasicEmbeddedXADataSource40</i></li>
+</ul>
+<p>Client-server environment, for applications running on JDK 5 or higher and
+using JDBC 3 and JDBC 4.0 methods:</p>
+<ul>
+<li><i>org.apache.derby.jdbc.ClientDataSource</i></li>
+<li><i>org.apache.derby.jdbc.ClientConnectionPoolDataSource</i></li>
+<li><i>org.apache.derby.jdbc.ClientXADataSource</i></li>
+</ul>
+<p>Client-server environment, for applications running on JDK 6 or higher and
+using methods specific to JDBC 4.1 or JDBC 4.2:</p>
+<ul>
+<li><i>org.apache.derby.jdbc.ClientDataSource40</i></li>
+<li><i>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</i></li>
+<li><i>org.apache.derby.jdbc.ClientXADataSource40</i></li>
+</ul>
+<p>Client-server environment, for applications using Java SE 8 Compact Profile
+2 or 3:</p>
+<ul>
+<li><i>org.apache.derby.jdbc.BasicClientDataSource40</i></li>
+<li><i>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</i></li>
+<li><i>org.apache.derby.jdbc.BasicClientXADataSource40</i></li>
+</ul>
+</section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefattribtracelevel.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattribtracelevel.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribtracelevel.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribtracelevel.dita Wed Feb 13 16:04:40 2013
@@ -103,6 +103,16 @@ for other attributes related to tracing.
 </tbody>
 </tgroup>
 </table>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides three
+ClientDataSource implementations. You can use the
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on
+Java SE 5 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 3 or JDBC 4.0 methods. You can use the
+<codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> class on
+Java SE 6 and above (except Java SE 8 Compact Profiles), in applications that
+call JDBC 4.1 or JDBC 4.2 methods. You must use the
+<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph>class on
+Java SE 8 Compact Profile 2 or 3.</p>
 <p>To specify more than one trace level, use one of the following techniques:
 </p>
 <ul>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_0dataSource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_0dataSource.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_0dataSource.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_0dataSource.dita Wed Feb 13 16:04:40 2013
@@ -19,7 +19,7 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefjdbc4_0dataSource" xml:lang="en-us">
-<title>javax.sql.DataSource interface: JDBC 4.0 features</title>
+<title>javax.sql.DataSource interface: JDBC 3 and JDBC 4.0 features</title>
 <prolog><metadata>
 <keywords>
 <indexterm>DataSource interface</indexterm>
@@ -28,18 +28,26 @@ limitations under the License.
 <refbody>
 <section>
 <p>
-<ph conref="../conrefs.dita#prod/productshortname"></ph> has
-added new JDBC 4.0-specific DataSources. Use these DataSources if your
-application runs on JDK 1.6 or higher.
-</p>
+<ph conref="../conrefs.dita#prod/productshortname"></ph> provides
+the following DataSource classes for JDBC 3 and JDBC 4.0 applications that run
+on JDK 5 or higher (except Java SE 8 Compact Profiles).</p>
+<ul>
+<li><b>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource</b></li>
+<li><b>org.apache.derby.jdbc.EmbeddedDataSource</b></li>
+<li><b>org.apache.derby.jdbc.EmbeddedXADataSource</b></li>
+</ul>
 <ul>
-<li><b>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40</b></li>
-<li><b>org.apache.derby.jdbc.EmbeddedDataSource40</b></li>
-<li><b>org.apache.derby.jdbc.EmbeddedXADataSource40</b></li>
-<li><b>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</b></li>
-<li><b>org.apache.derby.jdbc.ClientDataSource40</b></li>
-<li><b>org.apache.derby.jdbc.ClientXADataSource40</b></li>
+<li><b>org.apache.derby.jdbc.ClientConnectionPoolDataSource</b></li>
+<li><b>org.apache.derby.jdbc.ClientDataSource</b></li>
+<li><b>org.apache.derby.jdbc.ClientXADataSource</b></li>
 </ul>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports additional
+DataSource classes for applications that use methods specific to JDBC 4.1 or 4.2
+(running on JDK 6 or higher) or that run on JDK 8 Compact Profile 2 or 3. See
+<xref href="rrefjdbc4_1datasource.dita#rrefjdbc4_1datasource"></xref> or
+<xref href="rrefjdbc4_2compactprofiles.dita#rrefjdbc4_2compactprofiles"></xref> for
+details.
+</p>
 </section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_0summary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_0summary.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_0summary.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_0summary.dita Wed Feb 13 16:04:40 2013
@@ -19,11 +19,12 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefjdbc4_0summary" xml:lang="en-us">
-<title>JDBC 4.0 and 4.1 features</title>
+<title>Features supported on all JDBC 4 releases</title>
 <prolog><metadata>
 <keywords>
 <indexterm>JDBC 4.0</indexterm>
 <indexterm>JDBC 4.1</indexterm>
+<indexterm>JDBC 4.2</indexterm>
 <indexterm>Ease of development</indexterm>
 <indexterm>Driver autoloading</indexterm>
 <indexterm>SQLException subclasses</indexterm>
@@ -36,31 +37,37 @@ limitations under the License.
 <refbody>
 <section>
 <p>
-JDBC 4.0 adds some functionality to the core API. This section
-documents the features supported by <ph conref="../conrefs.dita#prod/productshortname"></ph>.
+JDBC 4.0 added some functionality to the core API. This section
+documents the features supported by
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.
 </p>
-<p>All these JDBC 4.0 features are also supported by JDBC 4.1. See
+<p>All these JDBC 4.0 features are also supported by JDBC 4.1 and JDBC 4.2. See
 <xref href="rrefjdbc4_1summary.dita#rrefjdbc4_1summary"></xref> for information
-about features supported only by JDBC 4.1.</p>
+about features supported only by JDBC 4.1 and above. See
+<xref href="rrefjdbc4_2summary.dita#rrefjdbc4_2summary"></xref> for information
+about features supported only by JDBC 4.2.</p>
 <p><note>These features are present only in a JDK 6 or higher
 environment.
 </note></p>
 </section>
 <section><p>These features are:</p>
 <ul>
-<li><b>DataSources.</b> To support the JDBC 4.0 ease of development,
-<ph conref="../conrefs.dita#prod/productshortname"></ph>
-introduces new implementations of <codeph>javax.sql.DataSource</codeph>. See
+<li><b>DataSources.</b> The
+<ph conref="../conrefs.dita#prod/productshortname"></ph> implementations of
+<codeph>javax.sql.DataSource</codeph> support both JDBC 3 and JDBC 4.0
+development. See
 <xref href="rrefjdbc4_0dataSource.dita#rrefjdbc4_0dataSource"></xref>.
 </li>
 <li><b>Autoloading of JDBC drivers.</b> In earlier versions of JDBC,
 applications had to manually register drivers before requesting
-Connections. With JDBC 4.0, applications no longer need to issue a
+Connections. With JDBC 4.0 and above, applications no longer need to issue a
 Class.forName() on the driver name; instead, the DriverManager will
 find an appropriate JDBC driver when the application requests a Connection.
 </li>
-<li><b>SQLExceptions.</b> JDBC 4.0 introduces refined subclasses of SQLException. See <xref href="rrefjdbc4_0sqlexception.dita#rrefjdbc4_0sqlexception"></xref>.</li>
-<li><b>Wrappers.</b> JDBC 4.0 introduces the concept of wrapped JDBC
+<li><b>SQLExceptions.</b> JDBC 4.0 introduced refined subclasses of
+SQLException. See
+<xref href="rrefjdbc4_0sqlexception.dita#rrefjdbc4_0sqlexception"></xref>.</li>
+<li><b>Wrappers.</b> JDBC 4.0 introduced the concept of wrapped JDBC
 objects. This is a formal mechanism by which application servers can
 look for vendor-specific extensions inside standard JDBC objects like
 Connections, Statements, and ResultSets. For
@@ -68,8 +75,11 @@ Connections, Statements, and ResultSets.
 this is a vacuous exercise because
 <ph conref="../conrefs.dita#prod/productshortname"></ph>
 does not expose any of these extensions.</li>
-<li><b>Statement events.</b> With JDBC 4.0, Connection pools can listen for Statement closing and Statement error events. New methods were added to <i>javax.sql.PooledConnection</i>: <i>addStatementEventListener</i> and <i>removeStatementEventListener</i>.</li>
-<li><b>Streaming APIs.</b> JDBC 4.0 adds new overloads of the streaming methods
+<li><b>Statement events.</b> With JDBC 4.0 and above, connection pools can
+listen for Statement closing and Statement error events. New methods were added
+to <i>javax.sql.PooledConnection</i>: <i>addStatementEventListener</i> and
+<i>removeStatementEventListener</i>.</li>
+<li><b>Streaming APIs.</b> JDBC 4.0 added new overloads of the streaming methods
 in <i>CallableStatement</i>, <i>PreparedStatement</i>, and <i>ResultSet</i>.
 These are the <i>setXXX</i> and <i>updateXXX</i> methods which take
 <i>java.io.InputStream</i> and <i>java.io.Reader</i> arguments. The new

Added: db/derby/docs/trunk/src/ref/rrefjdbc4_1datasource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_1datasource.dita?rev=1445699&view=auto
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_1datasource.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_1datasource.dita Wed Feb 13 16:04:40 2013
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<reference id="rrefjdbc4_1datasource" xml:lang="en-us">
+<title>javax.sql.DataSource interface: JDBC 4.1 features</title>
+<prolog><metadata>
+<keywords>
+<indexterm>DataSource interface</indexterm>
+</keywords>
+</metadata></prolog>
+<refbody>
+<section>
+<p>
+<ph conref="../conrefs.dita#prod/productshortname"></ph> has
+the following JDBC 4.1-specific DataSource classes. Use these DataSource
+classes if your application runs on JDK 6 or higher (except Java SE 8 Compact
+Profiles) and calls methods specific to JDBC 4.1 or 4.2.
+</p>
+<ul>
+<li><b>org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40</b></li>
+<li><b>org.apache.derby.jdbc.EmbeddedDataSource40</b></li>
+<li><b>org.apache.derby.jdbc.EmbeddedXADataSource40</b></li>
+</ul>
+<ul>
+<li><b>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</b></li>
+<li><b>org.apache.derby.jdbc.ClientDataSource40</b></li>
+<li><b>org.apache.derby.jdbc.ClientXADataSource40</b></li>
+</ul>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports additional
+DataSource classes for applications that use JDK 8 Compact Profile 2 or 3. See
+<xref href="rrefjdbc4_2compactprofiles.dita#rrefjdbc4_2compactprofiles"></xref> for
+details.</p>
+</section>
+</refbody>
+</reference>
+

Propchange: db/derby/docs/trunk/src/ref/rrefjdbc4_1datasource.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita Wed Feb 13 16:04:40 2013
@@ -19,20 +19,23 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefjdbc4_1summary" xml:lang="en-us">
-<title>JDBC 4.1-only features</title>
+<title>Features supported on JDBC 4.1 and above</title>
 <prolog><metadata>
 <keywords>
 <indexterm>JDBC 4.1</indexterm>
+<indexterm>JDBC 4.2</indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
 <section>
-<p>JDBC 4.1 adds some functionality to the core API. This section
+<p>JDBC 4.1 added some functionality to the core API. This section
 documents the JDBC 4.1 features supported by
 <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
-<p>For information on features supported by both JDBC 4.0 and JDBC 4.1, see
-<xref href="rrefjdbc4_0summary.dita#rrefjdbc4_0summary"></xref>.</p>
-<p><note>JDBC 4.1 features are present only in a JDK 7 or higher
+<p>For information on features supported by all releases of JDBC 4, see
+<xref href="rrefjdbc4_0summary.dita#rrefjdbc4_0summary"></xref>. For information
+about features supported only by JDBC 4.2, see
+<xref href="rrefjdbc4_2summary.dita#rrefjdbc4_2summary"></xref>.</p>
+<p><note>JDBC 4.1 features are present only in a JDK 6 or higher
 environment.</note></p>
 </section>
 </refbody>

Added: db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita?rev=1445699&view=auto
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita Wed Feb 13 16:04:40 2013
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<reference id="rrefjdbc4_2compactprofiles" xml:lang="en-us">
+<title>JDBC support for Java SE 8 Compact Profiles</title>
+<prolog><metadata>
+<keywords><indexterm>Compact Profiles<indexterm>JDBC support</indexterm></indexterm></keywords>
+</metadata></prolog>
+<refbody>
+<section><p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides
+support for Compact Profiles 2 and 3 on the Java SE 8 platform by means of a
+group of JDBC DataSource classes. (Compact Profile 1 does not provide any JDBC
+support.)</p>
+<p>The following DataSource classes, all within the
+<codeph>org.apache.derby.jdbc</codeph> package, support Java SE 8 Compact
+Profiles 2 and 3:</p>
+<ul>
+<li><b>org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40</b></li>
+<li><b>org.apache.derby.jdbc.BasicEmbeddedDataSource40</b></li>
+<li><b>org.apache.derby.jdbc.BasicEmbeddedXADataSource40</b></li>
+</ul>
+<ul>
+<li><b>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</b></li>
+<li><b>org.apache.derby.jdbc.BasicClientDataSource40</b></li>
+<li><b>org.apache.derby.jdbc.BasicClientXADataSource40</b></li>
+</ul>
+<p>These DataSource classes cannot be used in applications that use the
+Java Naming and Directory Interface (JNDI) API. Otherwise, they are just like
+the versions for the full Java SE platform.</p>
+</section>
+</refbody>
+</reference>
+

Propchange: db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita?rev=1445699&view=auto
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita Wed Feb 13 16:04:40 2013
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<reference id="rrefjdbc4_2summary" xml:lang="en-us">
+<title>JDBC 4.2-only features</title>
+<prolog><metadata>
+<keywords>
+<indexterm>JDBC 4.2</indexterm>
+</keywords>
+</metadata></prolog>
+<refbody>
+<section>
+<p>JDBC 4.2 adds some functionality to the core API. This section
+documents the JDBC 4.2 features supported by
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
+<p>For information on features supported by all versions of JDBC 4, see
+<xref href="rrefjdbc4_0summary.dita#rrefjdbc4_0summary"></xref>. For information
+on features supported by both JDBC 4.1 and JDBC 4.2, see
+<xref href="rrefjdbc4_1summary.dita#rrefjdbc4_1summary"></xref>.</p>
+<p><note>JDBC 4.2 features are present only in a JDK 8 or higher
+environment.</note></p>
+</section>
+</refbody>
+</reference>

Propchange: db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/trunk/src/ref/rrefjta16677.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjta16677.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjta16677.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjta16677.dita Wed Feb 13 16:04:40 2013
@@ -58,8 +58,10 @@ order to qualify as a resource manager i
 platform requires these basic areas of support:   <ul>
 <li>JNDI support<p>Allows calling applications to register names for databases
 and access them through those names instead of through database connection
-URLs. Implementation of one of the JDBC interfaces, <i><xref href="rrefjta18596.dita#rrefjta18596/jta20722">javax.sql.DataSource</xref>,</i> provides
-this support.</p></li>
+URLs. Implementation of one of the JDBC interfaces,
+<i><xref href="rrefjta18596.dita#rrefjta18596/jta20722">javax.sql.DataSource</xref></i>,
+provides this support (except for the DataSource implementations that support
+Java SE 8 Compact Profiles).</p></li>
 <li>Connection pooling <p>A mechanism by which a connection pool server keeps
 a set of open connections to a resource manager (<ph conref="../conrefs.dita#prod/productshortname"></ph>).
 A user requesting a connection can get one of the available connections from

Modified: db/derby/docs/trunk/src/ref/rrefjta18596.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjta18596.dita?rev=1445699&r1=1445698&r2=1445699&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjta18596.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjta18596.dita Wed Feb 13 16:04:40 2013
@@ -39,7 +39,14 @@ id="i1017905">
 <li><i id="jta20722">javax.sql.DataSource</i> <p>An interface that is a factory
 for connections to the physical data source that the object represents. An
 object that implements the DataSource interface will typically be registered
-with a naming service based on the Java Naming and Directory (JNDI) API.</p></li>
+with a naming service based on the Java Naming and Directory (JNDI) API. The
+<codeph>org.apache.derby.jdbc</codeph> DataSource classes support the JNDI API,
+with the exception of the DataSource classes that support Java SE 8 Compact
+Profiles 2 and 3. See
+<xref href="rrefjdbc4_0dataSource.dita#rrefjdbc4_0dataSource"></xref>,
+<xref href="rrefjdbc4_1datasource.dita#rrefjdbc4_1datasource"></xref>, and
+<xref href="rrefjdbc4_2compactprofiles.dita#rrefjdbc4_2compactprofiles"></xref>
+for more information.</p></li>
 <li><i id="jta96573">javax.sql.ConnectionPoolDataSource</i>  and <i> javax.sql.PooledConnection</i>  <p>Establishing
 a connection to the database can be a relatively expensive operation in client/server
 environments. Establishing the connection once and then using the same connection



Mime
View raw message