db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1441327 - in /db/derby/code/trunk/java: client/org/apache/derby/jdbc/ engine/org/apache/derby/jdbc/
Date Fri, 01 Feb 2013 07:42:53 GMT
Author: dag
Date: Fri Feb  1 07:42:53 2013
New Revision: 1441327

URL: http://svn.apache.org/viewvc?rev=1441327&view=rev
Log:
DERBY-5955 Prepare Derby to run with Compact Profiles (JEP 161)

Patch derby-5955-javadoc-followup; typo fix plus clarify usage: JDBC 4.2/Java
8/Java 8 Compact profile 2.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
Fri Feb  1 07:42:53 2013
@@ -34,7 +34,7 @@ import org.apache.derby.shared.common.re
 /**
  * This datasource is suitable for a client/server use of Derby,
  * running on full Java SE 5 or 6, corresponding to JDBC 3.0 and 4.0.
- * If running on Java SE 7 og higher, consider a more capable data source.
+ * If running on Java SE 7 or higher, consider a more capable data source.
  * <p/>
  * ClientConnectionPoolDataSource is a factory for PooledConnection objects.
  * An object that implements this interface

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
Fri Feb  1 07:42:53 2013
@@ -29,15 +29,24 @@ import org.apache.derby.shared.common.re
 
 /**
  * This datasource is suitable for a client/server use of Derby,
- * running on full Java SE 7, corresponding to JDBC 4.1.
- * <p/>
- * Use ClientConnectionPoolDataSource, instead, if your application
- * runs under JDBC 4.0 or JDBC 3.0, that is, on the following Java
- * Virtual Machines:
+ * running on the following platforms:
+ * <p>
+ * <ul>
+ *   <li>JDBC 4.1 - Java SE 7
+ *   <li>JDBC 4.2 - full Java SE 8
+ * </ul>
+ * <p>
+ * Use BasicClientConnectionPoolDataSource40 if your application
+ * runs on Java 8 Compact Profile 2.
+ * <p>
+ * Use ClientConnectionPoolDataSource if your application
+ * runs on the following platforms:
+ * <p>
  * <ul>
  *   <li> JDBC 4.0 - Java SE 6
  *   <li> JDBC 3.0 - J2SE 5.0
  * </ul>
+ * <p>
  * ClientConnectionPoolDataSource40 is a factory for PooledConnection objects.
  * An object that implements this interface
  * will typically be registered with a naming service that is based on the

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java Fri Feb  1
07:42:53 2013
@@ -24,7 +24,7 @@ package org.apache.derby.jdbc;
 /**
  * This datasource is suitable for a client/server use of Derby,
  * running on full Java SE 5 or 6, corresponding to JDBC 3.0 and 4.0.
- * If running on Java SE 7 og higher, consider a more capable data source.
+ * If running on Java SE 7 or higher, consider a more capable data source.
  * <p/>
  * ClientDataSource is a simple data source implementation
  * that can be used for establishing connections in a

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource40.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource40.java Fri Feb
 1 07:42:53 2013
@@ -29,15 +29,24 @@ import org.apache.derby.shared.common.re
 
 /**
  * This datasource is suitable for a client/server use of Derby,
- * running on full Java SE 7, corresponding to JDBC 4.1.
- * <p/>
- * Use the corresponding ClientDataSource,
- * ClientConnectionPoolDataSource, and ClientXADataSource classes if
- * your application runs in the following environments:
+ * running on the following platforms:
+ * <p>
+ * <ul>
+ *   <li>JDBC 4.1 - Java SE 7
+ *   <li>JDBC 4.2 - full Java SE 8
+ * </ul>
+ * <p>
+ * Use BasicClientDataSource40 if your application runs on Java 8
+ * Compact Profile 2.
+ * <p>
+ * Use ClientDataSource if your application runs on the following
+ * platforms:
+ * <p>
  * <ul>
  *  <li> JDBC 4.0 - Java SE 6
  *  <li> JDBC 3.0 - J2SE 5.0
  * </ul>
+ * <p>
  * ClientDataSource40 is a simple data source implementation
  * that can be used for establishing connections in a
  * non-pooling, non-distributed environment.

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java Fri Feb
 1 07:42:53 2013
@@ -30,7 +30,7 @@ import org.apache.derby.client.net.NetLo
 /**
  * This datasource is suitable for a client/server use of Derby,
  * running on full Java SE 5 or 6, corresponding to JDBC 3.0 and 4.0.
- * If running on Java SE 7 og higher, consider a more capable data source.
+ * If running on Java SE 7 or higher, consider a more capable data source.
  * </p>
  * An XADataSource is a factory for XAConnection objects.  It represents a
  * RM in a DTP environment.  An object that implements the XADataSource

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java Fri Feb
 1 07:42:53 2013
@@ -29,15 +29,24 @@ import org.apache.derby.shared.common.re
 
 /**
  * This datasource is suitable for a client/server use of Derby,
- * running on full Java SE 7, corresponding to JDBC 4.1.
- * <p/>
- * Use ClientXADataSource if your application runs in the following
- * environments:
+ * running on the following platforms:
+ * <p>
+ * <ul>
+ *   <li>JDBC 4.1 - Java SE 7
+ *   <li>JDBC 4.2 - full Java SE 8
+ * </ul>
+ * <p>
+ * Use BasicClientXADataSource40 if your application runs on Java 8
+ * Compact Profile 2.
+ * <p>
+ * Use ClientXADataSource if your application runs on the following
+ * platforms:
+ * <p>
  * <ul>
  *   <li> JDBC 4.0 - Java SE 6
  *   <li> JDBC 3.0 - J2SE 5.0
  * </ul>
- *
+ * <p>
  * 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.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
Fri Feb  1 07:42:53 2013
@@ -27,7 +27,7 @@ import javax.sql.PooledConnection;
 /** 
     This datasource is suitable for an application using embedded Derby,
     running on full Java SE 5 or 6, corresponding to JDBC 3.0 and 4.0.
-    If running on Java SE 7 og higher, consider a more capable data source.
+    If running on Java SE 7 or higher, consider a more capable data source.
     <p/>
    EmbeddedConnectionPoolDataSource is a ConnectionPoolDataSource
    implementation.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
Fri Feb  1 07:42:53 2013
@@ -26,10 +26,19 @@ import org.apache.derby.impl.jdbc.Util;
 
 /** 
     This datasource is suitable for an application using embedded Derby,
-    running on full Java SE 7, corresponding to JDBC 4.1.
+    running on the following platforms:
+    <p>
+    <ul>
+      <li>JDBC 4.1 - Java SE 7
+      <li>JDBC 4.2 - full Java SE 8
+    </ul>
+    <p>
+    Use BasicEmbeddedConnectionPoolDataSource40 if your application
+    runs on Java 8 Compact Profile 2.
+    <p>
+    Use EmbeddedConnectionPoolDataSource if your application
+    runs on the following platforms:
     <p>
-    Use EmbeddedConnectionPoolDataSource if your application runs in
-    the following environments:
     <ul>
       <li> JDBC 3.0 - J2SE 5.0 </li>
       <li> JDBC 4.0 - Java SE 6 </li>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java Fri Feb
 1 07:42:53 2013
@@ -32,7 +32,7 @@ import javax.naming.StringRefAddr;
 /** 
     This datasource is suitable for an application using embedded Derby,
     running on full Java SE 5 or 6, corresponding to JDBC 3.0 and 4.0.
-    If running on Java SE 7 og higher, consider a more capable data source.
+    If running on Java SE 7 or higher, consider a more capable data source.
     <p/>
 
 	<P>A DataSource  is a factory for Connection objects. An object that

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java Fri Feb
 1 07:42:53 2013
@@ -28,12 +28,19 @@ import org.apache.derby.impl.jdbc.Util;
 /** 
 
     This datasource is suitable for an application using embedded Derby,
-    running on full Java SE 7, corresponding to JDBC 4.1.
-    <p/>
-
-    Use EmbeddedDataSource if your application is runs in one of the
-    following older environments:
-
+    running on the following platforms:
+    <p>
+    <ul>
+      <li>JDBC 4.1 - Java SE 7
+      <li>JDBC 4.2 - full Java SE 8
+    </ul>
+    <p>
+    Use BasicEmbeddedDataSource40 if your application runs on Java 8
+    Compact Profile 2.
+    <p>
+    Use EmbeddedDataSource if your application runs on the following
+    platforms:
+    <p>
     <ul>
       <li> JDBC 3.0 - J2SE 5.0 </li>
       <li> JDBC 4.0 - Java SE 6 </li>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java Fri Feb
 1 07:42:53 2013
@@ -35,7 +35,7 @@ import org.apache.derby.iapi.services.mo
 
     This datasource is suitable for an application using embedded Derby,
     running on full Java SE 5 or 6, corresponding to JDBC 3.0 and 4.0.
-    If running on Java SE 7 og higher, consider a more capable data source.
+    If running on Java SE 7 or higher, consider a more capable data source.
     <p/>
     EmbeddedXADataSource is an XADataSource implementation.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java?rev=1441327&r1=1441326&r2=1441327&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java Fri
Feb  1 07:42:53 2013
@@ -28,10 +28,19 @@ import org.apache.derby.impl.jdbc.Util;
 /**
 
     This datasource is suitable for an application using embedded Derby,
-    running on full Java SE 7, corresponding to JDBC 4.1.
+    running on the following platforms:
+    <p>
+    <ul>
+      <li>JDBC 4.1 - Java SE 7
+      <li>JDBC 4.2 - full Java SE 8
+    </ul>
+    <p>
+    Use BasicEmbeddedXADataSource40 if your application runs on Java 8
+    Compact Profile 2.
+    <p>
+    Use EmbeddedXADataSource if your application runs on the following
+    platforms:
     <p>
-	Use EmbeddedXADataSource
-	if your application runs in the following environments:
     <ul>
       <li> JDBC 3.0 - J2SE 5.0 </li>
       <li> JDBC 4.0 - Java SE 6 </li>



Mime
View raw message