db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r470439 - in /db/derby/docs/trunk/src/workingwithderby: rwwdactivity3.dita twwdactivity1.dita twwdactivity1_Setup.dita twwdactivity2.dita twwdactivity3_Setup.dita twwdactivity4.dita
Date Thu, 02 Nov 2006 17:38:27 GMT
Author: jta
Date: Thu Nov  2 09:38:25 2006
New Revision: 470439

URL: http://svn.apache.org/viewvc?view=rev&rev=470439
Log:
DERBY-1948 Fixed 10.2 "Working with Derby" manual errors.
Patch contributed by Kim Haase <camilla.haase@sun.com>.

Modified:
    db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.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=470439&r1=470438&r2=470439
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/rwwdactivity3.dita Thu Nov  2 09:38:25 2006
@@ -33,7 +33,7 @@
 but you may find it helpful to open the program file and follow along in a
 text viewer or editor. The <cite>SECTION NAMES</cite> referred to in this
 text can be found in the comments within the program code and serve as cross-reference
-points between this document and the java program. The program utilizes routines
+points between this document and the Java program. The program utilizes routines
 from the <codeph>WwdUtils</codeph> class. The utility class code is not described
 here but is available for review in the file <codeph>WwdUtils.java</codeph></section>
 <section><title>Initialize the program</title> <cite>INITIALIZATION
SECTION</cite>:
@@ -180,7 +180,7 @@
       System.out.println("A non SQL error occured.");
       e.printStackTrace();
    }   
-}  // END errorPrint </codeblock>The <codeph>SQLException</codeph> method
+}  // END errorPrint </codeblock>The <codeph>SQLExceptionPrint</codeph>
method
 iterates through each of the exceptions on the stack. For each error the codes,
 message then stacktrace are printed. <codeblock frame="topbot">//  Iterates through
a stack of SQLExceptions 
 static void SQLExceptionPrint(SQLException sqle) {
@@ -194,6 +194,6 @@
    }
 }  //  END SQLExceptionPrint   </codeblock>If you wish to see the output produced
 by this method enter a wish list item with more than 32 characters like: <userinput>I
-wish to see a JAVA program fail</userinput>.</section>
+wish to see a Java program fail</userinput>.</section>
 </refbody>
 </reference>

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=470439&r1=470438&r2=470439
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity1.dita Thu Nov  2 09:38:25 2006
@@ -107,14 +107,14 @@
 <li>The <b><filepath><varname>derby.log</varname></filepath></b>
message and
 error log file. Under normal circumstances it will contain a set of startup
 messages and a shutdown message.<codeblock frame="topbot">----------------------------------------------------------------
-2006-12-18 23:33:37.564 GMT:
+2006-09-21 23:33:37.564 GMT:
  Booting Derby version The Apache Software Foundation 
-   - Apache Derby - <ph conref="wwdconrefs.dita#vers/shortversionnumber"></ph>.1.0
- (398064): 
+   - Apache Derby - <ph conref="wwdconrefs.dita#vers/shortversionnumber"></ph>.1.6
- (452058): 
    instance c013800d-0109-7f82-e11f-000000119a68
     on database directory C:\DERBYDBS\FIRSTDB 
 Database Class Loader started - derby.database.classpath=''
 
-2006-12-18 23:44:13.178 GMT:
+2006-09-21 23:44:13.178 GMT:
 Shutting down instance c013800d-0109-7f82-e11f-000000119a68
 ----------------------------------------------------------------</codeblock></li>
 <li>The <b><filepath><varname>firstdb</varname></filepath></b>
 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=470439&r1=470438&r2=470439
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity1_Setup.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity1_Setup.dita Thu Nov  2 09:38:25
2006
@@ -45,7 +45,7 @@
 <step><cmd>Changing the directory (<userinput>cd</userinput>) to
the work
 directory</cmd></step>
 <step><cmd>Copying the SQL scripts that create the tables and data for toursdb
-from the Derby <codeph>demo\toursdb</codeph> subdirectory into the <codeph>DERBYDBS</codeph>
directory.</cmd>
+from the Derby <codeph>demo\programs\toursdb</codeph> subdirectory into the <codeph>DERBYDBS</codeph>
directory.</cmd>
 </step>
 </steps>
 <example>Open a command window and perform the following activity sequence:<dl>
@@ -57,7 +57,7 @@
 
 cd DERBYDBS
 
-copy %DERBY_HOME%\demo\toursdb\*.sql . </b>
+copy %DERBY_HOME%\demo\programs\toursdb\*.sql . </b>
 </codeblock></dd>
 </dlentry><dlentry>
 <dt>On UNIX Korn Shell platforms:</dt>
@@ -67,7 +67,7 @@
 
 cd DERBYDBS
 
-cp $DERBY_HOME/demo/toursdb/*.sql . </b>
+cp $DERBY_HOME/demo/programs/toursdb/*.sql . </b>
 </codeblock></dd>
 </dlentry></dl><note type="important">A command prompt will be displayed
after
 each command is executed. If an error is displayed please double check the

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=470439&r1=470438&r2=470439
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity2.dita Thu Nov  2 09:38:25 2006
@@ -45,12 +45,16 @@
 <dt>On Windows platforms:</dt>
 <dd><codeblock frame="topbot"><b>java -jar %DERBY_HOME%\lib\derbynet.jar
start</b>
 
-<i>Server is ready to accept connections on port 1527.</i></codeblock></dd>
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) started and 
+ ready to accept connections on port 1527 at 2006-09-22 
+ 00:08:30.049 GMT</i></codeblock></dd>
 </dlentry></dl><dl><dlentry>
 <dt>On UNIX Korn Shell platforms:</dt>
 <dd><codeblock frame="topbot"><b>java -jar $DERBY_HOME/lib/derbynet.jar
start</b>
 
-<i>Server is ready to accept connections on port 1527.</i></codeblock></dd>
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) started and 
+ ready to accept connections on port 1527 at 2006-09-22 
+ 00:08:30.049 GMT</i></codeblock></dd>
 <dd></dd>
 </dlentry></dl></stepxmp><stepresult>A Network Server startup message
is displayed
 in the <codeph>Shell-1</codeph> command window.</stepresult></step>
@@ -111,13 +115,15 @@
 <dt>On Windows platforms:</dt>
 <dd><codeblock frame="topbot"><b>java -jar %DERBY_HOME%\lib\derbynet.jar
shutdown</b>
 
-<i>Shutdown successful.</i>
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) shutdown 
+ at 2006-09-22 00:16:44.223 GMT</i>
 </codeblock></dd>
 </dlentry></dl><dl><dlentry>
 <dt>On UNIX Korn Shell platforms:</dt>
 <dd><codeblock frame="topbot"><b>java -jar $DERBY_HOME/lib/derbynet.jar
shutdown</b>
 
-<i>Shutdown successful.</i>
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) shutdown 
+ at 2006-09-22 00:16:44.223 GMT</i>
 </codeblock></dd>
 </dlentry></dl></stepxmp><stepresult>The server shutdown confirmation
appears
 in both command windows.</stepresult></step>
@@ -133,9 +139,11 @@
 caused the Derby engine to be embedded in the <codeph>ij</codeph> application
 (an embedded configuration).</p><p>Network Server start up and shutdown messages
 are written to the <codeph>derby.log</codeph> log file along with the standard
-database engine messages. For example:<codeblock frame="topbot"><i>Server is
ready to accept connections on port 1527.</i>
+database engine messages. For example:<codeblock frame="topbot"><i>Apache Derby
Network Server - 10.2.1.6 - (452058) started and ready to 
+ accept connections on port 1527 at 2006-09-22 00:08:30.049 GMT</i>
    ...( database engine messages not shown )...
-<i>Shutdown successful.</i></codeblock></p><p>Though not demonstrated
here,
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) shutdown 
+ at 2006-09-22 00:16:44.223 GMT</i></codeblock></p><p>Though not
demonstrated here,
 multiple client programs can connect to Network Server and access the database
 simultaneously in this configuration.</p></postreq>
 </taskbody>

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=470439&r1=470438&r2=470439
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity3_Setup.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity3_Setup.dita Thu Nov  2 09:38:25
2006
@@ -43,13 +43,13 @@
 <step><cmd>Copy the program files into the <codeph>DERBYDBS</codeph>
directory
 and set the <varname>CLASSPATH</varname>:</cmd><stepxmp><dl><dlentry>
 <dt>On Windows platforms:</dt>
-<dd><codeblock frame="topbot"><b>copy %DERBY_HOME%\demo\workingwithderby\*
.
+<dd><codeblock frame="topbot"><b>copy %DERBY_HOME%\demo\programs\workingwithderby\*
.
 
 set CLASSPATH=%DERBY_HOME%\lib\derby.jar;.</b>
 </codeblock></dd>
 </dlentry><dlentry>
 <dt>On UNIX Korn Shell platforms:</dt>
-<dd><codeblock frame="topbot"><b>cp $DERBY_HOME/demo/workingwithderby/*
.
+<dd><codeblock frame="topbot"><b>cp $DERBY_HOME/demo/programs/workingwithderby/*
.
 
 export CLASSPATH=$DERBY_HOME/lib/derby.jar:.</b>
 </codeblock></dd>

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=470439&r1=470438&r2=470439
==============================================================================
--- db/derby/docs/trunk/src/workingwithderby/twwdactivity4.dita (original)
+++ db/derby/docs/trunk/src/workingwithderby/twwdactivity4.dita Thu Nov  2 09:38:25 2006
@@ -35,7 +35,7 @@
 <prereq>This activity assumes you have performed the preceding activities
 and so have a working directory called <codeph>DERBYDBS</codeph>, are familiar
 with setting the <varname>DERBY_HOME</varname> and <varname>CLASSPATH</varname>
environment
-variables and have copies of the program files from the <varname>DERBY_HOME/demo/workingwithderby/</varname>
directory.
+variables and have copies of the program files from the <varname>$DERBY_HOME/demo/programs/workingwithderby/</varname>
directory.
 A basic knowledge of the <codeph>WwdEmbedded.java</codeph> program and experience
 starting and connecting to Network Server is helpful. You will need to use
 a text editor to create the <codeph>WwdClient.java</codeph> program.</prereq>
@@ -112,12 +112,16 @@
 <dt>On Windows platforms:</dt>
 <dd><codeblock frame="topbot"><b>java -jar %DERBY_HOME%\lib\derbynet.jar
start</b>
 
-<i>Server is ready to accept connections on port 1527.</i></codeblock></dd>
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) started and
+ ready to accept connections on port 1527 at 2006-09-22 
+ 00:56:33.091 GMT</i></codeblock></dd>
 </dlentry></dl><dl><dlentry>
 <dt>On UNIX Korn Shell platforms:</dt>
 <dd><codeblock frame="topbot"><b>java -jar $DERBY_HOME/lib/derbynet.jar
start</b>
 
-<i>Server is ready to accept connections on port 1527.</i></codeblock></dd>
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) started and
+ ready to accept connections on port 1527 at 2006-09-22 
+ 00:56:33.091 GMT</i></codeblock></dd>
 </dlentry></dl></stepxmp>
 </substep>
 </substeps>
@@ -140,7 +144,7 @@
 </codeblock></dd>
 </dlentry></dl><dl><dlentry>
 <dt>On UNIX Korn Shell platforms:</dt>
-<dd><codeblock frame="topbot"><b>export CLASSPATH=$DERBY_HOME/lib/derby.jar:.</b>
+<dd><codeblock frame="topbot"><b>export CLASSPATH=$DERBY_HOME/lib/derbyclient.jar:.</b>
 </codeblock></dd>
 </dlentry></dl><note type="important">Include the dot (<b>.</b>)
at the end
 of the command so that your current working directory is included in the <varname>CLASSPATH</varname>.</note>
@@ -182,6 +186,23 @@
 </substep>
 </substeps>
 </step>
+<step><cmd><b>Shut down the Network Server.</b></cmd>
+<stepxmp><dl><dlentry>
+<dt>On Windows platforms:</dt>
+<dd><codeblock frame="topbot"><b>java -jar %DERBY_HOME%\lib\derbynet.jar
shutdown</b>
+
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) shutdown 
+ at 2006-09-22 19:13:51.445 GMT</i>
+</codeblock></dd>
+</dlentry></dl><dl><dlentry>
+<dt>On UNIX Korn Shell platforms:</dt>
+<dd><codeblock frame="topbot"><b>java -jar $DERBY_HOME/lib/derbynet.jar
shutdown</b>
+
+<i>Apache Derby Network Server - 10.2.1.6 - (452058) shutdown 
+ at 2006-09-22 19:13:51.445 GMT</i>
+</codeblock></dd>
+</dlentry></dl></stepxmp><stepresult>The server shutdown confirmation
appears
+in both command windows.</stepresult></step>
 </steps>
 <postreq><b>Activity notes</b><p>In a client/server environment,
the client
 program is often used from other computers on the network. Whenever a system



Mime
View raw message