db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1345197 - in /db/derby/code/trunk: ./ java/client/org/apache/derby/jdbc/ java/engine/org/apache/derby/jdbc/
Date Fri, 01 Jun 2012 14:30:38 GMT
Author: rhillegas
Date: Fri Jun  1 14:30:38 2012
New Revision: 1345197

URL: http://svn.apache.org/viewvc?rev=1345197&view=rev
Log:
DERBY-5488: Adjust top level index.html (and JDBC 4.1 javadoc) to note that the JDBC 4.1 DataSources
should be used on Java 7 and higher as well as on Java 6.

Modified:
    db/derby/code/trunk/index.html
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource40.java
    db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource40.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource40.java

Modified: db/derby/code/trunk/index.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/index.html?rev=1345197&r1=1345196&r2=1345197&view=diff
==============================================================================
--- db/derby/code/trunk/index.html (original)
+++ db/derby/code/trunk/index.html Fri Jun  1 14:30:38 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).</li>
-<li><a href="javadoc/jdbc4/index.html">JDBC 4.0 Public API</a> - Consult
this
-javadoc if your application runs on Java SE 6.</li>
+<li><a href="javadoc/jdbc4/index.html">JDBC 4.1 Public API</a> - Consult
this
+javadoc if your application runs on Java SE 6 or higher.</li>
 </ul>
 <p>
 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 <a
href="docs/html/adminguide/index.html">Derby Server and Administration Guide</a>
<a href="docs/pdf/adminguide/derbyadmin.pdf">[PDF]</a>.

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=1345197&r1=1345196&r2=1345197&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 Jun  1 14:30:38 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/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=1345197&r1=1345196&r2=1345197&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 Jun
 1 14:30:38 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:
  * <p/>

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=1345197&r1=1345196&r2=1345197&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 Jun
 1 14:30:38 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.   	
  * <P>
- * 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:
  * <UL>
  * <LI> JDBC 3.0 - Java 2 - JDK 1.4, J2SE 5.0

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=1345197&r1=1345196&r2=1345197&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 Jun  1 14:30:38 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.
 	
 
 	<P>A ConnectionPoolDataSource is a factory for PooledConnection
 	objects. An object that implements this interface will typically be
 	registered with a JNDI service.
 	<P>
-	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:
 	<UL>

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=1345197&r1=1345196&r2=1345197&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 Jun
 1 14:30:38 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).
 	
 
 	<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>
-	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:
 	<UL>
 	<LI> JDBC 3.0 - Java 2 - JDK 1.4, J2SE 5.0

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=1345197&r1=1345196&r2=1345197&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
Jun  1 14:30:38 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).
 	
 
 	<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 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:
 	<UL>
 	<LI> JDBC 3.0 - Java 2 - JDK 1.4, J2SE 5.0



Mime
View raw message