Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 66079 invoked from network); 8 Sep 2006 00:24:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Sep 2006 00:24:09 -0000 Received: (qmail 31445 invoked by uid 500); 8 Sep 2006 00:24:08 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 31415 invoked by uid 500); 8 Sep 2006 00:24:08 -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 31404 invoked by uid 99); 8 Sep 2006 00:24:08 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Sep 2006 17:24:08 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Sep 2006 17:24:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 302F11A981A; Thu, 7 Sep 2006 17:23:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r441307 - in /db/derby/docs/trunk/src/workingwithderby: cwwdsummary.dita rwwdactivity3.dita twwdIntro.dita twwdactivity1.dita twwdactivity2.dita Date: Fri, 08 Sep 2006 00:23:47 -0000 To: derby-commits@db.apache.org From: jta@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060908002347.302F11A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jta Date: Thu Sep 7 17:23:46 2006 New Revision: 441307 URL: http://svn.apache.org/viewvc?view=rev&rev=441307 Log: DERBY-1821 : Fixed minor formatting and typos in the Working With Derby Guide. Patch DERBY-1821_wwd_20060907.diff by Myrna van Lunteren . Modified: db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita db/derby/docs/trunk/src/workingwithderby/twwdIntro.dita db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita Modified: db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita?view=diff&rev=441307&r1=441306&r2=441307 ============================================================================== --- db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita (original) +++ db/derby/docs/trunk/src/workingwithderby/cwwdsummary.dita Thu Sep 7 17:23:46 2006 @@ -21,8 +21,8 @@ What next with Derby Congratulations on completing the activities in this workbook. -You now have experience with using Derby in both the embedded and client / -server architectures. With this basic knowledge you are ready to begin using +You now have experience with using Derby in both the embedded and Client-Server +architectures. With this basic knowledge you are ready to begin using Derby to address your own specific needs. We recommend visiting the Apache Derby website as your next step in learning about this lightweight and powerful tool. @@ -39,7 +39,7 @@ a few moments to become familiar with the many online resources available to Derby users and developers by browsing the Derby website at Apache. Whether you are performing a general evaluation of Derby or have a specific need to -address the above link is a good stepping stone to finding additional information +address, the above link is a good stepping stone to finding additional information of interest. The Derby Quick Start page is a good reference page organized by area of interest. You will find many content rich areas such as the Derby Modified: db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita?view=diff&rev=441307&r1=441306&r2=441307 ============================================================================== --- db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita (original) +++ db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita Thu Sep 7 17:23:46 2006 @@ -20,7 +20,7 @@ --> The WwdEmbedded program -This section describes the WwdEmbedded program, +This section describes the WwdEmbedded.java program, highlighting details specific to accessing a Derby database from a JDBC program. WwdEmbedded.javacode descriptionorg.apache.derby.jdbc.EmbeddedDriver @@ -28,8 +28,8 @@ SQLException -
The WwdEmbedded.java program is described here. -Most of the code related to the database activities performed is included +
+Most of the code related to the database activities performed is included in this document but you may find it helpful to open the program file and follow along in a text viewer or editor. The SECTION NAMES referred to in this text can be found in the comments within the program code and serve as cross-reference @@ -37,7 +37,7 @@ from the WwdUtils class. The utility class code is not described here but is available for review in the file WwdUtils.java
Initialize the program INITIALIZATION SECTION: -The initial lines of code identify the Java libraries used in the program +The initial lines of code identify the Java libraries used in the program, then set up the Java class WwdEmbedded and the main method signature. Refer to a standard Java programming guide for information on these program constructs.import java.sql.*; @@ -93,7 +93,7 @@ Program objects needed to perform subsequent SQL operations are initialized here and a check is made to see if the required data table exists.

The statement object s is initialized. If the utility method WwdUtils.wwdChk4Table does -not find the WISH_LIST table it is create by executing +not find the WISH_LIST table it is created by executing the SQL stored in the variable createString via this statement object.

s = conn.createStatement(); if (! WwdUtils.wwdChk4Table(conn)) @@ -110,13 +110,13 @@
Interact with the DatabaseADD / DISPLAY RECORD SECTION: This section uses the utility method WwdUtils.getWishItem to -gather information from the User. It then utilizes the objects setup previously +gather information from the User. It then utilizes the objects set up previously to insert the data into the WISH_LIST table and then display all records. A standard do loop causes the program to repeat this series of steps until exit is entered. The data related activities performed in this section are:

The setString method sets the substitution parameter of the psInsert object to -the value entered by the User then executeUpdate is called +the value entered by the User. Then executeUpdate is called to perform the database insert.psInsert.setString(1,answer); psInsert.executeUpdate();

The statement object s is used to select @@ -137,7 +137,7 @@ When an application starts the Derby engine it should shutdown all databases prior to exiting. The attribute ;shutdown=true in the Derby connection URL performs the shutdown. The shutdown process cleans up records -in the transaction log to insure a faster startup the next time the database +in the transaction log to ensure a faster startup the next time the database is booted.

This section verifies that the embedded driver is being used then issues the shutdown command and catches the shutdown exception to confirm the database shutdown cleanly. The shutdown status is displayed before the Modified: db/derby/docs/trunk/src/workingwithderby/twwdIntro.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/twwdIntro.dita?view=diff&rev=441307&r1=441306&r2=441307 ============================================================================== --- db/derby/docs/trunk/src/workingwithderby/twwdIntro.dita (original) +++ db/derby/docs/trunk/src/workingwithderby/twwdIntro.dita Thu Sep 7 17:23:46 2006 @@ -40,7 +40,7 @@ It is written and implemented completely in Java, and provides users with a small footprint standards-based database engine that can be tightly embedded into any Java based solution. Derby insures data integrity and provides sophisticated -transactional support. In it's default configuration there is no separate +transaction support. In its default configuration there is no separate database server to be installed or maintained by the end user. For more information on Derby visit the Derby website at: http://db.apache.org/derby.

Performing the Working @@ -72,9 +72,10 @@

On UNIX Korn Shell platforms:
"$JAVA_HOME/bin/java" -version
The output from the command will look -something like this:java version "1.4.2_04" Java(TM) 2 Runtime Environment, -Standard Edition (build 1.4.2_04-b05) Java HotSpot(TM) -Client VM (build 1.4.2_04-b05, mixed mode)The output you see +something like this:java version "1.4.2_04" +Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.2_04-b05) +Java HotSpot(TM) Client VM (build 1.4.2_04-b05, mixed mode) +The output you see may be different from what is shown here, because the java -version command outputs vendor-specific information. If the command produced an error or the version listed is not 1.3 or higher, please install a Java development kit Modified: db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita?view=diff&rev=441307&r1=441306&r2=441307 ============================================================================== --- db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita (original) +++ db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita Thu Sep 7 17:23:46 2006 @@ -22,14 +22,14 @@ Creating the database and running SQL Connection URLembedded drivercreate=true -IJDatabasecreatingconnecting +ijDatabasecreatingconnecting toDerbylogfile, message and errorSQLcreate tableinsertselect -Run the Derby IJ tool.
+Run the Derby ij tool.
On Windows platforms:
java -jar %DERBY_HOME%\lib\derbyrun.jar ij @@ -101,7 +101,7 @@ -Exit the IJ tool.exit; +Exit the ij tool.exit; Browse the key files created by the activity.
  • The derby.log message and @@ -124,8 +124,9 @@
-
Description of connection command: connect 'jdbc:derby:firstdb;create=true';
-
connect - the IJ command to establish a connection to +
Description of connection command: +connect 'jdbc:derby:firstdb;create=true';
+
connect - the ij command to establish a connection to a database
The Derby connection URL enclosed in single quotes:
  • jdbc:derby: - JDBC protocol specification for the Derby @@ -136,7 +137,7 @@
  • ;create=true - The Derby URL attribute used to create databases. Derby does not have an SQL create database command.
-
; (semicolon) - the IJ command terminator.
+
; (semicolon) - the ij command terminator.
Modified: db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita?view=diff&rev=441307&r1=441306&r2=441307 ============================================================================== --- db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita (original) +++ db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita Thu Sep 7 17:23:46 2006 @@ -19,13 +19,13 @@ limitations under the License. --> -Activity 2: Run SQL using the Client Driver +Activity 2: Run SQL using the Client driver This activity uses Derby within a Client-Server configuration by using the Network Server. The ij tool is the client application that connects to the Derby Network Server. A database called seconddb is created and some basic SQL commands are executed. -Network ServerClient Driver +Network ServerClient driver