Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 27541 invoked from network); 21 Jun 2005 23:40:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Jun 2005 23:40:11 -0000 Received: (qmail 72539 invoked by uid 500); 21 Jun 2005 23:40:02 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 72424 invoked by uid 500); 21 Jun 2005 23:40:01 -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 72293 invoked by uid 500); 21 Jun 2005 23:40:00 -0000 Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org Received: (qmail 72278 invoked by uid 99); 21 Jun 2005 23:40:00 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 21 Jun 2005 16:39:59 -0700 Received: (qmail 27483 invoked by uid 65534); 21 Jun 2005 23:39:58 -0000 Message-ID: <20050621233958.27482.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r191746 - /incubator/derby/docs/trunk/src/adminguide/ Date: Tue, 21 Jun 2005 23:39:53 -0000 To: derby-cvs@incubator.apache.org From: jta@apache.org X-Mailer: svnmailer-1.0.2 X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jta Date: Tue Jun 21 16:39:52 2005 New Revision: 191746 URL: http://svn.apache.org/viewcvs?rev=191746&view=rev Log: DERBY-373 Applied Jeff Levitt's patch that fixes documentation errors in the Server/Admin Guide. Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps.dita incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita incubator/derby/docs/trunk/src/adminguide/radminconfig.dita incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdatracedirectory.dita incubator/derby/docs/trunk/src/adminguide/radminconfigportnumber.dita incubator/derby/docs/trunk/src/adminguide/radminconfigstartnetworkserver.dita incubator/derby/docs/trunk/src/adminguide/radmindrdahost.dita incubator/derby/docs/trunk/src/adminguide/radmindrdamaxthreads.dita incubator/derby/docs/trunk/src/adminguide/radmindrdaminthreads.dita incubator/derby/docs/trunk/src/adminguide/radmindrdatimeslice.dita incubator/derby/docs/trunk/src/adminguide/radminservlet810850.dita incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita incubator/derby/docs/trunk/src/adminguide/tadminadv804451.dita incubator/derby/docs/trunk/src/adminguide/tadminapps811345.dita incubator/derby/docs/trunk/src/adminguide/tadminapps811695.dita incubator/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita incubator/derby/docs/trunk/src/adminguide/tadminconfig813694.dita incubator/derby/docs/trunk/src/adminguide/tadminconfig814963.dita incubator/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita incubator/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita incubator/derby/docs/trunk/src/adminguide/tadmincrtdbbkup.dita incubator/derby/docs/trunk/src/adminguide/tadminhubbkup44.dita Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/cadminapps.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/cadminapps.dita Tue Jun 21 16:39:52 2005 @@ -17,8 +17,8 @@ limitations under the License. --> -Differences between running Derby in embedded mode and using the network -server +Differences between running Derby in embedded mode and using the Network +Server Network ServerDerby features not supported in Modified: incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/cadminapps810777.dita Tue Jun 21 16:39:52 2005 @@ -25,7 +25,12 @@ to load the driver and connection URL 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 you use -to access the Network Server is: com.ibm.db2.jcc.DB2Driver

+to access the Network Server is: com.ibm.db2.jcc.DB2DriverYou +must have the following two jar files present in your classpath in order to +use the DB2 Universal Driver:
    +
  • db2jcc.jar
    • +
  • db2jcc_license_c.jar
    • +

The URL that is needed to access the Network Server is:

jdbc:derby:net://<server>[:<port>]/ <databaseName>[;< URL attribute>=<value> [;...]] @@ -54,9 +59,8 @@
  • Universal Driver Attribute=value

    Optional database connection URL attributes supported by the DB2 Universal JDBC Driver.

    The DB2 JDBC Universal Driver requires that you set the Universal Driver user and password -attributes to non-null values.

    Here is a list of the DB2 -Universal JDBC Driver attributes available to you when running the Network -Server:

      +attributes to non-null values.

      Here is a list of the DB2 Universal JDBC +Driver attributes available to you when running the Network Server:

      • user

        User name (required by the Universal JDBC Driver).

      • password

        User password (required by the Universal JDBC Driver).

      • portNumber

        The TCP/IP port number where the Network Server @@ -79,4 +83,3 @@ Server is compatible with the DB2 JDBC Universal Driver release 1.2 and higher.

        - Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/cadminappsclient.dita Tue Jun 21 16:39:52 2005 @@ -17,23 +17,18 @@ limitations under the License. --> -Accessing the Network Server by using the Network Client driver +Accessing the Network Server by using the network client driver

        When connecting to the Network Server, your application needs to load a driver and connection URL 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 you need to access -the Network Server is: org.apache.derby.jdbc.ClientDriver

        -

        The URL that is needed to access the Network Server is:

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

        The syntax for connection to the Network Server differs slightly from the -syntax used to connect to running -in embedded mode. After the database name and attributes you can include attributes -for the Network Client driver. You must include a semicolon after the last -Network Client attribute.

        +specify a user name and password if you are using authentication. The driver +you need to access the Network Server is: org.apache.derby.jdbc.ClientDriver

        +

        The URL that is needed to access the Network Server is:jdbc:derby://<server>[:<port>]/ +<databaseName>[;<URL attribute>=<value> [;...]] +where the <URL attribute> is either a embedded or network +client attribute.

        Standard JDBC DataSource properties @@ -198,4 +193,3 @@ DataSource, is not available for the client DataSource.

        - Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/cadminappsclienttracing.dita Tue Jun 21 16:39:52 2005 @@ -1,7 +1,6 @@ - -Network Client tracing +Network client tracing The Network -Client provides a tracing facility to collect JDBC trace information and view +client provides a tracing facility to collect JDBC trace information and view protocol flows. Network Client tracing @@ -51,7 +50,7 @@
        Changing the default trace level

        The trace level defaults to ClientDataSource.TRACE_ALL. The tracing can be changed by calling the setTraceLevel(int level) method or -setting the traceLevel URL attribute:String url = "jdbc:derby://myhost.mydomain.com:1528/mydb" + +setting the traceLevel URL attribute:String url = "jdbc:derby://samplehost.sampledomain.com:1528/mydb" + ";traceFile=/u/user1/trace.out" + ";traceLevel=" + org.apache.derby.jdbc.ClientDataSource.TRACE_PROTOCOL_FLOWS; @@ -125,4 +124,3 @@

        - Modified: incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Tue Jun 21 16:39:52 2005 @@ -1,8 +1,6 @@ - - - -Using XA with the Network Client driver +Using XA with the network client driver -XAUsing with the Network Client driver +XAUsing with the network client driver

        You can access XA support for the Network Server by using the -Network Client driver's XA DataSource interface (org.apache.derby.jdbc.ClientXADataSource).

        +network client driver's XA DataSource interface (org.apache.derby.jdbc.ClientXADataSource).

        The following example illustrates how to obtain an XA connection -with the Network Client driver:

        XAConnection xaConnection = null; +with the network client driver:

        import org.apache.derby.jdbc.ClientXADataSource; +import javax.sql.XAConnection; +... + +XAConnection xaConnection = null; Connection conn = null; - String driver = "org.apache.derby.jdbc.ClientDataSource"; - ClientXADataSource ds = new ClientXADataSource(); +String driver = "org.apache.derby.jdbc.ClientDataSource"; +ClientXADataSource ds = new ClientXADataSource(); - ds.setDatabaseName (dbname + ";create=true"); +ds.setDatabaseName ("sample;create=true"); ds.setServerName("localhost"); @@ -43,9 +44,8 @@ Class.forName(driver); - xaConnection = ds.getXAConnection("auser", "shhhh"); +xaConnection = ds.getXAConnection("auser", "shhhh"); - connection = xaConnection.getConnection();         +conn = xaConnection.getConnection();         - Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup01.dita Tue Jun 21 16:39:52 2005 @@ -1,5 +1,4 @@ - - Using the backup procedure @@ -44,7 +42,12 @@ that reflects the current date:

        public static void backUpDatabase(Connection conn)throws SQLException { -String backupdirectory ="c:/mybackups/"+JCalendar.getToday(); +// Get today's date as a string: +java.text.SimpleDateFormat todaysDate = + new java.text.SimpleDateFormat("yyyy-MM-dd"); +String backupdirectory = "c:/mybacksup/" + + todaysDate.format((java.util.Calendar.getInstance()).getTime()); + CallableStatement cs = conn.prepareCall("CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE(?)"); cs.setString(1, backupdirectory); cs.execute(); @@ -57,8 +60,5 @@ Do not back up different databases with the same name to the same backup directory. If a database of the same name already exists in the backup directory, it is assumed to be an older version and is overwritten. -If you are doing this through the Network Server, refer to the workaround -in .         - Modified: incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/cadminhubbkup75469.dita Tue Jun 21 16:39:52 2005 @@ -1,4 +1,6 @@ + - - Using operating system commands with the freeze and unfreeze system procedures @@ -27,35 +26,37 @@

        Typically, this procedure is used to speed up the copy operation involved -in the 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 explicitly copy the database directory using operating -system commands.

        +in the 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 explicitly copy the database directory using +operating system commands.

        For example, because the UNIX tar command uses operating system -file-copying routines and uses the IBM Application Developer Kit file-copying -routines, tar might provide faster backups than the SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure.

        +file-copying routines and uses +the IBM Application Developer Kit file-copying routines, tar might provide +faster backups than the SYSCS_UTIL.SYSCS_BACKUP_DATABASE procedure.

        To use operating system commands for online database backups, call the SYSCS_UTIL.SYSCS_FREEZE_DATABASE() system procedure. The SYSCS_UTIL.SYSCS_FREEZE_DATABASE() system procedure puts the database into a state in which it can be safely copied. After the -copy is complete, use the SYSCS_UTIL.SYSCS_FREEZE_DATABASE() system -procedure to continue working with the database. Only after SYSCS_UTIL.SYSCS_FREEZE_DATABASE() has +copy is complete, use the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE() 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 block applications -that attempt to write to a "frozen" database until the back up is completed -and the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()system procedure is called. +To ensure a consistent backup of the database, might +block applications that attempt to write to a "frozen" database until the +back up is completed and the SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE() system +procedure is called.

        The following example demonstrates using freeze and unfreeze surrounding an operating system copy command:

        -String backupdirectory = "c:/mybackups/" + JCalendar.getToday(); +public static void backUpDatabaseWithFreeze(Connection conn) + throws SQLException +{ Statement s = conn.createStatement(); s.executeUpdate( - "CALL SYSCS_UTIL.SYSCS_FREEZE_DATABASE(); + "CALL SYSCS_UTIL.SYSCS_FREEZE_DATABASE()"); //copy the database directory during this interval s.executeUpdate( - "CALL SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE(); -s.close(); -If you are doing this through the Network Server, refer to the workaround -in . + "CALL SYSCS_UTIL.SYSCS_UNFREEZE_DATABASE()"); +s.close(); +}         - Modified: incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original) +++ incubator/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Tue Jun 21 16:39:52 2005 @@ -72,6 +72,12 @@ + + + + + + @@ -155,12 +161,6 @@ - - - - - - @@ -168,7 +168,6 @@ - @@ -255,4 +254,3 @@ - Modified: incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Tue Jun 21 16:39:52 2005 @@ -17,22 +17,20 @@ limitations under the License. --> -Network Client driver examples +Network client driver examples
        Example 1

        The following example connects to the default server name localhost on the default port, 1527, and to the database sample. It specifies the user and password URL attributes. You must set these attributes before attempting to connect to -the server.

        jdbc:derby://localhost:1527/sample:user=judy;password=no12see;
        +the server.

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

        The following example specifies both and Network Client -driver attributes: jdbc:derby://localhost:1527/sample;create=true:user=judy; +driver attributes: jdbc:derby://localhost:1527/sample;create=true;user=judy; password=no12see;

        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 quotes and you cannot specify attributes -on the URL.

        jdbc:derby://localhost:1527/"c:/my-db-dir/my-db-name":user=judy; +in the database name portion of the URL.

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

        The following is a sample program fragment that connects to the Network Server using the Network Client driver:

        String databaseURL = "jdbc:derby://localhost:1527/sample"; @@ -46,4 +44,3 @@ Connection conn = DriverManager.getConnection(databaseURL, properties);
        - Modified: incubator/derby/docs/trunk/src/adminguide/radminconfig.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfig.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/radminconfig.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/radminconfig.dita Tue Jun 21 16:39:52 2005 @@ -24,7 +24,7 @@
        Turns tracing on for all sessions.
        -Syntax <derby.drda.traceAll=[true|false]>; +Syntax derby.drda.traceAll=[true|false]
        Default

        False.

        Examplederby.drda.traceAll=true
        Static or Dynamic

        Dynamic. System values can be Modified: incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/radminconfigdb2jdrdalogconnections.dita Tue Jun 21 16:39:52 2005 @@ -1,5 +1,4 @@ - - - -Test connection - - - -

        This page is displayed if the test connection button is pressed.

        -

        Enter the following applicable information:

        -
          -
        • Database Directory (optional). -

          Specify a database to test connection -to, or leave blank to test connecting to Network Server.

          • -
        • UserID (required if user authentication is enabled)
          • -
        • Password (required if user authentication is enabled)
          • -
        -

        You are given the option to test the connection or return to the previous -Menu.

        -

        Information about the success or failure of the connection test will be -displayed when the test connection button is pushed.

        - Modified: incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita?rev=191746&r1=191745&r2=191746&view=diff ============================================================================== --- incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita (original) +++ incubator/derby/docs/trunk/src/adminguide/tadminadv804410.dita Tue Jun 21 16:39:52 2005 @@ -1,5 +1,4 @@ -