Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3BDF99F8E for ; Fri, 1 Jun 2012 14:33:40 +0000 (UTC) Received: (qmail 70573 invoked by uid 500); 1 Jun 2012 14:33:40 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 70549 invoked by uid 500); 1 Jun 2012 14:33:40 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 70540 invoked by uid 99); 1 Jun 2012 14:33:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jun 2012 14:33:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jun 2012 14:33:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 68D6E2388980; Fri, 1 Jun 2012 14:33:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1345204 - in /db/derby/code/branches/10.9: ./ java/client/org/apache/derby/jdbc/ java/engine/org/apache/derby/jdbc/ Date: Fri, 01 Jun 2012 14:33:18 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120601143318.68D6E2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhillegas Date: Fri Jun 1 14:33:17 2012 New Revision: 1345204 URL: http://svn.apache.org/viewvc?rev=1345204&view=rev Log: DERBY-5488: Port 1345197 from trunk to 10.9 branch. Modified: db/derby/code/branches/10.9/ (props changed) db/derby/code/branches/10.9/index.html db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientDataSource40.java db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientXADataSource40.java db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java Propchange: db/derby/code/branches/10.9/ ------------------------------------------------------------------------------ Merged /db/derby/code/trunk:r1345197 Modified: db/derby/code/branches/10.9/index.html URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/index.html?rev=1345204&r1=1345203&r2=1345204&view=diff ============================================================================== --- db/derby/code/branches/10.9/index.html (original) +++ db/derby/code/branches/10.9/index.html Fri Jun 1 14:33:17 2012 @@ -45,8 +45,8 @@ Derby's JDBC API is documented in two se this javadoc if your application runs on J2SE 1.4, or J2SE 5.0. Also consult this javadoc if your application runs with the Java ME CDC/Foundation 1.1 Profile (JSR-169). -
  • JDBC 4.0 Public API - Consult this -javadoc if your application runs on Java SE 6.
    • +
  • JDBC 4.1 Public API - Consult this +javadoc if your application runs on Java SE 6 or higher.

    • For information on setting up and using the Derby Network Server, which provides a client/server access model for Derby databases on machines connected over a network, please read the Derby Server and Administration Guide [PDF]. Modified: db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java?rev=1345204&r1=1345203&r2=1345204&view=diff ============================================================================== --- db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java (original) +++ db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java Fri Jun 1 14:33:17 2012 @@ -34,7 +34,7 @@ import org.apache.derby.shared.common.re * An object that implements this interface * will typically be registered with a naming service that is based on the * Java Naming and Directory Interface (JNDI). Use this factory - * if your application runs under JDBC4.0. + * if your application runs at JDBC level 4.0 (or higher). * Use * ClientConnectionPoolDataSource, instead, if your application runs under * JDBC3.0 or JDBC2.0, that is, on the following Java Virtual Machines: Modified: db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientDataSource40.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientDataSource40.java?rev=1345204&r1=1345203&r2=1345204&view=diff ============================================================================== --- db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientDataSource40.java (original) +++ db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientDataSource40.java Fri Jun 1 14:33:17 2012 @@ -35,8 +35,8 @@ import org.apache.derby.shared.common.re * non-pooling, non-distributed environment. * The class ClientConnectionPoolDataSource40 can be used in a connection pooling environment, * and the class ClientXADataSource40 can be used in a distributed, and pooling - * environment. Use these DataSources if your application runs under - * JDBC4.0. Use the corresponding ClientDataSource, ClientConnectionPoolDataSource, and + * environment. Use these DataSources if your application runs at + * JDBC level 4.0 (or higher). Use the corresponding ClientDataSource, ClientConnectionPoolDataSource, and * ClientXADataSource classes if * your application runs in the following environments: *

    Modified: db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientXADataSource40.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientXADataSource40.java?rev=1345204&r1=1345203&r2=1345204&view=diff ============================================================================== --- db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientXADataSource40.java (original) +++ db/derby/code/branches/10.9/java/client/org/apache/derby/jdbc/ClientXADataSource40.java Fri Jun 1 14:33:17 2012 @@ -40,8 +40,8 @@ import org.apache.derby.shared.common.re * RM in a DTP environment. An object that implements the XADataSource * interface is typically registered with a JNDI service provider. *

    - * ClientXADataSource40 supports the JDBC 4.0 specification - * for the J2SE 6.0 Java Virtual Machine environment. Use ClientXADataSource + * Use ClientXADataSource40 if your application runs at JDBC level 4.0 (or higher). + * Use ClientXADataSource * if your application runs in the following environments: *

      *
    • JDBC 3.0 - Java 2 - JDK 1.4, J2SE 5.0 Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java?rev=1345204&r1=1345203&r2=1345204&view=diff ============================================================================== --- db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java (original) +++ db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java Fri Jun 1 14:33:17 2012 @@ -32,15 +32,15 @@ import org.apache.derby.iapi.reference.S /** EmbeddedConnectionPoolDataSource40 is Derby's ConnectionPoolDataSource - implementation for the JDBC4.0 environment. + implementation for JDBC 4.0 (and higher) environments.

      A ConnectionPoolDataSource is a factory for PooledConnection objects. An object that implements this interface will typically be registered with a JNDI service.

      - EmbeddedConnectionPoolDataSource40 supports the JDBC 4.0 specification - for the J2SE 6.0 Java Virtual Machine environment. Use + Use EmbeddedConnectionPoolDataSource40 if your application runs at JDBC level 4.0 (or higher). + Use EmbeddedConnectionPoolDataSource if your application runs in the following environments:

        Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java?rev=1345204&r1=1345203&r2=1345204&view=diff ============================================================================== --- db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java (original) +++ db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java Fri Jun 1 14:33:17 2012 @@ -32,16 +32,16 @@ import org.apache.derby.iapi.reference.S /** - EmbeddedDataSource40 is Derby's DataSource implementation for JDBC4.0. + EmbeddedDataSource40 is Derby's DataSource implementation for JDBC 4.0 (and higher).

        A DataSource is a factory for Connection objects. An object that implements the DataSource interface will typically be registered with a JNDI service provider.

        - EmbeddedDataSource40 supports the JDBC 4.0 specification - for the J2SE 6.0 Java Virtual Machine environment. Use EmbeddedDataSource - if your application is running in one of the following older + Use EmbeddedDataSource40 if your application runs at JDBC level 4.0 (or higher). + Use EmbeddedDataSource + if your application is runs in one of the following older environments:

        • JDBC 3.0 - Java 2 - JDK 1.4, J2SE 5.0 Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java?rev=1345204&r1=1345203&r2=1345204&view=diff ============================================================================== --- db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java (original) +++ db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java Fri Jun 1 14:33:17 2012 @@ -35,15 +35,15 @@ import org.apache.derby.iapi.reference.S /** - EmbeddedXADataSource40 is Derby's XADataSource implementation for JDBC4.0. + EmbeddedXADataSource40 is Derby's XADataSource implementation for JDBC 4.0 (and higher).

          An XADataSource is a factory for XAConnection objects. It represents a RM in a DTP environment. An object that implements the XADataSource interface is typically registered with a JNDI service provider.

          - EmbeddedXADataSource40 supports the JDBC 4.0 specification - for the J2SE 6.0 Java Virtual Machine environment. Use EmbeddedXADataSource + Use EmbeddedXADataSource40 if your application runs at JDBC level 4.0 (or higher). + Use EmbeddedXADataSource if your application runs in the following environments:

          • JDBC 3.0 - Java 2 - JDK 1.4, J2SE 5.0