db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r447673 - in /db/derby/docs/branches/10.2/src: adminguide/ devguide/ ref/ tools/
Date Tue, 19 Sep 2006 01:58:30 GMT
Author: jta
Date: Mon Sep 18 18:58:29 2006
New Revision: 447673

URL: http://svn.apache.org/viewvc?view=rev&rev=447673
Log:
DERBY-1271 Added JDBC 4.0 disclaimer to the Reference Manual, Admin Guide, 
Developers Guide, and Tools Guide, which says that functionality is based 
on a pre-release of Java SE 6.

The disclaimer itself is defined as a jdbc4disclaimer variable in the
conrefs.dita file for each book. The disclaimer then gets enabled in a
given page with a line such as the following:

   <p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p>

Also corrected the fullversionnumber variable in the Developer's
Guide conrefs.dita to say "Version 10.2" instead of "Open Source".

Modified:
    db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita
    db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita
    db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita
    db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita
    db/derby/docs/branches/10.2/src/devguide/devconrefs.dita
    db/derby/docs/branches/10.2/src/ref/refconrefs.dita
    db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita
    db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita
    db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita

Modified: db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita Mon Sep 18 18:58:29 2006
@@ -37,6 +37,23 @@
 <title>Version and release numbers</title>
 <conbody>
 <p><ph id="fullversionnumber">Version 10.2</ph></p>
+<p><ph id="jdbc4disclaimer"><note type="attention">
+<ph conref="adminconrefs.dita#prod/productshortname"></ph>
+<ph conref="adminconrefs.dita#vers/fullversionnumber"></ph> 
+includes JDBC 4.0 functionality based on a pre-release of Java SE 6. 
+When you use <ph conref="adminconrefs.dita#prod/productshortname"></ph>
+with a Java SE 6 virtual machine, 
+<ph conref="adminconrefs.dita#prod/productshortname"></ph>
+will use its JDBC 3.0 drivers, just as with 1.4 and 1.5 virtual
+machines. JDBC 4.0 is available only to developers who download Java SE
+6 and use it to build in support for JDBC 4.0. The Release Notes explain
+how to build the JDBC 4.0 functionality with 
+<ph conref="adminconrefs.dita#prod/productshortname"></ph>
+<ph conref="adminconrefs.dita#vers/fullversionnumber"></ph>.
+A follow-on <ph conref="adminconrefs.dita#prod/productshortname"></ph>
+release will include JDBC 4.0 functionality based on the final
+JDBC 4.0 specification once Java SE 6 becomes generally available.
+</note></ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Modified: db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita Mon Sep 18 18:58:29
2006
@@ -20,6 +20,7 @@
 <reference id="radminappsclientxmp" xml:lang="en-us">
 <title>Network client driver examples</title>
 <refbody>
+<section><p><ph conref="adminconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>The following examples specify the user and password URL attributes. 
 To enable user authentication, the  property <i>derby.connection.requireAuthentication</i>
@@ -34,7 +35,7 @@
 </section>
 <section><title>Example 1</title><p>The following example connects
to the
 default server name localhost on the default port, 1527, and to the database
-sample.</p>
+adminample.</p>
 <codeblock>jdbc:derby://localhost:1527/sample;user=judy;password=no12see</codeblock></section>
 <section><title>Example 2</title><p>The following example specifies
both <ph
 conref="adminconrefs.dita#prod/productshortname"></ph> and Network Client

Modified: db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita Mon Sep 18 18:58:29
2006
@@ -23,6 +23,7 @@
 <keywords><indexterm>Embedded server example</indexterm></keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="adminconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section><p>You can start the Network Server in another thread automatically
 when <ph conref="adminconrefs.dita#prod/productshortname"></ph> starts by setting
 the <i>derby.drda.startNetworkServer</i> property (see <xref href="tadminconfigsettingnetwrokserverproperties.dita#tadminconfigsettingnetwrokserverproperties"></xref>),
or you can start it by using a program. The following example shows how to start the Network
Server by using a program:</p></section>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita Mon Sep 18 18:58:29 2006
@@ -24,5 +24,7 @@
 In addition, it details the most basic <ph conref="devconrefs.dita#prod/productshortname"></ph>
deployment, <ph
 conref="devconrefs.dita#prod/productshortname"></ph> embedded in a Java application.</shortdesc>
 <prolog></prolog>
-<conbody></conbody>
+<conbody>
+<p><ph conref="devconrefs.dita#vers/jdbc4disclaimer"></ph></p>
+</conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/devguide/devconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/devconrefs.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/devconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/devconrefs.dita Mon Sep 18 18:58:29 2006
@@ -36,8 +36,25 @@
 <concept id="vers" xml:lang="en-us">
 <title>Version and release numbers</title>
 <conbody>
-<p><ph id="fullversionnumber">Open Source</ph></p>
+<p><ph id="fullversionnumber">Version 10.2</ph></p>
 <p><ph id="shortversionnumber">10.2</ph></p>
+<p><ph id="jdbc4disclaimer"><note type="attention">
+<ph conref="devconrefs.dita#prod/productshortname"></ph>
+<ph conref="devconrefs.dita#vers/fullversionnumber"></ph> 
+includes JDBC 4.0 functionality based on a pre-release of Java SE 6. 
+When you use <ph conref="devconrefs.dita#prod/productshortname"></ph>
+with a Java SE 6 virtual machine, 
+<ph conref="devconrefs.dita#prod/productshortname"></ph>
+will use its JDBC 3.0 drivers, just as with 1.4 and 1.5 virtual
+machines. JDBC 4.0 is available only to developers who download Java SE
+6 and use it to build in support for JDBC 4.0. The Release Notes explain
+how to build the JDBC 4.0 functionality with 
+<ph conref="devconrefs.dita#prod/productshortname"></ph>
+<ph conref="devconrefs.dita#vers/fullversionnumber"></ph>.
+A follow-on <ph conref="devconrefs.dita#prod/productshortname"></ph>
+release will include JDBC 4.0 functionality based on the final
+JDBC 4.0 specification once Java SE 6 becomes generally available.
+</note></ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Modified: db/derby/docs/branches/10.2/src/ref/refconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/refconrefs.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/refconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/refconrefs.dita Mon Sep 18 18:58:29 2006
@@ -37,6 +37,23 @@
 <title>Version and release numbers</title>
 <conbody>
 <p><ph id="fullversionnumber">Version 10.2</ph></p>
+<p><ph id="jdbc4disclaimer"><note type="attention">
+<ph conref="refconrefs.dita#prod/productshortname"></ph>
+<ph conref="refconrefs.dita#vers/fullversionnumber"></ph> 
+includes JDBC 4.0 functionality based on a pre-release of Java SE 6. 
+When you use <ph conref="refconrefs.dita#prod/productshortname"></ph>
+with a Java SE 6 virtual machine, 
+<ph conref="refconrefs.dita#prod/productshortname"></ph>
+will use its JDBC 3.0 drivers, just as with 1.4 and 1.5 virtual
+machines. JDBC 4.0 is available only to developers who download Java SE
+6 and use it to build in support for JDBC 4.0. The Release Notes explain
+how to build the JDBC 4.0 functionality with 
+<ph conref="refconrefs.dita#prod/productshortname"></ph>
+<ph conref="refconrefs.dita#vers/fullversionnumber"></ph>.
+A follow-on <ph conref="refconrefs.dita#prod/productshortname"></ph>
+release will include JDBC 4.0 functionality based on the final
+JDBC 4.0 specification once Java SE 6 becomes generally available.
+</note></ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Modified: db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita Mon Sep 18 18:58:29 2006
@@ -36,6 +36,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section><p>These classes are all related to <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 implementation of <i>javax.sql.DataSource</i> and related APIs. For more information,
 see the <cite><ph

Modified: db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita Mon Sep 18 18:58:29 2006
@@ -26,6 +26,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section><p><i>setXXXStream</i> requests stream data between the
application
 and the database.</p></section>
 <section><p>JDBC allows an IN parameter to be set to a Java input stream for

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita Mon Sep 18 18:58:29 2006
@@ -24,6 +24,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section><p>The class that loads <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 local JDBC driver is the class <i>org.apache.derby.jdbc.EmbeddedDriver</i>.
 Listed below are some of the ways to create instances of that class. Do not use the class
directly through the <i>java.sql.Driver</i> interface.

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita Mon Sep 18 18:58:29 2006
@@ -28,6 +28,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 JDBC 4.0 adds new capabilities to Connections:

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita Mon Sep 18 18:58:29 2006
@@ -27,6 +27,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 JDBC 4.0 introduces a simpler mechanism for

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita Mon Sep 18 18:58:29
2006
@@ -30,6 +30,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 <ph conref="refconrefs.dita#prod/productshortname"></ph>

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita Mon Sep 18 18:58:29 2006
@@ -25,6 +25,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 If your application runs on JDK 1.6 or higher, exceptions raised by

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita Mon Sep 18 18:58:29 2006
@@ -27,6 +27,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 <ph conref="refconrefs.dita#prod/productshortname"></ph>'s

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita Mon Sep 18 18:58:29 2006
@@ -33,6 +33,7 @@
 </keywords>
 </metadata></prolog>
 <refbody>
+<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 JDBC 4.0 adds some functionality to the core API. This section

Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita Mon Sep 18 18:58:29
2006
@@ -23,7 +23,11 @@
 <keywords><indexterm>ij.dataSource</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title><p>The <codeph>ij.dataSource</codeph>
property
+<section>
+<p><ph conref="toolsconrefs.dita#vers/jdbc4disclaimer"></ph></p>
+</section>
+<section>
+<title>Function</title><p>The <codeph>ij.dataSource</codeph>
property
 specifies the datasource to be used to access the database. When specifying
 a datasource, <ph conref="toolsconrefs.dita#prod/productshortname"></ph> does
 not use the DriverManager mechanism to establish connections.</p> </section>

Modified: db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita?view=diff&rev=447673&r1=447672&r2=447673
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita Mon Sep 18 18:58:29 2006
@@ -37,6 +37,23 @@
 <conbody>
 <p><ph id="fullversionnumber">Version 10.2</ph></p>
 <p><ph id="shortversionnumber">10.2</ph></p>
+<p><ph id="jdbc4disclaimer"> <note type="attention">
+<ph conref="toolsconrefs.dita#prod/productshortname"></ph>
+<ph conref="toolsconrefs.dita#vers/fullversionnumber"></ph> 
+includes JDBC 4.0 functionality based on a pre-release of Java SE 6. 
+When you use <ph conref="toolsconrefs.dita#prod/productshortname"></ph>
+with a Java SE 6 virtual machine, 
+<ph conref="toolsconrefs.dita#prod/productshortname"></ph>
+will use its JDBC 3.0 drivers, just as with 1.4 and 1.5 virtual
+machines. JDBC 4.0 is available only to developers who download Java SE
+6 and use it to build in support for JDBC 4.0. The Release Notes explain
+how to build the JDBC 4.0 functionality with 
+<ph conref="toolsconrefs.dita#prod/productshortname"></ph>
+<ph conref="toolsconrefs.dita#vers/fullversionnumber"></ph>.
+A follow-on <ph conref="toolsconrefs.dita#prod/productshortname"></ph>
+release will include JDBC 4.0 functionality based on the final
+JDBC 4.0 specification once Java SE 6 becomes generally available.
+</note></ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">



Mime
View raw message