db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r775289 - in /db/derby/docs/branches/10.5/src: devguide/ getstart/ tools/
Date Fri, 15 May 2009 19:06:23 GMT
Author: chaase3
Date: Fri May 15 19:06:23 2009
New Revision: 775289

URL: http://svn.apache.org/viewvc?rev=775289&view=rev
Log:
DERBY-4206: Documentation: Release versions in output need updating

Merged DERBY-4161-2.diff to 10.5 docs branch from trunk revision 775270.

Modified:
    db/derby/docs/branches/10.5/src/devguide/cdevdvlp27715.dita
    db/derby/docs/branches/10.5/src/devguide/tdevdvlp20349.dita
    db/derby/docs/branches/10.5/src/getstart/twwdactivity1.dita
    db/derby/docs/branches/10.5/src/getstart/twwdactivity2.dita
    db/derby/docs/branches/10.5/src/getstart/twwdactivity3_Setup.dita
    db/derby/docs/branches/10.5/src/getstart/twwdactivity4.dita
    db/derby/docs/branches/10.5/src/tools/rtoolssysinfo1002629.dita

Modified: db/derby/docs/branches/10.5/src/devguide/cdevdvlp27715.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/devguide/cdevdvlp27715.dita?rev=775289&r1=775288&r2=775289&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/devguide/cdevdvlp27715.dita (original)
+++ db/derby/docs/branches/10.5/src/devguide/cdevdvlp27715.dita Fri May 15 19:06:23 2009
@@ -41,10 +41,10 @@
 <p>When <ph conref="../conrefs.dita#prod/productshortname"></ph> boots
a database,
 a message is added to the log file. The message includes the <ph conref="../conrefs.dita#prod/productshortname"></ph>
version
 that the database was booted with, for example:</p>
-<codeblock>2008-09-18 16:43:54.992 GMT:
+<codeblock>2009-05-08 17:27:11.199 GMT:
  Booting <ph conref="../conrefs.dita#prod/productshortname"></ph> version The
Apache Software Foundation - <ph
 conref="../conrefs.dita#prod/productlongname"></ph> 
--  <ph conref="../conrefs.dita#vers/shortversionnumber"></ph>.2.0 - (689064):
instance a816c00e-011c-7658-a92a-fffff0cfee85
+-  10.5.1.1 - (764942): instance a816c00e-0121-2140-ffd9-fffff0cfee85
 on database directory C:\sampledb</codeblock>
 <p>The number of databases running in a <ph conref="../conrefs.dita#prod/productshortname"></ph>
system
 is limited only by the amount of memory available in the JVM.</p>

Modified: db/derby/docs/branches/10.5/src/devguide/tdevdvlp20349.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/devguide/tdevdvlp20349.dita?rev=775289&r1=775288&r2=775289&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/devguide/tdevdvlp20349.dita (original)
+++ db/derby/docs/branches/10.5/src/devguide/tdevdvlp20349.dita Fri May 15 19:06:23 2009
@@ -32,8 +32,8 @@
 the application shuts down the <ph conref="../conrefs.dita#prod/productshortname"></ph>
system
 by issuing the following JDBC call:</p><codeblock>DriverManager.getConnection("jdbc:derby:;shutdown=true");</codeblock><p>Shutdown
 commands always raise <i>SQLExceptions</i>.</p><p>When a <ph conref="../conrefs.dita#prod/productshortname"></ph>
system
-shuts down, a message goes to the error log:</p><codeblock>2008-08-07 19:23:00.508
GMT:
-Shutting down instance 80000001-00d0-8bdf-d115-000a0a0b2d00</codeblock><p>Typically,
+shuts down, a message goes to the log file:</p><codeblock>2009-05-08 17:28:47.140
GMT:
+Shutting down instance a816c00e-0121-2140-ffd9-fffff0cfee85</codeblock><p>Typically,
 an application using an embedded <ph conref="../conrefs.dita#prod/productshortname"></ph>
engine
 shuts down <ph conref="../conrefs.dita#prod/productshortname"></ph> just before
 shutting itself down. However, an application can shut down <ph conref="../conrefs.dita#prod/productshortname"></ph>
and

Modified: db/derby/docs/branches/10.5/src/getstart/twwdactivity1.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/getstart/twwdactivity1.dita?rev=775289&r1=775288&r2=775289&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/getstart/twwdactivity1.dita (original)
+++ db/derby/docs/branches/10.5/src/getstart/twwdactivity1.dita Fri May 15 19:06:23 2009
@@ -47,12 +47,12 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar
ij</userinput></b>
-<systemoutput>ij version 10.4</systemoutput></codeblock></stentry>
+<systemoutput>ij version 10.5</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar
ij</userinput></b>
-<systemoutput>ij version 10.4</systemoutput></codeblock></stentry>
+<systemoutput>ij version 10.5</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp></step>
 <step><cmd>Create the database and open a connection to the database using
@@ -143,16 +143,16 @@
 <li>The <codeph>derby.log</codeph> file. This file is a message and error
 log that, under normal circumstances, contains a set of startup messages and
 a shutdown message. <codeblock><systemoutput>----------------------------------------------------------------
-2008-09-16 20:59:31.661 GMT:
- Booting Derby version The Apache Software Foundation - Apache
-  Derby - 10.4.2.0 - (689064): 
-  instance a816c00e-011c-6cf5-f556-0000004c14a8
+2009-05-08 16:55:29.736 GMT:
+ Booting Derby version The Apache Software Foundation - Apache 
+  Derby - 10.5.1.1 - (764942): 
+  instance a816c00e-0121-2126-a56a-000000418588
   on database directory C:\DERBYTUTOR\firstdb  
 
 Database Class Loader started - derby.database.classpath=''
 
-2008-09-16 21:01:44.314 GMT:
-Shutting down instance a816c00e-011c-6cf5-f556-0000004c14a8
+2009-05-08 16:56:37.367 GMT:
+Shutting down instance a816c00e-0121-2126-a56a-000000418588
 ----------------------------------------------------------------</systemoutput></codeblock></li>
 <li>The <codeph>firstdb</codeph> database directory. Within the directory
 are the subdirectories <codeph>seg0</codeph> (containing the data files) and
<codeph>log</codeph> (containing

Modified: db/derby/docs/branches/10.5/src/getstart/twwdactivity2.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/getstart/twwdactivity2.dita?rev=775289&r1=775288&r2=775289&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/getstart/twwdactivity2.dita (original)
+++ db/derby/docs/branches/10.5/src/getstart/twwdactivity2.dita Fri May 15 19:06:23 2009
@@ -49,20 +49,20 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar
server start</userinput></b>
-<systemoutput>Security manager installed using the Basic server
- security policy.
-Apache Derby Network Server - 10.4.2.0 - (689064)
- started and ready to accept connections on
- port 1527 at 2008-09-17 13:40:18.386 GMT</systemoutput></codeblock></stentry>
+<systemoutput>2009-05-08 17:00:50.077 GMT : Security manager
+ installed using the Basic server security policy.
+2009-05-08 17:00:50.798 GMT : Apache Derby Network
+ Server - 10.5.1.1 - (764942) started and ready to
+ accept connections on port 1527</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar
server start</userinput></b>
-<systemoutput>Security manager installed using the Basic server
- security policy.
-Apache Derby Network Server - 10.4.2.0 - (689064)
- started and ready to accept connections on
- port 1527 at 2008-09-17 13:40:18.386 GMT</systemoutput></codeblock></stentry>
+<systemoutput>2009-05-08 17:00:50.077 GMT : Security manager
+ installed using the Basic server security policy.
+2009-05-08 17:00:50.798 GMT : Apache Derby Network
+ Server - 10.5.1.1 - (764942) started and ready to
+ accept connections on port 1527</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp><stepresult>A Network Server startup message appears
 in the Shell-1 command  window.</stepresult></step>
@@ -80,12 +80,12 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar
ij</userinput></b>
-<systemoutput>ij version 10.4</systemoutput></codeblock></stentry>
+<systemoutput>ij version 10.5</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar
ij</userinput></b>
-<systemoutput>ij version 10.4</systemoutput></codeblock></stentry>
+<systemoutput>ij version 10.5</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp><stepresult>You will enter all subsequent commands
 from the network client, so you will type the commands in the Shell-2 command
@@ -132,14 +132,14 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar
server shutdown</userinput></b>
-<systemoutput>Apache Derby Network Server - 10.4.2.0 - (689064)
- shutdown at 2008-09-17 13:43:17.737 GMT</systemoutput></codeblock></stentry>
+<systemoutput>2009-05-08 17:07:25.887 GMT : Apache Derby Network
+ Server - 10.5.1.1 - (764942) shutdown</systemoutput></codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar
server shutdown</userinput></b>
-<systemoutput>Apache Derby Network Server - 10.4.2.0 - (689064)
- shutdown at 2008-09-17 13:43:17.737 GMT</systemoutput></codeblock></stentry>
+<systemoutput>2009-05-08 17:07:25.887 GMT : Apache Derby Network
+ Server - 10.5.1.1 - (764942) shutdown</systemoutput></codeblock></stentry>
 </strow>
 </simpletable></stepxmp><stepresult>The server shutdown confirmation appears
 in both command windows.</stepresult></step>

Modified: db/derby/docs/branches/10.5/src/getstart/twwdactivity3_Setup.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/getstart/twwdactivity3_Setup.dita?rev=775289&r1=775288&r2=775289&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/getstart/twwdactivity3_Setup.dita (original)
+++ db/derby/docs/branches/10.5/src/getstart/twwdactivity3_Setup.dita Fri May 15 19:06:23
2009
@@ -84,19 +84,19 @@
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a peppermint stick</userinput></b>
 <systemoutput>  __________________________________________________________
-On 2008-09-17 10:11:28.235 I wished for a peppermint stick
+On 2009-05-08 13:12:09.058 I wished for a peppermint stick
   __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a long vacation</userinput></b>
 <systemoutput>  __________________________________________________________
-On 2008-09-17 10:11:28.235 I wished for a peppermint stick
-On 2008-09-17 10:11:38.555 I wished for a long vacation
+On 2009-05-08 13:12:09.058 I wished for a peppermint stick
+On 2009-05-08 13:12:21.28 I wished for a long vacation
   __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>exit</userinput></b>
 <systemoutput>Closed connection
 Database shut down normally
-Working With Derby JDBC program ending.</systemoutput></codeblock></stepxmp>
+Getting Started With Derby JDBC program ending.</systemoutput></codeblock></stepxmp>
 </step>
 </steps>
 </taskbody>

Modified: db/derby/docs/branches/10.5/src/getstart/twwdactivity4.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/getstart/twwdactivity4.dita?rev=775289&r1=775288&r2=775289&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/getstart/twwdactivity4.dita (original)
+++ db/derby/docs/branches/10.5/src/getstart/twwdactivity4.dita Fri May 15 19:06:23 2009
@@ -111,22 +111,20 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar
server start</userinput></b>
-Security manager installed using the Basic
- server security policy.
-Apache Derby Network Server - 10.4.2.0 -
- (689064) started and ready to accept
- connections on port 1527 at
- 2008-09-17 14:18:59.653 GMT</codeblock></stentry>
+2009-05-08 17:24:16.031 GMT : Security manager
+ installed using the Basic server security policy.
+2009-05-08 17:24:16.665 GMT : Apache Derby Network
+ Server - 10.5.1.1 - (764942) started and ready to
+ accept connections on port 1527</codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar
server start</userinput></b>
-Security manager installed using the Basic
- server security policy.
-Apache Derby Network Server - 10.4.2.0 -
- (689064) started and ready to accept
- connections on port 1527 at
- 2008-09-17 14:18:59.653 GMT</codeblock></stentry>
+2009-05-08 17:24:16.031 GMT : Security manager
+ installed using the Basic server security policy.
+2009-05-08 17:24:16.665 GMT : Apache Derby Network
+ Server - 10.5.1.1 - (764942) started and ready to
+ accept connections on port 1527</codeblock></stentry>
 </strow>
 </simpletable> </stepxmp></substep>
 </substeps>
@@ -159,22 +157,22 @@
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a sunny day</userinput></b>
 <systemoutput>  __________________________________________________________
-On 2008-09-17 10:11:28.235 I wished for a peppermint stick
-On 2008-09-17 10:11:38.555 I wished for a long vacation
-On 2008-09-17 10:22:19.249 I wished for a sunny day
+On 2009-05-08 13:12:09.058 I wished for a peppermint stick
+On 2009-05-08 13:12:21.28 I wished for a long vacation
+On 2009-05-08 13:27:22.581 I wished for a sunny day
   __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>a new car</userinput></b>
 <systemoutput>  __________________________________________________________
-On 2008-09-17 10:11:28.235 I wished for a peppermint stick
-On 2008-09-17 10:11:38.555 I wished for a long vacation
-On 2008-09-17 10:22:19.249 I wished for a sunny day
-On 2008-09-17 10:22:31.758 I wished for a new car
+On 2009-05-08 13:12:09.058 I wished for a peppermint stick
+On 2009-05-08 13:12:21.28 I wished for a long vacation
+On 2009-05-08 13:27:22.581 I wished for a sunny day
+On 2009-05-08 13:27:42.105 I wished for a new car
   __________________________________________________________
 Enter wish-list item (enter exit to end):</systemoutput>
 <b><userinput>exit</userinput></b>
 <systemoutput>Closed connection
-Working With Derby JDBC program ending.</systemoutput></codeblock> </stepxmp>
+Getting Started With Derby JDBC program ending.</systemoutput></codeblock> </stepxmp>
 </substep>
 </substeps>
 </step>
@@ -187,15 +185,15 @@
 <stentry><lines>UNIX
 (Korn Shell)</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar
server shutdown</userinput></b>
-<systemoutput>Apache Derby Network Server - 10.4.2.0 - (689064)
- shutdown at 2008-09-17 14:24:19.646 GMT</systemoutput>
+<systemoutput>2009-05-08 17:28:47.171 GMT : Apache Derby Network
+ Server - 10.5.1.1 - (764942) shutdown</systemoutput>
 </codeblock></stentry>
 </strow>
 <strow>
 <stentry><lines>Windows</lines></stentry>
 <stentry><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar
server shutdown</userinput></b>
-<systemoutput>Apache Derby Network Server - 10.4.2.0 - (689064)
- shutdown at 2008-09-17 14:24:19.646 GMT</systemoutput>
+<systemoutput>2009-05-08 17:28:47.171 GMT : Apache Derby Network
+ Server - 10.5.1.1 - (764942) shutdown</systemoutput>
 </codeblock></stentry>
 </strow>
 </simpletable> </stepxmp><stepresult>The server shutdown confirmation appears

Modified: db/derby/docs/branches/10.5/src/tools/rtoolssysinfo1002629.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/tools/rtoolssysinfo1002629.dita?rev=775289&r1=775288&r2=775289&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/tools/rtoolssysinfo1002629.dita (original)
+++ db/derby/docs/branches/10.5/src/tools/rtoolssysinfo1002629.dita Fri May 15 19:06:23 2009
@@ -27,55 +27,56 @@
 <refbody>
 <example>When you run the <codeph>sysinfo</codeph> command using the
 <codeph>derbyrun.jar</codeph> file, the output looks something like this: 
-<codeblock><b>java -jar C:\db-derby-10.4.2.0-bin\lib\derbyrun.jar sysinfo</b>
+<codeblock><b>java -jar C:\db-derby-10.5.1.1-bin\lib\derbyrun.jar sysinfo</b>
 ------------------ Java Information ------------------
-Java Version: 1.6.0_04
-Java Vendor: Sun Microsystems Inc.
-Java home: C:\jdk1.6.0_04\jre
-Java classpath: C:\db-derby-10.4.2.0-bin\lib\derbyrun.jar
-OS name: Windows XP
+Java Version:    1.6.0_13
+Java Vendor:     Sun Microsystems Inc.
+Java home:       C:\jdk1.6.0_13\jre
+Java classpath:  C:\db-derby-10.5.1.1-bin\lib\derbyrun.jar
+OS name:         Windows XP
 OS architecture: x86
-OS version: 5.1
-Java user name: user1
-Java user home: C:\Documents and Settings\myhome
-Java user dir: C:\DERBYDBS
+OS version:      5.1
+Java user name:  user1
+Java user home:  C:\Documents and Settings\user1
+Java user dir:   C:\DERBYDBS
 java.specification.name: Java Platform API Specification
 java.specification.version: 1.6
 --------- Derby Information --------
 JRE - JDBC: Java SE 6 - JDBC 4.0
-[C:\db-derby-10.4.2.0-bin\lib\derby.jar] 10.4.2.0 - (689064)
-[C:\db-derby-10.4.2.0-bin\lib\derbytools.jar] 10.4.2.0 - (689064)
-[C:\db-derby-10.4.2.0-bin\lib\derbynet.jar] 10.4.2.0 - (689064)
-[C:\db-derby-10.4.2.0-bin\lib\derbyclient.jar] 10.4.2.0 - (689064)
+[C:\db-derby-10.5.1.1-bin\lib\derby.jar] 10.5.1.1 - (764942)
+[C:\db-derby-10.5.1.1-bin\lib\derbytools.jar] 10.5.1.1 - (764942)
+[C:\db-derby-10.5.1.1-bin\lib\derbynet.jar] 10.5.1.1 - (764942)
+[C:\db-derby-10.5.1.1-bin\lib\derbyclient.jar] 10.5.1.1 - (764942)
 ------------------------------------------------------
 ----------------- Locale Information -----------------
 Current Locale : [English/United States [en_US]]
 Found support for locale: [cs]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [de_DE]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [es]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [fr]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [hu]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [it]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [ja_JP]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [ko_KR]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [pl]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [pt_BR]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [ru]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [zh_CN]
-         version: 10.4.2.0 - (689064)
+         version: 10.5.1.1 - (764942)
 Found support for locale: [zh_TW]
-         version: 10.4.2.0 - (689064)</codeblock></example>
+         version: 10.5.1.1 - (764942)
+------------------------------------------------------</codeblock></example>
 <section><p>When you request help for a problem by posting to the derby-user

 mailing list, include a copy of the information provided
 by the <codeph>sysinfo</codeph> utility.</p></section>



Mime
View raw message