db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r428167 - in /db/derby/docs/trunk/src/adminguide: cadminapps810777.dita derbyadmin.ditamap radminapps810699.dita
Date Wed, 02 Aug 2006 21:59:19 GMT
Author: jta
Date: Wed Aug  2 14:59:19 2006
New Revision: 428167

URL: http://svn.apache.org/viewvc?rev=428167&view=rev
Log:
DERBY-1628 Updated the name "IBM DB2 JDBC Universal Driver" to "IBM DB2 Driver 
for JDBC".  Patch contributed by Laura Stewart (scotsmatrix@gmail.com).

Modified:
    db/derby/docs/trunk/src/adminguide/cadminapps810777.dita
    db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
    db/derby/docs/trunk/src/adminguide/radminapps810699.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminapps810777.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps810777.dita?rev=428167&r1=428166&r2=428167&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps810777.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps810777.dita Wed Aug  2 14:59:19 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
  "../dtd/concept.dtd">
 <!-- 
@@ -16,18 +17,30 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
+<!--LS 8/1/06 - Updated for Derby-1628-->
 <concept id="cadminapps810777" xml:lang="en-us">
-<title>Accessing the Network Server by using the DB2 Universal Driver</title>
-<prolog></prolog>
+<title>Accessing the Network Server by using the <tm tmclass="ibm" tmowner="IBM
Corporation"
+tmtype="reg" trademark="DB2">DB2</tm> Driver for JDBC</title>
+<shortdesc>You can use the <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
+trademark="IBM">IBM</tm> <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
+trademark="DB2">DB2</tm> Driver for JDBC instead of the <ph conref="adminconrefs.dita#prod/productshortname"></ph>
network
+client driver to connect to the Network Server. </shortdesc>
+<prolog><metadata>
+<keywords><indexterm>drivers<indexterm>DB2 Driver for JDBC, overview</indexterm></indexterm>
+<indexterm>Network Server<indexterm>access using DB2 Driver for JDBC, overview</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <conbody>
-<p>You can use the DB2 Universal Driver instead of the <ph conref="adminconrefs.dita#prod/productshortname"></ph>
network
+<p>You can use the <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
+trademark="DB2">DB2</tm> Driver for JDBC instead of the <ph conref="adminconrefs.dita#prod/productshortname"></ph>
network
 client driver to connect to the Network Server. Your application needs to
 load the driver and connection URL that is specific to the Network Server.
 In addition, you specify a user name and password. If you have not set up
 authentication, you can use any value for the user name and password. The
 driver that you use  to access the Network Server is: <codeblock>com.ibm.db2.jcc.DB2Driver</codeblock>You
 must have the following two jar files present in your classpath in order to
-use the DB2 Universal Driver:<ul>
+use the <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm>
Driver
+for JDBC:<ul>
 <li><codeph>db2jcc.jar</codeph></li>
 <li><codeph>db2jcc_license_c.jar</codeph></li>
 </ul></p>
@@ -36,8 +49,9 @@
 &lt;<i>databaseName</i>&gt;[;&lt;<ph conref="adminconrefs.dita#prod/productshortname"></ph>
URL attribute&gt;=&lt;value&gt; [;...]]
 [:&lt;Universal Driver attribute&gt;=&lt;value&gt;; [...;]]</codeblock>
 <p>After you specify the database name and attributes, you can include attributes
-for the DB2 JDBC Driver. You must include a semicolon after the last Universal
-Driver attribute.</p>
+for the <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm>
Driver
+for JDBC. You must include a semicolon after the last <tm tmclass="ibm" tmowner="IBM Corporation"
+tmtype="reg" trademark="DB2">DB2</tm> Driver for JDBC attribute.</p>
 <dl><dlentry>
 <dt>server</dt>
 <dd>The name of the machine where the server is running. It can be the name
@@ -53,9 +67,10 @@
 can be a maximum of 18 characters. You must use quotation marks (") to include
 path information in the database name. Alternately, you can specify path information
 by setting the property <i>derby.system.home</i> in either the <codeph><i>derby.properties</i></codeph>
file
-or in the Java environment when you start the Network Server. See the <cite><ph
-conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for more information
-about defining the system home.</dd>
+or in the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
+trademark="Java">Java</tm> environment when you start the Network Server.
+See the <cite><ph conref="adminconrefs.dita#pub/citdevelop"></ph></cite>
for
+more information about defining the system home.</dd>
 </dlentry><dlentry>
 <dt><i><ph conref="adminconrefs.dita#prod/productlowercase"></ph>
URL attribute=value</i></dt>
 <dd>Optional database connection URL attributes that are supported by <ph
@@ -63,16 +78,21 @@
 conref="adminconrefs.dita#pub/citdevelop"></ph></cite> for more information.</dd>
 </dlentry><dlentry>
 <dt><i>Universal Driver Attribute=value</i></dt>
-<dd><p>Optional database connection URL attributes that are supported by the
-DB2 Universal JDBC Driver.</p><p>The DB2 JDBC Universal Driver requires that
-you set the Universal Driver user and password attributes to non-null values.</p><p>The
-following DB2 Universal JDBC Driver attributes are available to you when running
-the Network Server:</p><dl><dlentry>
+<dd><p>Optional database connection URL attributes that are supported by the
<tm
+tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm> Driver
+for JDBC.</p><p>The <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
+trademark="DB2">DB2</tm> Driver for JDBC requires that you set the user and
+password attributes to non-null values.</p><p>The following <tm tmclass="ibm"
+tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm> Driver for
+JDBC attributes are available to you when running the Network Server:</p><dl>
+<dlentry>
 <dt>user</dt>
-<dd><p>User name (required by the Universal JDBC Driver).</p></dd>
+<dd><p>User name (required by the <tm tmclass="ibm" tmowner="IBM Corporation"
+tmtype="reg" trademark="DB2">DB2</tm> Driver for JDBC).</p></dd>
 </dlentry><dlentry>
 <dt>password</dt>
-<dd><p>User password (required by the Universal JDBC Driver).</p></dd>
+<dd><p>User password (required by the <tm tmclass="ibm" tmowner="IBM Corporation"
+tmtype="reg" trademark="DB2">DB2</tm> Driver for JDBC).</p></dd>
 </dlentry><dlentry>
 <dt>portNumber</dt>
 <dd><p>The TCP/IP port number where the Network Server listens for connection
@@ -102,7 +122,9 @@
 server. The default value is true.</p></dd>
 </dlentry></dl></dd>
 </dlentry></dl>
-<section><title>Universal Driver System information</title><p>The
<ph conref="adminconrefs.dita#prod/productshortname"></ph> Network
-Server is compatible with the DB2 JDBC Universal Driver release 2.4 and higher.</p></section>
+<section><title><tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm>
Driver
+for JDBC System information</title><p>The <ph conref="adminconrefs.dita#prod/productshortname"></ph>
Network
+Server is compatible with the <tm tmclass="ibm" tmowner="IBM Corporation"
+tmtype="reg" trademark="DB2">DB2</tm> Driver for JDBC release 2.4 and higher.</p></section>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=428167&r1=428166&r2=428167&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Wed Aug  2 14:59:19 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "map.dtd">
 <!-- 
@@ -19,6 +20,7 @@
             specific language governing permissions and limitations
             under the License.
 -->
+<!--LS 8/1/06 - Updated for Derby-1628-->
 <map title="Server and Administration Guide">
 <topicmeta>
 <copyright>
@@ -102,8 +104,8 @@
 </topicref>
 <topicref href="radminappsclientxmp.dita" navtitle="Network client driver examples">
 </topicref>
-<topicref collection-type="family" href="cadminapps810777.dita" navtitle="Accessing the
Network Server by using the DB2 Universal Driver">
-<topicref href="radminapps810699.dita" navtitle="DB2 Universal Driver examples"
+<topicref collection-type="family" href="cadminapps810777.dita" navtitle="Accessing the
Network Server by using the DB2 Driver for JDBC">
+<topicref href="radminapps810699.dita" navtitle="DB2 Driver for JDBC examples"
 toc="no"></topicref>
 </topicref>
 </topicref>

Modified: db/derby/docs/trunk/src/adminguide/radminapps810699.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminapps810699.dita?rev=428167&r1=428166&r2=428167&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminapps810699.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminapps810699.dita Wed Aug  2 14:59:19 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Arbortext, Inc., 1988-2005, v.4002-->
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -16,27 +17,41 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
+<!--LS 8/1/06 - Updated for Derby-1628-->
 <reference id="radminapps810699" xml:lang="en-us">
-<title>DB2 Universal Driver examples</title>
+<title><tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm>
Driver
+for JDBC examples</title>
+<shortdesc>The examples show how to specify the server name, database, and
+the URL attributes. You must specify the user name and password attributes
+when you use the <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
+trademark="IBM">IBM</tm> <tm tmclass="ibm" tmowner="IBM Corporation" tmtype="reg"
+trademark="DB2">DB2</tm> Driver for JDBC.</shortdesc>
+<prolog><metadata>
+<keywords><indexterm>drivers<indexterm>DB2 Driver for JDBC, examples</indexterm></indexterm>
+<indexterm>Network Server<indexterm>access using DB2 Driver for JDBC, examples</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
 <refbody>
 <section><title>Example 1</title><p>The following example connects
to the
 default server name <i>localhost</i> on the default port, <i>1527</i>,
and
-to the database <i>sample</i>. It specifies the URL attributes <i>user,
password,</i> and <i>retrieveMessagesFromServerOnGetMessage</i>.
-You must set the Universal Driver Attributes user name and password.</p><codeblock>jdbc:derby:net://localhost:1527/sample:user=judy;password=no12see;
+to the database <i>sample</i>. It specifies the URL attributes <i>user,
password,</i> and <i>retrieveMessagesFromServerOnGetMessage</i>. </p><codeblock
+>jdbc:derby:net://localhost:1527/sample:user=judy;password=no12see;
 retrieveMessagesFromServerOnGetMessage=true;</codeblock></section>
-<section><title>Example 2</title><p>The following example specifies
both <ph
-conref="adminconrefs.dita#prod/productshortname"></ph> and Universal Driver
-Attributes:  <codeblock>jdbc:derby:net://localhost:1527/sample;create=true:user=judy;
+<section><title>Example 2</title><p>The following example specifies
the attributes
+for both <ph conref="adminconrefs.dita#prod/productshortname"></ph> and the <tm
+tmclass="ibm" tmowner="IBM Corporation" tmtype="reg" trademark="DB2">DB2</tm> Driver
+for JDBC:  <codeblock>jdbc:derby:net://localhost:1527/sample;create=true:user=judy;
 password=no12see;retrieveMessagesFromServerOnGetMessage=true;</codeblock></p></section>
 <section><title>Example 3</title><p>This example connects to the
default server
 name <i>localhost</i> on the default port, <i>1527</i>, and includes
the path
 in the database name portion of the URL. The database name must be delimited
-by double quotes and you cannot specify <ph conref="adminconrefs.dita#prod/productshortname"></ph>
attributes
+by double quotation marks and you cannot specify <ph conref="adminconrefs.dita#prod/productshortname"></ph>
attributes
 on the URL.</p><codeblock>jdbc:derby:net://localhost:1527/"c:/my-db-dir/my-db-name":user=judy;
 password=no12see;retrieveMessagesFromServerOnGetMessage=true;</codeblock></section>
 <section><title>Example 4</title><p>The following is a sample program
fragment
-that connects to the Network Server using the Universal Driver:</p><codeblock>String
databaseURL = "jdbc:derby:net://localhost:1527/sample";
-<b>// Load IBM JDBC Universal Driver class</b>
+that connects to the Network Server using the <tm tmclass="ibm" tmowner="IBM Corporation"
+tmtype="reg" trademark="DB2">DB2</tm> Driver for JDBC:</p><codeblock>String
databaseURL = "jdbc:derby:net://localhost:1527/sample";
+<b>// Load DB2 Driver for JDBC class</b>
 Class.forName("com.ibm.db2.jcc.DB2Driver");
 <b>// Set user and password properties</b>
 Properties properties = new Properties();
@@ -47,4 +62,3 @@
 Connection conn = DriverManager.getConnection(databaseURL, properties); </codeblock></section>
 </refbody>
 </reference>
-



Mime
View raw message