db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r425409 - in /db/derby/docs/trunk/src/adminguide: cadminembeddedserver.dita cadminnsdatasources.dita cadminovcliconnect.dita radminappsclientxmp.dita radminembeddedserverex.dita radminovnssample.dita
Date Tue, 25 Jul 2006 14:55:56 GMT
Author: rhillegas
Date: Tue Jul 25 07:55:55 2006
New Revision: 425409

URL: http://svn.apache.org/viewvc?rev=425409&view=rev
Log:
DERBY-1271: Commit derby-1271_adminGuide_v01.diff, the JDBC4-related changes to the Administrator's
Guide.

Modified:
    db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita
    db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
    db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
    db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
    db/derby/docs/trunk/src/adminguide/radminovnssample.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita?rev=425409&r1=425408&r2=425409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminembeddedserver.dita Tue Jul 25 07:55:55 2006
@@ -22,7 +22,11 @@
 <conbody>
 <p>In one thread, the embedding application starts the local JDBC driver for
 its own access.</p>
-<codeblock>/* loading the client driver boots the client driver only*/
+<codeblock>/*
+    If you are running on JDK 1.6 or higher, then you do not
+    need to invoke Class.forName(). In that environment, the
+    EmbeddedDriver loads automatically.
+*/
 Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
 Connection conn = DriverManager.getConnection(
     "jdbc:derby:sample");

Modified: db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?rev=425409&r1=425408&r2=425409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Tue Jul 25 07:55:55 2006
@@ -21,7 +21,13 @@
 <prolog></prolog>
 <conbody>
 <p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Client driver DataSources <codeph>org.apache.derby.jdbc.ClientDataSource</codeph>
and <codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph
-> are supported by the Network Server.</p>
+Client driver DataSources
+<codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph>
+are supported by the Network Server. If your client runs on JDK 1.6
+or higher, the DataSources are, instead:
+<codeph>org.apache.derby.jdbc.ClientDataSource40</codeph> and
+<codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource40</codeph>
+</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita?rev=425409&r1=425408&r2=425409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita Tue Jul 25 07:55:55 2006
@@ -29,15 +29,17 @@
 program that interacts with the <ph conref="adminconrefs.dita#prod/productshortname"></ph>
Network Server from another JVM.
 The program performs the following tasks:
 <ul>
-<li>Loads the network client driver</li>
-<li>Obtains a client connection by using the DriverManager</li>
-<li>Obtains a client connection by using a DataSource</li>
-<li>Tests the database connections by running a sample query</li>
-<li>Closes the connections and then exits the program</li>
+<li>Loads the network client driver. (Note that this step is not
+necessary if you are running the client on JDK 1.6 or higher. In that
+environment, the network client driver loads automatically.)</li>
+<li>Obtains a client connection by using the DriverManager.</li>
+<li>Obtains a client connection by using a DataSource.</li>
+<li>Tests the database connections by running a sample query.</li>
+<li>Closes the connections and then exits the program.</li>
 </ul></p>
 <p>You must install the following files in the <codeph>%<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>%\demo\nserverdemo\</codeph>
directory before you can run the sample program:
 <ul>
-<li>The source file: <filepath>SimpleNetworkClientSample.java</filepath></li>
-<li>The compiled class file: <filepath>SimpleNetworkClientSample.class</filepath></li>
+<li>The source file: <filepath>SimpleNetworkClientSample.java.</filepath></li>
+<li>The compiled class file: <filepath>SimpleNetworkClientSample.class.</filepath></li>
 </ul></p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?rev=425409&r1=425408&r2=425409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Tue Jul 25 07:55:55 2006
@@ -45,7 +45,12 @@
 password=no12see</codeblock></section>
 <section><title>Example 4</title><p>The following example shows how
to use
 the network client driver to connect the network client to the Network Server:</p><codeblock>String
databaseURL = "jdbc:derby://localhost:1527/sample";
-<b>// Load Derby Network Client driver class</b>
+<b>//
+// Load Derby Network Client driver class
+// If you are running on JDK 1.6 or higher, then you do not
+// need to invoke Class.forName(). In that environment, the
+// network client driver loads automatically.
+//</b>
 Class.forName("org.apache.derby.jdbc.ClientDriver");
 <b>// Set user and password properties</b>
 Properties properties = new Properties();

Modified: db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita?rev=425409&r1=425408&r2=425409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita Tue Jul 25 07:55:55 2006
@@ -42,6 +42,11 @@
 props.put("user","usr");
 props.put("password","pwd");
 
+/*
+    If you are running on JDK 1.6 or higher, then you do not
+    need to invoke Class.forName(). In that environment, the
+    EmbeddedDriver loads automatically.
+*/
 Class.forName("org.apache.derby.jdbc.ClientDriver").newInstance();
 Connection conn = DriverManager.getConnection(nsURL, props);
 

Modified: db/derby/docs/trunk/src/adminguide/radminovnssample.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminovnssample.dita?rev=425409&r1=425408&r2=425409&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminovnssample.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminovnssample.dita Tue Jul 25 07:55:55 2006
@@ -28,7 +28,9 @@
 <section><p>The <i>NsSample</i> program performs the following tasks:
<ul>
 <li>Starts the Network Server. </li>
 <li>Checks that the Network Server is running.</li>
-<li>Loads the Network Client driver. </li>
+<li>Loads the Network Client driver. (Note that this step is not
+necessary if you are running the client on JDK 1.6 or higher. In that
+environment, the network client driver loads automatically.)</li>
 <li>Creates the <i>NsSampledb</i> database if not already created. </li>
 <li>Checks to see if the schema is already created, and if not, creates the
 schema which includes the SAMPLETBL table and corresponding indexes. </li>



Mime
View raw message