You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ch...@apache.org on 2012/09/18 22:28:58 UTC
svn commit: r1387346 - in /db/derby/docs/trunk/src:
devguide/tdevdvlp20349.dita getstart/twwdactivity2.dita
getstart/twwdactivity3_Setup.dita getstart/twwdactivity4.dita
tools/rtoolssysinfo1002629.dita
Author: chaase3
Date: Tue Sep 18 20:28:58 2012
New Revision: 1387346
URL: http://svn.apache.org/viewvc?rev=1387346&view=rev
Log:
DERBY-5929 Release numbers in a few topics need updating
Provided modified output in 5 topics.
Patch: DERBY-5929.diff
Modified:
db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
db/derby/docs/trunk/src/getstart/twwdactivity2.dita
db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita
db/derby/docs/trunk/src/getstart/twwdactivity4.dita
db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita
Modified: db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita?rev=1387346&r1=1387345&r2=1387346&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita Tue Sep 18 20:28:58 2012
@@ -34,12 +34,12 @@ by issuing the following JDBC call:</p><
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 log file:</p>
<codeblock>----------------------------------------------------------------
-Wed Mar 02 17:08:36 EST 2011: Shutting down Derby engine
+Thu Sep 13 09:53:21 EDT 2012: Shutting down Derby engine
----------------------------------------------------------------
-Wed Mar 02 17:08:36 EST 2011:
-Shutting down instance a816c00e-012e-789c-116d-000000bbdd88 on
+Thu Sep 13 09:53:21 EDT 2012:
+Shutting down instance a816c00e-0139-bfe6-bff8-000000a155b8 on
database directory C:\sampledb with class loader
-sun.misc.Launcher$AppClassLoader@11b86e7
+sun.misc.Launcher$AppClassLoader@9931f5
----------------------------------------------------------------</codeblock>
<p>Typically,
an application using an embedded <ph conref="../conrefs.dita#prod/productshortname"></ph> engine
Modified: db/derby/docs/trunk/src/getstart/twwdactivity2.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity2.dita?rev=1387346&r1=1387345&r2=1387346&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity2.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity2.dita Tue Sep 18 20:28:58 2012
@@ -57,19 +57,19 @@ perform some basic SQL operations.</p></
<row>
<entry colname="col1">UNIX (Korn Shell)</entry>
<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server start</userinput></b>
-<systemoutput>Wed Mar 02 17:25:26 EST 2011 : Security manager
+<systemoutput>Thu Sep 13 16:45:36 EDT 2012 : Security manager
installed using the Basic server security policy.
-Wed Mar 02 17:25:27 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) started and
+Thu Sep 13 16:45:37 EDT 2012 : Apache Derby
+ Network Server - 10.10.0.0 - (1384314) started and
ready to accept connections on port 1527</systemoutput></codeblock></entry>
</row>
<row>
<entry colname="col1">Windows</entry>
<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server start</userinput></b>
-<systemoutput>Wed Mar 02 17:25:26 EST 2011 : Security manager
+<systemoutput>Thu Sep 13 16:45:36 EDT 2012 : Security manager
installed using the Basic server security policy.
-Wed Mar 02 17:25:27 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) started and
+Thu Sep 13 16:45:37 EDT 2012 : Apache Derby
+ Network Server - 10.10.0.0 - (1384314) started and
ready to accept connections on port 1527</systemoutput></codeblock></entry>
</row>
</tbody>
@@ -163,14 +163,14 @@ Server, as shown in the following table.
<row>
<entry colname="col1">UNIX (Korn Shell)</entry>
<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server shutdown</userinput></b>
-<systemoutput>Wed Mar 02 17:29:44 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></entry>
+<systemoutput>Thu Sep 13 16:50:37 EDT 2012 : Apache Derby
+ Network Server - 10.10.0.0 - (1384314) shutdown</systemoutput></codeblock></entry>
</row>
<row>
<entry colname="col1">Windows</entry>
<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server shutdown</userinput></b>
-<systemoutput>Wed Mar 02 17:29:44 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></entry>
+<systemoutput>Thu Sep 13 16:50:37 EDT 2012 : Apache Derby
+ Network Server - 10.10.0.0 - (1384314) shutdown</systemoutput></codeblock></entry>
</row>
</tbody>
</tgroup>
Modified: db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita?rev=1387346&r1=1387345&r2=1387346&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity3_Setup.dita Tue Sep 18 20:28:58 2012
@@ -101,13 +101,13 @@ Connected to database jdbcDemoDB
Enter wish-list item (enter exit to end):</systemoutput>
<b><userinput>a peppermint stick</userinput></b>
<systemoutput> __________________________________________________
-On 2011-03-02 17:41:52.531 I wished for a peppermint stick
+On 2012-09-14 09:46:37.77 I wished for a peppermint stick
__________________________________________________
Enter wish-list item (enter exit to end):</systemoutput>
<b><userinput>a long vacation</userinput></b>
<systemoutput> __________________________________________________
-On 2011-03-02 17:41:52.531 I wished for a peppermint stick
-On 2011-03-02 17:42:03.248 I wished for a long vacation
+On 2012-09-14 09:46:37.77 I wished for a peppermint stick
+On 2012-09-14 09:46:51.654 I wished for a long vacation
__________________________________________________
Enter wish-list item (enter exit to end):</systemoutput>
<b><userinput>exit</userinput></b>
Modified: db/derby/docs/trunk/src/getstart/twwdactivity4.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/twwdactivity4.dita?rev=1387346&r1=1387345&r2=1387346&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/twwdactivity4.dita (original)
+++ db/derby/docs/trunk/src/getstart/twwdactivity4.dita Tue Sep 18 20:28:58 2012
@@ -140,21 +140,21 @@ performed successfully.) </stepresult></
<row>
<entry colname="col1">UNIX (Korn Shell)</entry>
<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server start</userinput></b>
-Wed Mar 02 17:45:31 EST 2011 : Security
+Fri Sep 14 09:55:23 EDT 2012 : Security
manager installed using the Basic server
security policy.
-Wed Mar 02 17:45:32 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) started
+Fri Sep 14 09:55:24 EDT 2012 : Apache Derby
+ Network Server - 10.10.0.0 - (1384314) started
and ready to accept connections on port 1527</codeblock></entry>
</row>
<row>
<entry colname="col1">Windows</entry>
<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server start</userinput></b>
-Wed Mar 02 17:45:31 EST 2011 : Security
+Fri Sep 14 09:55:23 EDT 2012 : Security
manager installed using the Basic server
security policy.
-Wed Mar 02 17:45:32 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) started
+Fri Sep 14 09:55:24 EDT 2012 : Apache Derby
+ Network Server - 10.10.0.0 - (1384314) started
and ready to accept connections on port 1527</codeblock></entry>
</row>
</tbody>
@@ -207,17 +207,17 @@ Connected to database jdbcDemoDB
Enter wish-list item (enter exit to end):</systemoutput>
<b><userinput>a sunny day</userinput></b>
<systemoutput> __________________________________________________
-On 2011-03-02 17:41:52.531 I wished for a peppermint stick
-On 2011-03-02 17:42:03.248 I wished for a long vacation
-On 2011-03-02 17:48:09.622 I wished for a sunny day
+On 2012-09-14 09:46:37.77 I wished for a peppermint stick
+On 2012-09-14 09:46:51.654 I wished for a long vacation
+On 2012-09-14 09:56:36.6 I wished for a sunny day
__________________________________________________
Enter wish-list item (enter exit to end):</systemoutput>
<b><userinput>a new car</userinput></b>
<systemoutput> __________________________________________________
-On 2011-03-02 17:41:52.531 I wished for a peppermint stick
-On 2011-03-02 17:42:03.248 I wished for a long vacation
-On 2011-03-02 17:48:09.622 I wished for a sunny day
-On 2011-03-02 17:48:29.136 I wished for a new car
+On 2012-09-14 09:46:37.77 I wished for a peppermint stick
+On 2012-09-14 09:46:51.654 I wished for a long vacation
+On 2012-09-14 09:56:36.6 I wished for a sunny day
+On 2012-09-14 09:56:48.367 I wished for a new car
__________________________________________________
Enter wish-list item (enter exit to end):</systemoutput>
<b><userinput>exit</userinput></b>
@@ -244,14 +244,14 @@ Getting Started With Derby JDBC program
<row>
<entry colname="col1">UNIX (Korn Shell)</entry>
<entry colname="col2"><codeblock><b><userinput>java -jar $DERBY_HOME/lib/derbyrun.jar server shutdown</userinput></b>
-<systemoutput>Wed Mar 02 17:48:54 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></entry>
+<systemoutput>Fri Sep 14 09:58:12 EDT 2012 : Apache Derby
+ Network Server - 10.10.0.0 - (1384314) shutdown</systemoutput></codeblock></entry>
</row>
<row>
<entry colname="col1">Windows</entry>
<entry colname="col2"><codeblock><b><userinput>java -jar %DERBY_HOME%\lib\derbyrun.jar server shutdown</userinput></b>
-<systemoutput>Wed Mar 02 17:48:54 EST 2011 : Apache Derby
- Network Server - 10.8.0.0 - (1076370) shutdown</systemoutput></codeblock></entry>
+<systemoutput>Fri Sep 14 09:58:12 EDT 2012 : Apache Derby
+ Network Server - 10.10.0.0 - (1384314) shutdown</systemoutput></codeblock></entry>
</row>
</tbody>
</tgroup>
Modified: db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita?rev=1387346&r1=1387345&r2=1387346&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolssysinfo1002629.dita Tue Sep 18 20:28:58 2012
@@ -27,12 +27,12 @@ limitations under the License.
<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.8.0.0-bin\lib\derbyrun.jar sysinfo</b>
+<codeblock><b>java -jar C:\db-derby-10.10.0.0-bin\lib\derbyrun.jar sysinfo</b>
------------------ Java Information ------------------
-Java Version: 1.6.0_24
-Java Vendor: Sun Microsystems Inc.
-Java home: C:\jdk1.6.0_24\jre
-Java classpath: C:\db-derby-10.8.0.0-bin\lib\derbyrun.jar
+Java Version: 1.7.0_07
+Java Vendor: Oracle Corporation
+Java home: C:\jdk1.7.0_07\jre
+Java classpath: C:\db-derby-10.10.0.0-bin\lib\derbyrun.jar
OS name: Windows XP
OS architecture: x86
OS version: 5.1
@@ -40,43 +40,42 @@ 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
-java.runtime.version: 1.6.0_24-b07
+java.specification.version: 1.7
+java.runtime.version: 1.7.0_07-b11
--------- Derby Information --------
-JRE - JDBC: Java SE 6 - JDBC 4.0
-[C:\db-derby-10.7.1.0-bin\lib\derby.jar] 10.8.0.0 - (1076370)
-[C:\db-derby-10.7.1.0-bin\lib\derbytools.jar] 10.8.0.0 - (1076370)
-[C:\db-derby-10.7.1.0-bin\lib\derbynet.jar] 10.8.0.0 - (1076370)
-[C:\db-derby-10.7.1.0-bin\lib\derbyclient.jar] 10.8.0.0 - (1076370)
+[C:\db-derby-10.10.0.0-bin\lib\derby.jar] 10.10.0.0 - (1384314)
+[C:\db-derby-10.10.0.0-bin\lib\derbytools.jar] 10.10.0.0 - (1384314)
+[C:\db-derby-10.10.0.0-bin\lib\derbynet.jar] 10.10.0.0 - (1384314)
+[C:\db-derby-10.10.0.0-bin\lib\derbyclient.jar] 10.10.0.0 - (1384314)
------------------------------------------------------
----------------- Locale Information -----------------
Current Locale : [English/United States [en_US]]
Found support for locale: [cs]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [de_DE]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [es]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [fr]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [hu]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [it]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [ja_JP]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [ko_KR]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [pl]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [pt_BR]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [ru]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [zh_CN]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
Found support for locale: [zh_TW]
- version: 10.8.0.0 - (1076370)
+ version: 10.10.0.0 - (1384314)
------------------------------------------------------</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