db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1440264 - in /db/derby/code/trunk: java/client/org/apache/derby/jdbc/ java/engine/org/apache/derby/jdbc/ tools/javadoc/
Date Wed, 30 Jan 2013 03:46:09 GMT
Author: dag
Date: Wed Jan 30 03:46:07 2013
New Revision: 1440264

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

Patch derby-5955-javadoc, which updates the javadoc with a single line
usage advice at the top of the javadoc for all the data sources, and
also adds description of the new data sources to the jdbc package's
javadoc. Removed ClientBaseDataSource from the public api, added
adding ClientDriver40 to the jdbc4 instead of ClientDriver.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
    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/ClientDriver.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/BasicEmbeddedConnectionPoolDataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.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/EmbeddedSimpleDataSource.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
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/package.html
    db/derby/code/trunk/tools/javadoc/publishedapi.ant
    db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant
    db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
Wed Jan 30 03:46:07 2013
@@ -29,6 +29,9 @@ import org.apache.derby.shared.common.i1
 import org.apache.derby.shared.common.reference.MessageId;
 
 /**
+ * This datasource is suitable for client/server use of Derby,
+ * running on Java 8 Compact Profile 2 or higher.
+ * <p/>
  * BasicClientConnectionPoolDataSource40 is similar to
  * ClientConnectionPoolDataSource40 except that it does not support JNDI,
  * i.e. it does not implement {@code javax.naming.Referenceable}.

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java Wed
Jan 30 03:46:07 2013
@@ -29,6 +29,9 @@ import org.apache.derby.client.am.SqlExc
 import org.apache.derby.shared.common.reference.SQLState;
 
 /**
+ * This datasource is suitable for client/server use of Derby,
+ * running on Java 8 Compact Profile 2 or higher.
+ * <p/>
  * BasicClientDataSource40 is similar to ClientDataSource40 except it
  * can not be used with JNDI, i.e. it does not implement
  * {@code javax.naming.Referenceable}.

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java Wed
Jan 30 03:46:07 2013
@@ -26,6 +26,9 @@ import javax.sql.XAConnection;
 import javax.sql.XADataSource;
 
 /**
+ * This datasource is suitable for client/server use of Derby,
+ * running on Java 8 Compact Profile 2 or higher.
+ * <p/>
  * Similar to ClientXADataSource40 except it does not support JNDI,
  * i.e. it does not implement {@code javax.naming.Referenceable}.
  */

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=1440264&r1=1440263&r2=1440264&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
Wed Jan 30 03:46:07 2013
@@ -32,17 +32,14 @@ import org.apache.derby.shared.common.i1
 import org.apache.derby.shared.common.reference.MessageId;
 
 /**
+ * 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.
+ * <p/>
  * ClientConnectionPoolDataSource 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
- * Java Naming and Directory Interface (JNDI). Use
- * ClientConnectionPoolDataSource if your application runs under
- * JDBC 3.0 or JDBC 4.0, that is, on the following Java Virtual Machines:
- * <p/>
- * <UL>
- * <LI> JDBC 4.0 - Java SE 6
- * <LI> JDBC 3.0 - J2SE 5.0
- * </UL>
+ * Java Naming and Directory Interface (JNDI).
  */
 public class ClientConnectionPoolDataSource extends ClientDataSource 
     implements ClientConnectionPoolDataSourceInterface

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=1440264&r1=1440263&r2=1440264&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
Wed Jan 30 03:46:07 2013
@@ -28,18 +28,20 @@ import org.apache.derby.client.am.SqlExc
 import org.apache.derby.shared.common.reference.SQLState;
 
 /**
+ * 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:
+ * <ul>
+ *   <li> JDBC 4.0 - Java SE 6
+ *   <li> JDBC 3.0 - J2SE 5.0
+ * </ul>
  * 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
- * Java Naming and Directory Interface (JNDI). Use this factory
- * if your application runs at JDBC level 4.1 (or higher). Use
- * ClientConnectionPoolDataSource, instead, if your application runs under
- * JDBC 4.0 or JDBC 3.0, that is, on the following Java Virtual Machines:
- * <p/>
- * <UL>
- * <LI> JDBC 4.0 - Java SE 6
- * <LI> JDBC 3.0 - J2SE 5.0
- * </UL>
+ * Java Naming and Directory Interface (JNDI).
  */
 public class ClientConnectionPoolDataSource40
     extends ClientConnectionPoolDataSource

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=1440264&r1=1440263&r2=1440264&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 Wed Jan 30
03:46:07 2013
@@ -22,18 +22,16 @@
 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.
+ * <p/>
  * ClientDataSource is a simple data source implementation
  * that can be used for establishing connections in a
  * non-pooling, non-distributed environment.
  * The class ClientConnectionPoolDataSource can be used in a connection pooling environment,
  * and the class ClientXADataSource can be used in a distributed, and pooling
- * environment. Use these DataSources if your application runs under
- * JDBC 3.0 or JDBC 4.0, that is, on the following Java Virtual Machines:
- * <p/>
- * <UL>
- * <LI> JDBC 4.0 - Java SE 6
- * <LI> JDBC 3.0 - J2SE 5.0
- * </UL>
+ * environment.
  *
  * <p>The example below registers a DNC data source object with a JNDI naming service.
  * <pre>

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=1440264&r1=1440263&r2=1440264&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 Wed Jan
30 03:46:07 2013
@@ -28,20 +28,22 @@ import org.apache.derby.client.am.SqlExc
 import org.apache.derby.shared.common.reference.SQLState;
 
 /**
+ * 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:
+ * <ul>
+ *  <li> JDBC 4.0 - Java SE 6
+ *  <li> JDBC 3.0 - J2SE 5.0
+ * </ul>
  * ClientDataSource40 is a simple data source implementation
  * that can be used for establishing connections in a
  * 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 at
- * JDBC level 4.1 (or higher). Use the corresponding ClientDataSource,
- * ClientConnectionPoolDataSource, and ClientXADataSource classes if
- * your application runs in the following environments:
- * <p/>
- *  <UL>
- *  <LI> JDBC 4.0 - Java SE 6
- *  <LI> JDBC 3.0 - J2SE 5.0
- * </UL>
+ * environment.
  *
  * <p>The example below registers a DNC data source object with a JNDI naming service.
  * <pre>

Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java Wed Jan 30 03:46:07
2013
@@ -35,7 +35,9 @@ import org.apache.derby.shared.common.re
 import org.apache.derby.shared.common.reference.SQLState;
 import org.apache.derby.shared.common.reference.MessageId;
 
-
+/**
+ * The client JDBC driver (type 4) for Derby.
+ */
 public class ClientDriver implements java.sql.Driver {
     private transient int traceFileSuffixIndex_ = 0;
 

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=1440264&r1=1440263&r2=1440264&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 Wed Jan
30 03:46:07 2013
@@ -28,8 +28,9 @@ import org.apache.derby.client.am.SqlExc
 import org.apache.derby.client.net.NetLogWriter;
 
 /**
- * <p>
- * This is Derby's network XADataSource for use with JDBC 3.0 and JDBC 4.0.
+ * 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.
  * </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=1440264&r1=1440263&r2=1440264&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 Wed Jan
30 03:46:07 2013
@@ -28,21 +28,20 @@ import org.apache.derby.client.am.SqlExc
 import org.apache.derby.shared.common.reference.SQLState;
 
 /**
- * <p>
- * This is Derby's network XADataSource for use with JDBC 4.1.
- * </p>
+ * 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:
+ * <ul>
+ *   <li> JDBC 4.0 - Java SE 6
+ *   <li> JDBC 3.0 - J2SE 5.0
+ * </ul>
+ *
  * 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.
  * <P>
- * Use ClientXADataSource40 if your application runs at JDBC level 4.1 (or
- * higher). Use ClientXADataSource
- * if your application runs in the following environments:
- * <UL>
- * <LI> JDBC 4.0 - Java SE 6
- * <LI> JDBC 3.0 - J2SE 5.0
- * </UL>
- *
  * <P>ClientXADataSource40 is serializable and referenceable.</p>
  *
  * <P>See ClientDataSource40 for DataSource properties.</p>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
Wed Jan 30 03:46:07 2013
@@ -24,6 +24,9 @@ import java.sql.SQLException;
 import javax.sql.PooledConnection;
 
 /**
+ * This datasource is suitable for an application using embedded Derby,
+ * running on Java 8 Compact Profile 2 or higher.
+ * <p/>
  * BasicEmbeddedConnectionPoolDataSource40 is similar to
  * EmbeddedConnectionPoolDataSource40 except it does not support JNDI naming,
  * i.e. it does not implement {@code javax.naming.Referenceable}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java Wed
Jan 30 03:46:07 2013
@@ -27,6 +27,9 @@ import org.apache.derby.impl.jdbc.Util;
 
 /**
  *
+ * This datasource is suitable for an application using embedded Derby,
+ * running on Java 8 Compact Profile 2 or higher.
+ * <p/>
  * BasicEmbeddedDataSource40 is similar to EmbeddedDataSource40, but does
  * not support JNDI naming, i.e. it does not implement
  * {@code javax.naming.Referenceable}.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
Wed Jan 30 03:46:07 2013
@@ -27,6 +27,9 @@ import org.apache.derby.iapi.jdbc.Resour
 
 /**
  *
+ * This datasource is suitable for an application using embedded Derby,
+ * running on Java 8 Compact Profile 2 or higher.
+ * <p/>
  * BasicEmbeddedXADataSource40 is similar to
  * EmbeddedXADataSource40, except that it does not support JNDI
  * naming, i.e. it does not implement {@code javax.naming.Referenceable}.

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=1440264&r1=1440263&r2=1440264&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
Wed Jan 30 03:46:07 2013
@@ -25,8 +25,12 @@ import java.sql.SQLException;
 import javax.sql.PooledConnection;
 
 /** 
-	EmbeddedConnectionPoolDataSource is Derby's ConnectionPoolDataSource
-	implementation for JDBC 3.0 and JDBC 4.0.
+    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.
+    <p/>
+   EmbeddedConnectionPoolDataSource is a ConnectionPoolDataSource
+   implementation.
 	
 
 	<P>A ConnectionPoolDataSource is a factory for PooledConnection

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=1440264&r1=1440263&r2=1440264&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
Wed Jan 30 03:46:07 2013
@@ -25,23 +25,21 @@ import java.util.logging.Logger;
 import org.apache.derby.impl.jdbc.Util;
 
 /** 
-	EmbeddedConnectionPoolDataSource40 is Derby's ConnectionPoolDataSource
-    implementation for JDBC 4.1 (and higher) environments.
-	
+    This datasource is suitable for an application using embedded Derby,
+    running on full Java SE 7, corresponding to JDBC 4.1.
+    <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>
+    </ul>
+    <p>EmbeddedConnectionPoolDataSource40 is a ConnectionPoolDataSource
+    implementation.
 
 	<P>A ConnectionPoolDataSource is a factory for PooledConnection
 	objects. An object that implements this interface will typically be
 	registered with a JNDI service.
-	<P>
-    Use EmbeddedConnectionPoolDataSource40 if your application runs at JDBC
-    level 4.1 (or higher).
-	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>
-	</UL>	
 
 	<P>EmbeddedConnectionPoolDataSource40 is serializable and referenceable.
 

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=1440264&r1=1440263&r2=1440264&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 Wed Jan
30 03:46:07 2013
@@ -30,9 +30,10 @@ import javax.naming.Referenceable;
 import javax.naming.StringRefAddr;
 
 /** 
-
-    EmbeddedDataSource is Derby's DataSource implementation for JDBC 3.0
-    and JDBC 4.0.
+    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.
+    <p/>
 
 	<P>A DataSource  is a factory for Connection objects. An object that
 	implements the DataSource interface will typically be registered with a

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=1440264&r1=1440263&r2=1440264&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 Wed Jan
30 03:46:07 2013
@@ -27,23 +27,25 @@ import org.apache.derby.impl.jdbc.Util;
 
 /** 
 
-	EmbeddedDataSource40 is Derby's DataSource implementation for JDBC 4.1.
+    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:
+
+    <ul>
+      <li> JDBC 3.0 - J2SE 5.0 </li>
+      <li> JDBC 4.0 - Java SE 6 </li>
+    </ul>
+    <p>
+    EmbeddedDataSource40 is a DataSource implementation.
 
 	<P>A DataSource  is a factory for Connection objects. An object that
 	implements the DataSource interface will typically be registered with a
 	JNDI service provider.
 	<P>
-    Use EmbeddedDataSource40 if your application runs at JDBC level 4.1
-    (or higher).
-	Use EmbeddedDataSource
-	if your application is runs in one of the following older
-	environments:
-	<UL>
-    <LI> JDBC 3.0 - J2SE 5.0 </LI>
-    <LI> JDBC 4.0 - Java SE 6 </LI>
-	</UL>	
-
-	<P>The following is a list of properties that can be set on a Derby
+   The following is a list of properties that can be set on a Derby
 	DataSource object:
 	<P><B>Standard DataSource properties</B> (from JDBC 3.0 specification).
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedSimpleDataSource.java Wed
Jan 30 03:46:07 2013
@@ -41,11 +41,12 @@ import org.apache.derby.impl.jdbc.Util;
 
 /**
  * 
- * 
+ * This datasource is suitable for an application using embedded Derby,
+ * running on CDC/Foundation Profile 1.1.
+ * <p/>
  * EmbeddedSimpleDataSource is Derby's DataSource implementation
  * for J2ME/CDC/Foundation. It is also supports J2SE platforms.
  * 
- * 
  * Supports the same properties as EmbeddedDataSource, see that class for details.
  * <P>
 	EmbeddedSimpleDataSource automatically supports the correct JDBC specification version

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=1440264&r1=1440263&r2=1440264&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 Wed Jan
30 03:46:07 2013
@@ -33,8 +33,11 @@ import org.apache.derby.iapi.services.mo
 
 /**
 
-    EmbeddedXADataSource is Derby's XADataSource implementation for JDBC 3.0
-    and JDBC 4.0.
+    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.
+    <p/>
+    EmbeddedXADataSource is an XADataSource implementation.
 
 	<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/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=1440264&r1=1440263&r2=1440264&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 Wed
Jan 30 03:46:07 2013
@@ -27,25 +27,26 @@ import org.apache.derby.impl.jdbc.Util;
 
 /**
 
-    EmbeddedXADataSource40 is Derby's XADataSource implementation for
-    JDBC 4.1 (and higher).
-
-	<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.   	
-	<P>
-    Use EmbeddedXADataSource40 if your application runs at JDBC level 4.1
-    (or higher).
+    This datasource is suitable for an application using embedded Derby,
+    running on full Java SE 7, corresponding to JDBC 4.1.
+    <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>
-	</UL>
-
-	<P>EmbeddedXADataSource40 object only works on a local database.  There is no
-	client/server support.  An EmbeddedXADataSource40 object must live in the same jvm as
-	the database. 
+    <ul>
+      <li> JDBC 3.0 - J2SE 5.0 </li>
+      <li> JDBC 4.0 - Java SE 6 </li>
+    </ul>
+    <p>
+    EmbeddedXADataSource40 is an XADataSource implementation.
+
+   <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.
+
+   <p> EmbeddedXADataSource40 object only works on a local database.
+   There is no client/server support.  An EmbeddedXADataSource40
+   object must live in the same jvm as the database.
 
 	<P>EmbeddedXADataSource40 is serializable and referenceable.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/package.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/package.html?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/package.html (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/package.html Wed Jan 30 03:46:07
2013
@@ -19,10 +19,11 @@
 <P>
 Client/Remote driver and data sources, used to connect to the network server
 <UL>
-<LI> <B>ClientDriver</B> - Type 4 JDBC driver
-<LI> <B>ClientDataSource</B> - Data source
-<LI> <B>ClientConnectionPoolDataSource</B> - Connection pooling data source
-<LI> <B>ClientXADataSource</B> - XA data source
+<LI> <B>ClientDriver, ClientDriver40</B> - Type 4 JDBC drivers
+<LI> <B>ClientDataSource, ClientDataSource40</B> - Data sources
+<LI> <B>ClientConnectionPoolDataSource, ClientConnectionPoolDataSource40</B>
-
+        Connection pooling data sources
+<LI> <B>ClientXADataSource, ClientXADataSource40</B> - XA data sources
 </UL>
 <P>
 Embedded driver and data sources, used when the database engine is embedded with the application.
@@ -33,7 +34,26 @@ Embedded driver and data sources, used w
 <LI> <B>EmbeddedConnectionPoolSource, EmbeddedConnectionPoolSource40</B>
- Connection pooling data source
 <LI> <B>EmbeddedXASource, EmbeddedXASource40</B> - XA data sources
 </UL>
-<P>
+
+<p>
+Client/server data sources for use with Java 8 Compact Profile 2 and above:
+<ul>
+  <li> <b>BasicClientDataSource40</b> - Data source
+  <li> <b>BasicClientConnectionPoolDataSource40</b> - Connection pooling
data
+    source
+  <li> <b>BasicClientXADataSource40</b> - XA data source
+</ul>
+
+<p>
+Embedded data sources for use with Java 8 Compact Profile 2 and above:
+<ul>
+  <li> <b>BasicEmbeddedDataSource40</b> - Data source for J2SE and J2EE
+  <li> <b>BasicEmbeddedConnectionPoolSource40</B> - Connection pooling
data
+    source
+  <li> <b>BasicEmbeddedXASource40</B> - XA data source
+</ul>
+
+<p>
 Derby's JDBC api is defined by its entry point classes, the drivers and data source implementations
 and the standard JDBC api definitions of the <code>java.sql</code> and <code>javax.sql</code>
classes.
 Derby does not provide non-standard extensions to standard JDBC classes such as <code>Connection</code>,

Modified: db/derby/code/trunk/tools/javadoc/publishedapi.ant
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/publishedapi.ant?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/tools/javadoc/publishedapi.ant (original)
+++ db/derby/code/trunk/tools/javadoc/publishedapi.ant Wed Jan 30 03:46:07 2013
@@ -42,8 +42,6 @@ org/apache/derby/drda/NetworkServerContr
 
 # package: org.apache.derby.jdbc
 
-org/apache/derby/jdbc/ClientBaseDataSource.java
-org/apache/derby/jdbc/ClientDriver.java
 org/apache/derby/jdbc/EmbeddedDriver.java
 
 # package: org.apache.derby.tools

Modified: db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant (original)
+++ db/derby/code/trunk/tools/javadoc/publishedapi_jdbc3.ant Wed Jan 30 03:46:07 2013
@@ -33,6 +33,7 @@
 
 # package: org.apache.derby.jdbc
 
+org/apache/derby/jdbc/ClientDriver.java
 org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
 org/apache/derby/jdbc/ClientDataSource.java
 org/apache/derby/jdbc/ClientXADataSource.java

Modified: db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant?rev=1440264&r1=1440263&r2=1440264&view=diff
==============================================================================
--- db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant (original)
+++ db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant Wed Jan 30 03:46:07 2013
@@ -33,6 +33,7 @@
 
 # package: org.apache.derby.jdbc
 
+org/apache/derby/jdbc/ClientDriver40.java
 org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
 org/apache/derby/jdbc/ClientDataSource40.java
 org/apache/derby/jdbc/ClientXADataSource40.java



Mime
View raw message