Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 6966 invoked from network); 26 Mar 2007 19:04:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Mar 2007 19:04:15 -0000 Received: (qmail 2049 invoked by uid 500); 26 Mar 2007 19:04:22 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 2024 invoked by uid 500); 26 Mar 2007 19:04:22 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 2013 invoked by uid 99); 26 Mar 2007 19:04:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2007 12:04:22 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Mar 2007 12:04:11 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7EEF21A9838; Mon, 26 Mar 2007 12:03:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r522592 [1/2] - /db/derby/docs/trunk/src/adminguide/ Date: Mon, 26 Mar 2007 19:03:47 -0000 To: derby-commits@db.apache.org From: scotsmatrix@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070326190351.7EEF21A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: scotsmatrix Date: Mon Mar 26 12:03:40 2007 New Revision: 522592 URL: http://svn.apache.org/viewvc?view=rev&rev=522592 Log: DERBY-1590: Updated the conrefs for the Admin Guide. Patch derby-1590-adminguide.diff submitted by Kim Haase. Modified: db/derby/docs/trunk/src/adminguide/cadminadvtops.dita db/derby/docs/trunk/src/adminguide/cadminapps.dita db/derby/docs/trunk/src/adminguide/cadminapps49914.dita db/derby/docs/trunk/src/adminguide/cadminapps59125.dita db/derby/docs/trunk/src/adminguide/cadminapps810777.dita db/derby/docs/trunk/src/adminguide/cadminapps811478.dita db/derby/docs/trunk/src/adminguide/cadminapps811631.dita db/derby/docs/trunk/src/adminguide/cadminapps811656.dita db/derby/docs/trunk/src/adminguide/cadminappsclient.dita db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita db/derby/docs/trunk/src/adminguide/cadminov11108.dita db/derby/docs/trunk/src/adminguide/cadminov16172.dita db/derby/docs/trunk/src/adminguide/cadminov17524.dita db/derby/docs/trunk/src/adminguide/cadminov28261.dita db/derby/docs/trunk/src/adminguide/cadminov33597.dita db/derby/docs/trunk/src/adminguide/cadminov38650.dita db/derby/docs/trunk/src/adminguide/cadminov65220.dita db/derby/docs/trunk/src/adminguide/cadminov825125.dita db/derby/docs/trunk/src/adminguide/cadminov825149.dita db/derby/docs/trunk/src/adminguide/cadminov825266.dita db/derby/docs/trunk/src/adminguide/cadminov83312.dita db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita db/derby/docs/trunk/src/adminguide/cadminpartone.dita db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita db/derby/docs/trunk/src/adminguide/cadminrollforward.dita db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita db/derby/docs/trunk/src/adminguide/cadminspace21579.dita db/derby/docs/trunk/src/adminguide/radminapps810699.dita db/derby/docs/trunk/src/adminguide/radminapps811974.dita db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita db/derby/docs/trunk/src/adminguide/radminconsist30301.dita db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita db/derby/docs/trunk/src/adminguide/radminovnssample.dita db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita db/derby/docs/trunk/src/adminguide/radmintrademderby.dita db/derby/docs/trunk/src/adminguide/tadminapps811302.dita db/derby/docs/trunk/src/adminguide/tadminapps811345.dita db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita db/derby/docs/trunk/src/adminguide/tadminappssettingportnumbers.dita db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita db/derby/docs/trunk/src/adminguide/tadminconfig815768.dita db/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita db/derby/docs/trunk/src/adminguide/tadminconfigsysteminformation.dita db/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita db/derby/docs/trunk/src/adminguide/tadminlogfile.dita db/derby/docs/trunk/src/adminguide/tadminovclirun.dita db/derby/docs/trunk/src/adminguide/tadminovnsrundemo.dita db/derby/docs/trunk/src/adminguide/tadminovrunsrvprgm.dita Modified: db/derby/docs/trunk/src/adminguide/cadminadvtops.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminadvtops.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminadvtops.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminadvtops.dita Mon Mar 26 12:03:40 2007 @@ -21,6 +21,6 @@ -

This section discusses several advanced topics for users of the Network +

This section discusses several advanced topics for users of the Network Server.

 Modified: db/derby/docs/trunk/src/adminguide/cadminapps.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminapps.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminapps.dita Mon Mar 26 12:03:40 2007 @@ -25,7 +25,7 @@

This section describes the differences between running in embedded mode and +conref="../conrefs.dita#prod/productshortname"> in embedded mode and using the Network Server. Note that there may be undocumented differences that have not yet been identified.

 Modified: db/derby/docs/trunk/src/adminguide/cadminapps49914.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps49914.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminapps49914.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminapps49914.dita Mon Mar 26 12:03:40 2007 @@ -29,13 +29,13 @@ org.apache.derby.jdbc.ClientDataSource.STRONG_PASSWORD_SUBSTITUTE_SECURITY -

When running in -embedded mode or when using the Network +

When running in +embedded mode or when using the Network Server, you can enable or disable server-side user authentication. However, when using the Network Server, the default security mechanism (CLEAR_TEXT_PASSWORD_SECURITY) requires that you supply both the user name and password.

In addition to the default user name and password security mechanism, org.apache.derby.jdbc.ClientDataSource.CLEAR_TEXT_PASSWORD_SECURITY, Network Server +> Network Server supports the following security properties:

  • UserID (org.apache.derby.jdbc.ClientDataSource.USER_ONLY_SECURITY) @@ -49,7 +49,7 @@ never sent in any form across the network.

The user's name that is specified upon connection is the default schema -for the connection, if a schema with that name exists. See the for +for the connection, if a schema with that name exists. See the for more information on schema and user names.

If you specify any other security mechanism, you will receive an exception.

To change the default, you can specify another security mechanism either @@ -57,7 +57,7 @@ the connection. For details, see and "securityMechanism=value attribute" in the -.

+.

Whether the security mechanism you specify for the client actually takes effect depends upon the setting of the derby.drda.securityMechanism property for the Network Server. Modified: db/derby/docs/trunk/src/adminguide/cadminapps59125.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps59125.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminapps59125.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminapps59125.dita Mon Mar 26 12:03:40 2007 @@ -21,6 +21,6 @@ -

You must modify Java applications that currently run against in -embedded mode so that they work with the Network Server. The topics in this section discuss these changes.

+

You must modify Java applications that currently run against in +embedded mode so that they work with the Network Server. The topics in this section discuss these changes.

 Modified: db/derby/docs/trunk/src/adminguide/cadminapps810777.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps810777.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminapps810777.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminapps810777.dita Mon Mar 26 12:03:40 2007 @@ -24,7 +24,7 @@ tmtype="reg" trademark="DB2">DB2 Driver for JDBC You can use the IBM DB2 Driver for JDBC instead of the network +trademark="DB2">DB2 Driver for JDBC instead of the network client driver to connect to the Network Server. driversDB2 Driver for JDBC, overview @@ -33,7 +33,7 @@

You can use the DB2 Driver for JDBC instead of the network +trademark="DB2">DB2 Driver for JDBC instead of the 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 @@ -47,7 +47,7 @@

The syntax of the URL that is required to access the Network Server is:

jdbc:derby:net://<server>[:<port>]/ -<databaseName>[;< URL attribute>=<value> [;...]] +<databaseName>[;< URL attribute>=<value> [;...]] [:<Universal Driver attribute>=<value>; [...;]]

After you specify the database name and attributes, you can include attributes for the DB2 Driver @@ -70,13 +70,13 @@ by setting the property derby.system.home in either the derby.properties file or in the Java environment when you start the Network Server. -See the for +See the for more information about defining the system home. -

URL attribute=value
+
URL attribute=value
Optional database connection URL attributes that are supported by . See the for more information.
+conref="../conrefs.dita#prod/productshortname">. See the for more information.
Universal Driver Attribute=value

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 System information

The Network +for JDBC System information

The Network Server is compatible with the DB2 Driver for JDBC release 2.4 and higher.

 Modified: db/derby/docs/trunk/src/adminguide/cadminapps811478.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps811478.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminapps811478.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminapps811478.dita Mon Mar 26 12:03:40 2007 @@ -25,7 +25,7 @@ -

Both the embedded +

Both the embedded driver and the Network Server provide XA support. The Network Server provides DRDA level 7 support. DRDA clients that support XAMGR, such as the Derby network client, can send XA requests to Modified: db/derby/docs/trunk/src/adminguide/cadminapps811631.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps811631.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminapps811631.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminapps811631.dita Mon Mar 26 12:03:40 2007 @@ -23,7 +23,7 @@

When user authentication is enabled in -, you can use any of +, you can use any of the following security mechanisms:

  • Clear text user name and password security, the default
    • Modified: db/derby/docs/trunk/src/adminguide/cadminapps811656.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps811656.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminapps811656.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminapps811656.dita Mon Mar 26 12:03:40 2007 @@ -22,8 +22,8 @@ -

    When user authentication is turned off in , you can use any +

    When user authentication is turned off in , you can use any of the security mechanism options.

    You must provide a user and password for all security mechanisms except USER_ONLY_SECURITY. However, because user authentication -is disabled in the server, the user name and password that you supply does not have to be one recognized as valid by .

    +is disabled in the server, the user name and password that you supply does not have to be one recognized as valid by .

     Modified: db/derby/docs/trunk/src/adminguide/cadminappsclient.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclient.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminappsclient.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminappsclient.dita Mon Mar 26 12:03:40 2007 @@ -30,7 +30,7 @@

    The syntax of the URL that is required to access the Network Server is:jdbc:derby://<server>[:<port>]/ <databaseName>[;<URL attribute>=<value> [;...]] where the <URL attribute> is either a embedded or network +conref="../conrefs.dita#prod/productshortname"> embedded or network client attribute.

    Standard JDBC DataSource properties connectionAttributes String -Set to the list of embedded +Set to the list of embedded connection attributes separated by semicolons. Various This property is also available using EmbeddedDataSource. -See the for more information +See the for more information about the various connection attributes. Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminappsclientdiffs.dita Mon Mar 26 12:03:40 2007 @@ -24,7 +24,7 @@ driver -

    The following are known differences that exist between the embedded +

    The following are known differences that exist between the embedded driver and the network client driver. Note that there may be undocumented differences that have not yet been identified. Some differences with the network client may be changed in future releases to match the embedded driver functionality.

      Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Mon Mar 26 12:03:40 2007 @@ -19,7 +19,7 @@ --> Network client security -The Network +The Network Client allows you to select a security mechanism by specifying a value for the securityMechanism property. @@ -35,7 +35,7 @@ and deploy your own DataSource objects, invoke the DataSource.setSecurityMechanism method after you create a DataSource object.
    lists -the security mechanisms that the Network +the security mechanisms that the Network Client supports, and the corresponding property value to specify to obtain this securityMechanism. The default security mechanism is the user id only if no password is set. If the password is set, the default security mechanism Modified: db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Mon Mar 26 12:03:40 2007 @@ -19,7 +19,7 @@ --> Network client tracing -The Network +The Network client provides a tracing facility to collect JDBC trace information and view protocol flows. Modified: db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita Mon Mar 26 12:03:40 2007 @@ -23,7 +23,7 @@ The Network Server and JVMs -

    The Network Server is compatible with The Network Server is compatible with Java 2 Platform, Standard Edition, v 1.3.1 (J2SE) and above.

     Modified: db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminappsusingthederbytoolswiththene.dita Mon Mar 26 12:03:40 2007 @@ -21,6 +21,6 @@ -

    The tools ij and dblook work in embedded +

    The tools ij and dblook work in embedded mode and client/server mode.

     Modified: db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminconfig86869.dita Mon Mar 26 12:03:40 2007 @@ -19,8 +19,8 @@ --> Managing the Derby Network Server -The Network -Server can run as a stand-alone server, with as +The Network +Server can run as a stand-alone server, with as an embedded part of the application. Modified: db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminconfigoverview.dita Mon Mar 26 12:03:40 2007 @@ -21,11 +21,11 @@ Overview -

    You start the Network -Server using the command line or using the Server -API. ( provides +

    You start the Network +Server using the command line or using the Server +API. ( provides scripts for you to use to start the server from the command line.) Before -starting the server, you will probably set certain and +starting the server, you will probably set certain and Network Server properties.

         Modified: db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita Mon Mar 26 12:03:40 2007 @@ -27,7 +27,7 @@

    Typically, these procedures are used to speed up the copy operation involved -in an online backup. In this scenario, does +in an online backup. In this scenario, does not perform the copy operation for you. You use the SYSCS_UTIL.SYSCS_FREEZE_DATABASE procedure to lock the database, and then you explicitly copy the database directory by using operating system commands.

    @@ -43,7 +43,7 @@ system procedure to continue working with the database. Only after SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE has been specified can transactions once again write to the database. Read operations can proceed while the database is "frozen."

    -To ensure a consistent backup of the database, might +To ensure a consistent backup of the database, might block applications that attempt to write to a frozen database until the backup is completed and the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE system procedure is called. Modified: db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminhubbkup98797.dita Mon Mar 26 12:03:40 2007 @@ -20,7 +20,7 @@ --> Backing up and restoring databases - provides + provides a way to back up a database while it is online. You can also restore a full backup from a specified location. Modified: db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminlockvti42553.dita Mon Mar 26 12:03:40 2007 @@ -25,7 +25,7 @@ to help minimize -

    provides a tool +

    provides a tool to monitor and display locking information. This tool can help you create applications that minimize deadlock. It can also help you locate the cause of deadlock when it does occur.

    Modified: db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminlockvti83889.dita Mon Mar 26 12:03:40 2007 @@ -44,8 +44,8 @@ Use derby.locks.deadlockTrace with care. Setting this property can alter the timing of the application, severely affect performance, and produce a very large derby.log file. -

    For information about how to set properties, and information about the specific properties that are mentioned in this topic, see .

    -

    Here is an example of an error message when aborts +

    For information about how to set properties, and information about the specific properties that are mentioned in this topic, see .

    +

    Here is an example of an error message when aborts a transaction because of a deadlock:

    --SQLException Caught-- @@ -59,10 +59,10 @@ Waiting XID : {758, U} , APP, update employee set bonus=150 where salary=23840 Granted XID : {752, X} The selected victim is XID : 752 You can use the derby.locks.waitTimeout and derby.locks.deadlockTimeout properties -to configure how long waits +to configure how long waits for a lock to be released, or when to begin deadlock checking. For more information -about these properties, see the section that discusses controlling application -behavior in the . +about these properties, see the section that discusses controlling application +behavior in the .         Modified: db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminnetservsecurity.dita Mon Mar 26 12:03:40 2007 @@ -24,7 +24,7 @@ Serverand security changes -

    By default, the Network +

    By default, the Network Server will only listen on the localhost. Clients must use the localhost host name to connect. By default, clients cannot access the Network Server from another host. To enable connections from other hosts, set the derby.drda.host Modified: db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Mon Mar 26 12:03:40 2007 @@ -21,7 +21,7 @@ Accessing the Network Server by using a DataSource -

    The Network +

    The Network Client driver DataSources org.apache.derby.jdbc.ClientDataSource and org.apache.derby.jdbc.ClientConnectionPoolDataSource Modified: db/derby/docs/trunk/src/adminguide/cadminov11108.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov11108.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov11108.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov11108.dita Mon Mar 26 12:03:40 2007 @@ -21,5 +21,5 @@ -

    This section describes how to use in a multi-user (or "server") environment.

    +

    This section describes how to use in a multi-user (or "server") environment.

     Modified: db/derby/docs/trunk/src/adminguide/cadminov16172.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov16172.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov16172.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov16172.dita Mon Mar 26 12:03:40 2007 @@ -23,7 +23,7 @@ Isolation levels -

    supports SERIALIZABLE +

    supports SERIALIZABLE (RR), REPEATABLE (RS), READ COMMITTED (CS), and READ UNCOMMITTED (UR) isolation levels.

    @@ -41,8 +41,8 @@
    UR provides maximum concurrency, if uncommitted values are allowed in the query. It is typically used if approximate results are acceptable.
    -

    See "Types and Scope of Locks in Systems" -in the for +

    See "Types and Scope of Locks in Systems" +in the for more information.

     Modified: db/derby/docs/trunk/src/adminguide/cadminov17524.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov17524.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov17524.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov17524.dita Mon Mar 26 12:03:40 2007 @@ -21,20 +21,20 @@ Derby in a server framework -

    In a sense, is +

    In a sense, is always an embedded product. You can embed it in an application in which users access the database from a single JVM or you can embed it in a server framework -(an application that allows users from different JVMs to connect to simultaneously). -When is embedded -in an application, the local JDBC driver calls the local database. -When is embedded +(an application that allows users from different JVMs to connect to simultaneously). +When is embedded +in an application, the local JDBC driver calls the local database. +When is embedded in a server framework, the server framework's connectivity software provides data to multiple client JDBC applications over a network or the Internet.

    For local or remote multi-user connectivity (multiple users who access from different JVMs), -use the Network +conref="../conrefs.dita#prod/productshortname"> from different JVMs), +use the Network Server. If you require features that are not included in the Network Server, -you can embed the basic product +you can embed the basic product in another server framework.

     Modified: db/derby/docs/trunk/src/adminguide/cadminov28261.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov28261.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov28261.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov28261.dita Mon Mar 26 12:03:40 2007 @@ -25,13 +25,13 @@ -

    To support multi-user access, utilizes -row-level locking. However, you can configure to +

    To support multi-user access, utilizes +row-level locking. However, you can configure to use table-level locking in environments that have few concurrent transactions (for example, a read-only database) . Table-level locking is preferable if there are few or no writes to the server, while row-level locking is essential for good performance if many clients write to the server concurrently. The optimizer tunes lock +conref="../conrefs.dita#prod/productshortname"> optimizer tunes lock choice for queries automatically.

     Modified: db/derby/docs/trunk/src/adminguide/cadminov33597.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov33597.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov33597.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov33597.dita Mon Mar 26 12:03:40 2007 @@ -21,5 +21,5 @@ -

    contains some features that are useful for developing multi-user applications.

    +

    contains some features that are useful for developing multi-user applications.

     Modified: db/derby/docs/trunk/src/adminguide/cadminov38650.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov38650.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov38650.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov38650.dita Mon Mar 26 12:03:40 2007 @@ -21,7 +21,7 @@ -

    This guide assumes that you are familiar with features and tuning. Before reading this guide, you should first learn about basic functionality -by reading the . Also, because multi-user environments typically -have performance and tuning issues, you should read .

    +

    This guide assumes that you are familiar with features and tuning. Before reading this guide, you should first learn about basic functionality +by reading the . Also, because multi-user environments typically +have performance and tuning issues, you should read .

     Modified: db/derby/docs/trunk/src/adminguide/cadminov65220.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov65220.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov65220.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov65220.dita Mon Mar 26 12:03:40 2007 @@ -27,8 +27,8 @@ -

    allows multiple simultaneous connections to a database, even -in embedded mode. is also fully multi-threaded, and you can have +

    allows multiple simultaneous connections to a database, even +in embedded mode. is also fully multi-threaded, and you can have multiple threads active at the same time. However, JDBC semantics impose some -limitations on multi-threading. See the for more information.

    +limitations on multi-threading. See the for more information.

     Modified: db/derby/docs/trunk/src/adminguide/cadminov825125.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825125.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov825125.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov825125.dita Mon Mar 26 12:03:40 2007 @@ -21,25 +21,25 @@ Connectivity configurations -

    There are several ways to embed in +

    There are several ways to embed in a server framework:

    Use the Network Server
    This is the easiest way to provide connectivity to multiple users who -are accessing databases -from different JVMs. The Network -Server provides this kind of connectivity to databases +are accessing databases +from different JVMs. The Network +Server provides this kind of connectivity to databases within a single system or over a network.
    Purchase another server framework
    -
    You can use within +
    You can use within many server frameworks, such as IBM WebSphere Application Server.
    Write your own framework
    -
    's flexibility +
    's flexibility allows other configurations as well. For example, rather than embedding in a server that communicates -with a client that uses JDBC, you can embed within +conref="../conrefs.dita#prod/productshortname"> in a server that communicates +with a client that uses JDBC, you can embed within a servlet in a web server that communicates with a browser using HTTP.
     Modified: db/derby/docs/trunk/src/adminguide/cadminov825149.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825149.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov825149.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov825149.dita Mon Mar 26 12:03:40 2007 @@ -21,5 +21,5 @@ -

    Because is written in Java, you have great flexibility in how you choose to configure your deployment. For example, you can run , the JDBC server framework, and another application in the same JVM as a single process.

    +

    Because is written in Java, you have great flexibility in how you choose to configure your deployment. For example, you can run , the JDBC server framework, and another application in the same JVM as a single process.

     Modified: db/derby/docs/trunk/src/adminguide/cadminov825266.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov825266.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov825266.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov825266.dita Mon Mar 26 12:03:40 2007 @@ -21,27 +21,27 @@ The Derby Network Server -

    The Network -Server provides multi-user connectivity to databases +

    The Network +Server provides multi-user connectivity to databases within a single system or over a network. The Network Server uses the standard Distributed Relational Database Architecture (DRDA) protocol to receive and -reply to queries from clients. Databases are accessed through the Network -Server by using the Network +reply to queries from clients. Databases are accessed through the Network +Server by using the Network Client driver.

    The Network Server is a solution for multiple JVMs that connect to the database, unlike the embedded scenario where only one JVM runs as part of -the system. When is +the system. When is embedded in a single-JVM application, the embedded JDBC driver calls the local database. When is embedded in a server +conref="../conrefs.dita#prod/productshortname"> database. When is embedded in a server framework, the server framework's connectivity software provides data to multiple client JDBC applications over a network or the Internet.

    -

    To run the Network +

    To run the Network Server, you need to install the following files:

    • On the server side, install derby.jar and derbynet.jar.
    • On the client side, install derbyclient.jar.

    -

    There are several ways to manage the Network +

    There are several ways to manage the Network Server, including:

    • Through the command line
      • @@ -51,8 +51,8 @@
    • By setting Network Server properties

    explains how -to change existing Java applications that currently run against in -embedded mode to run against the Network +to change existing Java applications that currently run against in +embedded mode to run against the Network Server.

    explains how to manage the Network Server by using the command line, including starting @@ -60,10 +60,10 @@

    explains how to use the servlet interface to manage the Network Server.

    contains advanced -topics for Network +topics for Network Server users.

    Because of the differences in JDBC drivers that are used, you might encounter -differences in functionality when running in +differences in functionality when running in the Network Server framework as opposed to running it embedded in a user application. Refer to for a complete list of the differences between embedded and Network Server configurations.

    Modified: db/derby/docs/trunk/src/adminguide/cadminov83312.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminov83312.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminov83312.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminov83312.dita Mon Mar 26 12:03:40 2007 @@ -21,7 +21,7 @@ -

    provides some tools and features to assist database administrators, including:

    +

    provides some tools and features to assist database administrators, including:

    • Consistency checker
    • Online backup
      • Modified: db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminovcliconnect.dita Mon Mar 26 12:03:40 2007 @@ -27,7 +27,7 @@

      The SimpleNetworkClientSample program is a client -program that interacts with the Network Server from another JVM. +program that interacts with the Network Server from another JVM. The program performs the following tasks:

      • Loads the network client driver. (Note that this step is not @@ -38,7 +38,7 @@
      • Tests the database connections by running a sample query.
      • Closes the connections and then exits the program.

      -

      You must install the following files in the %%\demo\nserverdemo\ directory before you can run the sample program: +

      You must install the following files in the %%\demo\nserverdemo\ directory before you can run the sample program:

      • The source file: SimpleNetworkClientSample.java.
      • The compiled class file: SimpleNetworkClientSample.class.
        • Modified: db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminovntsrvsample.dita Mon Mar 26 12:03:40 2007 @@ -19,7 +19,7 @@ --> Network Server sample programs for embedded and client connections -This Network +This Network Server sample program demonstrates how to obtain an embedded connection and client connections to the same database by using the Network Server. This program shows how to use either the DriverManager or a DataSource to obtain Modified: db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminovsrvsmpprgm.dita Mon Mar 26 12:03:40 2007 @@ -25,11 +25,11 @@ -

        The SimpleNetworkServerSample program starts the Network +

        The SimpleNetworkServerSample program starts the Network Server, as well as the embedded driver, and waits for clients to connect. The program performs the following tasks.

          -
        • Starts the Network Server by using a property and also loads the embedded driver
          • +
        • Starts the Network Server by using a property and also loads the embedded driver
        • Determines if the Network Server is running
        • Creates the NSSimpleDB database if it is not already created
          • @@ -41,7 +41,7 @@
        • Shuts down the Network Server before exiting the program

        To run the sample program, install the following files in -the %%\demo\nserverdemo\ directory: +the %%\demo\nserverdemo\ directory:

        • The source file: SimpleNetworkServerSample.java
        • The compiled class file: SimpleNetworkServerSample.class
          • Modified: db/derby/docs/trunk/src/adminguide/cadminpartone.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpartone.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminpartone.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminpartone.dita Mon Mar 26 12:03:40 2007 @@ -21,6 +21,6 @@ -

          This part of the guide explains the Network Server and other server frameworks. +

          This part of the guide explains the Network Server and other server frameworks.

          Modified: db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminpreface11181.dita Mon Mar 26 12:03:40 2007 @@ -22,13 +22,13 @@ Purpose of this guide -

          This guide explains how to use in a multiple-client environment. +

          This guide explains how to use in a multiple-client environment. It also provides information that a server administrator might need to keep - running with a high level of performance and reliability in a server framework -or in a multiple-client application server environment (When running in embedded mode, + running with a high level of performance and reliability in a server framework +or in a multiple-client application server environment (When running in embedded mode, databases typically do not need any administration).

          -

          To connect multiple clients with , you can embed in a server -framework that you choose, or you can use the Network Server. This +

          To connect multiple clients with , you can embed in a server +framework that you choose, or you can use the Network Server. This guide describes these options.

           Modified: db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita Mon Mar 26 12:03:40 2007 @@ -22,13 +22,13 @@

          This guide includes the following two parts:

          -

          Part one: Server Guide

          +

          Part one: Server Guide

          • -

            Describes the different options for embedding in a server framework and +

            Describes the different options for embedding in a server framework and explains the Network Server option.

          • -

            Describes how to change existing applications to work with the +

            Describes how to change existing applications to work with the Network Server.

          • Describes how to use shell scripts, the command @@ -37,12 +37,12 @@

            Describes how to use the servlet interface to manage the Network Server.

          • Describes -advanced topics for Network Server users.

            • +advanced topics for Network Server users.

          -

          Part two: Administration Guide

          +

          Part two: Administration Guide

          • -

            Describes how to check the consistency of databases.

            • +

            Describes how to check the consistency of databases.

          • Describes how to back up a database when it is online.

          • Modified: db/derby/docs/trunk/src/adminguide/cadminrollforward.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminrollforward.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminrollforward.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminrollforward.dita Mon Mar 26 12:03:40 2007 @@ -20,7 +20,7 @@ --> Roll-forward recovery - supports + supports roll-forward recovery to restore a damaged database to the most recent state before a failure occurred. @@ -30,7 +30,7 @@ recovery -

            restores a database +

            restores a database from full backup and replays all the transactions after the backup. All the log files after a backup are required to replay the transactions after the backup. By default, the database keeps only logs that are required for crash-recovery. @@ -40,7 +40,7 @@

            In roll-forward recovery the log archival mode ensures that all old log files are available. The log files are available only from the time that the log archival mode is enabled.

            -

            uses the following +

            uses the following information to restore the database:

            • The backup copy of the database
            • The set of archived logs
              • @@ -52,7 +52,7 @@ have a backup copy of the database, all the archived logs since the backup was created, and the active log files. All the log files should be in the database log directory.

              -

              There are two types of log files in : +

              There are two types of log files in : active logs and online archived logs.

              Active logs
              @@ -131,7 +131,7 @@ URL:

              rollForwardRecoveryFrom=<Path>

              For more information, see the rollForwardRecoveryFrom=<Path> section -in the .

              +in the .

              After a database is restored from full backup, transactions from the online archived logs and active logs are replayed.

              Modified: db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminservlet98430.dita Mon Mar 26 12:03:40 2007 @@ -23,8 +23,8 @@ remotely. To use the servlet interface, the servlet must be registered with an Application Server, and derby.system.home must be known to the Application Server. -

              A Web application archive (WAR) file, derby.war, for the -Network Server is available in $/lib. This +

              A Web application archive (WAR) file, derby.war, for the +Network Server is available in $/lib. This file registers the Network Server's servlet at the relative path /derbynet. See the documentation for your Application Server for instructions on how to install it.

              Modified: db/derby/docs/trunk/src/adminguide/cadminspace21579.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminspace21579.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/cadminspace21579.dita (original) +++ db/derby/docs/trunk/src/adminguide/cadminspace21579.dita Mon Mar 26 12:03:40 2007 @@ -19,18 +19,18 @@ --> Reclaiming unused space -A table +A table or index (sometimes called a conglomerate) can contain unused space after large amounts of data have been deleted or updated. Compressing tables and indexes -

              This happens because, by default, does +

              This happens because, by default, does not return unused space to the operating system. After a page has been allocated -to a table or index, does +to a table or index, does not automatically return the page to the operating system until the table -or index is dropped, even if the space is no longer needed. However, does +or index is dropped, even if the space is no longer needed. However, does provide a way to reclaim unused space in tables and associated indexes.

              If you determine that a table and its indexes have a significant amount of unused space, use either the SYSCS_UTIL.SYSCS_COMPRESS_TABLE or SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE @@ -47,12 +47,12 @@ third parameter in the SYSCS_UTIL.SYSCS_COMPRESS_TABLE() procedure determines whether the operation will run in sequential or non-sequential mode. If you specify 0 for the third argument in the procedure, the operation -will run in non-sequential mode. In sequential mode, compresses +will run in non-sequential mode. In sequential mode, compresses the table and indexes sequentially, one at a time. Sequential compression uses less memory and disk space but is slower. To force the operation to run in sequential mode, substitute a non-zero smallint value for the third argument. The following example shows how to force the procedure to run in sequential mode:

              call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'FLIGHTAVAILABILITY', 1); -
              For more information about this command, see the .
              +
              For more information about this command, see the .
                             Modified: db/derby/docs/trunk/src/adminguide/radminapps810699.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminapps810699.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminapps810699.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminapps810699.dita Mon Mar 26 12:03:40 2007 @@ -39,14 +39,14 @@ >jdbc:derby:net://localhost:1527/sample:user=judy;password=no12see; retrieveMessagesFromServerOnGetMessage=true;
              Example 2

              The following example specifies the attributes -for both and the and the DB2 Driver for JDBC: jdbc:derby:net://localhost:1527/sample;create=true:user=judy; password=no12see;retrieveMessagesFromServerOnGetMessage=true;

              Example 3

              This example connects to the default server name localhost on the default port, 1527, and includes the path in the database name portion of the URL. The database name must be delimited -by double quotation marks and you cannot specify attributes +by double quotation marks and you cannot specify attributes on the URL.

              jdbc:derby:net://localhost:1527/"c:/my-db-dir/my-db-name":user=judy; password=no12see;retrieveMessagesFromServerOnGetMessage=true;
              Example 4

              The following is a sample program fragment Modified: db/derby/docs/trunk/src/adminguide/radminapps811974.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminapps811974.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminapps811974.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminapps811974.dita Mon Mar 26 12:03:40 2007 @@ -34,7 +34,7 @@ the exception message to the error: ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI': SQLSTATE: 22003: The resulting value is outside the range for the data type INTEGER.

              -

              The embedded +

              The embedded driver, however, would generate two SQL exceptions:ERROR 42Z24: Overflow occurred in identity for column 'Y' in table 'AI'. ERROR 22003: The resulting value is outside the range for the data type INTEGER.

              This is because the network client driver reports only one SQLException Modified: db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Mon Mar 26 12:03:40 2007 @@ -23,7 +23,7 @@

              The following examples specify the user and password URL attributes. To enable user authentication, the property derby.connection.requireAuthentication -must be set to true, otherwise, +must be set to true, otherwise, does not require a user name and password. For a multi-user product, you would typically set it for the system in the derby.properties file for your server, since it is in a trusted environment. Below is a sample @@ -37,7 +37,7 @@ sample.

              jdbc:derby://localhost:1527/sample;user=judy;password=no12see
              Example 2

              The following example specifies both and Network Client +conref="../conrefs.dita#prod/productshortname"> and Network Client driver attributes: jdbc:derby://localhost:1527/sample;create=true;user=judy; password=no12see

              Example 3

              This example connects to the default server Modified: db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminappsresultsetdiffs.dita Mon Mar 26 12:03:40 2007 @@ -21,7 +21,7 @@ Updatable Result Sets

              The functionality of updatable result sets in a server environment are similar -to an embedded environment in , +to an embedded environment in , with the exception of the following differences:

              • The Network Client requires that there be at least one column in the select list from the target table. For example, the following statement will fail Modified: db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita Mon Mar 26 12:03:40 2007 @@ -29,7 +29,7 @@
                Default

                If the derby.system.home property has been set, it is the default. Otherwise, the default is the current directory.

                Examplederby.drda.traceDirectory=c://trace +conref="../conrefs.dita#prod/productshortname">/trace
                Static or dynamic

                Dynamic. System values can be changed by using commands or the servlet interface after the Network Server has been started.

                Modified: db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita Mon Mar 26 12:03:40 2007 @@ -27,8 +27,8 @@

                Use the derby.drda.startNetworkServer property to simplify embedding the Network Server in your Java application. When you set derby.drda.startNetworkServer to true, the Network Server will automatically -start when you start -(in this context, +start when you start +(in this context, will start when the embedded driver is loaded). Only one Network Server can be started in a JVM.

                NOTE: @@ -41,7 +41,7 @@

                Default

                False.

                Examplederby.drda.startNetworkServer=true
                Static or dynamic

                Static. You must shut down the -Network Server and restart for +Network Server and restart for this change to take effect.

                Modified: db/derby/docs/trunk/src/adminguide/radminconsist30301.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminconsist30301.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminconsist30301.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminconsist30301.dita Mon Mar 26 12:03:40 2007 @@ -25,7 +25,7 @@

                The SYSCS_UTIL.SYSCS_CHECK_TABLE() function checks the consistency -of a table. In +of a table. In particular, the SYSCS_UTIL.SYSCS_CHECK_TABLE function verifies the following conditions:

                • Base tables are internally consistent
                  • Modified: db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita (original) +++ db/derby/docs/trunk/src/adminguide/radmindrdakeepalive.dita Mon Mar 26 12:03:40 2007 @@ -27,9 +27,9 @@ mechanism is used to detect when clients disconnect unexpectedly. A keepalive probe is sent to the client if a long time (by default, more than two hours) passes with no other data being sent or received. -The .drda.keepAlive property is used to detect and clean up connections for +The .drda.keepAlive property is used to detect and clean up connections for clients on powered-off machines or clients that have disconnected unexpectedly.

                -

                If the property is set to false, will +

                If the property is set to false, will not attempt to clean up disconnected clients. The keepAlive mechanism might be disabled if clients need to resume work without reconnecting even after being disconnected from the network for some time. To disable keepAlive probes Modified: db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminembeddedserverex.dita Mon Mar 26 12:03:40 2007 @@ -24,7 +24,7 @@

                You can start the Network Server in another thread automatically -when starts by setting +when starts by setting the derby.drda.startNetworkServer property (see ), or you can start it by using a program. The following example shows how to start the Network Server by using a program:

                import org.apache.derby.drda.NetworkServerControl; import java.net.InetAddress; @@ -35,8 +35,8 @@ by using either the embedded driver or the Network Client driver. The server framework's attempt to boot the local JDBC driver is ignored because it has already been booted within the application's JVM. The server framework -simply accesses the instance of that is already booted. There is no conflict between the application and the server framework.

                -

                The remote client can then connect through the client +simply accesses the instance of that is already booted. There is no conflict between the application and the server framework.

                +

                The remote client can then connect through the client driver:

                String nsURL="jdbc:derby://localhost:1527/sample"; java.util.Properties props = new java.util.Properties(); @@ -51,7 +51,7 @@ Class.forName("org.apache.derby.jdbc.ClientDriver").newInstance(); Connection conn = DriverManager.getConnection(nsURL, props); -/*interact with */ +/*interact with */ Statement s = conn.createStatement(); ResultSet rs = s.executeQuery( Modified: db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminnsdatasourcexmp.dita Mon Mar 26 12:03:40 2007 @@ -29,7 +29,7 @@ org.apache.derby.jdbc.ClientDataSource ds = new org.apache.derby.jdbc.ClientDataSource(); -// DatabaseName can include URL Attributes +// DatabaseName can include URL Attributes ds.setDatabaseName(database); if (user != null) Modified: db/derby/docs/trunk/src/adminguide/radminovnssample.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminovnssample.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminovnssample.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminovnssample.dita Mon Mar 26 12:03:40 2007 @@ -44,7 +44,7 @@ a client connection to the Network Server to perform database operations.

              • Waits for the client threads to finish the tasks.
              • Shuts down the Network Server at the end of the demonstration.
                • -

              You must install the following files in the %%\demo\nserverdemo\

              You must install the following files in the %%\demo\nserverdemo\ directory before you can run the sample program:

              • NsSample.java

                This is the entry point into the sample program. The program starts up two client threads. The first client Modified: db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita (original) +++ db/derby/docs/trunk/src/adminguide/radminsampleprograms.dita Mon Mar 26 12:03:40 2007 @@ -25,6 +25,6 @@ -

                This section describes several Network Server sample +

                This section describes several Network Server sample programs for Network Server users.

                Modified: db/derby/docs/trunk/src/adminguide/radmintrademderby.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radmintrademderby.dita?view=diff&rev=522592&r1=522591&r2=522592 ============================================================================== --- db/derby/docs/trunk/src/adminguide/radmintrademderby.dita (original) +++ db/derby/docs/trunk/src/adminguide/radmintrademderby.dita Mon Mar 26 12:03:40 2007 @@ -21,7 +21,7 @@ Trademarks

                The following terms are trademarks or registered trademarks of other companies -and have been used in at least one of the documents in the documentation +and have been used in at least one of the documents in the documentation library:

                Cloudscape, DB2, DB2 Universal Database, DRDA, and IBM are trademarks of International Business Machines Corporation in the United States, other countries,