db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scotsmat...@apache.org
Subject svn commit: r494961 - in /db/derby/docs/trunk/src/workingwithderby: rwwdactivity3.dita twwdIntro.dita twwdactivity1.dita twwdactivity1_Setup.dita twwdactivity2.dita twwdactivity3_Setup.dita twwdactivity4.dita
Date Wed, 10 Jan 2007 20:05:22 GMT
Author: scotsmatrix
Date: Wed Jan 10 12:05:21 2007
New Revision: 494961

URL: http://svn.apache.org/viewvc?view=rev&rev=494961
Log:
Derby-2194: Updates to WWD manual. Doc builds verified. Patch submitted by Kim Haase.

Modified:
    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/twwdactivity1_Setup.dita
    db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita
    db/derby/docs/trunk/src/workingwithderby/twwdactivity3_Setup.dita
    db/derby/docs/trunk/src/workingwithderby/twwdactivity4.dita

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=494961&r1=494960&r2=494961
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita Wed Jan 10 12:05:21 2007
@@ -44,6 +44,7 @@
 Refer to a Java programming guide for information on these program 
 constructs.</p>
 <codeblock>import java.sql.*;
+
 public class WwdEmbedded   
 {
     public static void main(String[] args)
@@ -80,10 +81,11 @@
 <codeblock>String driver = "org.apache.derby.jdbc.EmbeddedDriver";
 String dbName="jdbcDemoDB";
 String connectionURL = "jdbc:derby:" + dbName + ";create=true";
+...
 String createString = "CREATE TABLE WISH_LIST  "
-        +  "(WISH_ID INT NOT NULL GENERATED ALWAYS AS IDENTITY " 
-        ...
-        +  " WISH_ITEM VARCHAR(32) NOT NULL) " ;</codeblock></section>
+  +  "(WISH_ID INT NOT NULL GENERATED ALWAYS AS IDENTITY " 
+  ...
+  +  " WISH_ITEM VARCHAR(32) NOT NULL) " ;</codeblock></section>
 <section><title>Start the 
 <ph conref="wwdconrefs.dita#prod/productshortname"></ph> engine</title>
 <p><cite>LOAD DRIVER SECTION</cite>: Loading the 
@@ -94,10 +96,10 @@
 is usually due to an incorrect classpath setting.</p> 
 <codeblock>String driver = "org.apache.derby.jdbc.EmbeddedDriver";
 ...
-try{
+try {
     Class.forName(driver); 
 } catch(java.lang.ClassNotFoundException e) {
-...
+  ...
 }</codeblock></section>
 <section><title>Boot the database</title>
 <p><cite>BOOT DATABASE SECTION</cite>: The <codeph>DriverManager</codeph>
class 
@@ -112,9 +114,9 @@
 ...
 try {
     conn = DriverManager.getConnection(connectionURL);
-...  <i>&lt;most of the program code is contained here></i>
+    ...  <i>&lt;most of the program code is contained here></i>
 }  catch (Throwable e)  {   
-...
+   ...
 }</codeblock></section>
 <section><title>Set up program to execute SQL</title>
 <p><cite>INITIAL SQL SECTION</cite>: The program initializes the objects
needed 
@@ -198,7 +200,7 @@
       }
    }
    if (!gotSQLExc) {
-   	  System.out.println("Database did not shut down normally");
+      System.out.println("Database did not shut down normally");
    }  else  {
       System.out.println("Database shut down normally");
    }
@@ -219,7 +221,7 @@
 <codeblock>//  Beginning of the primary catch block: uses errorPrint method
 }  catch (Throwable e)  {   
    /*    Catch all exceptions and pass them to 
-   **       the exception reporting method   */ 
+   **    the exception reporting method   */ 
    System.out.println(" . . . exception thrown:");
    errorPrint(e);
 }</codeblock>

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=494961&r1=494960&r2=494961
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdIntro.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdIntro.dita Wed Jan 10 12:05:21 2007
@@ -105,6 +105,40 @@
 outputs vendor-specific information. If the command produces an error or the
 version listed is not 1.3 or higher, install a JDK
 before continuing.</stepresult></step>
+<step><cmd>Set the 
+<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>

+environment variable.</cmd>
+<info>
+The <codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>

+variable defines the file system path to the root directory of the 
+<ph conref="wwdconrefs.dita#prod/productshortname"></ph> installation.
+<p>
+The example commands defining 
+<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>
use 
+the fictitious file system paths <codeph>C:\derby</codeph> for Windows examples

+and <codeph>/opt/derby</codeph> for UNIX examples. Be sure to adjust these 
+commands so that 
+<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>

+indicates the location of the 
+<ph conref="wwdconrefs.dita#prod/productshortname"></ph> installation on the

+system you are using.
+</p>
+</info>
+<stepxmp><simpletable relcolwidth="1* 3*">
+<sthead>
+<stentry>Operating System</stentry>
+<stentry>Command</stentry>
+</sthead>
+<strow>
+<stentry>Windows</stentry>
+<stentry><codeblock><b><userinput>set DERBY_HOME=C:\derby</userinput></b></codeblock></stentry>
+</strow>
+<strow>
+<stentry>UNIX (Korn Shell)</stentry>
+<stentry><codeblock><b><userinput>export DERBY_HOME=/opt/derby</userinput></b></codeblock></stentry>
+</strow>
+</simpletable></stepxmp>
+</step>
 <step><cmd>Verify that the 
 <codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>

 environment variable is set and points to the root directory of the 

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=494961&r1=494960&r2=494961
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita Wed Jan 10 12:05:21 2007
@@ -40,8 +40,9 @@
 </metadata></prolog>
 <taskbody>
 <steps>
-<step><cmd>Run the <ph conref="wwdconrefs.dita#prod/productshortname"></ph>

-<codeph>ij</codeph> tool.</cmd>
+<step><cmd>Run the 
+<ph conref="wwdconrefs.dita#prod/productshortname"></ph>&nbsp;<codeph>ij</codeph>

+tool.</cmd>
 <stepxmp><simpletable relcolwidth="1* 3*">
 <sthead>
 <stentry>Operating System</stentry>
@@ -50,13 +51,11 @@
 <strow>
 <stentry>Windows</stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar
ij</userinput></b>
-
 <systemoutput>ij version 10.2</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry>UNIX (Korn Shell)</stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar
ij</userinput></b>
-
 <systemoutput>ij version 10.2</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp>
@@ -75,7 +74,8 @@
 <dt><codeph>connect</codeph></dt>
 <dd>The <codeph>ij</codeph> command to establish a connection to a database.
 The <ph conref="wwdconrefs.dita#prod/productshortname"></ph> connection URL
-is enclosed in single quotation marks.</dd>
+is enclosed in single quotation marks. An <codeph>ij</codeph> command can
+be in either uppercase or lowercase.</dd>
 </dlentry>
 <dlentry>
 <dt><codeph>jdbc:derby:</codeph></dt>
@@ -109,38 +109,36 @@
 <stepxmp><codeblock><b><userinput>CREATE TABLE FIRSTTABLE
     (ID INT PRIMARY KEY,
     NAME VARCHAR(12));</userinput></b>
-
 <systemoutput>0 rows inserted/updated/deleted</systemoutput></codeblock></stepxmp></step>
 <step><cmd>Insert three records.</cmd><stepxmp><codeblock><b><userinput>INSERT
INTO FIRSTTABLE VALUES 
     (10,'TEN'),(20,'TWENTY'),(30,'THIRTY');</userinput></b>
-
 <systemoutput>3 rows inserted/updated/deleted</systemoutput></codeblock></stepxmp>
 </step>
 <step><cmd>Perform a simple select of all records in the table.</cmd>
 <stepxmp><codeblock><b><userinput>SELECT * FROM FIRSTTABLE;</userinput></b>
-<systemoutput>
-    ID         |NAME
-    ------------------------
-    10         |TEN
-    20         |TWENTY
-    30         |THIRTY
+<systemoutput>ID         |NAME
+------------------------
+10         |TEN
+20         |TWENTY
+30         |THIRTY
 
 3 rows selected</systemoutput></codeblock></stepxmp></step>
 <step><cmd>Perform a qualified select of the record with column ID=20.</cmd>
 <stepxmp><codeblock><b><userinput>SELECT * FROM FIRSTTABLE
 WHERE ID=20;</userinput></b>
-<systemoutput>
-    ID         |NAME
-    ------------------------
-    20         |TWENTY
+<systemoutput>ID         |NAME
+------------------------
+20         |TWENTY
 
 1 row selected</systemoutput></codeblock></stepxmp></step>
 <step><cmd>Load the SQL script <codeph>ToursDB_schema.sql</codeph>
to
 create the tables and other schema objects (this step is optional).</cmd>
 <stepxmp><codeblock><b><userinput>run 'ToursDB_schema.sql';</userinput></b>
 <systemoutput>
-ij> CREATE TABLE AIRLINES
-   (  AIRLINE CHAR(2) NOT NULL ,
+ij> ...
+CREATE TABLE AIRLINES
+   (  
+      AIRLINE CHAR(2) NOT NULL ,
       AIRLINE_FULL VARCHAR(24),
       BASIC_RATE DOUBLE PRECISION,
    ...
@@ -170,14 +168,15 @@
 error log file. Under normal circumstances, this file contains a set of startup
 messages and a shutdown message.
 <codeblock><systemoutput>----------------------------------------------------------------
-<varname>date</varname> 23:33:37.564 GMT:
+2007-01-04 19:55:20.837 GMT:
  Booting Derby version The Apache Software Foundation 
-   - Apache Derby - <varname>version</varname> - (<varname>tag</varname>):

+   - Apache Derby - 10.2.2.0 - (485682): 
    instance c013800d-0109-7f82-e11f-000000119a68
-    on database directory C:\DERBYDBS\FIRSTDB 
+    on database directory C:\DERBYDBS\firstdb 
+
 Database Class Loader started - derby.database.classpath=''
 
-<varname>date</varname> 23:44:13.178 GMT:
+2007-01-04 20:00:12.640 GMT:
 Shutting down instance c013800d-0109-7f82-e11f-000000119a68
 ----------------------------------------------------------------</systemoutput></codeblock></li>
 <li>The <codeph>firstdb</codeph> database directory.

Modified: db/derby/docs/trunk/src/workingwithderby/twwdactivity1_Setup.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/twwdactivity1_Setup.dita?view=diff&rev=494961&r1=494960&r2=494961
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity1_Setup.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity1_Setup.dita Wed Jan 10 12:05:21
2007
@@ -31,48 +31,17 @@
 </keywords>
 </metadata></prolog>
 <taskbody>
-<prereq>In preparation for performing this activity, you must set the 
-environment variable 
-<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>
and 
-create an empty working directory, <codeph>DERBYDBS</codeph>. The 
-<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>

-variable defines the file system path to the root directory of the 
-<ph conref="wwdconrefs.dita#prod/productshortname"></ph> installation. The 
-<codeph>DERBYDBS</codeph> directory is where the files created during the 
-activities are stored.
+<prereq>In preparation for performing this activity, you must have set the 
+environment variables <codeph>JAVA_HOME</codeph> and 
+<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>,
as
+described in <xref href="twwdIntro.dita#twwdIntro"></xref>.
 </prereq>
-<context>The example commands defining 
-<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>
use 
-the fictitious file system paths <codeph>C:\derby</codeph> for Windows examples

-and <codeph>/opt/derby</codeph> for UNIX examples. Be sure to adjust these 
-commands so that 
-<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>

-indicates the location of the 
-<ph conref="wwdconrefs.dita#prod/productshortname"></ph> installation on the

-system you are using.
+<context>
 <note type="important">A command prompt appears after
 each command is executed. If an error appears, verify the
 spelling and retype the command.</note>
 </context>
 <steps>
-<step><cmd>Set the 
-<codeph><ph conref="wwdconrefs.dita#prod/productinstallpath"></ph></codeph>

-environment variable.</cmd>
-<stepxmp><simpletable relcolwidth="1* 3*">
-<sthead>
-<stentry>Operating System</stentry>
-<stentry>Command</stentry>
-</sthead>
-<strow>
-<stentry>Windows</stentry>
-<stentry><codeblock><b><userinput>set DERBY_HOME=C:\derby</userinput></b></codeblock></stentry>
-</strow>
-<strow>
-<stentry>UNIX (Korn Shell)</stentry>
-<stentry><codeblock><b><userinput>export DERBY_HOME=/opt/derby</userinput></b></codeblock></stentry>
-</strow>
-</simpletable></stepxmp>
-</step>
 <step><cmd>Create the <codeph>DERBYDBS</codeph> work directory.</cmd>
 <stepxmp><simpletable relcolwidth="1* 3*">
 <sthead>
@@ -88,6 +57,8 @@
 <stentry><codeblock><b><userinput>mkdir DERBYDBS</userinput></b></codeblock></stentry>
 </strow>
 </simpletable></stepxmp>
+<info>The <codeph>DERBYDBS</codeph> directory is where the files created

+during the activities are stored.</info>
 </step>
 <step><cmd>Change the directory (<codeph>cd</codeph>) to the work
 directory.</cmd>

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=494961&r1=494960&r2=494961
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita Wed Jan 10 12:05:21 2007
@@ -57,18 +57,14 @@
 <strow>
 <stentry>Windows</stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbynet.jar
start</userinput></b>
-
-<systemoutput>Apache Derby Network Server - <varname>version</varname>
- (<varname>tag</varname>) started and 
- ready to accept connections on port 1527 at <varname>date</varname> 
- 00:08:30.049 GMT</systemoutput></codeblock></stentry>
+<systemoutput>Apache Derby Network Server - 10.2.2.0 - (485682) started and 
+ ready to accept connections on port 1527 at 2007-01-04 20:04:33.511 GMT</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry>UNIX (Korn Shell)</stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbynet.jar
start</userinput></b>
-
-<systemoutput>Apache Derby Network Server - <varname>version</varname>
- (<varname>tag</varname>) started and 
- ready to accept connections on port 1527 at <varname>date</varname> 
- 00:08:30.049 GMT</systemoutput></codeblock></stentry>
+<systemoutput>Apache Derby Network Server - 10.2.2.0 - (485682) started and 
+ ready to accept connections on port 1527 at 2007-01-04 20:04:33.511 GMT</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp>
 <stepresult>A Network Server startup message appears in the Shell-1 command 
@@ -86,13 +82,11 @@
 <strow>
 <stentry>Windows</stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar
ij</userinput></b>
-
 <systemoutput>ij version 10.2</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry>UNIX (Korn Shell)</stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar
ij</userinput></b>
-
 <systemoutput>ij version 10.2</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp>
@@ -109,32 +103,28 @@
 <stepxmp><codeblock><b><userinput>CREATE TABLE SECONDTABLE
     (ID INT PRIMARY KEY,
     NAME VARCHAR(14));</userinput></b>
-
 <systemoutput>0 rows inserted/updated/deleted
 </systemoutput></codeblock></stepxmp></step>
 <step><cmd>Insert three records into the table.</cmd>
 <stepxmp><codeblock><b><userinput>INSERT INTO SECONDTABLE VALUES

     (100,'ONE HUNDRED'),(200,'TWO HUNDRED'),(300,'THREE HUNDRED');</userinput></b>
-
 <systemoutput>3 rows inserted/updated/deleted
 </systemoutput></codeblock></stepxmp></step>
 <step><cmd>Select all of the records in the table.</cmd>
 <stepxmp><codeblock><b><userinput>SELECT * FROM SECONDTABLE;</userinput></b>
-<systemoutput>
-    ID         |NAME
-    ------------------------
-    100        |ONE HUNDRED
-    200        |TWO HUNDRED
-    300        |THREE HUNDRED
+<systemoutput>ID         |NAME
+------------------------
+100        |ONE HUNDRED
+200        |TWO HUNDRED
+300        |THREE HUNDRED
 
 3 rows selected</systemoutput></codeblock></stepxmp></step>
 <step><cmd>Select a subset of records from the table by specifying a 
 <codeph>WHERE</codeph> clause.</cmd>
 <stepxmp><codeblock><b><userinput>SELECT * FROM SECONDTABLE WHERE
ID=200;</userinput></b>
-<systemoutput>
-    ID         |NAME
-    ------------------------
-    200        |TWO HUNDRED
+<systemoutput>ID         |NAME
+------------------------
+200        |TWO HUNDRED
 
 1 row selected</systemoutput></codeblock></stepxmp></step>
 <step><cmd>Exit <codeph>ij</codeph>.</cmd>
@@ -150,17 +140,15 @@
 <strow>
 <stentry>Windows</stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbynet.jar
shutdown</userinput></b>
-
-<systemoutput>Apache Derby Network Server - <varname>version</varname>
- (<varname>tag</varname>) shutdown 
- at <varname>date</varname> 00:16:44.223 GMT
+<systemoutput>Apache Derby Network Server - 10.2.2.0 - (485682) shutdown 
+ at 2007-01-04 20:08:44.247 GMT
 </systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry>UNIX (Korn Shell)</stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbynet.jar
shutdown</userinput></b>
-
-<systemoutput>Apache Derby Network Server - <varname>version</varname>
- (<varname>tag</varname>) shutdown 
- at <varname>date</varname> 00:16:44.223 GMT
+<systemoutput>Apache Derby Network Server - 10.2.2.0 - (485682) shutdown 
+ at 2007-01-04 20:08:44.247 GMT
 </systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp>
@@ -179,14 +167,14 @@
 <codeph>//localhost:1527/</codeph>) would have caused the 
 <ph conref="wwdconrefs.dita#prod/productshortname"></ph> engine to be embedded

 in the <codeph>ij</codeph> application (an embedded configuration).</p>
-<p>Network Server startup and shutdown messages are written to the 
+<p>A Network Server startup message is written to the 
 <codeph>derby.log</codeph> log file along with the standard database engine 
 messages. For example:
-<codeblock><systemoutput>Apache Derby Network Server - <varname>version</varname>
- (<varname>tag</varname>) started and ready to 
- accept connections on port 1527 at <varname>date</varname> 00:08:30.049 GMT</systemoutput>
+<codeblock><systemoutput>Apache Derby Network Server - 10.2.2.0 - (485682) started
and ready to 
+ accept connections on port 1527 at 2007-01-04 20:04:33.511 GMT</systemoutput>
    <i>... Database engine messages not shown ...</i>
-<systemoutput>Apache Derby Network Server - <varname>version</varname>
- (<varname>tag</varname>) shutdown 
- at <varname>date</varname> 00:16:44.223 GMT</systemoutput></codeblock>
+<systemoutput>2007-01-04 20:08:43.883 GMT:
+Shutting down instance c013800d-010f-82e9-fa03-00000011f280</systemoutput></codeblock>
 </p>
 <p>In this configuration, multiple client programs can connect to the Network 
 Server and access the database simultaneously. (This example does not 

Modified: db/derby/docs/trunk/src/workingwithderby/twwdactivity3_Setup.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/twwdactivity3_Setup.dita?view=diff&rev=494961&r1=494960&r2=494961
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity3_Setup.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity3_Setup.dita Wed Jan 10 12:05:21
2007
@@ -78,39 +78,32 @@
 an error message appears, verify that the JDK is properly installed.</note>
 </stepxmp></step>
 <step><cmd>Run the program.</cmd>
-<info><p>The <codeph>WwdEmbedded.java</codeph> program populates
a table with 
+<info>The <codeph>WwdEmbedded.java</codeph> program populates a table with

 wish-list items. It prompts the user for text input (up to 32 characters), 
 stores the text input in a database table, and then lists the items stored in 
 the table. The program continues to ask for wish-list items until the user 
 types the command <codeph>exit</codeph> or a problem is encountered. Some basic

 information on program progress is displayed at the beginning and the end of 
-the program.</p></info>
+the program.</info>
 <stepxmp>
 <codeblock><b><userinput>java WwdEmbedded</userinput></b>
-<systemoutput>
-org.apache.derby.jdbc.EmbeddedDriver loaded.
+<systemoutput>org.apache.derby.jdbc.EmbeddedDriver loaded.
 Connected to database jdbcDemoDB
  . . . . creating table WISH_LIST
-
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a peppermint stick</userinput></b>
-<systemoutput>
-__________________________________________________________
-On <varname>date</varname> 15:11:50.412 I wished for a peppermint stick
-__________________________________________________________
-
+<systemoutput>  __________________________________________________________
+On 2007-01-04 15:16:16.795 I wished for a peppermint stick
+  __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>an all expenses paid vacation</userinput></b>
-<systemoutput>
-__________________________________________________________
-On <varname>date</varname> 15:11:50.412 I wished for a peppermint stick
-On <varname>date</varname> 15:12:47.024 I wished for an all expenses paid vacation
-__________________________________________________________
-
+<systemoutput>  __________________________________________________________
+On 2007-01-04 15:16:16.795 I wished for a peppermint stick
+On 2007-01-04 15:16:46.875 I wished for an all expenses paid vacation
+  __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>exit</userinput></b>
-<systemoutput>
-Closed connection
+<systemoutput>Closed connection
 Database shut down normally
 Working With Derby JDBC program ending.</systemoutput></codeblock></stepxmp></step>
 </steps>

Modified: db/derby/docs/trunk/src/workingwithderby/twwdactivity4.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/workingwithderby/twwdactivity4.dita?view=diff&rev=494961&r1=494960&r2=494961
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity4.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity4.dita Wed Jan 10 12:05:21 2007
@@ -140,18 +140,14 @@
 <strow>
 <stentry>Windows</stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbynet.jar
start</userinput></b>
-
-Apache Derby Network Server - <varname>version</varname> - (<varname>tag</varname>)
started and
- ready to accept connections on port 1527 at <varname>date</varname> 
- 00:56:33.091 GMT</codeblock></stentry>
+Apache Derby Network Server - 10.2.2.0 - (485682) started and
+ ready to accept connections on port 1527 at 2007-01-04 20:21:28.255 GMT</codeblock></stentry>
  </strow>
 <strow>
 <stentry>UNIX (Korn Shell)</stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbynet.jar
start</userinput></b>
-
-Apache Derby Network Server - <varname>version</varname> - (<varname>tag</varname>)
started and
- ready to accept connections on port 1527 at <varname>date</varname> 
- 00:56:33.091 GMT</codeblock></stentry>
+Apache Derby Network Server - 10.2.2.0 - (485682) started and
+ ready to accept connections on port 1527 at 2007-01-04 20:21:28.255 GMT</codeblock></stentry>
  </strow>
 </simpletable>
 </stepxmp>
@@ -194,33 +190,26 @@
 <cmd>Run the program:</cmd>
 <stepxmp>
 <codeblock><b><userinput>java WwdClient</userinput></b>
-<systemoutput>
-org.apache.derby.jdbc.ClientDriver loaded.
+<systemoutput>org.apache.derby.jdbc.ClientDriver loaded.
 Connected to database jdbcDemoDB
-
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a sunny day</userinput></b>
-<systemoutput>
-__________________________________________________________
-On <varname>date</varname> 15:11:50.412 I wished for a peppermint stick
-On <varname>date</varname> 15:12:47.024 I wished for an all expenses paid vacation
-On <varname>date</varname> 10:08:21.167 I wished for a sunny day
-__________________________________________________________
-
+<systemoutput>  __________________________________________________________
+On 2007-01-04 15:16:16.795 I wished for a peppermint stick
+On 2007-01-04 15:16:46.875 I wished for an all expenses paid vacation
+On 2007-01-04 15:24:06.843 I wished for a sunny day
+  __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a new car</userinput></b>
-<systemoutput>
-__________________________________________________________
-On <varname>date</varname> 15:11:50.412 I wished for a peppermint stick
-On <varname>date</varname> 15:12:47.024 I wished for an all expenses paid vacation
-On <varname>date</varname> 10:08:21.167 I wished for a sunny day
-On <varname>date</varname> 10:08:33.665 I wished for a new car
-__________________________________________________________
-
+<systemoutput>  __________________________________________________________
+On 2007-01-04 15:16:16.795 I wished for a peppermint stick
+On 2007-01-04 15:16:46.875 I wished for an all expenses paid vacation
+On 2007-01-04 15:24:06.843 I wished for a sunny day
+On 2007-01-04 15:25:24.007 I wished for a new car
+  __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>exit</userinput></b>
-<systemoutput>
-Closed connection
+<systemoutput>Closed connection
 Working With Derby JDBC program ending.</systemoutput></codeblock>
 </stepxmp>
 </substep>
@@ -236,17 +225,15 @@
 <strow>
 <stentry>Windows</stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbynet.jar
shutdown</userinput></b>
-
-<systemoutput>Apache Derby Network Server - <varname>version</varname>
- (<varname>tag</varname>) shutdown 
- at <varname>date</varname> 19:13:51.445 GMT
-</systemoutput></codeblock></stentry>
+<systemoutput>Apache Derby Network Server - 10.2.2.0 - (485682) shutdown 
+ at 2007-01-04 20:27:23.364 GMT</systemoutput>
+</codeblock></stentry>
 </strow>
 <strow>
 <stentry>UNIX (Korn Shell)</stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbynet.jar
shutdown</userinput></b>
-
-<systemoutput>Apache Derby Network Server - <varname>version</varname>
- (<varname>tag</varname>) shutdown 
- at <varname>date</varname> 19:13:51.445 GMT</systemoutput>
+<systemoutput>Apache Derby Network Server - 10.2.2.0 - (485682) shutdown 
+ at 2007-01-04 20:27:23.364 GMT</systemoutput>
 </codeblock></stentry>
 </strow>
 </simpletable>



Mime
View raw message