Return-Path: 
 <derby-commits-return-7016-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 8563 invoked from network); 10 Apr 2007 20:51:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 10 Apr 2007 20:51:36 -0000
Received: (qmail 62898 invoked by uid 500); 10 Apr 2007 20:51:43 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 62867 invoked by uid 500); 10 Apr 2007 20:51:43 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 62856 invoked by uid 99); 10 Apr 2007 20:51:42 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2007 13:51:42 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2007 13:51:36 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id CE8B41A9838; Tue, 10 Apr 2007 13:51:15 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r527293 - in /db/derby/docs/trunk/src/ref:
 rrefjdbc4_0connection.dita rrefjdbc4_0dataSource.dita
Date: Tue, 10 Apr 2007 20:51:15 -0000
To: derby-commits@db.apache.org
From: scotsmatrix@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070410205115.CE8B41A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: scotsmatrix
Date: Tue Apr 10 13:51:14 2007
New Revision: 527293

URL: http://svn.apache.org/viewvc?view=rev&rev=527293
Log:
DERBY-2511: Removed inaccurate sentences regarding JDBC 4.0. This patch was contributed by Kim Haase.

Modified:
    db/derby/docs/trunk/src/ref/rrefjdbc4_0connection.dita
    db/derby/docs/trunk/src/ref/rrefjdbc4_0dataSource.dita

Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_0connection.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_0connection.dita?view=diff&rev=527293&r1=527292&r2=527293
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_0connection.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_0connection.dita Tue Apr 10 13:51:14 2007
@@ -22,8 +22,8 @@
 <title>java.sql.Connection interface: JDBC 4.0 features</title>
 <prolog><metadata>
 <keywords>
+<indexterm>Connection interface</indexterm>
 <indexterm>LOB creation</indexterm>
-<indexterm>Ease of development</indexterm>
 <indexterm>Validity tracking</indexterm>
 </keywords>
 </metadata></prolog>
@@ -36,10 +36,6 @@
 <li><b>LOB creation</b> - New methods, <i>createBlob()</i> and
 <i>createClob()</i> let you create empty Blobs and Clobs, which you
 can then fill up before stuffing into a column.</li>
-<li><b>Ease of development</b> - JDBC 4.0 introduces DataSet, a simple
-mechanism to iterate through a table. You obtain
-a DataSet by passing an annotated query to
-your Connection's <i>createQueryObject</i> method.</li>
 <li><b>Validity tracking</b> - The <i>isValid</i> method tells you
 whether your Connection is still alive.</li>
 </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?view=diff&rev=527293&r1=527292&r2=527293
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc4_0dataSource.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc4_0dataSource.dita Tue Apr 10 13:51:14 2007
@@ -22,29 +22,22 @@
 <title>javax.sql.DataSource interface: JDBC 4.0 features</title>
 <prolog><metadata>
 <keywords>
-<indexterm>Ease of development</indexterm>
-<indexterm>DataSource</indexterm>
+<indexterm>DataSource interface</indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
 <section>
 <p>
-JDBC 4.0 introduces a simpler mechanism for
-iterating through a table. You use this mechanism by passing an
-annotated query to your DataSource's <i>createQueryObject</i> method.
-To expose this <i>createQueryObject</i> method,
-<ph conref="../conrefs.dita#prod/productshortname"></ph>
-adds new JDBC 4.0-specific DataSources. Use these DataSources if your
+<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>
 <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.EmbeddedDriver</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.ClientDriver</b></li>
 <li><b>org.apache.derby.jdbc.ClientXADataSource40</b></li>
 </ul>
 </section>