You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ch...@apache.org on 2014/02/18 18:46:12 UTC
svn commit: r1569440 - in /db/derby/docs/trunk/src: adminguide/ devguide/
ref/
Author: chaase3
Date: Tue Feb 18 17:46:11 2014
New Revision: 1569440
URL: http://svn.apache.org/r1569440
Log:
DERBY-6478 Fix language about supported DataSources for Compact Profiles
Modified 4 Admin Guide, 1 Developer's Guide, and 3 Reference Manual topics.
Patch: DERBY-6478-2.diff
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/rrefapi1003363.dita
db/derby/docs/trunk/src/ref/rrefattribtracelevel.dita
db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.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=1569440&r1=1569439&r2=1569440&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Tue Feb 18 17:46:11 2014
@@ -87,8 +87,8 @@ the Diffie-Hellman algorithm with a publ
<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides two
ClientDataSource implementations. Use the
<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on all supported
-Java SE versions except Java SE 8 Compact Profiles. On Java SE 8 Compact
-Profile 2 or 3, use the
+Java SE versions except Java SE 8 Compact Profile 2. On Java SE 8 Compact
+Profile 2, use the
<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> class.</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=1569440&r1=1569439&r2=1569440&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Tue Feb 18 17:46:11 2014
@@ -55,8 +55,8 @@ for programs that have multiple connecti
<p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides two
ClientDataSource implementations. Use the
<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on all supported
-Java SE versions except Java SE 8 Compact Profiles. On Java SE 8 Compact
-Profile 2 or 3, use the
+Java SE versions except Java SE 8 Compact Profile 2. On Java SE 8 Compact
+Profile 2, use the
<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> class.</p>
</section>
<section><title>Implementing DriverManager tracing</title>
Modified: db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?rev=1569440&r1=1569439&r2=1569440&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Tue Feb 18 17:46:11 2014
@@ -28,8 +28,8 @@ client driver's XA DataSource interface.
<conbody>
<section>
<p>Use the <codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>
-class on all supported Java SE versions except Java SE 8 Compact Profiles. On
-Java SE 8 Compact Profile 2 or 3, use the
+class on all supported Java SE versions except Java SE 8 Compact Profile 2. On
+Java SE 8 Compact Profile 2, use the
<codeph>org.apache.derby.jdbc.BasicClientXADataSource40</codeph> class.</p>
</section>
<example><p>The following example illustrates how to obtain an XA connection
Modified: db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?rev=1569440&r1=1569439&r2=1569440&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Tue Feb 18 17:46:11 2014
@@ -29,8 +29,8 @@ Client driver <codeph>DataSource</codeph
<conbody>
<p>Use the <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph> classes
-on all supported Java SE versions (except Java SE 8 Compact Profiles). On
-Java SE 8 Compact Profile 2 or 3, use the
+on all supported Java SE versions except Java SE 8 Compact Profile 2. On
+Java SE 8 Compact Profile 2, use the
<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> and
<codeph>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</codeph>
classes.</p>
Modified: db/derby/docs/trunk/src/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevresman79556.dita?rev=1569440&r1=1569439&r2=1569440&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevresman79556.dita Tue Feb 18 17:46:11 2014
@@ -35,11 +35,12 @@ API.</shortdesc>
</metadata></prolog>
<refbody>
<section>
-<p>Most applications must use the first variant.</p>
-<p>However, applications that run on Java SE 8 Compact Profile 2 or 3
+<p>Most applications will use the first variant.</p>
+<p>However, applications that run on Java SE 8 Compact Profile 2
must use the second variant (the ones whose class name begins with "Basic").
-Compact profiles do not support the Java Naming and Directory Interface (JNDI)
-API.</p>
+Compact Profile 2 does not support the Java Naming and Directory Interface
+(JNDI) API. Applications that run on Compact Profile 3 may use either
+variant.</p>
<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> implementation
classes for the <i>DataSource</i> interfaces are as follows:</p>
<ul>
Modified: db/derby/docs/trunk/src/ref/rrefapi1003363.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefapi1003363.dita?rev=1569440&r1=1569439&r2=1569440&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefapi1003363.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefapi1003363.dita Tue Feb 18 17:46:11 2014
@@ -69,6 +69,8 @@ or 3:</p>
<li><i>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</i></li>
<li><i>org.apache.derby.jdbc.BasicClientXADataSource40</i></li>
</ul>
+<p>Applications using Java SE 8 Compact Profile 3 can use either the ordinary
+DataSource classes or those whose names begin with "Basic".</p>
</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=1569440&r1=1569439&r2=1569440&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribtracelevel.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribtracelevel.dita Tue Feb 18 17:46:11 2014
@@ -103,16 +103,12 @@ 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><ph conref="../conrefs.dita#prod/productshortname"></ph> provides two
+ClientDataSource implementations. Use the
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> class on all supported
+Java SE versions except Java SE 8 Compact Profile 2. On Java SE 8 Compact
+Profile 2, use the
+<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> class.</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_2compactprofiles.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita?rev=1569440&r1=1569439&r2=1569440&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita Tue Feb 18 17:46:11 2014
@@ -42,7 +42,8 @@ Profiles 2 and 3:</p>
</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>
+the versions for the full Java SE platform. Applications using Java SE 8 Compact
+Profile 3 can use either these classes or the ordinary DataSource classes.</p>
</section>
</refbody>
</reference>